Merge pull request #463 from eclipse/jpsm-refactoring

[BUG] It is not possible to use jnosql with JPMS

CHANGELOG.adoc

@@ -13,6 +13,10 @@ and this project adheres to https://semver.org/spec/v2.0.0.html[Semantic Version
 - Fix serialization when the entity has constructor with simple generic types
 - null Embeddable list of nested object cannot be saved
 
+=== Changed
+
+- Change package name to avoid duplicated name in different modules
+
 == [1.0.3] - 2023-12-02
 
 === Changed

jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Actor.java → jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Actor.java

@@ -12,7 +12,7 @@
  *
  *    Otavio Santana
  */
-package org.eclipse.jnosql.mapping.test.entities;
+package org.eclipse.jnosql.mapping.core.entities;
 
 
 

jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/ActorBuilder.java → jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/ActorBuilder.java

@@ -12,7 +12,7 @@
  *
  *    Otavio Santana
  */
-package org.eclipse.jnosql.mapping.test.entities;
+package org.eclipse.jnosql.mapping.core.entities;
 
 import java.util.List;
 import java.util.Map;

jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Address.java → jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Address.java

@@ -12,7 +12,7 @@
  *
  *    Otavio Santana
  */
-package org.eclipse.jnosql.mapping.test.entities;
+package org.eclipse.jnosql.mapping.core.entities;
 
 import jakarta.nosql.Column;
 import jakarta.nosql.Entity;

jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Animal.java → jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Animal.java

@@ -12,7 +12,7 @@
  *
  *    Otavio Santana
  */
-package org.eclipse.jnosql.mapping.test.entities;
+package org.eclipse.jnosql.mapping.core.entities;
 
 import jakarta.nosql.Column;
 import jakarta.nosql.Entity;

jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Book.java → jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Book.java

@@ -12,7 +12,7 @@
  *
  *    Otavio Santana
  */
-package org.eclipse.jnosql.mapping.test.entities;
+package org.eclipse.jnosql.mapping.core.entities;
 
 import jakarta.nosql.Column;
 import jakarta.nosql.Entity;

jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/Job.java → jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Job.java

@@ -12,7 +12,7 @@
  *
  *    Otavio Santana
  */
-package org.eclipse.jnosql.mapping.test.entities;
+package org.eclipse.jnosql.mapping.core.entities;
 
 
 import jakarta.nosql.Column;

jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Money.java → jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Money.java

@@ -12,7 +12,7 @@
  *
  *    Otavio Santana
  */
-package org.eclipse.jnosql.mapping.test.entities;
+package org.eclipse.jnosql.mapping.core.entities;
 
 
 import java.math.BigDecimal;

jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/MoneyConverter.java → jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/MoneyConverter.java

@@ -12,7 +12,7 @@
  *
  *    Otavio Santana
  */
-package org.eclipse.jnosql.mapping.test.entities;
+package org.eclipse.jnosql.mapping.core.entities;
 
 
 import org.eclipse.jnosql.mapping.AttributeConverter;

jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Movie.java → jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Movie.java

@@ -12,7 +12,7 @@
  *
  *    Otavio Santana
  */
-package org.eclipse.jnosql.mapping.test.entities;
+package org.eclipse.jnosql.mapping.core.entities;
 
 
 import jakarta.nosql.Column;

jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Person.java → jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Person.java

@@ -12,7 +12,7 @@
  *
  *    Otavio Santana
  */
-package org.eclipse.jnosql.mapping.test.entities;
+package org.eclipse.jnosql.mapping.core.entities;
 
 
 import jakarta.nosql.Column;

jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonBuilder.java → jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/PersonBuilder.java

@@ -12,7 +12,7 @@
  *
  *    Otavio Santana
  */
-package org.eclipse.jnosql.mapping.test.entities;
+package org.eclipse.jnosql.mapping.core.entities;
 
 import java.util.List;
 

jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Worker.java → jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Worker.java

@@ -12,7 +12,7 @@
  *
  *    Otavio Santana
  */
-package org.eclipse.jnosql.mapping.test.entities;
+package org.eclipse.jnosql.mapping.core.entities;
 
 
 import jakarta.nosql.Column;

jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/ZipCode.java → jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/ZipCode.java

@@ -12,7 +12,7 @@
  *
  *    Otavio Santana
  */
-package org.eclipse.jnosql.mapping.test.entities;
+package org.eclipse.jnosql.mapping.core.entities;
 
 import jakarta.nosql.Column;
 import jakarta.nosql.Entity;

jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/BookUser.java → jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/constructor/BookUser.java

@@ -12,13 +12,13 @@
  *
  *    Otavio Santana
  */
