diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index aea5385d8..73c22f77c 100644 --- a/CHANGELOG.adoc +++ b/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 diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Actor.java b/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Actor.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Actor.java rename to jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Actor.java index 590bd430e..f66b260bf 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Actor.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/ActorBuilder.java b/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/ActorBuilder.java similarity index 97% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/ActorBuilder.java rename to jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/ActorBuilder.java index 16abcf3d3..11f087ffc 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/ActorBuilder.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Address.java b/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Address.java similarity index 97% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Address.java rename to jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Address.java index 512d33fa0..2adbc8dc6 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Address.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Animal.java b/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Animal.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Animal.java rename to jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Animal.java index 16377e87b..b639a0745 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Animal.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Book.java b/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Book.java similarity index 97% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Book.java rename to jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Book.java index 8afd117f7..807b3049d 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Book.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/Job.java b/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Job.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/Job.java rename to jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Job.java index 780129154..e9c331723 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/Job.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Money.java b/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Money.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Money.java rename to jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Money.java index 2316c0a36..994fd2aea 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Money.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/MoneyConverter.java b/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/MoneyConverter.java similarity index 95% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/MoneyConverter.java rename to jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/MoneyConverter.java index 50c951d2f..67e84fc68 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/MoneyConverter.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Movie.java b/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Movie.java similarity index 97% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Movie.java rename to jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Movie.java index 23566538d..a2d78b558 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Movie.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Person.java b/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Person.java similarity index 98% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Person.java rename to jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Person.java index ff1e70192..e3ea303a1 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Person.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonBuilder.java b/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/PersonBuilder.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonBuilder.java rename to jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/PersonBuilder.java index 45abfe70d..db383d901 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonBuilder.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Worker.java b/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Worker.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Worker.java rename to jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Worker.java index 13c6bc014..259fb57bb 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Worker.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/ZipCode.java b/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/ZipCode.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/ZipCode.java rename to jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/ZipCode.java index 8820f0f4c..95cea42a2 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/ZipCode.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/BookUser.java b/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/constructor/BookUser.java similarity index 94% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/BookUser.java rename to jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/constructor/BookUser.java index 18c37178a..29877c599 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/BookUser.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/PetOwner.java b/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/constructor/PetOwner.java similarity index 93% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/PetOwner.java rename to jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/constructor/PetOwner.java index 76ba743d7..8f466dae0 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/PetOwner.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/metadata/MappingTypeTest.java b/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/metadata/MappingTypeTest.java index 78fe4e8b7..54a311a35 100644 --- a/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/metadata/MappingTypeTest.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/AbstractColumnTemplate.java b/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/AbstractColumnTemplate.java index b20ccf1e3..a8313a1a7 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/AbstractColumnTemplate.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/AbstractMapperQuery.java b/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/AbstractMapperQuery.java index f351c21b5..1daa11d6f 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/AbstractMapperQuery.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnEntityConverter.java b/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnEntityConverter.java index 9efa4502b..91ef35fa2 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnEntityConverter.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnFieldValue.java b/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnFieldValue.java index b240c88a4..7b4f10580 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnFieldValue.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnMapperDelete.java b/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnMapperDelete.java index 86ab82634..20c1d4c79 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnMapperDelete.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnMapperSelect.java b/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnMapperSelect.java index 628b30e3a..b2f34eaa7 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnMapperSelect.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnTemplateProducer.java b/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnTemplateProducer.java index 2c2be6c24..0d2a7907a 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnTemplateProducer.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/DefaultColumnEntityConverter.java b/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/DefaultColumnEntityConverter.java index f1569d1cb..a7adfddd5 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/DefaultColumnEntityConverter.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/DefaultColumnFieldValue.java b/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/DefaultColumnFieldValue.java index 534a40026..2a39732c2 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/DefaultColumnFieldValue.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/DefaultColumnTemplate.java b/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/DefaultColumnTemplate.java index 775778047..045b141ec 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/DefaultColumnTemplate.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/AbstractColumnRepository.java b/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/AbstractColumnRepository.java index 60daca049..e5ee3ce36 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/AbstractColumnRepository.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/AbstractColumnRepositoryProxy.java b/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/AbstractColumnRepositoryProxy.java index eb4a69a84..01b08af7b 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/AbstractColumnRepositoryProxy.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/BaseColumnRepository.java b/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/BaseColumnRepository.java index fb736d8c3..47e778ec7 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/BaseColumnRepository.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryProducer.java b/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryProducer.java index 13e09bbb8..1a850dd03 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryProducer.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryProxy.java b/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryProxy.java index 093185fdd..464920cd5 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryProxy.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/ColumnTokenProcessor.java b/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/ColumnTokenProcessor.java index ee1b8fe01..2975ce245 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/ColumnTokenProcessor.java +++ b/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 { diff --git a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/DynamicQuery.java b/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/DynamicQuery.java index e15eba693..8dc613ba7 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/DynamicQuery.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/RepositoryColumnBean.java b/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/RepositoryColumnBean.java index 11ef9005c..e14afde37 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/RepositoryColumnBean.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/RepositoryColumnObserverParser.java b/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/RepositoryColumnObserverParser.java index c6c06de4e..10913e673 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/RepositoryColumnObserverParser.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnEntityConverterConstructorTest.java b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnEntityConverterConstructorTest.java index 8d7c69fa0..56aea28f3 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnEntityConverterConstructorTest.java +++ b/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; diff --git a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnEntityConverterInheritanceTest.java b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnEntityConverterInheritanceTest.java index 85dcf4745..bc1892636 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnEntityConverterInheritanceTest.java +++ b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnEntityConverterInheritanceTest.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.inheritance.EmailNotification; import org.eclipse.jnosql.mapping.column.entities.inheritance.LargeProject; import org.eclipse.jnosql.mapping.column.entities.inheritance.Notification; diff --git a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnEntityConverterTest.java b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnEntityConverterTest.java index 91acdc620..cab0a833d 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnEntityConverterTest.java +++ b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnEntityConverterTest.java @@ -20,7 +20,7 @@ import org.eclipse.jnosql.communication.Value; 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.Actor; import org.eclipse.jnosql.mapping.column.entities.Address; import org.eclipse.jnosql.mapping.column.entities.AppointmentBook; diff --git a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnEntityImmutableTest.java b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnEntityImmutableTest.java index 10f9dc17a..82b0a50a7 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnEntityImmutableTest.java +++ b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnEntityImmutableTest.java @@ -17,7 +17,7 @@ import jakarta.inject.Inject; 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.Car; import org.eclipse.jnosql.mapping.column.entities.Hero; import org.eclipse.jnosql.mapping.column.spi.ColumnExtension; diff --git a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnMapperObserverTest.java b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnMapperObserverTest.java index 84d1dd235..4ffc2592b 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnMapperObserverTest.java +++ b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnMapperObserverTest.java @@ -16,7 +16,7 @@ import jakarta.inject.Inject; import org.eclipse.jnosql.communication.column.ColumnObserverParser; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.column.entities.Car; import org.eclipse.jnosql.mapping.column.entities.Vendor; import org.eclipse.jnosql.mapping.column.entities.Worker; diff --git a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnTemplateTest.java b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnTemplateTest.java index e764b609b..cb2fed38c 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnTemplateTest.java +++ b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnTemplateTest.java @@ -16,7 +16,7 @@ import jakarta.inject.Inject; import jakarta.nosql.Template; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.Database; import org.eclipse.jnosql.mapping.column.spi.ColumnExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; diff --git a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/DefaultColumnTemplateProducerTest.java b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/DefaultColumnTemplateProducerTest.java index a83a10cdd..5b0475713 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/DefaultColumnTemplateProducerTest.java +++ b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/DefaultColumnTemplateProducerTest.java @@ -17,7 +17,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.column.spi.ColumnExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension; diff --git a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/DefaultColumnTemplateTest.java b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/DefaultColumnTemplateTest.java index a65955ad6..c0ad23e17 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/DefaultColumnTemplateTest.java +++ b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/DefaultColumnTemplateTest.java @@ -24,7 +24,7 @@ import org.eclipse.jnosql.communication.column.ColumnEntity; import org.eclipse.jnosql.communication.column.ColumnManager; 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.IdNotFoundException; import org.eclipse.jnosql.mapping.column.entities.Job; import org.eclipse.jnosql.mapping.column.entities.Person; diff --git a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/MapperDeleteTest.java b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/MapperDeleteTest.java index 14f4e1b91..3e585891e 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/MapperDeleteTest.java +++ b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/MapperDeleteTest.java @@ -18,7 +18,7 @@ import jakarta.inject.Inject; import org.eclipse.jnosql.communication.column.ColumnDeleteQuery; 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.entities.Address; import org.eclipse.jnosql.mapping.column.entities.Money; import org.eclipse.jnosql.mapping.column.entities.Person; diff --git a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/MapperSelectTest.java b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/MapperSelectTest.java index 2d228f110..cd36a74b8 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/MapperSelectTest.java +++ b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/MapperSelectTest.java @@ -19,7 +19,7 @@ import org.eclipse.jnosql.communication.column.ColumnEntity; import org.eclipse.jnosql.communication.column.ColumnManager; 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.column.entities.Address; import org.eclipse.jnosql.mapping.column.entities.Money; import org.eclipse.jnosql.mapping.column.entities.Person; diff --git a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/configuration/ColumnManagerSupplierTest.java b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/configuration/ColumnManagerSupplierTest.java index 5a8e08a72..b641d4956 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/configuration/ColumnManagerSupplierTest.java +++ b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/configuration/ColumnManagerSupplierTest.java @@ -17,7 +17,7 @@ import jakarta.data.exceptions.MappingException; 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.column.ColumnEntityConverter; import org.eclipse.jnosql.mapping.column.MockProducer; import org.eclipse.jnosql.mapping.column.spi.ColumnExtension; diff --git a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/ColumnCrudRepositoryProxyTest.java b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/ColumnCrudRepositoryProxyTest.java index f2bae714a..3bbae5f1b 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/ColumnCrudRepositoryProxyTest.java +++ b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/ColumnCrudRepositoryProxyTest.java @@ -28,7 +28,7 @@ import org.eclipse.jnosql.communication.column.ColumnCondition; 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.column.ColumnEntityConverter; import org.eclipse.jnosql.mapping.column.JNoSQLColumnTemplate; import org.eclipse.jnosql.mapping.column.MockProducer; diff --git a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryExtensionTest.java b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryExtensionTest.java index ac00c6708..5ac93b3da 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryExtensionTest.java +++ b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryExtensionTest.java @@ -15,7 +15,7 @@ package org.eclipse.jnosql.mapping.column.query; import jakarta.inject.Inject; -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.column.ColumnEntityConverter; diff --git a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryProxyPageableTest.java b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryProxyPageableTest.java index e56add40e..43442d1cf 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryProxyPageableTest.java +++ b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryProxyPageableTest.java @@ -27,8 +27,8 @@ import org.eclipse.jnosql.communication.column.Column; import org.eclipse.jnosql.communication.column.ColumnCondition; import org.eclipse.jnosql.communication.column.ColumnQuery; -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.ColumnEntityConverter; import org.eclipse.jnosql.mapping.column.JNoSQLColumnTemplate; import org.eclipse.jnosql.mapping.column.MockProducer; diff --git a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryProxyTest.java b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryProxyTest.java index 9b37d65db..643685297 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryProxyTest.java +++ b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryProxyTest.java @@ -30,7 +30,7 @@ import org.eclipse.jnosql.communication.column.ColumnCondition; 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.column.ColumnEntityConverter; import org.eclipse.jnosql.mapping.column.JNoSQLColumnTemplate; import org.eclipse.jnosql.mapping.column.MockProducer; diff --git a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/DefaultColumnRepositoryProducerTest.java b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/DefaultColumnRepositoryProducerTest.java index be9864b05..396ddc16d 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/DefaultColumnRepositoryProducerTest.java +++ b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/DefaultColumnRepositoryProducerTest.java @@ -16,7 +16,7 @@ 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.column.ColumnEntityConverter; import org.eclipse.jnosql.mapping.column.JNoSQLColumnTemplate; import org.eclipse.jnosql.mapping.column.MockProducer; diff --git a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/DynamicQueryTest.java b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/DynamicQueryTest.java index 11a8e96f0..050b181cb 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/DynamicQueryTest.java +++ b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/DynamicQueryTest.java @@ -18,7 +18,7 @@ import jakarta.data.repository.Pageable; import jakarta.data.repository.Sort; import org.eclipse.jnosql.communication.column.ColumnQuery; -import org.eclipse.jnosql.mapping.repository.SpecialParameters; +import org.eclipse.jnosql.mapping.core.repository.SpecialParameters; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; diff --git a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/ParamsBinderTest.java b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/ParamsBinderTest.java index 06d88c779..f55736108 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/ParamsBinderTest.java +++ b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/ParamsBinderTest.java @@ -25,7 +25,7 @@ import org.eclipse.jnosql.communication.column.SelectQueryParser; import org.eclipse.jnosql.communication.query.SelectQuery; import org.eclipse.jnosql.communication.query.method.SelectMethodProvider; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.column.ColumnEntityConverter; import org.eclipse.jnosql.mapping.column.MockProducer; import org.eclipse.jnosql.mapping.column.entities.Person; @@ -34,7 +34,7 @@ import org.eclipse.jnosql.mapping.metadata.EntityMetadata; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension; -import org.eclipse.jnosql.mapping.util.ParamsBinder; +import org.eclipse.jnosql.mapping.core.util.ParamsBinder; import org.jboss.weld.junit5.auto.AddExtensions; import org.jboss.weld.junit5.auto.AddPackages; import org.jboss.weld.junit5.auto.EnableAutoWeld; diff --git a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/spi/ColumnExtensionTest.java b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/spi/ColumnExtensionTest.java index aacfaa2a2..180445971 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/spi/ColumnExtensionTest.java +++ b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/spi/ColumnExtensionTest.java @@ -16,7 +16,7 @@ import jakarta.inject.Inject; import jakarta.nosql.column.ColumnTemplate; -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.column.ColumnEntityConverter; diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/Converters.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/Converters.java similarity index 93% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/Converters.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/Converters.java index 8e54da8c5..3c8bb245e 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/Converters.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/Converters.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping; +package org.eclipse.jnosql.mapping.core; import jakarta.enterprise.context.ApplicationScoped; @@ -20,6 +20,7 @@ import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.inject.Inject; +import org.eclipse.jnosql.mapping.AttributeConverter; import org.eclipse.jnosql.mapping.metadata.FieldParameterMetadata; import java.util.Iterator; @@ -28,7 +29,7 @@ import java.util.logging.Logger; /** - * The {@link Convert} collection, this instance will generate/create an instance. + * The {@link org.eclipse.jnosql.mapping.Convert} collection, this instance will generate/create an instance. */ @ApplicationScoped public class Converters { diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/NoSQLPage.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/NoSQLPage.java similarity index 98% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/NoSQLPage.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/NoSQLPage.java index c235ba859..d23186e9d 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/NoSQLPage.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/NoSQLPage.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping; +package org.eclipse.jnosql.mapping.core; import jakarta.data.repository.Page; import jakarta.data.repository.Pageable; diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/config/MappingConfigurations.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/config/MappingConfigurations.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/config/MappingConfigurations.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/config/MappingConfigurations.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/config/MicroProfileSettings.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/config/MicroProfileSettings.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/config/MicroProfileSettings.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/config/MicroProfileSettings.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/config/package-info.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/config/package-info.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/config/package-info.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/config/package-info.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/package-info.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/package-info.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/package-info.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/package-info.java index 50b1b4dba..4bbdfcf86 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/package-info.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/package-info.java @@ -22,4 +22,4 @@ * The core package provides a flexible and extensible foundation for building NoSQL-based applications with JNoSQL. * */ -package org.eclipse.jnosql.mapping; \ No newline at end of file +package org.eclipse.jnosql.mapping.core; \ No newline at end of file diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/query/RepositoryType.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/query/RepositoryType.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/query/RepositoryType.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/query/RepositoryType.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/DefaultRepositoryReturn.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/DefaultRepositoryReturn.java similarity index 95% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/DefaultRepositoryReturn.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/DefaultRepositoryReturn.java index e3497bc9b..160c0f67e 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/DefaultRepositoryReturn.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/DefaultRepositoryReturn.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository; +package org.eclipse.jnosql.mapping.core.repository; class DefaultRepositoryReturn implements RepositoryReturn { diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/DynamicQueryMethodReturn.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/DynamicQueryMethodReturn.java similarity index 98% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/DynamicQueryMethodReturn.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/DynamicQueryMethodReturn.java index 5d11b4af0..da443280b 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/DynamicQueryMethodReturn.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/DynamicQueryMethodReturn.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository; +package org.eclipse.jnosql.mapping.core.repository; import jakarta.nosql.PreparedStatement; diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/DynamicReturn.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/DynamicReturn.java similarity index 99% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/DynamicReturn.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/DynamicReturn.java index febab1901..44d57c39e 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/DynamicReturn.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/DynamicReturn.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository; +package org.eclipse.jnosql.mapping.core.repository; import jakarta.data.exceptions.NonUniqueResultException; import jakarta.data.repository.Page; diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/DynamicReturnConverter.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/DynamicReturnConverter.java similarity index 98% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/DynamicReturnConverter.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/DynamicReturnConverter.java index 9e6f8d049..df2893e15 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/DynamicReturnConverter.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/DynamicReturnConverter.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository; +package org.eclipse.jnosql.mapping.core.repository; import jakarta.nosql.PreparedStatement; diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/MethodDynamicExecutable.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/MethodDynamicExecutable.java similarity index 94% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/MethodDynamicExecutable.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/MethodDynamicExecutable.java index 54afcbbe4..b7c4a41da 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/MethodDynamicExecutable.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/MethodDynamicExecutable.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository; +package org.eclipse.jnosql.mapping.core.repository; /** diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/RepositoryObserverParser.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/RepositoryObserverParser.java similarity index 98% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/RepositoryObserverParser.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/RepositoryObserverParser.java index 4d0c1e83d..d60c945d0 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/RepositoryObserverParser.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/RepositoryObserverParser.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository; +package org.eclipse.jnosql.mapping.core.repository; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; import org.eclipse.jnosql.mapping.metadata.FieldMetadata; diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/RepositoryReflectionUtils.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/RepositoryReflectionUtils.java similarity index 97% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/RepositoryReflectionUtils.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/RepositoryReflectionUtils.java index c0483bfbc..bb9d71b06 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/RepositoryReflectionUtils.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/RepositoryReflectionUtils.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository; +package org.eclipse.jnosql.mapping.core.repository; diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/RepositoryReturn.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/RepositoryReturn.java similarity index 94% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/RepositoryReturn.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/RepositoryReturn.java index 4c3ede3ed..b222fa432 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/RepositoryReturn.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/RepositoryReturn.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository; +package org.eclipse.jnosql.mapping.core.repository; public interface RepositoryReturn { diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/SpecialParameters.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/SpecialParameters.java similarity index 98% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/SpecialParameters.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/SpecialParameters.java index 2c72975c6..862557a1d 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/SpecialParameters.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/SpecialParameters.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository; +package org.eclipse.jnosql.mapping.core.repository; import jakarta.data.repository.Limit; import jakarta.data.repository.Pageable; diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/ThrowingSupplier.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/ThrowingSupplier.java similarity index 92% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/ThrowingSupplier.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/ThrowingSupplier.java index 9d0d73061..04c2ec48e 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/ThrowingSupplier.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/ThrowingSupplier.java @@ -12,7 +12,7 @@ * * Georg Leber */ -package org.eclipse.jnosql.mapping.repository; +package org.eclipse.jnosql.mapping.core.repository; @FunctionalInterface public interface ThrowingSupplier { diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/AbstractRepositoryReturn.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/AbstractRepositoryReturn.java similarity index 88% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/AbstractRepositoryReturn.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/AbstractRepositoryReturn.java index 05758c719..9e4f3350f 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/AbstractRepositoryReturn.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/AbstractRepositoryReturn.java @@ -12,9 +12,9 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository.returns; +package org.eclipse.jnosql.mapping.core.repository.returns; -import org.eclipse.jnosql.mapping.repository.RepositoryReturn; +import org.eclipse.jnosql.mapping.core.repository.RepositoryReturn; abstract class AbstractRepositoryReturn implements RepositoryReturn { diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/InstanceRepositoryReturn.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/InstanceRepositoryReturn.java similarity index 86% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/InstanceRepositoryReturn.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/InstanceRepositoryReturn.java index dcfd070cf..b4bfd3429 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/InstanceRepositoryReturn.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/InstanceRepositoryReturn.java @@ -12,10 +12,10 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository.returns; +package org.eclipse.jnosql.mapping.core.repository.returns; -import org.eclipse.jnosql.mapping.repository.DynamicReturn; -import org.eclipse.jnosql.mapping.repository.RepositoryReturn; +import org.eclipse.jnosql.mapping.core.repository.DynamicReturn; +import org.eclipse.jnosql.mapping.core.repository.RepositoryReturn; import java.util.Optional; diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/ListRepositoryReturn.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/ListRepositoryReturn.java similarity index 91% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/ListRepositoryReturn.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/ListRepositoryReturn.java index 08f97c872..c8b739a9d 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/ListRepositoryReturn.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/ListRepositoryReturn.java @@ -12,9 +12,9 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository.returns; +package org.eclipse.jnosql.mapping.core.repository.returns; -import org.eclipse.jnosql.mapping.repository.DynamicReturn; +import org.eclipse.jnosql.mapping.core.repository.DynamicReturn; import java.util.Collection; import java.util.List; diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/OptionalRepositoryReturn.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/OptionalRepositoryReturn.java similarity index 89% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/OptionalRepositoryReturn.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/OptionalRepositoryReturn.java index f1840fb3a..3290f5966 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/OptionalRepositoryReturn.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/OptionalRepositoryReturn.java @@ -12,9 +12,9 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository.returns; +package org.eclipse.jnosql.mapping.core.repository.returns; -import org.eclipse.jnosql.mapping.repository.DynamicReturn; +import org.eclipse.jnosql.mapping.core.repository.DynamicReturn; import java.util.Optional; diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/PageRepositoryReturn.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/PageRepositoryReturn.java similarity index 91% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/PageRepositoryReturn.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/PageRepositoryReturn.java index ba9ed4e9d..ff41eb0d7 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/PageRepositoryReturn.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/PageRepositoryReturn.java @@ -12,12 +12,12 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository.returns; +package org.eclipse.jnosql.mapping.core.repository.returns; import jakarta.data.repository.Page; import jakarta.data.repository.Slice; import org.eclipse.jnosql.mapping.DynamicQueryException; -import org.eclipse.jnosql.mapping.repository.DynamicReturn; +import org.eclipse.jnosql.mapping.core.repository.DynamicReturn; public class PageRepositoryReturn extends AbstractRepositoryReturn { diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/QueueRepositoryReturn.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/QueueRepositoryReturn.java similarity index 91% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/QueueRepositoryReturn.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/QueueRepositoryReturn.java index 0cb6ca6d3..2381921ff 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/QueueRepositoryReturn.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/QueueRepositoryReturn.java @@ -12,9 +12,9 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository.returns; +package org.eclipse.jnosql.mapping.core.repository.returns; -import org.eclipse.jnosql.mapping.repository.DynamicReturn; +import org.eclipse.jnosql.mapping.core.repository.DynamicReturn; import java.util.Deque; import java.util.LinkedList; diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/SetRepositoryReturn.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/SetRepositoryReturn.java similarity index 89% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/SetRepositoryReturn.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/SetRepositoryReturn.java index 97a12b7a8..2f22b9ae2 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/SetRepositoryReturn.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/SetRepositoryReturn.java @@ -12,9 +12,9 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository.returns; +package org.eclipse.jnosql.mapping.core.repository.returns; -import org.eclipse.jnosql.mapping.repository.DynamicReturn; +import org.eclipse.jnosql.mapping.core.repository.DynamicReturn; import java.util.Set; import java.util.stream.Collectors; diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/SortedSetRepositoryReturn.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/SortedSetRepositoryReturn.java similarity index 93% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/SortedSetRepositoryReturn.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/SortedSetRepositoryReturn.java index e5e308227..c2ed5e9ef 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/SortedSetRepositoryReturn.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/SortedSetRepositoryReturn.java @@ -12,10 +12,10 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository.returns; +package org.eclipse.jnosql.mapping.core.repository.returns; import org.eclipse.jnosql.mapping.DynamicQueryException; -import org.eclipse.jnosql.mapping.repository.DynamicReturn; +import org.eclipse.jnosql.mapping.core.repository.DynamicReturn; import java.util.NavigableSet; import java.util.SortedSet; diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/StreamRepositoryReturn.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/StreamRepositoryReturn.java similarity index 89% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/StreamRepositoryReturn.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/StreamRepositoryReturn.java index 0710882f7..713853b84 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/repository/returns/StreamRepositoryReturn.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/returns/StreamRepositoryReturn.java @@ -12,9 +12,9 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository.returns; +package org.eclipse.jnosql.mapping.core.repository.returns; -import org.eclipse.jnosql.mapping.repository.DynamicReturn; +import org.eclipse.jnosql.mapping.core.repository.DynamicReturn; import java.util.stream.Stream; diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/spi/AbstractBean.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/spi/AbstractBean.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/spi/AbstractBean.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/spi/AbstractBean.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/spi/EntityMetadataExtension.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/spi/EntityMetadataExtension.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/spi/EntityMetadataExtension.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/spi/EntityMetadataExtension.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/spi/package-info.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/spi/package-info.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/spi/package-info.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/spi/package-info.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/util/AnnotationLiteralUtil.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/util/AnnotationLiteralUtil.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/util/AnnotationLiteralUtil.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/util/AnnotationLiteralUtil.java index dc36de0ab..c1107289a 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/util/AnnotationLiteralUtil.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/util/AnnotationLiteralUtil.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.util; +package org.eclipse.jnosql.mapping.core.util; import jakarta.enterprise.inject.Any; import jakarta.enterprise.inject.Default; diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/util/ConverterUtil.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/util/ConverterUtil.java similarity index 97% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/util/ConverterUtil.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/util/ConverterUtil.java index b963532f5..f7121a6aa 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/util/ConverterUtil.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/util/ConverterUtil.java @@ -12,11 +12,11 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.util; +package org.eclipse.jnosql.mapping.core.util; import org.eclipse.jnosql.communication.Value; import org.eclipse.jnosql.mapping.AttributeConverter; -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.metadata.FieldMetadata; diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/util/ParamsBinder.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/util/ParamsBinder.java similarity index 97% rename from jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/util/ParamsBinder.java rename to jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/util/ParamsBinder.java index 5eae0f112..71e0f0cc3 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/util/ParamsBinder.java +++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/util/ParamsBinder.java @@ -12,10 +12,10 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.util; +package org.eclipse.jnosql.mapping.core.util; import org.eclipse.jnosql.communication.Params; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.DynamicQueryException; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; import org.eclipse.jnosql.mapping.metadata.FieldMetadata; diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/resources/META-INF/services/org.eclipse.jnosql.mapping.core.repository.RepositoryReturn b/jnosql-mapping/jnosql-mapping-core/src/main/resources/META-INF/services/org.eclipse.jnosql.mapping.core.repository.RepositoryReturn new file mode 100644 index 000000000..ed49eb58c --- /dev/null +++ b/jnosql-mapping/jnosql-mapping-core/src/main/resources/META-INF/services/org.eclipse.jnosql.mapping.core.repository.RepositoryReturn @@ -0,0 +1,8 @@ +org.eclipse.jnosql.mapping.core.repository.returns.InstanceRepositoryReturn +org.eclipse.jnosql.mapping.core.repository.returns.ListRepositoryReturn +org.eclipse.jnosql.mapping.core.repository.returns.OptionalRepositoryReturn +org.eclipse.jnosql.mapping.core.repository.returns.PageRepositoryReturn +org.eclipse.jnosql.mapping.core.repository.returns.QueueRepositoryReturn +org.eclipse.jnosql.mapping.core.repository.returns.SetRepositoryReturn +org.eclipse.jnosql.mapping.core.repository.returns.SortedSetRepositoryReturn +org.eclipse.jnosql.mapping.core.repository.returns.StreamRepositoryReturn \ No newline at end of file diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/resources/META-INF/services/org.eclipse.jnosql.mapping.repository.RepositoryReturn b/jnosql-mapping/jnosql-mapping-core/src/main/resources/META-INF/services/org.eclipse.jnosql.mapping.repository.RepositoryReturn deleted file mode 100644 index 334bb745f..000000000 --- a/jnosql-mapping/jnosql-mapping-core/src/main/resources/META-INF/services/org.eclipse.jnosql.mapping.repository.RepositoryReturn +++ /dev/null @@ -1,8 +0,0 @@ -org.eclipse.jnosql.mapping.repository.returns.InstanceRepositoryReturn -org.eclipse.jnosql.mapping.repository.returns.ListRepositoryReturn -org.eclipse.jnosql.mapping.repository.returns.OptionalRepositoryReturn -org.eclipse.jnosql.mapping.repository.returns.PageRepositoryReturn -org.eclipse.jnosql.mapping.repository.returns.QueueRepositoryReturn -org.eclipse.jnosql.mapping.repository.returns.SetRepositoryReturn -org.eclipse.jnosql.mapping.repository.returns.SortedSetRepositoryReturn -org.eclipse.jnosql.mapping.repository.returns.StreamRepositoryReturn \ No newline at end of file diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/ConvertersTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/ConvertersTest.java similarity index 95% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/ConvertersTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/ConvertersTest.java index 4a093eb91..e30240673 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/ConvertersTest.java +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/ConvertersTest.java @@ -12,9 +12,11 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping; +package org.eclipse.jnosql.mapping.core; import jakarta.inject.Inject; +import org.eclipse.jnosql.mapping.AttributeConverter; +import org.eclipse.jnosql.mapping.Convert; import org.eclipse.jnosql.mapping.metadata.FieldMetadata; import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension; import org.jboss.weld.junit5.auto.AddExtensions; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/DatabaseMetadataTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/DatabaseMetadataTest.java similarity index 91% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/DatabaseMetadataTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/DatabaseMetadataTest.java index 74a365c0c..a51868d08 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/DatabaseMetadataTest.java +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/DatabaseMetadataTest.java @@ -12,8 +12,11 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping; +package org.eclipse.jnosql.mapping.core; +import org.eclipse.jnosql.mapping.Database; +import org.eclipse.jnosql.mapping.DatabaseMetadata; +import org.eclipse.jnosql.mapping.DatabaseType; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/DatabaseQualifierTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/DatabaseQualifierTest.java similarity index 97% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/DatabaseQualifierTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/DatabaseQualifierTest.java index dc3960a1f..1e028e6f3 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/DatabaseQualifierTest.java +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/DatabaseQualifierTest.java @@ -12,8 +12,9 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping; +package org.eclipse.jnosql.mapping.core; +import org.eclipse.jnosql.mapping.DatabaseQualifier; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/MyConverter.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/MyConverter.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/MyConverter.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/MyConverter.java index 90d7e38d4..94c8c1749 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/MyConverter.java +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/MyConverter.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping; +package org.eclipse.jnosql.mapping.core; import org.eclipse.jnosql.mapping.AttributeConverter; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/NoSQLPageTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/NoSQLPageTest.java similarity index 99% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/NoSQLPageTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/NoSQLPageTest.java index 568c16c5f..ceb32f8e8 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/NoSQLPageTest.java +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/NoSQLPageTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping; +package org.eclipse.jnosql.mapping.core; import jakarta.data.repository.Page; import jakarta.data.repository.Pageable; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/RandomText.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/RandomText.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/RandomText.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/RandomText.java index 0e11fe0d2..4cad5af7b 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/RandomText.java +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/RandomText.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping; +package org.eclipse.jnosql.mapping.core; import jakarta.enterprise.context.ApplicationScoped; import java.util.List; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/VetedConverter.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/VetedConverter.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/VetedConverter.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/VetedConverter.java index 0acd10ac1..0205ebced 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/VetedConverter.java +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/VetedConverter.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping; +package org.eclipse.jnosql.mapping.core; import org.eclipse.jnosql.mapping.AttributeConverter; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/config/MappingConfigurationsTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/config/MappingConfigurationsTest.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/config/MappingConfigurationsTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/config/MappingConfigurationsTest.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/config/MicroProfileSettingsTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/config/MicroProfileSettingsTest.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/config/MicroProfileSettingsTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/config/MicroProfileSettingsTest.java diff --git a/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Actor.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Actor.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Actor.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Actor.java diff --git a/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/ActorBuilder.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/ActorBuilder.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/ActorBuilder.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/ActorBuilder.java diff --git a/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Address.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Address.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Address.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Address.java diff --git a/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Animal.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Animal.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Animal.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Animal.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/AnimalRepository.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/AnimalRepository.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/AnimalRepository.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/AnimalRepository.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/AppointmentBook.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/AppointmentBook.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/AppointmentBook.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/AppointmentBook.java diff --git a/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Book.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Book.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Book.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Book.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Contact.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Contact.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Contact.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Contact.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/ContactType.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/ContactType.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/ContactType.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/ContactType.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Director.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Director.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Director.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Director.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Download.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Download.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Download.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Download.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/IgnoreRepository.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/IgnoreRepository.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/IgnoreRepository.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/IgnoreRepository.java diff --git a/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Job.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Job.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Job.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Job.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Machine.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Machine.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Machine.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Machine.java diff --git a/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Money.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Money.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Money.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Money.java diff --git a/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/MoneyConverter.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/MoneyConverter.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/MoneyConverter.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/MoneyConverter.java diff --git a/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Movie.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Movie.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Movie.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Movie.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/MovieRepository.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/MovieRepository.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/MovieRepository.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/MovieRepository.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/NoConstructorEntity.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/NoConstructorEntity.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/NoConstructorEntity.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/NoConstructorEntity.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/NoSQLVendor.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/NoSQLVendor.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/NoSQLVendor.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/NoSQLVendor.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/NonRepository.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/NonRepository.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/NonRepository.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/NonRepository.java diff --git a/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Person.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Person.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Person.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Person.java diff --git a/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonBuilder.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/PersonBuilder.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonBuilder.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/PersonBuilder.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonRepository.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/PersonRepository.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonRepository.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/PersonRepository.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/User.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/User.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/User.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/User.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Vendor.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Vendor.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Vendor.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Vendor.java diff --git a/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Worker.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Worker.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Worker.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/Worker.java diff --git a/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/ZipCode.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/ZipCode.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/ZipCode.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/ZipCode.java diff --git a/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/BookUser.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/constructor/BookUser.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/BookUser.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/constructor/BookUser.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/Computer.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/constructor/Computer.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/Computer.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/constructor/Computer.java diff --git a/jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/PetOwner.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/constructor/PetOwner.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-api-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/PetOwner.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/constructor/PetOwner.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/Smartphone.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/constructor/Smartphone.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/Smartphone.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/constructor/Smartphone.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/Tablet.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/constructor/Tablet.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/Tablet.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/constructor/Tablet.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/EmailNotification.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/inheritance/EmailNotification.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/EmailNotification.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/inheritance/EmailNotification.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/LargeProject.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/inheritance/LargeProject.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/LargeProject.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/inheritance/LargeProject.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/Notification.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/inheritance/Notification.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/Notification.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/inheritance/Notification.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/NotificationReader.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/inheritance/NotificationReader.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/NotificationReader.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/inheritance/NotificationReader.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/Project.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/inheritance/Project.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/Project.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/inheritance/Project.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/ProjectManager.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/inheritance/ProjectManager.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/ProjectManager.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/inheritance/ProjectManager.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/SmallProject.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/inheritance/SmallProject.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/SmallProject.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/inheritance/SmallProject.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/SmsNotification.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/inheritance/SmsNotification.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/SmsNotification.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/inheritance/SmsNotification.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/SocialMediaNotification.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/inheritance/SocialMediaNotification.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/SocialMediaNotification.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/entities/inheritance/SocialMediaNotification.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/query/RepositoryTypeTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/query/RepositoryTypeTest.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/query/RepositoryTypeTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/query/RepositoryTypeTest.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/DefaultRepositoryReturnTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/DefaultRepositoryReturnTest.java similarity index 98% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/DefaultRepositoryReturnTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/DefaultRepositoryReturnTest.java index cee3b7815..5ccf2feea 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/DefaultRepositoryReturnTest.java +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/DefaultRepositoryReturnTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository; +package org.eclipse.jnosql.mapping.core.repository; import jakarta.data.repository.Page; import jakarta.data.repository.Pageable; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/DynamicQueryMethodReturnTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/DynamicQueryMethodReturnTest.java similarity index 99% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/DynamicQueryMethodReturnTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/DynamicQueryMethodReturnTest.java index 56a6499cd..8b51510bb 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/DynamicQueryMethodReturnTest.java +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/DynamicQueryMethodReturnTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository; +package org.eclipse.jnosql.mapping.core.repository; import jakarta.data.exceptions.NonUniqueResultException; import jakarta.data.repository.CrudRepository; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/DynamicReturnPaginationTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/DynamicReturnPaginationTest.java similarity index 99% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/DynamicReturnPaginationTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/DynamicReturnPaginationTest.java index ded7d7845..5f84b7fa1 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/DynamicReturnPaginationTest.java +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/DynamicReturnPaginationTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository; +package org.eclipse.jnosql.mapping.core.repository; import jakarta.data.repository.CrudRepository; import jakarta.data.repository.Page; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/DynamicReturnTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/DynamicReturnTest.java new file mode 100644 index 000000000..626ecd788 --- /dev/null +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/DynamicReturnTest.java @@ -0,0 +1 @@ +/* * Copyright (c) 2022 Contributors to the Eclipse Foundation * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * and Apache License v2.0 which accompanies this distribution. * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html * and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php. * * You may elect to redistribute this code under either of these licenses. * * Contributors: * * Otavio Santana */ package org.eclipse.jnosql.mapping.core.repository; import jakarta.data.exceptions.NonUniqueResultException; import jakarta.data.repository.CrudRepository; import jakarta.data.repository.Page; import jakarta.data.repository.Pageable; import org.eclipse.jnosql.mapping.DynamicQueryException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import java.lang.reflect.Method; import java.math.BigDecimal; import java.util.Collection; import java.util.Deque; import java.util.List; import java.util.NavigableSet; import java.util.Optional; import java.util.Queue; import java.util.Set; import java.util.SortedSet; import java.util.function.Supplier; import java.util.stream.Stream; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; class DynamicReturnTest { @Test void shouldReturnNPEWhenThereIsPagination() { Method method = getMethod(PersonRepository.class, "getOptional"); Supplier> stream = Stream::empty; Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); assertThrows(NullPointerException.class, () -> DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult) .withPagination(Pageable.ofPage(1L).size(2)).build()); } @Test void shouldReturnEmptyOptional() { Method method = getMethod(PersonRepository.class, "getOptional"); Supplier> stream = Stream::empty; Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertTrue(execute instanceof Optional); Optional optional = (Optional) execute; Assertions.assertFalse(optional.isPresent()); } @Test void shouldReturnOptional() { Method method = getMethod(PersonRepository.class, "getOptional"); Supplier> stream = () -> Stream.of(new Person("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertTrue(execute instanceof Optional); Optional optional = (Optional) execute; assertTrue(optional.isPresent()); Assertions.assertEquals(new Person("Ada"), optional.get()); } @Test void shouldReturnOptionalError() { Method method = getMethod(PersonRepository.class, "getOptional"); Supplier> stream = () -> Stream.of(new Person("Poliana"), new Person("Otavio")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); assertThrows(NonUniqueResultException.class, dynamicReturn::execute); } @Test void shouldReturnAnInstance() { Method method = getMethod(PersonRepository.class, "getInstance"); Supplier> stream = () -> Stream.of(new Person("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertTrue(execute instanceof Person); Person person = (Person) execute; Assertions.assertEquals(new Person("Ada"), person); } @Test void shouldReturnNull() { Method method = getMethod(PersonRepository.class, "getInstance"); Supplier> stream = Stream::empty; Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertNull(execute); } @Test void shouldReturnList() { Method method = getMethod(PersonRepository.class, "getList"); Supplier> stream = () -> Stream.of(new Person("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertTrue(execute instanceof List); List persons = (List) execute; Assertions.assertFalse(persons.isEmpty()); Assertions.assertEquals(new Person("Ada"), persons.get(0)); } @Test void shouldReturnIterable() { Method method = getMethod(PersonRepository.class, "getIterable"); Supplier> stream = () -> Stream.of(new Person("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertTrue(execute instanceof Iterable); Iterable persons = (List) execute; Assertions.assertEquals(new Person("Ada"), persons.iterator().next()); } @Test void shouldReturnCollection() { Method method = getMethod(PersonRepository.class, "getCollection"); Supplier> stream = () -> Stream.of(new Person("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertTrue(execute instanceof Collection); Collection persons = (Collection) execute; Assertions.assertFalse(persons.isEmpty()); Assertions.assertEquals(new Person("Ada"), persons.iterator().next()); } @Test void shouldReturnSet() { Method method = getMethod(PersonRepository.class, "getSet"); Supplier> stream = () -> Stream.of(new Person("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertTrue(execute instanceof Set); Set persons = (Set) execute; Assertions.assertFalse(persons.isEmpty()); Assertions.assertEquals(new Person("Ada"), persons.iterator().next()); } @Test void shouldReturnQueue() { Method method = getMethod(PersonRepository.class, "getQueue"); Supplier> stream = () -> Stream.of(new Person("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertTrue(execute instanceof Queue); Queue persons = (Queue) execute; Assertions.assertFalse(persons.isEmpty()); Assertions.assertEquals(new Person("Ada"), persons.iterator().next()); } @Test void shouldReturnStream() { Method method = getMethod(PersonRepository.class, "getStream"); Supplier> stream = () -> Stream.of(new Person("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertTrue(execute instanceof Stream); Stream persons = (Stream) execute; Assertions.assertEquals(new Person("Ada"), persons.iterator().next()); } @Test void shouldReturnSortedSet() { Method method = getMethod(PersonRepository.class, "getSortedSet"); Supplier> stream = () -> Stream.of(new Person("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertTrue(execute instanceof SortedSet); SortedSet persons = (SortedSet) execute; Assertions.assertFalse(persons.isEmpty()); Assertions.assertEquals(new Person("Ada"), persons.iterator().next()); } @Test void shouldReturnNavigableSet() { Method method = getMethod(PersonRepository.class, "getNavigableSet"); Supplier> stream = () -> Stream.of(new Person("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertTrue(execute instanceof NavigableSet); NavigableSet persons = (NavigableSet) execute; Assertions.assertFalse(persons.isEmpty()); Assertions.assertEquals(new Person("Ada"), persons.iterator().next()); } @Test void shouldReturnDeque() { Method method = getMethod(PersonRepository.class, "getDeque"); Supplier> stream = () -> Stream.of(new Person("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertTrue(execute instanceof Deque); Deque persons = (Deque) execute; Assertions.assertFalse(persons.isEmpty()); Assertions.assertEquals(new Person("Ada"), persons.iterator().next()); } @Test void shouldReturnErrorWhenExecutePage() { Method method = getMethod(PersonRepository.class, "getPage"); Supplier> stream = () -> Stream.of(new Person("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); assertThrows(DynamicQueryException.class, dynamicReturn::execute); } @Test void shouldReturnErrorNavigableSetEntityIsNotComparable() { Method method = getMethod(AnimalRepository.class, "getSortedSet"); Supplier> stream = () -> Stream.of(new Animal("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Animal.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); assertThrows(DynamicQueryException.class, dynamicReturn::execute); } @Test void shouldReturnNullWhenParamIsEmptyOnFindSpecial() { assertTrue(DynamicReturn.findSpecialParameters(null).isEmpty()); assertTrue(DynamicReturn.findSpecialParameters(new Object[0]).isEmpty()); } @Test void shouldFindSpecial() { Pageable pagination = Pageable.ofPage(1L).size(2); SpecialParameters specialParameters = DynamicReturn.findSpecialParameters(new Object[]{"value", 23, pagination}); Assertions.assertEquals(pagination, specialParameters.pageable().orElseThrow()); } @Test void shouldReturnNullWhenThereIsNotSpecial() { SpecialParameters pagination = DynamicReturn.findSpecialParameters(new Object[]{"value", 23, BigDecimal.TEN}); assertTrue(pagination.isEmpty()); } // @Test void shouldReturnNullWhenParamIsEmptyOnFindPagination() { assertNull(DynamicReturn.findPageable(null)); assertNull(DynamicReturn.findPageable(new Object[0])); } @Test void shouldFindPagination() { Pageable pagination = Pageable.ofPage(1L).size(2); Pageable pageable = DynamicReturn.findPageable(new Object[]{"value", 23, pagination}); Assertions.assertEquals(pagination, pageable); } @Test void shouldReturnNullWhenThereIsNotPagination() { Pageable pagination = DynamicReturn.findPageable(new Object[]{"value", 23, BigDecimal.TEN}); assertNull(pagination); } private Method getMethod(Class repository, String methodName) { return Stream.of(repository.getDeclaredMethods()) .filter(m -> m.getName().equals(methodName)) .findFirst().get(); } private record Animal(String name) { } private record Person(String name) implements Comparable { @Override public int compareTo(Person o) { return name.compareTo(o.name); } } private interface AnimalRepository extends CrudRepository { SortedSet getSortedSet(); } private interface PersonRepository extends CrudRepository { Optional getOptional(); Person getInstance(); List getList(); Iterable getIterable(); Collection getCollection(); Set getSet(); Queue getQueue(); Stream getStream(); SortedSet getSortedSet(); NavigableSet getNavigableSet(); Deque getDeque(); Page getPage(); } } \ No newline at end of file diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/RepositoryObserverParserTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/RepositoryObserverParserTest.java similarity index 95% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/RepositoryObserverParserTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/RepositoryObserverParserTest.java index fb1e976a1..28a251c16 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/RepositoryObserverParserTest.java +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/RepositoryObserverParserTest.java @@ -12,11 +12,11 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository; +package org.eclipse.jnosql.mapping.core.repository; import jakarta.inject.Inject; -import org.eclipse.jnosql.mapping.Converters; -import org.eclipse.jnosql.mapping.VetedConverter; +import org.eclipse.jnosql.mapping.core.Converters; +import org.eclipse.jnosql.mapping.core.VetedConverter; import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; import org.eclipse.jnosql.mapping.reflection.Reflections; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/RepositoryReflectionUtilsTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/RepositoryReflectionUtilsTest.java similarity index 97% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/RepositoryReflectionUtilsTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/RepositoryReflectionUtilsTest.java index f28d6abc7..1b4b62674 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/RepositoryReflectionUtilsTest.java +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/RepositoryReflectionUtilsTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository; +package org.eclipse.jnosql.mapping.core.repository; import jakarta.data.repository.PageableRepository; import jakarta.data.repository.Param; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/SpecialParametersTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/SpecialParametersTest.java similarity index 98% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/SpecialParametersTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/SpecialParametersTest.java index adb99d6ca..8b673544d 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/SpecialParametersTest.java +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/SpecialParametersTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository; +package org.eclipse.jnosql.mapping.core.repository; import jakarta.data.repository.Limit; import jakarta.data.repository.Pageable; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/returns/InstanceRepositoryReturnTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/returns/InstanceRepositoryReturnTest.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/returns/InstanceRepositoryReturnTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/returns/InstanceRepositoryReturnTest.java index 06c6b99f2..788d762af 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/returns/InstanceRepositoryReturnTest.java +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/returns/InstanceRepositoryReturnTest.java @@ -12,12 +12,12 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository.returns; +package org.eclipse.jnosql.mapping.core.repository.returns; import jakarta.data.repository.Page; import jakarta.data.repository.Pageable; -import org.eclipse.jnosql.mapping.repository.DynamicReturn; -import org.eclipse.jnosql.mapping.repository.RepositoryReturn; +import org.eclipse.jnosql.mapping.core.repository.DynamicReturn; +import org.eclipse.jnosql.mapping.core.repository.RepositoryReturn; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/returns/ListRepositoryReturnTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/returns/ListRepositoryReturnTest.java similarity index 95% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/returns/ListRepositoryReturnTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/returns/ListRepositoryReturnTest.java index 53230959b..c7938d71a 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/returns/ListRepositoryReturnTest.java +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/returns/ListRepositoryReturnTest.java @@ -12,12 +12,12 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository.returns; +package org.eclipse.jnosql.mapping.core.repository.returns; import jakarta.data.repository.Page; import jakarta.data.repository.Pageable; -import org.eclipse.jnosql.mapping.repository.DynamicReturn; -import org.eclipse.jnosql.mapping.repository.RepositoryReturn; +import org.eclipse.jnosql.mapping.core.repository.DynamicReturn; +import org.eclipse.jnosql.mapping.core.repository.RepositoryReturn; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/returns/OptionalRepositoryReturnTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/returns/OptionalRepositoryReturnTest.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/returns/OptionalRepositoryReturnTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/returns/OptionalRepositoryReturnTest.java index ed1605c52..2f5586875 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/returns/OptionalRepositoryReturnTest.java +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/returns/OptionalRepositoryReturnTest.java @@ -12,12 +12,12 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository.returns; +package org.eclipse.jnosql.mapping.core.repository.returns; import jakarta.data.repository.Page; import jakarta.data.repository.Pageable; -import org.eclipse.jnosql.mapping.repository.DynamicReturn; -import org.eclipse.jnosql.mapping.repository.RepositoryReturn; +import org.eclipse.jnosql.mapping.core.repository.DynamicReturn; +import org.eclipse.jnosql.mapping.core.repository.RepositoryReturn; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/returns/PageRepositoryReturnTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/returns/PageRepositoryReturnTest.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/returns/PageRepositoryReturnTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/returns/PageRepositoryReturnTest.java index 749d875dd..c25f28a6e 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/returns/PageRepositoryReturnTest.java +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/returns/PageRepositoryReturnTest.java @@ -12,14 +12,14 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository.returns; +package org.eclipse.jnosql.mapping.core.repository.returns; import jakarta.data.repository.Page; import jakarta.data.repository.Pageable; import jakarta.data.repository.Slice; import org.eclipse.jnosql.mapping.DynamicQueryException; -import org.eclipse.jnosql.mapping.repository.DynamicReturn; -import org.eclipse.jnosql.mapping.repository.RepositoryReturn; +import org.eclipse.jnosql.mapping.core.repository.DynamicReturn; +import org.eclipse.jnosql.mapping.core.repository.RepositoryReturn; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/returns/QueueRepositoryReturnTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/returns/QueueRepositoryReturnTest.java similarity index 95% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/returns/QueueRepositoryReturnTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/returns/QueueRepositoryReturnTest.java index 606d80125..89fb56bbf 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/returns/QueueRepositoryReturnTest.java +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/returns/QueueRepositoryReturnTest.java @@ -12,12 +12,12 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository.returns; +package org.eclipse.jnosql.mapping.core.repository.returns; import jakarta.data.repository.Page; import jakarta.data.repository.Pageable; -import org.eclipse.jnosql.mapping.repository.DynamicReturn; -import org.eclipse.jnosql.mapping.repository.RepositoryReturn; +import org.eclipse.jnosql.mapping.core.repository.DynamicReturn; +import org.eclipse.jnosql.mapping.core.repository.RepositoryReturn; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/returns/SetRepositoryReturnTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/returns/SetRepositoryReturnTest.java similarity index 95% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/returns/SetRepositoryReturnTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/returns/SetRepositoryReturnTest.java index 9d4d3aed6..4dea59974 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/returns/SetRepositoryReturnTest.java +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/returns/SetRepositoryReturnTest.java @@ -12,12 +12,12 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository.returns; +package org.eclipse.jnosql.mapping.core.repository.returns; import jakarta.data.repository.Page; import jakarta.data.repository.Pageable; -import org.eclipse.jnosql.mapping.repository.DynamicReturn; -import org.eclipse.jnosql.mapping.repository.RepositoryReturn; +import org.eclipse.jnosql.mapping.core.repository.DynamicReturn; +import org.eclipse.jnosql.mapping.core.repository.RepositoryReturn; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/returns/SortedSetRepositoryReturnTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/returns/SortedSetRepositoryReturnTest.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/returns/SortedSetRepositoryReturnTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/returns/SortedSetRepositoryReturnTest.java index baebd9431..0df8ee24f 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/returns/SortedSetRepositoryReturnTest.java +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/returns/SortedSetRepositoryReturnTest.java @@ -12,13 +12,13 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository.returns; +package org.eclipse.jnosql.mapping.core.repository.returns; import jakarta.data.repository.Page; import jakarta.data.repository.Pageable; import org.eclipse.jnosql.mapping.DynamicQueryException; -import org.eclipse.jnosql.mapping.repository.DynamicReturn; -import org.eclipse.jnosql.mapping.repository.RepositoryReturn; +import org.eclipse.jnosql.mapping.core.repository.DynamicReturn; +import org.eclipse.jnosql.mapping.core.repository.RepositoryReturn; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/returns/StreamRepositoryReturnTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/returns/StreamRepositoryReturnTest.java similarity index 95% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/returns/StreamRepositoryReturnTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/returns/StreamRepositoryReturnTest.java index 81c8be736..cfaffa48a 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/returns/StreamRepositoryReturnTest.java +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/returns/StreamRepositoryReturnTest.java @@ -12,12 +12,12 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.repository.returns; +package org.eclipse.jnosql.mapping.core.repository.returns; import jakarta.data.repository.Page; import jakarta.data.repository.Pageable; -import org.eclipse.jnosql.mapping.repository.DynamicReturn; -import org.eclipse.jnosql.mapping.repository.RepositoryReturn; +import org.eclipse.jnosql.mapping.core.repository.DynamicReturn; +import org.eclipse.jnosql.mapping.core.repository.RepositoryReturn; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/spi/AbstractBeanTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/spi/AbstractBeanTest.java similarity index 100% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/spi/AbstractBeanTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/spi/AbstractBeanTest.java diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/util/AnnotationLiteralUtilTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/util/AnnotationLiteralUtilTest.java similarity index 97% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/util/AnnotationLiteralUtilTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/util/AnnotationLiteralUtilTest.java index 811b55bc1..e786bab1a 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/util/AnnotationLiteralUtilTest.java +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/util/AnnotationLiteralUtilTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.util; +package org.eclipse.jnosql.mapping.core.util; import jakarta.enterprise.inject.Any; import jakarta.enterprise.inject.Default; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/util/ConverterUtilTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/util/ConverterUtilTest.java similarity index 94% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/util/ConverterUtilTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/util/ConverterUtilTest.java index 06e2c3a7d..192364c20 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/util/ConverterUtilTest.java +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/util/ConverterUtilTest.java @@ -12,9 +12,9 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.util; +package org.eclipse.jnosql.mapping.core.util; -import org.eclipse.jnosql.mapping.VetedConverter; +import org.eclipse.jnosql.mapping.core.VetedConverter; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension; import org.eclipse.jnosql.mapping.test.entities.Money; @@ -23,7 +23,7 @@ import org.jboss.weld.junit5.auto.AddExtensions; import org.jboss.weld.junit5.auto.AddPackages; import org.jboss.weld.junit5.auto.EnableAutoWeld; -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.metadata.EntitiesMetadata; import org.junit.jupiter.api.Test; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/util/ParamsBinderTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/util/ParamsBinderTest.java similarity index 97% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/util/ParamsBinderTest.java rename to jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/util/ParamsBinderTest.java index 0f03a8b80..52e0e5781 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/util/ParamsBinderTest.java +++ b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/util/ParamsBinderTest.java @@ -12,15 +12,15 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.util; +package org.eclipse.jnosql.mapping.core.util; import jakarta.data.repository.CrudRepository; import jakarta.inject.Inject; import org.eclipse.jnosql.communication.Params; import org.eclipse.jnosql.communication.Value; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.DynamicQueryException; -import org.eclipse.jnosql.mapping.VetedConverter; +import org.eclipse.jnosql.mapping.core.VetedConverter; import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; import org.eclipse.jnosql.mapping.reflection.Reflections; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/DynamicReturnTest.java b/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/DynamicReturnTest.java deleted file mode 100644 index 534e48be3..000000000 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/repository/DynamicReturnTest.java +++ /dev/null @@ -1 +0,0 @@ -/* * Copyright (c) 2022 Contributors to the Eclipse Foundation * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * and Apache License v2.0 which accompanies this distribution. * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html * and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php. * * You may elect to redistribute this code under either of these licenses. * * Contributors: * * Otavio Santana */ package org.eclipse.jnosql.mapping.repository; import jakarta.data.exceptions.NonUniqueResultException; import jakarta.data.repository.CrudRepository; import jakarta.data.repository.Page; import jakarta.data.repository.Pageable; import org.eclipse.jnosql.mapping.DynamicQueryException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import java.lang.reflect.Method; import java.math.BigDecimal; import java.util.Collection; import java.util.Deque; import java.util.List; import java.util.NavigableSet; import java.util.Optional; import java.util.Queue; import java.util.Set; import java.util.SortedSet; import java.util.function.Supplier; import java.util.stream.Stream; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; class DynamicReturnTest { @Test void shouldReturnNPEWhenThereIsPagination() { Method method = getMethod(PersonRepository.class, "getOptional"); Supplier> stream = Stream::empty; Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); assertThrows(NullPointerException.class, () -> DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult) .withPagination(Pageable.ofPage(1L).size(2)).build()); } @Test void shouldReturnEmptyOptional() { Method method = getMethod(PersonRepository.class, "getOptional"); Supplier> stream = Stream::empty; Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertTrue(execute instanceof Optional); Optional optional = (Optional) execute; Assertions.assertFalse(optional.isPresent()); } @Test void shouldReturnOptional() { Method method = getMethod(PersonRepository.class, "getOptional"); Supplier> stream = () -> Stream.of(new Person("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertTrue(execute instanceof Optional); Optional optional = (Optional) execute; assertTrue(optional.isPresent()); Assertions.assertEquals(new Person("Ada"), optional.get()); } @Test void shouldReturnOptionalError() { Method method = getMethod(PersonRepository.class, "getOptional"); Supplier> stream = () -> Stream.of(new Person("Poliana"), new Person("Otavio")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); assertThrows(NonUniqueResultException.class, dynamicReturn::execute); } @Test void shouldReturnAnInstance() { Method method = getMethod(PersonRepository.class, "getInstance"); Supplier> stream = () -> Stream.of(new Person("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertTrue(execute instanceof Person); Person person = (Person) execute; Assertions.assertEquals(new Person("Ada"), person); } @Test void shouldReturnNull() { Method method = getMethod(PersonRepository.class, "getInstance"); Supplier> stream = Stream::empty; Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertNull(execute); } @Test void shouldReturnList() { Method method = getMethod(PersonRepository.class, "getList"); Supplier> stream = () -> Stream.of(new Person("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertTrue(execute instanceof List); List persons = (List) execute; Assertions.assertFalse(persons.isEmpty()); Assertions.assertEquals(new Person("Ada"), persons.get(0)); } @Test void shouldReturnIterable() { Method method = getMethod(PersonRepository.class, "getIterable"); Supplier> stream = () -> Stream.of(new Person("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertTrue(execute instanceof Iterable); Iterable persons = (List) execute; Assertions.assertEquals(new Person("Ada"), persons.iterator().next()); } @Test void shouldReturnCollection() { Method method = getMethod(PersonRepository.class, "getCollection"); Supplier> stream = () -> Stream.of(new Person("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertTrue(execute instanceof Collection); Collection persons = (Collection) execute; Assertions.assertFalse(persons.isEmpty()); Assertions.assertEquals(new Person("Ada"), persons.iterator().next()); } @Test void shouldReturnSet() { Method method = getMethod(PersonRepository.class, "getSet"); Supplier> stream = () -> Stream.of(new Person("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertTrue(execute instanceof Set); Set persons = (Set) execute; Assertions.assertFalse(persons.isEmpty()); Assertions.assertEquals(new Person("Ada"), persons.iterator().next()); } @Test void shouldReturnQueue() { Method method = getMethod(PersonRepository.class, "getQueue"); Supplier> stream = () -> Stream.of(new Person("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertTrue(execute instanceof Queue); Queue persons = (Queue) execute; Assertions.assertFalse(persons.isEmpty()); Assertions.assertEquals(new Person("Ada"), persons.iterator().next()); } @Test void shouldReturnStream() { Method method = getMethod(PersonRepository.class, "getStream"); Supplier> stream = () -> Stream.of(new Person("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertTrue(execute instanceof Stream); Stream persons = (Stream) execute; Assertions.assertEquals(new Person("Ada"), persons.iterator().next()); } @Test void shouldReturnSortedSet() { Method method = getMethod(PersonRepository.class, "getSortedSet"); Supplier> stream = () -> Stream.of(new Person("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertTrue(execute instanceof SortedSet); SortedSet persons = (SortedSet) execute; Assertions.assertFalse(persons.isEmpty()); Assertions.assertEquals(new Person("Ada"), persons.iterator().next()); } @Test void shouldReturnNavigableSet() { Method method = getMethod(PersonRepository.class, "getNavigableSet"); Supplier> stream = () -> Stream.of(new Person("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertTrue(execute instanceof NavigableSet); NavigableSet persons = (NavigableSet) execute; Assertions.assertFalse(persons.isEmpty()); Assertions.assertEquals(new Person("Ada"), persons.iterator().next()); } @Test void shouldReturnDeque() { Method method = getMethod(PersonRepository.class, "getDeque"); Supplier> stream = () -> Stream.of(new Person("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); Object execute = dynamicReturn.execute(); assertTrue(execute instanceof Deque); Deque persons = (Deque) execute; Assertions.assertFalse(persons.isEmpty()); Assertions.assertEquals(new Person("Ada"), persons.iterator().next()); } @Test void shouldReturnErrorWhenExecutePage() { Method method = getMethod(PersonRepository.class, "getPage"); Supplier> stream = () -> Stream.of(new Person("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Person.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); assertThrows(DynamicQueryException.class, dynamicReturn::execute); } @Test void shouldReturnErrorNavigableSetEntityIsNotComparable() { Method method = getMethod(AnimalRepository.class, "getSortedSet"); Supplier> stream = () -> Stream.of(new Animal("Ada")); Supplier> singleResult = DynamicReturn.toSingleResult(method).apply(stream); DynamicReturn dynamicReturn = DynamicReturn.builder() .withClassSource(Animal.class) .withMethodSource(method).withResult(stream) .withSingleResult(singleResult).build(); assertThrows(DynamicQueryException.class, dynamicReturn::execute); } @Test void shouldReturnNullWhenParamIsEmptyOnFindSpecial() { assertTrue(DynamicReturn.findSpecialParameters(null).isEmpty()); assertTrue(DynamicReturn.findSpecialParameters(new Object[0]).isEmpty()); } @Test void shouldFindSpecial() { Pageable pagination = Pageable.ofPage(1L).size(2); SpecialParameters specialParameters = DynamicReturn.findSpecialParameters(new Object[]{"value", 23, pagination}); Assertions.assertEquals(pagination, specialParameters.pageable().orElseThrow()); } @Test void shouldReturnNullWhenThereIsNotSpecial() { SpecialParameters pagination = DynamicReturn.findSpecialParameters(new Object[]{"value", 23, BigDecimal.TEN}); assertTrue(pagination.isEmpty()); } // @Test void shouldReturnNullWhenParamIsEmptyOnFindPagination() { assertNull(DynamicReturn.findPageable(null)); assertNull(DynamicReturn.findPageable(new Object[0])); } @Test void shouldFindPagination() { Pageable pagination = Pageable.ofPage(1L).size(2); Pageable pageable = DynamicReturn.findPageable(new Object[]{"value", 23, pagination}); Assertions.assertEquals(pagination, pageable); } @Test void shouldReturnNullWhenThereIsNotPagination() { Pageable pagination = DynamicReturn.findPageable(new Object[]{"value", 23, BigDecimal.TEN}); assertNull(pagination); } private Method getMethod(Class repository, String methodName) { return Stream.of(repository.getDeclaredMethods()) .filter(m -> m.getName().equals(methodName)) .findFirst().get(); } private record Animal(String name) { } private record Person(String name) implements Comparable { @Override public int compareTo(Person o) { return name.compareTo(o.name); } } private interface AnimalRepository extends CrudRepository { SortedSet getSortedSet(); } private interface PersonRepository extends CrudRepository { Optional getOptional(); Person getInstance(); List getList(); Iterable getIterable(); Collection getCollection(); Set getSet(); Queue getQueue(); Stream getStream(); SortedSet getSortedSet(); NavigableSet getNavigableSet(); Deque getDeque(); Page getPage(); } } \ No newline at end of file diff --git a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/AbstractDocumentTemplate.java b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/AbstractDocumentTemplate.java index fc804afd7..a892a84dc 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/AbstractDocumentTemplate.java +++ b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/AbstractDocumentTemplate.java @@ -24,12 +24,12 @@ import org.eclipse.jnosql.communication.document.DocumentObserverParser; import org.eclipse.jnosql.communication.document.DocumentQuery; import org.eclipse.jnosql.communication.document.DocumentQueryParser; -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; diff --git a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/AbstractMapperQuery.java b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/AbstractMapperQuery.java index a8cf3fa9f..8cdd773a6 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/AbstractMapperQuery.java +++ b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/AbstractMapperQuery.java @@ -17,9 +17,9 @@ import org.eclipse.jnosql.communication.document.Document; import org.eclipse.jnosql.communication.document.DocumentCondition; -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; diff --git a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DefaultDocumentEntityConverter.java b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DefaultDocumentEntityConverter.java index e7015e5a0..7816b35ae 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DefaultDocumentEntityConverter.java +++ b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DefaultDocumentEntityConverter.java @@ -16,7 +16,7 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; /** diff --git a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DefaultDocumentFieldValue.java b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DefaultDocumentFieldValue.java index da4af96ba..d6c913eb1 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DefaultDocumentFieldValue.java +++ b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DefaultDocumentFieldValue.java @@ -16,7 +16,7 @@ import org.eclipse.jnosql.communication.document.Document; import org.eclipse.jnosql.mapping.AttributeConverter; -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; diff --git a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DefaultDocumentTemplate.java b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DefaultDocumentTemplate.java index ff763838a..b65d3c9c0 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DefaultDocumentTemplate.java +++ b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DefaultDocumentTemplate.java @@ -19,7 +19,7 @@ import jakarta.enterprise.inject.Instance; import jakarta.inject.Inject; import org.eclipse.jnosql.communication.document.DocumentManager; -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; diff --git a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentEntityConverter.java b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentEntityConverter.java index b43387401..ece5c5bf0 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentEntityConverter.java +++ b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentEntityConverter.java @@ -17,7 +17,7 @@ import jakarta.data.exceptions.MappingException; import org.eclipse.jnosql.communication.document.Document; import org.eclipse.jnosql.communication.document.DocumentEntity; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.metadata.ConstructorBuilder; import org.eclipse.jnosql.mapping.metadata.ConstructorMetadata; import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; diff --git a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentFieldValue.java b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentFieldValue.java index c2fd84d9c..7f9f04bbc 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentFieldValue.java +++ b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentFieldValue.java @@ -15,7 +15,7 @@ package org.eclipse.jnosql.mapping.document; import org.eclipse.jnosql.communication.document.Document; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.metadata.FieldValue; diff --git a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentMapperDelete.java b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentMapperDelete.java index d863ccf7e..032715ae8 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentMapperDelete.java +++ b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentMapperDelete.java @@ -19,7 +19,7 @@ import jakarta.nosql.QueryMapper.MapperDeleteNotCondition; import jakarta.nosql.QueryMapper.MapperDeleteWhere; import org.eclipse.jnosql.communication.document.DocumentDeleteQuery; -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; diff --git a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentMapperSelect.java b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentMapperSelect.java index f1611170b..700871da7 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentMapperSelect.java +++ b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentMapperSelect.java @@ -25,7 +25,7 @@ import jakarta.nosql.QueryMapper.MapperSkip; import jakarta.nosql.QueryMapper.MapperWhere; import org.eclipse.jnosql.communication.document.DocumentQuery; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; import java.util.ArrayList; diff --git a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentTemplateProducer.java b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentTemplateProducer.java index 332c92551..8a2fa1a71 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentTemplateProducer.java +++ b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentTemplateProducer.java @@ -15,7 +15,7 @@ package org.eclipse.jnosql.mapping.document; import org.eclipse.jnosql.communication.document.DocumentManager; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import jakarta.nosql.document.DocumentTemplate; import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; diff --git a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/AbstractDocumentRepository.java b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/AbstractDocumentRepository.java index 9bd977d5e..a913b49d4 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/AbstractDocumentRepository.java +++ b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/AbstractDocumentRepository.java @@ -18,7 +18,7 @@ import jakarta.data.repository.Pageable; import jakarta.data.repository.PageableRepository; import org.eclipse.jnosql.communication.document.DocumentQuery; -import org.eclipse.jnosql.mapping.NoSQLPage; +import org.eclipse.jnosql.mapping.core.NoSQLPage; import org.eclipse.jnosql.mapping.document.JNoSQLDocumentTemplate; import org.eclipse.jnosql.mapping.document.MappingDocumentQuery; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; diff --git a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/AbstractDocumentRepositoryProxy.java b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/AbstractDocumentRepositoryProxy.java index 47d2ee639..09262a5a0 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/AbstractDocumentRepositoryProxy.java +++ b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/AbstractDocumentRepositoryProxy.java @@ -20,8 +20,8 @@ import org.eclipse.jnosql.communication.document.DocumentDeleteQuery; import org.eclipse.jnosql.communication.document.DocumentQuery; 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; diff --git a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/BaseDocumentRepository.java b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/BaseDocumentRepository.java index 4c333a2bb..5737d24af 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/BaseDocumentRepository.java +++ b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/BaseDocumentRepository.java @@ -30,14 +30,14 @@ 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.document.JNoSQLDocumentTemplate; import org.eclipse.jnosql.mapping.document.MappingDocumentQuery; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; -import org.eclipse.jnosql.mapping.repository.DynamicReturn; -import org.eclipse.jnosql.mapping.repository.SpecialParameters; -import org.eclipse.jnosql.mapping.util.ParamsBinder; +import org.eclipse.jnosql.mapping.core.repository.DynamicReturn; +import org.eclipse.jnosql.mapping.core.repository.SpecialParameters; +import org.eclipse.jnosql.mapping.core.util.ParamsBinder; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryProducer.java b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryProducer.java index 8d09c2da9..4ad40b212 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryProducer.java +++ b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryProducer.java @@ -18,7 +18,7 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import org.eclipse.jnosql.communication.document.DocumentManager; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.document.DocumentTemplateProducer; import org.eclipse.jnosql.mapping.document.JNoSQLDocumentTemplate; import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; diff --git a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryProxy.java b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryProxy.java index 7488e5b40..f662f8546 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryProxy.java +++ b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryProxy.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.document.JNoSQLDocumentTemplate; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; diff --git a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/DocumentTokenProcessor.java b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/DocumentTokenProcessor.java index 790ffd182..220e2305d 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/DocumentTokenProcessor.java +++ b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/DocumentTokenProcessor.java @@ -15,7 +15,7 @@ package org.eclipse.jnosql.mapping.document.query; import org.eclipse.jnosql.communication.document.DocumentCondition; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; interface DocumentTokenProcessor { diff --git a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/DynamicQuery.java b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/DynamicQuery.java index 7ebd2afa1..60540cbf0 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/DynamicQuery.java +++ b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/DynamicQuery.java @@ -17,10 +17,10 @@ import jakarta.data.repository.Limit; import jakarta.data.repository.Sort; import org.eclipse.jnosql.communication.document.DocumentQuery; -import org.eclipse.jnosql.mapping.NoSQLPage; +import org.eclipse.jnosql.mapping.core.NoSQLPage; import org.eclipse.jnosql.mapping.document.MappingDocumentQuery; -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; diff --git a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/RepositoryDocumentBean.java b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/RepositoryDocumentBean.java index bfa9e9e09..2ef2e9c16 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/RepositoryDocumentBean.java +++ b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/RepositoryDocumentBean.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.document.JNoSQLDocumentTemplate; 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; diff --git a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/RepositoryDocumentObserverParser.java b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/RepositoryDocumentObserverParser.java index 4a6ddd395..735051f12 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/RepositoryDocumentObserverParser.java +++ b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/RepositoryDocumentObserverParser.java @@ -16,7 +16,7 @@ import org.eclipse.jnosql.communication.document.DocumentObserverParser; 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; diff --git a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DefaultDocumentTemplateProducerTest.java b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DefaultDocumentTemplateProducerTest.java index 586b4bc3b..287e92d53 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DefaultDocumentTemplateProducerTest.java +++ b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DefaultDocumentTemplateProducerTest.java @@ -17,7 +17,7 @@ import jakarta.inject.Inject; import jakarta.nosql.document.DocumentTemplate; import org.eclipse.jnosql.communication.document.DocumentManager; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.document.spi.DocumentExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension; diff --git a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DefaultDocumentTemplateTest.java b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DefaultDocumentTemplateTest.java index 58fcfac1f..81a41b260 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DefaultDocumentTemplateTest.java +++ b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DefaultDocumentTemplateTest.java @@ -24,7 +24,7 @@ import org.eclipse.jnosql.communication.document.DocumentEntity; import org.eclipse.jnosql.communication.document.DocumentManager; import org.eclipse.jnosql.communication.document.DocumentQuery; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.IdNotFoundException; import org.eclipse.jnosql.mapping.document.entities.Job; import org.eclipse.jnosql.mapping.document.entities.Person; diff --git a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DocumentEntityConverterConstructorTest.java b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DocumentEntityConverterConstructorTest.java index 6027335a5..9fbc1283c 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DocumentEntityConverterConstructorTest.java +++ b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DocumentEntityConverterConstructorTest.java @@ -19,7 +19,7 @@ import org.eclipse.jnosql.communication.TypeReference; import org.eclipse.jnosql.communication.document.Document; import org.eclipse.jnosql.communication.document.DocumentEntity; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.document.entities.Animal; import org.eclipse.jnosql.mapping.document.entities.BookRelease; import org.eclipse.jnosql.mapping.document.entities.Money; diff --git a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DocumentEntityConverterInheritanceTest.java b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DocumentEntityConverterInheritanceTest.java index 75ce3c34a..6618eb8e9 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DocumentEntityConverterInheritanceTest.java +++ b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DocumentEntityConverterInheritanceTest.java @@ -19,7 +19,7 @@ import org.eclipse.jnosql.communication.TypeReference; import org.eclipse.jnosql.communication.document.Document; import org.eclipse.jnosql.communication.document.DocumentEntity; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.document.entities.inheritance.EmailNotification; import org.eclipse.jnosql.mapping.document.entities.inheritance.LargeProject; import org.eclipse.jnosql.mapping.document.entities.inheritance.Notification; diff --git a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DocumentEntityConverterTest.java b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DocumentEntityConverterTest.java index 8783eb6d7..81c879cf5 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DocumentEntityConverterTest.java +++ b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DocumentEntityConverterTest.java @@ -20,7 +20,7 @@ import org.eclipse.jnosql.communication.Value; import org.eclipse.jnosql.communication.document.Document; import org.eclipse.jnosql.communication.document.DocumentEntity; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.document.entities.Actor; import org.eclipse.jnosql.mapping.document.entities.Address; import org.eclipse.jnosql.mapping.document.entities.AppointmentBook; diff --git a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DocumentEntityImmutableTest.java b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DocumentEntityImmutableTest.java index 7433aad17..900a9b938 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DocumentEntityImmutableTest.java +++ b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DocumentEntityImmutableTest.java @@ -17,7 +17,7 @@ import jakarta.inject.Inject; import org.eclipse.jnosql.communication.document.Document; import org.eclipse.jnosql.communication.document.DocumentEntity; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.document.entities.Car; import org.eclipse.jnosql.mapping.document.entities.Hero; import org.eclipse.jnosql.mapping.document.spi.DocumentExtension; diff --git a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DocumentMapperObserverTest.java b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DocumentMapperObserverTest.java index d525eb706..f7f67eead 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DocumentMapperObserverTest.java +++ b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DocumentMapperObserverTest.java @@ -16,7 +16,7 @@ import jakarta.inject.Inject; import org.eclipse.jnosql.communication.document.DocumentObserverParser; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.document.entities.Car; import org.eclipse.jnosql.mapping.document.entities.Vendor; import org.eclipse.jnosql.mapping.document.entities.Worker; diff --git a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DocumentTemplateTest.java b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DocumentTemplateTest.java index df9677a48..ce7752217 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DocumentTemplateTest.java +++ b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/DocumentTemplateTest.java @@ -16,7 +16,7 @@ import jakarta.inject.Inject; import jakarta.nosql.Template; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.Database; import org.eclipse.jnosql.mapping.document.spi.DocumentExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; diff --git a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/MapperDeleteTest.java b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/MapperDeleteTest.java index b0916cb5f..d1ebf1e1d 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/MapperDeleteTest.java +++ b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/MapperDeleteTest.java @@ -18,7 +18,7 @@ import jakarta.inject.Inject; import org.eclipse.jnosql.communication.document.DocumentDeleteQuery; import org.eclipse.jnosql.communication.document.DocumentManager; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.document.entities.Address; import org.eclipse.jnosql.mapping.document.entities.Money; import org.eclipse.jnosql.mapping.document.entities.Person; diff --git a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/MapperSelectTest.java b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/MapperSelectTest.java index d9410e790..000a8effb 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/MapperSelectTest.java +++ b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/MapperSelectTest.java @@ -19,7 +19,7 @@ import org.eclipse.jnosql.communication.document.DocumentEntity; import org.eclipse.jnosql.communication.document.DocumentManager; import org.eclipse.jnosql.communication.document.DocumentQuery; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.document.entities.Address; import org.eclipse.jnosql.mapping.document.entities.Money; import org.eclipse.jnosql.mapping.document.entities.Person; diff --git a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/configuration/DocumentManagerSupplierTest.java b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/configuration/DocumentManagerSupplierTest.java index 150fee800..6ac55a2f7 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/configuration/DocumentManagerSupplierTest.java +++ b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/configuration/DocumentManagerSupplierTest.java @@ -17,7 +17,7 @@ import jakarta.data.exceptions.MappingException; import jakarta.inject.Inject; import org.eclipse.jnosql.communication.document.DocumentManager; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.document.DocumentEntityConverter; import org.eclipse.jnosql.mapping.document.MockProducer; import org.eclipse.jnosql.mapping.document.spi.DocumentExtension; diff --git a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/DocumentCrudRepositoryProxyTest.java b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/DocumentCrudRepositoryProxyTest.java index 9ef27f4ce..631460b09 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/DocumentCrudRepositoryProxyTest.java +++ b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/DocumentCrudRepositoryProxyTest.java @@ -30,7 +30,7 @@ import org.eclipse.jnosql.communication.document.DocumentCondition; import org.eclipse.jnosql.communication.document.DocumentDeleteQuery; import org.eclipse.jnosql.communication.document.DocumentQuery; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.document.DocumentEntityConverter; import org.eclipse.jnosql.mapping.document.JNoSQLDocumentTemplate; import org.eclipse.jnosql.mapping.document.MockProducer; diff --git a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryProducerTest.java b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryProducerTest.java index 78b9f8f49..307888f69 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryProducerTest.java +++ b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryProducerTest.java @@ -16,7 +16,7 @@ import jakarta.inject.Inject; import org.eclipse.jnosql.communication.document.DocumentManager; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.document.DocumentEntityConverter; import org.eclipse.jnosql.mapping.document.JNoSQLDocumentTemplate; import org.eclipse.jnosql.mapping.document.MockProducer; diff --git a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryProxyPageableTest.java b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryProxyPageableTest.java index 9754cfd43..dbbf93360 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryProxyPageableTest.java +++ b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryProxyPageableTest.java @@ -27,8 +27,8 @@ import org.eclipse.jnosql.communication.document.Document; import org.eclipse.jnosql.communication.document.DocumentCondition; import org.eclipse.jnosql.communication.document.DocumentQuery; -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.document.DocumentEntityConverter; import org.eclipse.jnosql.mapping.document.JNoSQLDocumentTemplate; import org.eclipse.jnosql.mapping.document.MockProducer; diff --git a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryProxyTest.java b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryProxyTest.java index f650d0531..d85c7446f 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryProxyTest.java +++ b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryProxyTest.java @@ -28,7 +28,7 @@ import org.eclipse.jnosql.communication.document.DocumentCondition; import org.eclipse.jnosql.communication.document.DocumentDeleteQuery; import org.eclipse.jnosql.communication.document.DocumentQuery; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.document.DocumentEntityConverter; import org.eclipse.jnosql.mapping.document.JNoSQLDocumentTemplate; import org.eclipse.jnosql.mapping.document.MockProducer; diff --git a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/DynamicQueryTest.java b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/DynamicQueryTest.java index fd7ccec9e..d1b4ecaf6 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/DynamicQueryTest.java +++ b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/DynamicQueryTest.java @@ -18,7 +18,7 @@ import jakarta.data.repository.Pageable; import jakarta.data.repository.Sort; import org.eclipse.jnosql.communication.document.DocumentQuery; -import org.eclipse.jnosql.mapping.repository.SpecialParameters; +import org.eclipse.jnosql.mapping.core.repository.SpecialParameters; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; diff --git a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/ParamsBinderTest.java b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/ParamsBinderTest.java index d456c653d..8b8b4bfe5 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/ParamsBinderTest.java +++ b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/ParamsBinderTest.java @@ -26,7 +26,7 @@ import org.eclipse.jnosql.communication.document.SelectQueryParser; import org.eclipse.jnosql.communication.query.SelectQuery; import org.eclipse.jnosql.communication.query.method.SelectMethodProvider; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.document.DocumentEntityConverter; import org.eclipse.jnosql.mapping.document.MockProducer; import org.eclipse.jnosql.mapping.document.entities.Person; @@ -35,7 +35,7 @@ import org.eclipse.jnosql.mapping.metadata.EntityMetadata; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension; -import org.eclipse.jnosql.mapping.util.ParamsBinder; +import org.eclipse.jnosql.mapping.core.util.ParamsBinder; import org.jboss.weld.junit5.auto.AddExtensions; import org.jboss.weld.junit5.auto.AddPackages; import org.jboss.weld.junit5.auto.EnableAutoWeld; diff --git a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/spi/DocumentExtensionTest.java b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/spi/DocumentExtensionTest.java index 0c396e3a8..3b2b4a184 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/spi/DocumentExtensionTest.java +++ b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/spi/DocumentExtensionTest.java @@ -16,7 +16,7 @@ import jakarta.inject.Inject; import jakarta.nosql.document.DocumentTemplate; -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.document.DocumentEntityConverter; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/AbstractGraphTemplate.java b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/AbstractGraphTemplate.java index 606b3b09e..6ece9dfad 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/AbstractGraphTemplate.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/AbstractGraphTemplate.java @@ -18,7 +18,7 @@ import jakarta.data.exceptions.NonUniqueResultException; import jakarta.nosql.PreparedStatement; import jakarta.nosql.QueryMapper; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.apache.tinkerpop.gremlin.process.traversal.Traverser; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; @@ -31,7 +31,7 @@ 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.ArrayList; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/AbstractMapperQuery.java b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/AbstractMapperQuery.java index 554ae8e82..e46a77f83 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/AbstractMapperQuery.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/AbstractMapperQuery.java @@ -14,14 +14,14 @@ */ package org.eclipse.jnosql.mapping.graph; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.apache.tinkerpop.gremlin.structure.Vertex; 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.util.List; import java.util.Optional; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultGraphConverter.java b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultGraphConverter.java index fc23c2463..70bb60c0e 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultGraphConverter.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultGraphConverter.java @@ -14,7 +14,7 @@ */ package org.eclipse.jnosql.mapping.graph; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.apache.tinkerpop.gremlin.structure.Graph; import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTemplate.java b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTemplate.java index 0b669081a..59f3f8557 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTemplate.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTemplate.java @@ -19,7 +19,7 @@ import jakarta.enterprise.inject.Instance; import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.structure.Graph; -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; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTraversalSourceConverter.java b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTraversalSourceConverter.java index ad29b7811..6aff6efe9 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTraversalSourceConverter.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTraversalSourceConverter.java @@ -15,7 +15,7 @@ package org.eclipse.jnosql.mapping.graph; import jakarta.data.exceptions.EmptyResultException; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Edge; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTraversalSourceTemplate.java b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTraversalSourceTemplate.java index 80d783384..dbec6c16c 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTraversalSourceTemplate.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTraversalSourceTemplate.java @@ -14,7 +14,7 @@ */ package org.eclipse.jnosql.mapping.graph; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Graph; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/EntityConverterByContructor.java b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/EntityConverterByContructor.java index 80c011bef..1fac81b9b 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/EntityConverterByContructor.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/EntityConverterByContructor.java @@ -18,7 +18,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex; import org.eclipse.jnosql.communication.Value; import org.eclipse.jnosql.mapping.AttributeConverter; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.metadata.ConstructorBuilder; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; import org.eclipse.jnosql.mapping.metadata.ParameterMetaData; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/EntityConverterByField.java b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/EntityConverterByField.java index 9a429926b..16444bb75 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/EntityConverterByField.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/EntityConverterByField.java @@ -18,7 +18,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex; import org.eclipse.jnosql.communication.Value; import org.eclipse.jnosql.mapping.AttributeConverter; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.metadata.ConstructorMetadata; import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/FieldGraph.java b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/FieldGraph.java index 2bb7160a2..a7ed32c87 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/FieldGraph.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/FieldGraph.java @@ -16,7 +16,7 @@ import org.eclipse.jnosql.mapping.AttributeConverter; import org.apache.tinkerpop.gremlin.structure.Property; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.metadata.FieldMetadata; import java.util.List; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/GraphConverter.java b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/GraphConverter.java index 43d92c26f..9efffca96 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/GraphConverter.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/GraphConverter.java @@ -20,7 +20,7 @@ import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Property; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.metadata.ConstructorMetadata; import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/GraphMapperDelete.java b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/GraphMapperDelete.java index 0f0fb9795..2b9874cff 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/GraphMapperDelete.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/GraphMapperDelete.java @@ -14,7 +14,7 @@ */ package org.eclipse.jnosql.mapping.graph; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/GraphMapperSelect.java b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/GraphMapperSelect.java index 054e627bf..7b3160cb7 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/GraphMapperSelect.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/GraphMapperSelect.java @@ -15,7 +15,7 @@ package org.eclipse.jnosql.mapping.graph; import jakarta.data.exceptions.NonUniqueResultException; -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; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/GraphTemplateProducer.java b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/GraphTemplateProducer.java index c9565d08c..84f0da2ba 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/GraphTemplateProducer.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/GraphTemplateProducer.java @@ -14,7 +14,7 @@ */ package org.eclipse.jnosql.mapping.graph; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.apache.tinkerpop.gremlin.structure.Graph; import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/AbstractGraphRepository.java b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/AbstractGraphRepository.java index c61e5c379..0bcaff489 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/AbstractGraphRepository.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/AbstractGraphRepository.java @@ -17,7 +17,7 @@ import jakarta.data.repository.Page; import jakarta.data.repository.Pageable; import jakarta.data.repository.PageableRepository; -import org.eclipse.jnosql.mapping.NoSQLPage; +import org.eclipse.jnosql.mapping.core.NoSQLPage; import org.eclipse.jnosql.mapping.graph.GraphTemplate; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; import org.eclipse.jnosql.mapping.metadata.FieldMetadata; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/AbstractGraphRepositoryProxy.java b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/AbstractGraphRepositoryProxy.java index 70a034eed..7973a2a9f 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/AbstractGraphRepositoryProxy.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/AbstractGraphRepositoryProxy.java @@ -22,15 +22,15 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Vertex; -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.core.repository.DynamicQueryMethodReturn; import org.eclipse.jnosql.mapping.graph.GraphConverter; import org.eclipse.jnosql.mapping.graph.GraphTemplate; import org.eclipse.jnosql.mapping.query.RepositoryType; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; -import org.eclipse.jnosql.mapping.repository.DynamicQueryMethodReturn; -import org.eclipse.jnosql.mapping.repository.DynamicReturn; -import org.eclipse.jnosql.mapping.repository.ThrowingSupplier; +import org.eclipse.jnosql.mapping.core.repository.DynamicReturn; +import org.eclipse.jnosql.mapping.core.repository.ThrowingSupplier; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/AbstractQueryConvert.java b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/AbstractQueryConvert.java index 2708242f2..0a685ba5a 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/AbstractQueryConvert.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/AbstractQueryConvert.java @@ -24,7 +24,7 @@ import org.eclipse.jnosql.communication.query.QueryValue; import org.eclipse.jnosql.communication.query.Where; 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.Optional; import java.util.function.Supplier; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/GraphQueryMethod.java b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/GraphQueryMethod.java index 9c04fd0bb..4c0ebe279 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/GraphQueryMethod.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/GraphQueryMethod.java @@ -18,10 +18,10 @@ import org.apache.tinkerpop.gremlin.structure.Vertex; import org.eclipse.jnosql.communication.query.BooleanQueryValue; import org.eclipse.jnosql.communication.query.QueryValue; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.DynamicQueryException; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; -import org.eclipse.jnosql.mapping.util.ConverterUtil; +import org.eclipse.jnosql.mapping.core.util.ConverterUtil; import java.lang.reflect.Method; import java.util.Collection; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/GraphRepositoryProducer.java b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/GraphRepositoryProducer.java index 0142b4d17..4c4905829 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/GraphRepositoryProducer.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/GraphRepositoryProducer.java @@ -15,7 +15,7 @@ package org.eclipse.jnosql.mapping.graph.query; import jakarta.data.repository.PageableRepository; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.GraphConverter; import org.eclipse.jnosql.mapping.graph.GraphTemplate; import org.eclipse.jnosql.mapping.graph.GraphTemplateProducer; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/GraphRepositoryProxy.java b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/GraphRepositoryProxy.java index 300e0c011..6c5e52c28 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/GraphRepositoryProxy.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/GraphRepositoryProxy.java @@ -16,7 +16,7 @@ import jakarta.data.repository.PageableRepository; import org.apache.tinkerpop.gremlin.structure.Graph; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.GraphConverter; import org.eclipse.jnosql.mapping.graph.GraphTemplate; import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/RepositoryGraphBean.java b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/RepositoryGraphBean.java index fc971090d..36596a6b3 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/RepositoryGraphBean.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/RepositoryGraphBean.java @@ -17,14 +17,14 @@ import jakarta.data.repository.CrudRepository; import jakarta.enterprise.context.spi.CreationalContext; import org.apache.tinkerpop.gremlin.structure.Graph; -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.graph.GraphConverter; import org.eclipse.jnosql.mapping.graph.GraphTemplate; 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; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/SelectQueryConverter.java b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/SelectQueryConverter.java index d832d5e68..9ec571da0 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/SelectQueryConverter.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/SelectQueryConverter.java @@ -19,11 +19,11 @@ import org.apache.tinkerpop.gremlin.structure.Vertex; import org.eclipse.jnosql.communication.query.SelectQuery; import org.eclipse.jnosql.communication.query.method.SelectMethodProvider; -import org.eclipse.jnosql.mapping.NoSQLPage; +import org.eclipse.jnosql.mapping.core.NoSQLPage; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; -import org.eclipse.jnosql.mapping.repository.DynamicReturn; -import org.eclipse.jnosql.mapping.repository.RepositoryObserverParser; -import org.eclipse.jnosql.mapping.repository.SpecialParameters; +import org.eclipse.jnosql.mapping.core.repository.DynamicReturn; +import org.eclipse.jnosql.mapping.core.repository.RepositoryObserverParser; +import org.eclipse.jnosql.mapping.core.repository.SpecialParameters; import java.util.function.BiFunction; import java.util.function.Consumer; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/BookTemplateTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/BookTemplateTest.java index 9ab4eb03d..de15aedad 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/BookTemplateTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/BookTemplateTest.java @@ -18,7 +18,7 @@ import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Transaction; import org.apache.tinkerpop.gremlin.structure.Transaction.Status; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.entities.Book; import org.eclipse.jnosql.mapping.graph.entities.BookTemplate; import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeTraversalTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeTraversalTest.java index fb825af9d..441222d80 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeTraversalTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultEdgeTraversalTest.java @@ -17,7 +17,7 @@ import jakarta.data.exceptions.NonUniqueResultException; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.structure.T; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.entities.Animal; import org.eclipse.jnosql.mapping.graph.entities.Book; import org.eclipse.jnosql.mapping.graph.entities.Person; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultEntityTreeTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultEntityTreeTest.java index f940a7297..eebb49b42 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultEntityTreeTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultEntityTreeTest.java @@ -18,7 +18,7 @@ import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.entities.Animal; import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphConverterTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphConverterTest.java index 919bc8ed5..974aa7b14 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphConverterTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphConverterTest.java @@ -16,7 +16,7 @@ import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.structure.Graph; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphInheritanceConverterTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphInheritanceConverterTest.java index a8e27fdb9..6ae04bd2d 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphInheritanceConverterTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphInheritanceConverterTest.java @@ -16,7 +16,7 @@ import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.structure.Graph; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTraversalInheritanceConverterTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTraversalInheritanceConverterTest.java index e964576e9..adfe7648b 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTraversalInheritanceConverterTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTraversalInheritanceConverterTest.java @@ -16,7 +16,7 @@ import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.structure.Graph; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTraversalSourceConverterTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTraversalSourceConverterTest.java index a5b488d91..adf20c275 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTraversalSourceConverterTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTraversalSourceConverterTest.java @@ -16,7 +16,7 @@ import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.structure.Graph; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTraversalSourceTemplateTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTraversalSourceTemplateTest.java index 12371fffb..f3e9a42fa 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTraversalSourceTemplateTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultGraphTraversalSourceTemplateTest.java @@ -16,7 +16,7 @@ import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.structure.Graph; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultValueMapTraversalTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultValueMapTraversalTest.java index 98ece4b6a..2b2d58b87 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultValueMapTraversalTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultValueMapTraversalTest.java @@ -15,7 +15,7 @@ package org.eclipse.jnosql.mapping.graph; import jakarta.data.exceptions.NonUniqueResultException; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.entities.Person; import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultVertexTraversalTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultVertexTraversalTest.java index 028b44ee8..9d61fa177 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultVertexTraversalTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/DefaultVertexTraversalTest.java @@ -17,7 +17,7 @@ import jakarta.data.exceptions.NonUniqueResultException; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.structure.T; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.entities.Animal; import org.eclipse.jnosql.mapping.graph.entities.Book; import org.eclipse.jnosql.mapping.graph.entities.Person; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/EdgeEntityTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/EdgeEntityTest.java index 0920e3fcc..e3a2bca22 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/EdgeEntityTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/EdgeEntityTest.java @@ -17,7 +17,7 @@ import jakarta.data.exceptions.EmptyResultException; import jakarta.inject.Inject; import org.eclipse.jnosql.communication.Value; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.entities.Book; import org.eclipse.jnosql.mapping.graph.entities.Person; import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/EntityConverterByConstructorTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/EntityConverterByConstructorTest.java index 80aae0ff8..7878e306f 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/EntityConverterByConstructorTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/EntityConverterByConstructorTest.java @@ -18,7 +18,7 @@ import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.assertj.core.api.SoftAssertions; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.entities.Car; import org.eclipse.jnosql.mapping.graph.entities.Hero; import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/GraphImmutableConveterTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/GraphImmutableConveterTest.java index 5e4be942d..afb170067 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/GraphImmutableConveterTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/GraphImmutableConveterTest.java @@ -20,7 +20,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.VertexProperty; import org.assertj.core.api.SoftAssertions; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.entities.Car; import org.eclipse.jnosql.mapping.graph.entities.Hero; import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/GraphTemplateProducerTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/GraphTemplateProducerTest.java index 176d7fc12..d8938b5e0 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/GraphTemplateProducerTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/GraphTemplateProducerTest.java @@ -16,7 +16,7 @@ import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.structure.Graph; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/GraphTemplateTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/GraphTemplateTest.java index 33467817f..ab7d79fae 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/GraphTemplateTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/GraphTemplateTest.java @@ -16,7 +16,7 @@ import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.structure.Graph; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/GremlinExecutorTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/GremlinExecutorTest.java index c81dc83d6..e3a631248 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/GremlinExecutorTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/GremlinExecutorTest.java @@ -19,7 +19,7 @@ import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.entities.Person; import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/MapperDeleteTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/MapperDeleteTest.java index d13b43d3f..6eed48646 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/MapperDeleteTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/MapperDeleteTest.java @@ -18,7 +18,7 @@ import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.entities.Job; import org.eclipse.jnosql.mapping.graph.entities.Money; import org.eclipse.jnosql.mapping.graph.entities.Person; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/MapperSelectTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/MapperSelectTest.java index 3eaad9ab3..d30db7f17 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/MapperSelectTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/MapperSelectTest.java @@ -20,7 +20,7 @@ import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.entities.Job; import org.eclipse.jnosql.mapping.graph.entities.Money; import org.eclipse.jnosql.mapping.graph.entities.Person; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/TemplateGraphTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/TemplateGraphTest.java index 052559f2a..c52baefb1 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/TemplateGraphTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/TemplateGraphTest.java @@ -16,7 +16,7 @@ import jakarta.inject.Inject; import jakarta.nosql.Template; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.Database; import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/configuration/GraphSupplierTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/configuration/GraphSupplierTest.java index 45a08daec..cef0a94e1 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/configuration/GraphSupplierTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/configuration/GraphSupplierTest.java @@ -16,7 +16,7 @@ import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.structure.Graph; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.BookRepository; import org.eclipse.jnosql.mapping.graph.Transactional; import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/query/DeleteQueryConverterTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/query/DeleteQueryConverterTest.java index 52f52c40f..b1b9e7b94 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/query/DeleteQueryConverterTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/query/DeleteQueryConverterTest.java @@ -20,7 +20,7 @@ import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.BookRepository; import org.eclipse.jnosql.mapping.graph.Transactional; import org.eclipse.jnosql.mapping.graph.entities.Person; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/query/GraphCrudRepositoryProxyTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/query/GraphCrudRepositoryProxyTest.java index 1d6a985b5..93e1772bc 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/query/GraphCrudRepositoryProxyTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/query/GraphCrudRepositoryProxyTest.java @@ -23,7 +23,7 @@ import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.BookRepository; import org.eclipse.jnosql.mapping.graph.GraphConverter; import org.eclipse.jnosql.mapping.graph.GraphTemplate; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/query/GraphRepositoryProducerTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/query/GraphRepositoryProducerTest.java index 287e90df8..ea388ea31 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/query/GraphRepositoryProducerTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/query/GraphRepositoryProducerTest.java @@ -16,7 +16,7 @@ import jakarta.inject.Inject; import org.apache.tinkerpop.gremlin.structure.Graph; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.BookRepository; import org.eclipse.jnosql.mapping.graph.Transactional; import org.eclipse.jnosql.mapping.graph.spi.GraphExtension; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/query/GraphRepositoryProxyPageableTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/query/GraphRepositoryProxyPageableTest.java index b2f481a7e..c2dba04d6 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/query/GraphRepositoryProxyPageableTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/query/GraphRepositoryProxyPageableTest.java @@ -25,7 +25,7 @@ import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.BookRepository; import org.eclipse.jnosql.mapping.graph.GraphConverter; import org.eclipse.jnosql.mapping.graph.GraphTemplate; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/query/GraphRepositoryProxyTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/query/GraphRepositoryProxyTest.java index 3b1f8379a..78e35e7a1 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/query/GraphRepositoryProxyTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/query/GraphRepositoryProxyTest.java @@ -26,7 +26,7 @@ import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.assertj.core.api.SoftAssertions; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.BookRepository; import org.eclipse.jnosql.mapping.graph.GraphConverter; import org.eclipse.jnosql.mapping.graph.GraphTemplate; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/query/SelectQueryConverterTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/query/SelectQueryConverterTest.java index d08bc4c53..445a2356b 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/query/SelectQueryConverterTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/query/SelectQueryConverterTest.java @@ -20,7 +20,7 @@ import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.graph.BookRepository; import org.eclipse.jnosql.mapping.graph.Transactional; import org.eclipse.jnosql.mapping.graph.entities.Person; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/spi/GraphConfigurationProducerExtensionTest.java b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/spi/GraphConfigurationProducerExtensionTest.java index 8b1ef80f6..ea9e08f59 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/spi/GraphConfigurationProducerExtensionTest.java +++ b/jnosql-mapping/jnosql-mapping-graph/src/test/java/org/eclipse/jnosql/mapping/graph/spi/GraphConfigurationProducerExtensionTest.java @@ -15,7 +15,7 @@ package org.eclipse.jnosql.mapping.graph.spi; import jakarta.inject.Inject; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.Database; import org.eclipse.jnosql.mapping.graph.BookRepository; import org.eclipse.jnosql.mapping.graph.GraphTemplate; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/DefaultKeyValueEntityConverter.java b/jnosql-mapping/jnosql-mapping-key-value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/DefaultKeyValueEntityConverter.java index 2f30930bd..8f5d55769 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/DefaultKeyValueEntityConverter.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/DefaultKeyValueEntityConverter.java @@ -14,7 +14,7 @@ */ package org.eclipse.jnosql.mapping.keyvalue; -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; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/KeyValueEntityConverter.java b/jnosql-mapping/jnosql-mapping-key-value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/KeyValueEntityConverter.java index 9768afc88..fb1ca3bbb 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/KeyValueEntityConverter.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/KeyValueEntityConverter.java @@ -17,7 +17,7 @@ import org.eclipse.jnosql.mapping.AttributeConverter; import org.eclipse.jnosql.communication.Value; import org.eclipse.jnosql.communication.keyvalue.KeyValueEntity; -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.EntityMetadata; import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/query/AbstractKeyValueRepositoryProxy.java b/jnosql-mapping/jnosql-mapping-key-value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/query/AbstractKeyValueRepositoryProxy.java index ef194eec7..bc0eb8776 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/query/AbstractKeyValueRepositoryProxy.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/query/AbstractKeyValueRepositoryProxy.java @@ -19,8 +19,8 @@ import jakarta.nosql.keyvalue.KeyValueTemplate; import org.eclipse.jnosql.mapping.DynamicQueryException; 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; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/query/RepositoryKeyValueBean.java b/jnosql-mapping/jnosql-mapping-key-value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/query/RepositoryKeyValueBean.java index b71a5dfde..bd4e51438 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/query/RepositoryKeyValueBean.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/query/RepositoryKeyValueBean.java @@ -21,7 +21,7 @@ import org.eclipse.jnosql.mapping.DatabaseType; 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; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/DefaultKeyValueEntityConverterTest.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/DefaultKeyValueEntityConverterTest.java index ed30f45fd..198054b23 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/DefaultKeyValueEntityConverterTest.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/DefaultKeyValueEntityConverterTest.java @@ -17,16 +17,16 @@ import jakarta.inject.Inject; import org.eclipse.jnosql.communication.Value; import org.eclipse.jnosql.communication.keyvalue.KeyValueEntity; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.IdNotFoundException; import org.eclipse.jnosql.mapping.keyvalue.spi.KeyValueExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension; -import org.eclipse.jnosql.mapping.test.entities.Car; -import org.eclipse.jnosql.mapping.test.entities.Person; -import org.eclipse.jnosql.mapping.test.entities.Plate; -import org.eclipse.jnosql.mapping.test.entities.User; -import org.eclipse.jnosql.mapping.test.entities.Worker; +import org.eclipse.jnosql.mapping.keyvalue.entities.Car; +import org.eclipse.jnosql.mapping.keyvalue.entities.Person; +import org.eclipse.jnosql.mapping.keyvalue.entities.Plate; +import org.eclipse.jnosql.mapping.keyvalue.entities.User; +import org.eclipse.jnosql.mapping.keyvalue.entities.Worker; import org.jboss.weld.junit5.auto.AddExtensions; import org.jboss.weld.junit5.auto.AddPackages; import org.jboss.weld.junit5.auto.EnableAutoWeld; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/DefaultKeyValueTemplateTest.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/DefaultKeyValueTemplateTest.java index 444367a32..656352c15 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/DefaultKeyValueTemplateTest.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/DefaultKeyValueTemplateTest.java @@ -23,12 +23,12 @@ import org.eclipse.jnosql.communication.keyvalue.BucketManager; import org.eclipse.jnosql.communication.keyvalue.KeyValueEntity; import org.eclipse.jnosql.communication.keyvalue.KeyValuePreparedStatement; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.keyvalue.spi.KeyValueExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension; -import org.eclipse.jnosql.mapping.test.entities.Person; -import org.eclipse.jnosql.mapping.test.entities.User; +import org.eclipse.jnosql.mapping.keyvalue.entities.Person; +import org.eclipse.jnosql.mapping.keyvalue.entities.User; import org.jboss.weld.junit5.auto.AddExtensions; import org.jboss.weld.junit5.auto.AddPackages; import org.jboss.weld.junit5.auto.EnableAutoWeld; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/KeyValueTemplateProducerTest.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/KeyValueTemplateProducerTest.java index c84281fd4..061925d5c 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/KeyValueTemplateProducerTest.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/KeyValueTemplateProducerTest.java @@ -17,7 +17,7 @@ import jakarta.inject.Inject; import jakarta.nosql.keyvalue.KeyValueTemplate; import org.eclipse.jnosql.communication.keyvalue.BucketManager; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.keyvalue.spi.KeyValueExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/KeyValueTemplateTest.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/KeyValueTemplateTest.java index c13bb5436..049c5c21f 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/KeyValueTemplateTest.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/KeyValueTemplateTest.java @@ -16,7 +16,7 @@ import jakarta.inject.Inject; import jakarta.nosql.Template; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.Database; import org.eclipse.jnosql.mapping.keyvalue.spi.KeyValueExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/MockProducer.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/MockProducer.java index 51fcccc89..e4720e6ec 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/MockProducer.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/MockProducer.java @@ -24,8 +24,8 @@ import org.eclipse.jnosql.communication.keyvalue.BucketManager; import org.eclipse.jnosql.mapping.Database; import org.eclipse.jnosql.mapping.DatabaseType; -import org.eclipse.jnosql.mapping.test.entities.Person; -import org.eclipse.jnosql.mapping.test.entities.User; +import org.eclipse.jnosql.mapping.keyvalue.entities.Person; +import org.eclipse.jnosql.mapping.keyvalue.entities.User; import org.mockito.Mockito; import java.util.Optional; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/configuration/BucketManagerFactorySupplierTest.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/configuration/BucketManagerFactorySupplierTest.java index 67e289ce0..3801d1361 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/configuration/BucketManagerFactorySupplierTest.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/configuration/BucketManagerFactorySupplierTest.java @@ -18,7 +18,7 @@ import jakarta.inject.Inject; import org.eclipse.jnosql.communication.keyvalue.BucketManager; import org.eclipse.jnosql.communication.keyvalue.BucketManagerFactory; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.keyvalue.KeyValueEntityConverter; import org.eclipse.jnosql.mapping.keyvalue.MockProducer; import org.eclipse.jnosql.mapping.keyvalue.spi.KeyValueExtension; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/configuration/BucketManagerSupplierTest.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/configuration/BucketManagerSupplierTest.java index 227c70e86..583bf2416 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/configuration/BucketManagerSupplierTest.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/configuration/BucketManagerSupplierTest.java @@ -17,7 +17,7 @@ import jakarta.data.exceptions.MappingException; import jakarta.inject.Inject; import org.eclipse.jnosql.communication.keyvalue.BucketManager; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.keyvalue.KeyValueEntityConverter; import org.eclipse.jnosql.mapping.keyvalue.MockProducer; import org.eclipse.jnosql.mapping.keyvalue.spi.KeyValueExtension; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/configuration/CollectionSupplierTest.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/configuration/CollectionSupplierTest.java index 192cb8f4d..769dd65cb 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/configuration/CollectionSupplierTest.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/configuration/CollectionSupplierTest.java @@ -17,7 +17,7 @@ import jakarta.enterprise.inject.spi.CDI; import jakarta.enterprise.util.TypeLiteral; import jakarta.inject.Inject; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.keyvalue.KeyValueDatabase; import org.eclipse.jnosql.mapping.keyvalue.KeyValueDatabaseQualifier; import org.eclipse.jnosql.mapping.keyvalue.KeyValueEntityConverter; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/Car.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/Car.java similarity index 95% rename from jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/Car.java rename to jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/Car.java index 4bc176910..fbee9cb0f 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/Car.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/Car.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.keyvalue.entities; import jakarta.nosql.Entity; import jakarta.nosql.Id; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Job.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/Job.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Job.java rename to jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/Job.java index 780129154..7ee543d4a 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Job.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/Job.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.keyvalue.entities; import jakarta.nosql.Column; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Money.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/Money.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Money.java rename to jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/Money.java index 2316c0a36..6d9732d05 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Money.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/Money.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.keyvalue.entities; import java.math.BigDecimal; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/MoneyConverter.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/MoneyConverter.java similarity index 94% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/MoneyConverter.java rename to jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/MoneyConverter.java index 50c951d2f..1f9a8ec68 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/MoneyConverter.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/MoneyConverter.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.keyvalue.entities; import org.eclipse.jnosql.mapping.AttributeConverter; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Person.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/Person.java similarity index 97% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Person.java rename to jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/Person.java index ff1e70192..2a944bb51 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Person.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/Person.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.keyvalue.entities; import jakarta.nosql.Column; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonBuilder.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/PersonBuilder.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonBuilder.java rename to jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/PersonBuilder.java index 45abfe70d..384913634 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonBuilder.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/PersonBuilder.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.keyvalue.entities; import java.util.List; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonRepository.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/PersonRepository.java similarity index 93% rename from jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonRepository.java rename to jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/PersonRepository.java index 5b002ad64..00104c645 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonRepository.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/PersonRepository.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.keyvalue.entities; import jakarta.data.repository.PageableRepository; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonStatisticRepository.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/PersonStatisticRepository.java similarity index 93% rename from jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonStatisticRepository.java rename to jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/PersonStatisticRepository.java index cae8e3823..9c305ffe0 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonStatisticRepository.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/PersonStatisticRepository.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.keyvalue.entities; public interface PersonStatisticRepository { diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonStatisticRepositoryProducer.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/PersonStatisticRepositoryProducer.java similarity index 94% rename from jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonStatisticRepositoryProducer.java rename to jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/PersonStatisticRepositoryProducer.java index a0f47e55d..0798bb0d7 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonStatisticRepositoryProducer.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/PersonStatisticRepositoryProducer.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.keyvalue.entities; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Produces; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/Plate.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/Plate.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/Plate.java rename to jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/Plate.java index 09d76fb9e..f27d82dd6 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/Plate.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/Plate.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.keyvalue.entities; import java.util.Objects; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/PlateConverter.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/PlateConverter.java similarity index 94% rename from jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/PlateConverter.java rename to jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/PlateConverter.java index 325131c3f..870f356dc 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/PlateConverter.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/PlateConverter.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.keyvalue.entities; import org.eclipse.jnosql.mapping.AttributeConverter; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/User.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/User.java similarity index 97% rename from jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/User.java rename to jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/User.java index bdb1e42f3..d71fee666 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/User.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/User.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.keyvalue.entities; import jakarta.nosql.Entity; import jakarta.nosql.Id; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/Worker.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/Worker.java similarity index 95% rename from jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/Worker.java rename to jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/Worker.java index 13c6bc014..8e54ad74c 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/Worker.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/entities/Worker.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.keyvalue.entities; import jakarta.nosql.Column; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/query/KeyValueRepositoryProducerTest.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/query/KeyValueRepositoryProducerTest.java index 6b50237da..4296906b0 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/query/KeyValueRepositoryProducerTest.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/query/KeyValueRepositoryProducerTest.java @@ -17,13 +17,13 @@ import jakarta.inject.Inject; import jakarta.nosql.keyvalue.KeyValueTemplate; import org.eclipse.jnosql.communication.keyvalue.BucketManager; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.keyvalue.KeyValueEntityConverter; import org.eclipse.jnosql.mapping.keyvalue.MockProducer; import org.eclipse.jnosql.mapping.keyvalue.spi.KeyValueExtension; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension; -import org.eclipse.jnosql.mapping.test.entities.PersonRepository; +import org.eclipse.jnosql.mapping.keyvalue.entities.PersonRepository; import org.jboss.weld.junit5.auto.AddExtensions; import org.jboss.weld.junit5.auto.AddPackages; import org.jboss.weld.junit5.auto.EnableAutoWeld; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/query/KeyValueRepositoryProxyTest.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/query/KeyValueRepositoryProxyTest.java index cbd92361c..a23bb1172 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/query/KeyValueRepositoryProxyTest.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/query/KeyValueRepositoryProxyTest.java @@ -21,7 +21,7 @@ import jakarta.nosql.PreparedStatement; import jakarta.nosql.keyvalue.KeyValueTemplate; import org.assertj.core.api.SoftAssertions; -import org.eclipse.jnosql.mapping.Converters; +import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.DynamicQueryException; import org.eclipse.jnosql.mapping.keyvalue.KeyValueEntityConverter; import org.eclipse.jnosql.mapping.keyvalue.MockProducer; @@ -29,8 +29,8 @@ import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension; -import org.eclipse.jnosql.mapping.test.entities.PersonStatisticRepository; -import org.eclipse.jnosql.mapping.test.entities.User; +import org.eclipse.jnosql.mapping.keyvalue.entities.PersonStatisticRepository; +import org.eclipse.jnosql.mapping.keyvalue.entities.User; import org.jboss.weld.junit5.auto.AddExtensions; import org.jboss.weld.junit5.auto.AddPackages; import org.jboss.weld.junit5.auto.EnableAutoWeld; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/spi/KeyValueExtensionTest.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/spi/KeyValueExtensionTest.java index 468bd8d99..177b744a7 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/spi/KeyValueExtensionTest.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/spi/KeyValueExtensionTest.java @@ -16,15 +16,15 @@ import jakarta.inject.Inject; import jakarta.nosql.keyvalue.KeyValueTemplate; -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.keyvalue.KeyValueEntityConverter; import org.eclipse.jnosql.mapping.keyvalue.MockProducer; import org.eclipse.jnosql.mapping.reflection.Reflections; import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension; -import org.eclipse.jnosql.mapping.test.entities.Person; -import org.eclipse.jnosql.mapping.test.entities.User; +import org.eclipse.jnosql.mapping.keyvalue.entities.Person; +import org.eclipse.jnosql.mapping.keyvalue.entities.User; import org.jboss.weld.junit5.auto.AddExtensions; import org.jboss.weld.junit5.auto.AddPackages; import org.jboss.weld.junit5.auto.EnableAutoWeld; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/spi/UserRepository.java b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/spi/UserRepository.java index 832856820..2ae227d76 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/spi/UserRepository.java +++ b/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/spi/UserRepository.java @@ -16,7 +16,7 @@ import jakarta.data.repository.CrudRepository; import jakarta.data.repository.Repository; -import org.eclipse.jnosql.mapping.test.entities.User; +import org.eclipse.jnosql.mapping.keyvalue.entities.User; @Repository public interface UserRepository extends CrudRepository { diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/ClassConverterTest.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ClassConverterTest.java similarity index 95% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/ClassConverterTest.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ClassConverterTest.java index 6d202a718..4fc361a1b 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/ClassConverterTest.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ClassConverterTest.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping; +package org.eclipse.jnosql.mapping.reflection; import org.eclipse.jnosql.mapping.metadata.ClassConverter; import org.junit.jupiter.api.Test; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ClassGraphClassScannerTest.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ClassGraphClassScannerTest.java index 0916959e2..1a8cfcd47 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ClassGraphClassScannerTest.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ClassGraphClassScannerTest.java @@ -16,13 +16,13 @@ import jakarta.data.repository.CrudRepository; import jakarta.data.repository.PageableRepository; -import org.eclipse.jnosql.mapping.test.entities.AnimalRepository; -import org.eclipse.jnosql.mapping.test.entities.Contact; -import org.eclipse.jnosql.mapping.test.entities.Job; -import org.eclipse.jnosql.mapping.test.entities.MovieRepository; -import org.eclipse.jnosql.mapping.test.entities.NoSQLVendor; -import org.eclipse.jnosql.mapping.test.entities.Person; -import org.eclipse.jnosql.mapping.test.entities.PersonRepository; +import org.eclipse.jnosql.mapping.reflection.entities.AnimalRepository; +import org.eclipse.jnosql.mapping.reflection.entities.Contact; +import org.eclipse.jnosql.mapping.reflection.entities.Job; +import org.eclipse.jnosql.mapping.reflection.entities.MovieRepository; +import org.eclipse.jnosql.mapping.reflection.entities.NoSQLVendor; +import org.eclipse.jnosql.mapping.reflection.entities.Person; +import org.eclipse.jnosql.mapping.reflection.entities.PersonRepository; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ConstructorMetadataBuilderTest.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ConstructorMetadataBuilderTest.java index 7c37fad38..cd2ed25fc 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ConstructorMetadataBuilderTest.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ConstructorMetadataBuilderTest.java @@ -16,15 +16,14 @@ import jakarta.inject.Inject; import org.eclipse.jnosql.mapping.Convert; -import org.eclipse.jnosql.mapping.ReflectionGroupEntityMetadata; import org.eclipse.jnosql.mapping.metadata.ConstructorMetadata; import org.eclipse.jnosql.mapping.metadata.ParameterMetaData; -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.Computer; -import org.eclipse.jnosql.mapping.test.entities.constructor.PetOwner; -import org.eclipse.jnosql.mapping.test.entities.constructor.Smartphone; +import org.eclipse.jnosql.mapping.reflection.entities.Person; +import org.eclipse.jnosql.mapping.reflection.entities.Worker; +import org.eclipse.jnosql.mapping.reflection.entities.constructor.BookUser; +import org.eclipse.jnosql.mapping.reflection.entities.constructor.Computer; +import org.eclipse.jnosql.mapping.reflection.entities.constructor.PetOwner; +import org.eclipse.jnosql.mapping.reflection.entities.constructor.Smartphone; import org.jboss.weld.junit5.auto.AddPackages; import org.jboss.weld.junit5.auto.EnableAutoWeld; import org.junit.jupiter.api.Assertions; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultConstructorBuilderTest.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultConstructorBuilderTest.java index 17e878cdd..3f0626cd4 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultConstructorBuilderTest.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultConstructorBuilderTest.java @@ -16,12 +16,11 @@ import org.assertj.core.api.SoftAssertions; import org.eclipse.jnosql.mapping.Convert; -import org.eclipse.jnosql.mapping.ReflectionGroupEntityMetadata; import org.eclipse.jnosql.mapping.metadata.ClassConverter; import org.eclipse.jnosql.mapping.metadata.ConstructorBuilder; import org.eclipse.jnosql.mapping.metadata.ConstructorMetadata; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; -import org.eclipse.jnosql.mapping.test.entities.constructor.BookUser; +import org.eclipse.jnosql.mapping.reflection.entities.constructor.BookUser; import org.jboss.weld.junit5.auto.AddPackages; import org.jboss.weld.junit5.auto.EnableAutoWeld; import org.junit.jupiter.api.BeforeEach; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultEntitiesMetadataTest.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultEntitiesMetadataTest.java index fb91908a4..7d2daf13e 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultEntitiesMetadataTest.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultEntitiesMetadataTest.java @@ -16,19 +16,18 @@ import jakarta.inject.Inject; import org.eclipse.jnosql.mapping.Convert; -import org.eclipse.jnosql.mapping.ReflectionGroupEntityMetadata; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; import org.eclipse.jnosql.mapping.metadata.InheritanceMetadata; -import org.eclipse.jnosql.mapping.test.entities.Movie; -import org.eclipse.jnosql.mapping.test.entities.Person; -import org.eclipse.jnosql.mapping.test.entities.Vendor; -import org.eclipse.jnosql.mapping.test.entities.inheritance.EmailNotification; -import org.eclipse.jnosql.mapping.test.entities.inheritance.LargeProject; -import org.eclipse.jnosql.mapping.test.entities.inheritance.Notification; -import org.eclipse.jnosql.mapping.test.entities.inheritance.Project; -import org.eclipse.jnosql.mapping.test.entities.inheritance.SmallProject; -import org.eclipse.jnosql.mapping.test.entities.inheritance.SmsNotification; -import org.eclipse.jnosql.mapping.test.entities.inheritance.SocialMediaNotification; +import org.eclipse.jnosql.mapping.reflection.entities.Movie; +import org.eclipse.jnosql.mapping.reflection.entities.Person; +import org.eclipse.jnosql.mapping.reflection.entities.Vendor; +import org.eclipse.jnosql.mapping.reflection.entities.inheritance.EmailNotification; +import org.eclipse.jnosql.mapping.reflection.entities.inheritance.LargeProject; +import org.eclipse.jnosql.mapping.reflection.entities.inheritance.Notification; +import org.eclipse.jnosql.mapping.reflection.entities.inheritance.Project; +import org.eclipse.jnosql.mapping.reflection.entities.inheritance.SmallProject; +import org.eclipse.jnosql.mapping.reflection.entities.inheritance.SmsNotification; +import org.eclipse.jnosql.mapping.reflection.entities.inheritance.SocialMediaNotification; import org.jboss.weld.junit5.auto.AddPackages; import org.jboss.weld.junit5.auto.EnableAutoWeld; import org.junit.jupiter.api.Assertions; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultEntityMetadataTest.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultEntityMetadataTest.java index 9081b0842..055c45a7d 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultEntityMetadataTest.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultEntityMetadataTest.java @@ -18,8 +18,8 @@ import org.eclipse.jnosql.mapping.metadata.ClassConverter; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; import org.eclipse.jnosql.mapping.metadata.FieldMetadata; -import org.eclipse.jnosql.mapping.test.entities.Person; -import org.eclipse.jnosql.mapping.test.entities.inheritance.Notification; +import org.eclipse.jnosql.mapping.reflection.entities.Person; +import org.eclipse.jnosql.mapping.reflection.entities.inheritance.Notification; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultFieldMetadataTest.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultFieldMetadataTest.java index dee611119..98f28f364 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultFieldMetadataTest.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultFieldMetadataTest.java @@ -19,9 +19,10 @@ import org.eclipse.jnosql.mapping.metadata.ClassConverter; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; import org.eclipse.jnosql.mapping.metadata.FieldMetadata; -import org.eclipse.jnosql.mapping.test.entities.MoneyConverter; -import org.eclipse.jnosql.mapping.test.entities.Person; -import org.eclipse.jnosql.mapping.test.entities.Worker; +import org.eclipse.jnosql.mapping.reflection.entities.Person; +import org.eclipse.jnosql.mapping.reflection.entities.MoneyConverter; +import org.eclipse.jnosql.mapping.reflection.entities.Person; +import org.eclipse.jnosql.mapping.reflection.entities.Worker; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultGenericFieldMetaDataTest.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultGenericFieldMetaDataTest.java index 25def057c..f050964dd 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultGenericFieldMetaDataTest.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultGenericFieldMetaDataTest.java @@ -20,7 +20,7 @@ import org.eclipse.jnosql.mapping.metadata.EntityMetadata; import org.eclipse.jnosql.mapping.metadata.FieldMetadata; import org.eclipse.jnosql.mapping.metadata.GenericFieldMetadata; -import org.eclipse.jnosql.mapping.test.entities.Person; +import org.eclipse.jnosql.mapping.reflection.entities.Person; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultGenericParameterMetaDataTest.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultGenericParameterMetaDataTest.java index 44f84c1fa..40ba8c0df 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultGenericParameterMetaDataTest.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultGenericParameterMetaDataTest.java @@ -18,8 +18,8 @@ import org.eclipse.jnosql.mapping.metadata.ConstructorMetadata; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; import org.eclipse.jnosql.mapping.metadata.GenericParameterMetaData; -import org.eclipse.jnosql.mapping.test.entities.Book; -import org.eclipse.jnosql.mapping.test.entities.constructor.BookUser; +import org.eclipse.jnosql.mapping.reflection.entities.Book; +import org.eclipse.jnosql.mapping.reflection.entities.constructor.BookUser; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultParameterMetaDataTest.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultParameterMetaDataTest.java index eb31e91e7..878085c38 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultParameterMetaDataTest.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/DefaultParameterMetaDataTest.java @@ -21,7 +21,7 @@ import org.eclipse.jnosql.mapping.metadata.EntityMetadata; import org.eclipse.jnosql.mapping.metadata.MappingType; import org.eclipse.jnosql.mapping.metadata.ParameterMetaData; -import org.eclipse.jnosql.mapping.test.entities.constructor.BookUser; +import org.eclipse.jnosql.mapping.reflection.entities.constructor.BookUser; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/EmbeddedFieldMetadataTest.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/EmbeddedFieldMetadataTest.java index 79e67fc68..ee005397c 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/EmbeddedFieldMetadataTest.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/EmbeddedFieldMetadataTest.java @@ -18,7 +18,7 @@ import org.eclipse.jnosql.mapping.metadata.ClassConverter; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; import org.eclipse.jnosql.mapping.metadata.FieldMetadata; -import org.eclipse.jnosql.mapping.test.entities.Worker; +import org.eclipse.jnosql.mapping.reflection.entities.Worker; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/MappingTypeTest.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/MappingTypeTest.java index 66d04e3d1..5138980fc 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/MappingTypeTest.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/MappingTypeTest.java @@ -17,13 +17,13 @@ import jakarta.nosql.Column; import org.eclipse.jnosql.mapping.Embeddable; import org.eclipse.jnosql.mapping.metadata.MappingType; -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.reflection.entities.Actor; +import org.eclipse.jnosql.mapping.reflection.entities.Address; +import org.eclipse.jnosql.mapping.reflection.entities.Movie; +import org.eclipse.jnosql.mapping.reflection.entities.Person; +import org.eclipse.jnosql.mapping.reflection.entities.Worker; +import org.eclipse.jnosql.mapping.reflection.entities.constructor.BookUser; +import org.eclipse.jnosql.mapping.reflection.entities.constructor.PetOwner; import org.junit.jupiter.api.Test; import java.lang.reflect.Constructor; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ParameterMetaDataBuilderTest.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ParameterMetaDataBuilderTest.java index 84772e686..a37118015 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ParameterMetaDataBuilderTest.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ParameterMetaDataBuilderTest.java @@ -18,14 +18,15 @@ import org.eclipse.jnosql.mapping.AttributeConverter; import org.eclipse.jnosql.mapping.metadata.MappingType; import org.eclipse.jnosql.mapping.metadata.ParameterMetaData; -import org.eclipse.jnosql.mapping.test.entities.Animal; -import org.eclipse.jnosql.mapping.test.entities.Money; -import org.eclipse.jnosql.mapping.test.entities.MoneyConverter; -import org.eclipse.jnosql.mapping.test.entities.constructor.BookUser; -import org.eclipse.jnosql.mapping.test.entities.constructor.Computer; -import org.eclipse.jnosql.mapping.test.entities.constructor.PetOwner; -import org.eclipse.jnosql.mapping.test.entities.constructor.Smartphone; -import org.eclipse.jnosql.mapping.test.entities.constructor.SuperHero; + +import org.eclipse.jnosql.mapping.reflection.entities.Animal; +import org.eclipse.jnosql.mapping.reflection.entities.Money; +import org.eclipse.jnosql.mapping.reflection.entities.MoneyConverter; +import org.eclipse.jnosql.mapping.reflection.entities.constructor.BookUser; +import org.eclipse.jnosql.mapping.reflection.entities.constructor.Computer; +import org.eclipse.jnosql.mapping.reflection.entities.constructor.PetOwner; +import org.eclipse.jnosql.mapping.reflection.entities.constructor.Smartphone; +import org.eclipse.jnosql.mapping.reflection.entities.constructor.SuperHero; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ReflectionClassConverterJavaFieldParserTest.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ReflectionClassConverterJavaFieldParserTest.java index dd58b3489..842529178 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ReflectionClassConverterJavaFieldParserTest.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ReflectionClassConverterJavaFieldParserTest.java @@ -16,10 +16,11 @@ import org.eclipse.jnosql.mapping.metadata.ClassConverter; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; -import org.eclipse.jnosql.mapping.test.entities.Address; -import org.eclipse.jnosql.mapping.test.entities.AppointmentBook; -import org.eclipse.jnosql.mapping.test.entities.Person; -import org.eclipse.jnosql.mapping.test.entities.Worker; + +import org.eclipse.jnosql.mapping.reflection.entities.Address; +import org.eclipse.jnosql.mapping.reflection.entities.AppointmentBook; +import org.eclipse.jnosql.mapping.reflection.entities.Person; +import org.eclipse.jnosql.mapping.reflection.entities.Worker; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ReflectionClassConverterTest.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ReflectionClassConverterTest.java index 6b205375f..594777655 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ReflectionClassConverterTest.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ReflectionClassConverterTest.java @@ -20,19 +20,19 @@ import org.eclipse.jnosql.mapping.metadata.FieldMetadata; import org.eclipse.jnosql.mapping.metadata.InheritanceMetadata; import org.eclipse.jnosql.mapping.metadata.MappingType; -import org.eclipse.jnosql.mapping.test.entities.Actor; -import org.eclipse.jnosql.mapping.test.entities.Director; -import org.eclipse.jnosql.mapping.test.entities.Machine; -import org.eclipse.jnosql.mapping.test.entities.NoConstructorEntity; -import org.eclipse.jnosql.mapping.test.entities.Person; -import org.eclipse.jnosql.mapping.test.entities.User; -import org.eclipse.jnosql.mapping.test.entities.Worker; -import org.eclipse.jnosql.mapping.test.entities.constructor.Computer; -import org.eclipse.jnosql.mapping.test.entities.inheritance.EmailNotification; -import org.eclipse.jnosql.mapping.test.entities.inheritance.Notification; -import org.eclipse.jnosql.mapping.test.entities.inheritance.Project; -import org.eclipse.jnosql.mapping.test.entities.inheritance.SmallProject; -import org.eclipse.jnosql.mapping.test.entities.inheritance.SocialMediaNotification; +import org.eclipse.jnosql.mapping.reflection.entities.Actor; +import org.eclipse.jnosql.mapping.reflection.entities.Director; +import org.eclipse.jnosql.mapping.reflection.entities.Machine; +import org.eclipse.jnosql.mapping.reflection.entities.NoConstructorEntity; +import org.eclipse.jnosql.mapping.reflection.entities.Person; +import org.eclipse.jnosql.mapping.reflection.entities.User; +import org.eclipse.jnosql.mapping.reflection.entities.Worker; +import org.eclipse.jnosql.mapping.reflection.entities.constructor.Computer; +import org.eclipse.jnosql.mapping.reflection.entities.inheritance.EmailNotification; +import org.eclipse.jnosql.mapping.reflection.entities.inheritance.Notification; +import org.eclipse.jnosql.mapping.reflection.entities.inheritance.Project; +import org.eclipse.jnosql.mapping.reflection.entities.inheritance.SmallProject; +import org.eclipse.jnosql.mapping.reflection.entities.inheritance.SocialMediaNotification; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/ReflectionGroupEntityMetadata.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ReflectionGroupEntityMetadata.java similarity index 97% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/ReflectionGroupEntityMetadata.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ReflectionGroupEntityMetadata.java index bce67db71..adfa7a712 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/ReflectionGroupEntityMetadata.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ReflectionGroupEntityMetadata.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping; +package org.eclipse.jnosql.mapping.reflection; import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.jnosql.mapping.metadata.ClassConverter; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ReflectionsTest.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ReflectionsTest.java index 0ae2a78eb..df223dbae 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ReflectionsTest.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/ReflectionsTest.java @@ -16,23 +16,22 @@ import jakarta.inject.Inject; import org.eclipse.jnosql.mapping.Convert; -import org.eclipse.jnosql.mapping.ReflectionGroupEntityMetadata; import org.eclipse.jnosql.mapping.metadata.InheritanceMetadata; -import org.eclipse.jnosql.mapping.test.entities.Actor; -import org.eclipse.jnosql.mapping.test.entities.Download; -import org.eclipse.jnosql.mapping.test.entities.Movie; -import org.eclipse.jnosql.mapping.test.entities.Person; -import org.eclipse.jnosql.mapping.test.entities.Vendor; -import org.eclipse.jnosql.mapping.test.entities.Worker; -import org.eclipse.jnosql.mapping.test.entities.constructor.Smartphone; -import org.eclipse.jnosql.mapping.test.entities.constructor.Tablet; -import org.eclipse.jnosql.mapping.test.entities.inheritance.EmailNotification; -import org.eclipse.jnosql.mapping.test.entities.inheritance.LargeProject; -import org.eclipse.jnosql.mapping.test.entities.inheritance.Notification; -import org.eclipse.jnosql.mapping.test.entities.inheritance.Project; -import org.eclipse.jnosql.mapping.test.entities.inheritance.SmallProject; -import org.eclipse.jnosql.mapping.test.entities.inheritance.SmsNotification; -import org.eclipse.jnosql.mapping.test.entities.inheritance.SocialMediaNotification; +import org.eclipse.jnosql.mapping.reflection.entities.Actor; +import org.eclipse.jnosql.mapping.reflection.entities.Download; +import org.eclipse.jnosql.mapping.reflection.entities.Movie; +import org.eclipse.jnosql.mapping.reflection.entities.Person; +import org.eclipse.jnosql.mapping.reflection.entities.Vendor; +import org.eclipse.jnosql.mapping.reflection.entities.Worker; +import org.eclipse.jnosql.mapping.reflection.entities.constructor.Smartphone; +import org.eclipse.jnosql.mapping.reflection.entities.constructor.Tablet; +import org.eclipse.jnosql.mapping.reflection.entities.inheritance.EmailNotification; +import org.eclipse.jnosql.mapping.reflection.entities.inheritance.LargeProject; +import org.eclipse.jnosql.mapping.reflection.entities.inheritance.Notification; +import org.eclipse.jnosql.mapping.reflection.entities.inheritance.Project; +import org.eclipse.jnosql.mapping.reflection.entities.inheritance.SmallProject; +import org.eclipse.jnosql.mapping.reflection.entities.inheritance.SmsNotification; +import org.eclipse.jnosql.mapping.reflection.entities.inheritance.SocialMediaNotification; import org.jboss.weld.junit5.auto.AddPackages; import org.jboss.weld.junit5.auto.EnableAutoWeld; import org.junit.jupiter.api.Test; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/RepositoryFilterTest.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/RepositoryFilterTest.java index 4ed6515fe..808e9918b 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/RepositoryFilterTest.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/RepositoryFilterTest.java @@ -17,9 +17,12 @@ import jakarta.data.repository.PageableRepository; import jakarta.nosql.Column; import jakarta.nosql.Id; -import org.eclipse.jnosql.mapping.test.entities.NoSQLVendor; -import org.eclipse.jnosql.mapping.test.entities.Person; -import org.eclipse.jnosql.mapping.test.entities.PersonRepository; +import org.eclipse.jnosql.mapping.reflection.entities.NoSQLVendor; +import org.eclipse.jnosql.mapping.reflection.entities.Person; +import org.eclipse.jnosql.mapping.reflection.entities.PersonRepository; +import org.eclipse.jnosql.mapping.reflection.entities.NoSQLVendor; +import org.eclipse.jnosql.mapping.reflection.entities.Person; +import org.eclipse.jnosql.mapping.reflection.entities.PersonRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Actor.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Actor.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Actor.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Actor.java index 590bd430e..ffc721b37 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Actor.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Actor.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/ActorBuilder.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/ActorBuilder.java similarity index 97% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/ActorBuilder.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/ActorBuilder.java index 16abcf3d3..d45153c97 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/ActorBuilder.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/ActorBuilder.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import java.util.List; import java.util.Map; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Address.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Address.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Address.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Address.java index 512d33fa0..239e182fe 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Address.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Address.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import jakarta.nosql.Column; import jakarta.nosql.Entity; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Animal.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Animal.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Animal.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Animal.java index 16377e87b..45cc9d3ba 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Animal.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Animal.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import jakarta.nosql.Column; import jakarta.nosql.Entity; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/AnimalRepository.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/AnimalRepository.java similarity index 92% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/AnimalRepository.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/AnimalRepository.java index f79b6abce..10dbdb5be 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/AnimalRepository.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/AnimalRepository.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import jakarta.data.repository.Repository; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/AppointmentBook.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/AppointmentBook.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/AppointmentBook.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/AppointmentBook.java index 7046581a1..eaba6950a 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/AppointmentBook.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/AppointmentBook.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import jakarta.nosql.Column; import jakarta.nosql.Entity; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Book.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Book.java similarity index 97% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Book.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Book.java index 8afd117f7..90b9f3960 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Book.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Book.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import jakarta.nosql.Column; import jakarta.nosql.Entity; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Contact.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Contact.java similarity index 98% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Contact.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Contact.java index f5a611a6b..8b8337c54 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Contact.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Contact.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import jakarta.nosql.Column; import org.eclipse.jnosql.mapping.Embeddable; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/ContactType.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/ContactType.java similarity index 92% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/ContactType.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/ContactType.java index 2dad465fa..b4fcd76bc 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/ContactType.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/ContactType.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; public enum ContactType { MOBILE, PHONE, EMAIL diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Director.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Director.java similarity index 97% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Director.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Director.java index 1c3781a6e..6fa504cb6 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Director.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Director.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import jakarta.nosql.Column; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Download.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Download.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Download.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Download.java index 69febb941..b69afcc20 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Download.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Download.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import jakarta.nosql.Column; import jakarta.nosql.Entity; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/IgnoreRepository.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/IgnoreRepository.java similarity index 92% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/IgnoreRepository.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/IgnoreRepository.java index d48bd39eb..9ba079daa 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/IgnoreRepository.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/IgnoreRepository.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import jakarta.data.repository.PageableRepository; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Job.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Job.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Job.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Job.java index 780129154..27d9d53d3 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Job.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Job.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import jakarta.nosql.Column; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Machine.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Machine.java similarity index 93% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Machine.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Machine.java index 52ac09649..2f9ff3f00 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Machine.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Machine.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import jakarta.nosql.Column; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/Money.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Money.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/Money.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Money.java index 2316c0a36..63865f369 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/Money.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Money.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import java.math.BigDecimal; diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/MoneyConverter.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/MoneyConverter.java similarity index 94% rename from jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/MoneyConverter.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/MoneyConverter.java index 50c951d2f..b79424e57 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/MoneyConverter.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/MoneyConverter.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import org.eclipse.jnosql.mapping.AttributeConverter; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Movie.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Movie.java similarity index 97% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Movie.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Movie.java index 23566538d..ab9786fd2 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Movie.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Movie.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import jakarta.nosql.Column; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/MovieRepository.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/MovieRepository.java similarity index 93% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/MovieRepository.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/MovieRepository.java index 779d24496..c8f00c8f6 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/MovieRepository.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/MovieRepository.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import jakarta.data.repository.CrudRepository; import jakarta.data.repository.Repository; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/NoConstructorEntity.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/NoConstructorEntity.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/NoConstructorEntity.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/NoConstructorEntity.java index 4fd5a96f7..faf3bd3c1 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/NoConstructorEntity.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/NoConstructorEntity.java @@ -13,7 +13,7 @@ * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import java.util.Objects; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/NoSQLVendor.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/NoSQLVendor.java similarity index 92% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/NoSQLVendor.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/NoSQLVendor.java index 52a58d9c2..6786dfddb 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/NoSQLVendor.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/NoSQLVendor.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import jakarta.data.repository.PageableRepository; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/NonRepository.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/NonRepository.java similarity index 91% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/NonRepository.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/NonRepository.java index 650b20639..b79ed0239 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/NonRepository.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/NonRepository.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; public class NonRepository{ } diff --git a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/Person.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Person.java similarity index 97% rename from jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/Person.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Person.java index ff1e70192..9ccb52c70 100644 --- a/jnosql-mapping/jnosql-mapping-key-value/src/test/java/org/eclipse/jnosql/mapping/test/entities/Person.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Person.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import jakarta.nosql.Column; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonBuilder.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/PersonBuilder.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonBuilder.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/PersonBuilder.java index 45abfe70d..f32665d41 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonBuilder.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/PersonBuilder.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import java.util.List; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonRepository.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/PersonRepository.java similarity index 93% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonRepository.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/PersonRepository.java index 735a993fb..60f7647b4 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/PersonRepository.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/PersonRepository.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import jakarta.data.repository.PageableRepository; import jakarta.data.repository.Repository; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/User.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/User.java similarity index 97% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/User.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/User.java index 5639e549d..ba7002b46 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/User.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/User.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import jakarta.nosql.Id; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Vendor.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Vendor.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Vendor.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Vendor.java index b9634a8ed..6cdde881a 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/Vendor.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Vendor.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import jakarta.nosql.Column; import jakarta.nosql.Entity; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Worker.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Worker.java similarity index 95% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Worker.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Worker.java index 13c6bc014..a196bd9ca 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/Worker.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/Worker.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import jakarta.nosql.Column; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/ZipCode.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/ZipCode.java similarity index 95% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/ZipCode.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/ZipCode.java index 8820f0f4c..1cf0db5c9 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/ZipCode.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/ZipCode.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities; +package org.eclipse.jnosql.mapping.reflection.entities; import jakarta.nosql.Column; import jakarta.nosql.Entity; diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/BookUser.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/constructor/BookUser.java similarity index 93% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/BookUser.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/constructor/BookUser.java index 18c37178a..a3eefec9b 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/BookUser.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/constructor/BookUser.java @@ -12,13 +12,13 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities.constructor; +package org.eclipse.jnosql.mapping.reflection.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.reflection.entities.Book; import java.util.List; import java.util.Objects; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/Computer.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/constructor/Computer.java similarity index 90% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/Computer.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/constructor/Computer.java index bd7b07bc0..127561f1e 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/Computer.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/constructor/Computer.java @@ -12,14 +12,15 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities.constructor; +package org.eclipse.jnosql.mapping.reflection.entities.constructor; import jakarta.nosql.Column; import jakarta.nosql.Entity; import jakarta.nosql.Id; import org.eclipse.jnosql.mapping.Convert; -import org.eclipse.jnosql.mapping.test.entities.Money; -import org.eclipse.jnosql.mapping.test.entities.MoneyConverter; +import org.eclipse.jnosql.mapping.reflection.entities.Money; +import org.eclipse.jnosql.mapping.reflection.entities.MoneyConverter; + @Entity public class Computer { diff --git a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/PetOwner.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/constructor/PetOwner.java similarity index 93% rename from jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/PetOwner.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/constructor/PetOwner.java index 76ba743d7..7891f6c1f 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/PetOwner.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/constructor/PetOwner.java @@ -12,12 +12,12 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities.constructor; +package org.eclipse.jnosql.mapping.reflection.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.reflection.entities.Animal; import java.util.Objects; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/Smartphone.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/constructor/Smartphone.java similarity index 91% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/Smartphone.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/constructor/Smartphone.java index c09091d96..fdd2fd711 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/Smartphone.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/constructor/Smartphone.java @@ -13,7 +13,7 @@ * Maximillian Arruda */ -package org.eclipse.jnosql.mapping.test.entities.constructor; +package org.eclipse.jnosql.mapping.reflection.entities.constructor; import jakarta.nosql.Column; import jakarta.nosql.Entity; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/SuperHero.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/constructor/SuperHero.java similarity index 92% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/SuperHero.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/constructor/SuperHero.java index e77a4449b..4a080737f 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/SuperHero.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/constructor/SuperHero.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities.constructor; +package org.eclipse.jnosql.mapping.reflection.entities.constructor; import jakarta.nosql.Column; import jakarta.nosql.Entity; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/Tablet.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/constructor/Tablet.java similarity index 92% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/Tablet.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/constructor/Tablet.java index 5ed2e15fe..442dddd9a 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/constructor/Tablet.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/constructor/Tablet.java @@ -13,7 +13,7 @@ * Maximillian Arruda */ -package org.eclipse.jnosql.mapping.test.entities.constructor; +package org.eclipse.jnosql.mapping.reflection.entities.constructor; import jakarta.nosql.Column; import jakarta.nosql.Entity; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/EmailNotification.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/EmailNotification.java similarity index 94% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/EmailNotification.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/EmailNotification.java index e64d95d0e..6e8d73e2f 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/EmailNotification.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/EmailNotification.java @@ -13,7 +13,7 @@ * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities.inheritance; +package org.eclipse.jnosql.mapping.reflection.entities.inheritance; import jakarta.nosql.Column; import jakarta.nosql.Entity; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/LargeProject.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/LargeProject.java similarity index 93% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/LargeProject.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/LargeProject.java index 81912847f..309ac448c 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/LargeProject.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/LargeProject.java @@ -13,7 +13,7 @@ * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities.inheritance; +package org.eclipse.jnosql.mapping.reflection.entities.inheritance; import jakarta.nosql.Column; import jakarta.nosql.Entity; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/Notification.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/Notification.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/Notification.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/Notification.java index 14e980f78..d29c348fa 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/Notification.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/Notification.java @@ -13,7 +13,7 @@ * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities.inheritance; +package org.eclipse.jnosql.mapping.reflection.entities.inheritance; import jakarta.nosql.Column; import jakarta.nosql.Entity; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/NotificationReader.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/NotificationReader.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/NotificationReader.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/NotificationReader.java index 7ac3da8a3..31b16b991 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/NotificationReader.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/NotificationReader.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities.inheritance; +package org.eclipse.jnosql.mapping.reflection.entities.inheritance; import jakarta.nosql.Column; import jakarta.nosql.Entity; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/Project.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/Project.java similarity index 95% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/Project.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/Project.java index fb548b58c..c8ab64363 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/Project.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/Project.java @@ -13,7 +13,7 @@ * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities.inheritance; +package org.eclipse.jnosql.mapping.reflection.entities.inheritance; import jakarta.nosql.Entity; import jakarta.nosql.Id; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/ProjectManager.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/ProjectManager.java similarity index 97% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/ProjectManager.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/ProjectManager.java index 51b15ab6d..6e1d8685b 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/ProjectManager.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/ProjectManager.java @@ -12,7 +12,7 @@ * * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities.inheritance; +package org.eclipse.jnosql.mapping.reflection.entities.inheritance; import jakarta.nosql.Column; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/SmallProject.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/SmallProject.java similarity index 93% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/SmallProject.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/SmallProject.java index f32a14be0..470374d5f 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/SmallProject.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/SmallProject.java @@ -13,7 +13,7 @@ * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities.inheritance; +package org.eclipse.jnosql.mapping.reflection.entities.inheritance; import jakarta.nosql.Column; import jakarta.nosql.Entity; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/SmsNotification.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/SmsNotification.java similarity index 94% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/SmsNotification.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/SmsNotification.java index 2845f1743..102910112 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/SmsNotification.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/SmsNotification.java @@ -13,7 +13,7 @@ * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities.inheritance; +package org.eclipse.jnosql.mapping.reflection.entities.inheritance; import jakarta.nosql.Column; import jakarta.nosql.Entity; diff --git a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/SocialMediaNotification.java b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/SocialMediaNotification.java similarity index 93% rename from jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/SocialMediaNotification.java rename to jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/SocialMediaNotification.java index 1480c1f24..cf58d5164 100644 --- a/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/test/entities/inheritance/SocialMediaNotification.java +++ b/jnosql-mapping/jnosql-mapping-reflection/src/test/java/org/eclipse/jnosql/mapping/reflection/entities/inheritance/SocialMediaNotification.java @@ -13,7 +13,7 @@ * Otavio Santana */ -package org.eclipse.jnosql.mapping.test.entities.inheritance; +package org.eclipse.jnosql.mapping.reflection.entities.inheritance; import jakarta.nosql.Column; import jakarta.nosql.Entity;