-package org.eclipse.jnosql.mapping.test.entities.constructor;
+package org.eclipse.jnosql.mapping.core.entities.constructor;
 
 
 import jakarta.nosql.Column;
 import jakarta.nosql.Entity;
 import jakarta.nosql.Id;
-import org.eclipse.jnosql.mapping.test.entities.Book;
+import org.eclipse.jnosql.mapping.core.entities.Book;
 
 import java.util.List;
 import java.util.Objects;

jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/PetOwner.java → jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/constructor/PetOwner.java

@@ -12,12 +12,12 @@
  *
  *    Otavio Santana
  */
-package org.eclipse.jnosql.mapping.test.entities.constructor;
+package org.eclipse.jnosql.mapping.core.entities.constructor;
 
 import jakarta.nosql.Column;
 import jakarta.nosql.Entity;
 import jakarta.nosql.Id;
-import org.eclipse.jnosql.mapping.test.entities.Animal;
+import org.eclipse.jnosql.mapping.core.entities.Animal;
 
 import java.util.Objects;
 

jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/metadata/MappingTypeTest.java

@@ -19,13 +19,13 @@
 
 import jakarta.nosql.Column;
 import org.eclipse.jnosql.mapping.Embeddable;
-import org.eclipse.jnosql.mapping.test.entities.Actor;
-import org.eclipse.jnosql.mapping.test.entities.Address;
-import org.eclipse.jnosql.mapping.test.entities.Movie;
-import org.eclipse.jnosql.mapping.test.entities.Person;
-import org.eclipse.jnosql.mapping.test.entities.Worker;
-import org.eclipse.jnosql.mapping.test.entities.constructor.BookUser;
-import org.eclipse.jnosql.mapping.test.entities.constructor.PetOwner;
+import org.eclipse.jnosql.mapping.core.entities.Actor;
+import org.eclipse.jnosql.mapping.core.entities.Address;
+import org.eclipse.jnosql.mapping.core.entities.Movie;
+import org.eclipse.jnosql.mapping.core.entities.Person;
+import org.eclipse.jnosql.mapping.core.entities.Worker;
+import org.eclipse.jnosql.mapping.core.entities.constructor.BookUser;
+import org.eclipse.jnosql.mapping.core.entities.constructor.PetOwner;
 import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Constructor;

jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/AbstractColumnTemplate.java

@@ -25,12 +25,12 @@
 import org.eclipse.jnosql.communication.column.ColumnObserverParser;
 import org.eclipse.jnosql.communication.column.ColumnQuery;
 import org.eclipse.jnosql.communication.column.ColumnQueryParser;
-import org.eclipse.jnosql.mapping.Converters;
+import org.eclipse.jnosql.mapping.core.Converters;
 import org.eclipse.jnosql.mapping.IdNotFoundException;
 import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
 import org.eclipse.jnosql.mapping.metadata.EntityMetadata;
 import org.eclipse.jnosql.mapping.metadata.FieldMetadata;
-import org.eclipse.jnosql.mapping.util.ConverterUtil;
+import org.eclipse.jnosql.mapping.core.util.ConverterUtil;
 
 import java.time.Duration;
 import java.util.Iterator;

jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/AbstractMapperQuery.java

@@ -16,9 +16,9 @@
 
 import org.eclipse.jnosql.communication.column.Column;
 import org.eclipse.jnosql.communication.column.ColumnCondition;
-import org.eclipse.jnosql.mapping.Converters;
+import org.eclipse.jnosql.mapping.core.Converters;
 import org.eclipse.jnosql.mapping.metadata.EntityMetadata;
-import org.eclipse.jnosql.mapping.util.ConverterUtil;
+import org.eclipse.jnosql.mapping.core.util.ConverterUtil;
 
 import java.util.List;
 import java.util.stream.StreamSupport;

jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnEntityConverter.java

@@ -16,7 +16,7 @@
 
 import org.eclipse.jnosql.communication.column.Column;
 import org.eclipse.jnosql.communication.column.ColumnEntity;
-import org.eclipse.jnosql.mapping.Converters;
+import org.eclipse.jnosql.mapping.core.Converters;
 import jakarta.data.exceptions.MappingException;
 import org.eclipse.jnosql.mapping.metadata.ConstructorBuilder;
 import org.eclipse.jnosql.mapping.metadata.ConstructorMetadata;

jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnFieldValue.java

@@ -16,7 +16,7 @@
 
 
 import org.eclipse.jnosql.communication.column.Column;
-import org.eclipse.jnosql.mapping.Converters;
+import org.eclipse.jnosql.mapping.core.Converters;
 import org.eclipse.jnosql.mapping.metadata.FieldValue;
 
 import java.util.List;

jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnMapperDelete.java

@@ -19,7 +19,7 @@
 import jakarta.nosql.QueryMapper.MapperDeleteNotCondition;
 import jakarta.nosql.QueryMapper.MapperDeleteWhere;
 import org.eclipse.jnosql.communication.column.ColumnDeleteQuery;
-import org.eclipse.jnosql.mapping.Converters;
+import org.eclipse.jnosql.mapping.core.Converters;
 import org.eclipse.jnosql.mapping.metadata.EntityMetadata;
 
 import static java.util.Objects.requireNonNull;

jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnMapperSelect.java

@@ -17,7 +17,7 @@
 import jakarta.data.repository.Direction;
 import jakarta.data.repository.Sort;
 import org.eclipse.jnosql.communication.column.ColumnQuery;
-import org.eclipse.jnosql.mapping.Converters;
+import org.eclipse.jnosql.mapping.core.Converters;
 import jakarta.nosql.QueryMapper.MapperFrom;
 import jakarta.nosql.QueryMapper.MapperLimit;
 import jakarta.nosql.QueryMapper.MapperNameCondition;

jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnTemplateProducer.java

@@ -19,7 +19,7 @@
 import jakarta.inject.Inject;
 import jakarta.nosql.column.ColumnTemplate;
 import org.eclipse.jnosql.communication.column.ColumnManager;
-import org.eclipse.jnosql.mapping.Converters;
+import org.eclipse.jnosql.mapping.core.Converters;
 import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
 
 import java.util.Objects;

jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/DefaultColumnEntityConverter.java

@@ -15,7 +15,7 @@
 package org.eclipse.jnosql.mapping.column;
 
 
-import org.eclipse.jnosql.mapping.Converters;
+import org.eclipse.jnosql.mapping.core.Converters;
 import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
 
 import jakarta.enterprise.context.ApplicationScoped;

jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/DefaultColumnFieldValue.java

@@ -16,7 +16,7 @@
 
 import org.eclipse.jnosql.mapping.AttributeConverter;
 import org.eclipse.jnosql.communication.column.Column;
-import org.eclipse.jnosql.mapping.Converters;
+import org.eclipse.jnosql.mapping.core.Converters;
 import org.eclipse.jnosql.mapping.metadata.FieldMetadata;
 import org.eclipse.jnosql.mapping.metadata.MappingType;
 import org.eclipse.jnosql.mapping.metadata.FieldValue;

jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/DefaultColumnTemplate.java

@@ -19,7 +19,7 @@
 import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 import org.eclipse.jnosql.communication.column.ColumnManager;
-import org.eclipse.jnosql.mapping.Converters;
+import org.eclipse.jnosql.mapping.core.Converters;
 import org.eclipse.jnosql.mapping.Database;
 import org.eclipse.jnosql.mapping.DatabaseType;
 import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;

jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/AbstractColumnRepository.java

@@ -18,7 +18,7 @@
 import jakarta.data.repository.Pageable;
 import jakarta.data.repository.PageableRepository;
 import org.eclipse.jnosql.communication.column.ColumnQuery;
-import org.eclipse.jnosql.mapping.NoSQLPage;
+import org.eclipse.jnosql.mapping.core.NoSQLPage;
 import org.eclipse.jnosql.mapping.column.JNoSQLColumnTemplate;
 import org.eclipse.jnosql.mapping.column.MappingColumnQuery;
 import org.eclipse.jnosql.mapping.metadata.EntityMetadata;

jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/AbstractColumnRepositoryProxy.java

@@ -19,10 +19,10 @@
 import jakarta.enterprise.inject.spi.CDI;
 import org.eclipse.jnosql.communication.column.ColumnDeleteQuery;
 import org.eclipse.jnosql.communication.column.ColumnQuery;
-import org.eclipse.jnosql.mapping.Converters;
+import org.eclipse.jnosql.mapping.core.Converters;
 import org.eclipse.jnosql.mapping.query.RepositoryType;
-import org.eclipse.jnosql.mapping.repository.DynamicQueryMethodReturn;
-import org.eclipse.jnosql.mapping.repository.ThrowingSupplier;
+import org.eclipse.jnosql.mapping.core.repository.DynamicQueryMethodReturn;
+import org.eclipse.jnosql.mapping.core.repository.ThrowingSupplier;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;

jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/BaseColumnRepository.java

@@ -29,12 +29,12 @@
 import org.eclipse.jnosql.communication.query.SelectQuery;
 import org.eclipse.jnosql.communication.query.method.DeleteMethodProvider;
 import org.eclipse.jnosql.communication.query.method.SelectMethodProvider;
-import org.eclipse.jnosql.mapping.Converters;
-import org.eclipse.jnosql.mapping.NoSQLPage;
+import org.eclipse.jnosql.mapping.core.Converters;
+import org.eclipse.jnosql.mapping.core.NoSQLPage;
 import org.eclipse.jnosql.mapping.column.JNoSQLColumnTemplate;
 import org.eclipse.jnosql.mapping.metadata.EntityMetadata;
-import org.eclipse.jnosql.mapping.repository.DynamicReturn;
-import org.eclipse.jnosql.mapping.util.ParamsBinder;
+import org.eclipse.jnosql.mapping.core.repository.DynamicReturn;
+import org.eclipse.jnosql.mapping.core.util.ParamsBinder;
 
 import java.lang.reflect.Method;
 import java.util.Objects;

jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryProducer.java

@@ -17,7 +17,7 @@
 import jakarta.data.repository.PageableRepository;
 import jakarta.nosql.column.ColumnTemplate;
 import org.eclipse.jnosql.communication.column.ColumnManager;
-import org.eclipse.jnosql.mapping.Converters;
+import org.eclipse.jnosql.mapping.core.Converters;
 import org.eclipse.jnosql.mapping.column.ColumnTemplateProducer;
 import org.eclipse.jnosql.mapping.column.JNoSQLColumnTemplate;
 import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;

jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryProxy.java

@@ -16,7 +16,7 @@
 
 
 import jakarta.data.repository.PageableRepository;
-import org.eclipse.jnosql.mapping.Converters;
+import org.eclipse.jnosql.mapping.core.Converters;
 import org.eclipse.jnosql.mapping.column.JNoSQLColumnTemplate;
 import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
 import org.eclipse.jnosql.mapping.metadata.EntityMetadata;

jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/ColumnTokenProcessor.java

@@ -15,7 +15,7 @@
 package org.eclipse.jnosql.mapping.column.query;
 
 import org.eclipse.jnosql.communication.column.ColumnCondition;
-import org.eclipse.jnosql.mapping.Converters;
+import org.eclipse.jnosql.mapping.core.Converters;
 import org.eclipse.jnosql.mapping.metadata.EntityMetadata;
 
 interface ColumnTokenProcessor {

jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/DynamicQuery.java

@@ -17,10 +17,10 @@
 import jakarta.data.repository.Limit;
 import jakarta.data.repository.Sort;
 import org.eclipse.jnosql.communication.column.ColumnQuery;
-import org.eclipse.jnosql.mapping.NoSQLPage;
+import org.eclipse.jnosql.mapping.core.NoSQLPage;
 import org.eclipse.jnosql.mapping.column.MappingColumnQuery;
-import org.eclipse.jnosql.mapping.repository.DynamicReturn;
-import org.eclipse.jnosql.mapping.repository.SpecialParameters;
+import org.eclipse.jnosql.mapping.core.repository.DynamicReturn;
+import org.eclipse.jnosql.mapping.core.repository.SpecialParameters;
 
 import java.util.ArrayList;
 import java.util.List;

jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/RepositoryColumnBean.java

@@ -16,13 +16,13 @@
 
 import jakarta.data.repository.CrudRepository;
 import jakarta.enterprise.context.spi.CreationalContext;
-import org.eclipse.jnosql.mapping.Converters;
+import org.eclipse.jnosql.mapping.core.Converters;
 import org.eclipse.jnosql.mapping.DatabaseQualifier;
 import org.eclipse.jnosql.mapping.DatabaseType;
 import org.eclipse.jnosql.mapping.column.JNoSQLColumnTemplate;
 import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
 import org.eclipse.jnosql.mapping.spi.AbstractBean;
-import org.eclipse.jnosql.mapping.util.AnnotationLiteralUtil;
+import org.eclipse.jnosql.mapping.core.util.AnnotationLiteralUtil;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Proxy;

jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/RepositoryColumnObserverParser.java

@@ -16,7 +16,7 @@
 
 import org.eclipse.jnosql.communication.column.ColumnObserverParser;
 import org.eclipse.jnosql.mapping.metadata.EntityMetadata;
-import org.eclipse.jnosql.mapping.repository.RepositoryObserverParser;
+import org.eclipse.jnosql.mapping.core.repository.RepositoryObserverParser;
 
 import java.util.Objects;
 

jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnEntityConverterConstructorTest.java

@@ -19,7 +19,7 @@
 import org.eclipse.jnosql.communication.TypeReference;
 import org.eclipse.jnosql.communication.column.Column;
 import org.eclipse.jnosql.communication.column.ColumnEntity;
-import org.eclipse.jnosql.mapping.Converters;
+import org.eclipse.jnosql.mapping.core.Converters;
 import org.eclipse.jnosql.mapping.column.entities.Animal;
 import org.eclipse.jnosql.mapping.column.entities.Book;
 import org.eclipse.jnosql.mapping.column.entities.BookRelease;