Merge pull request #92 from eclipse/update-api

Update based on 417
eclipse · Jul 31, 2023 · 82b4ccd · 82b4ccd
2 parents 2dc5606 + 5920a92
commit 82b4ccd
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 22 deletions.
diff --git a/...on/src/main/java/org/eclipse/jnosql/mapping/criteria/DefaultCriteriaDocumentTemplate.java b/...on/src/main/java/org/eclipse/jnosql/mapping/criteria/DefaultCriteriaDocumentTemplate.java
@@ -30,7 +30,7 @@
 import org.eclipse.jnosql.mapping.criteria.api.SelectQuery;
 import org.eclipse.jnosql.mapping.criteria.api.CriteriaDocumentTemplate;
 import org.eclipse.jnosql.mapping.document.AbstractDocumentTemplate;
-import org.eclipse.jnosql.mapping.reflection.EntitiesMetadata;
+import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
 
 /**
  * This class provides a delegating implementation of the

diff --git a/...ain/java/org/eclipse/jnosql/mapping/criteria/DefaultCriteriaDocumentTemplateProducer.java b/...ain/java/org/eclipse/jnosql/mapping/criteria/DefaultCriteriaDocumentTemplateProducer.java
@@ -22,7 +22,7 @@
 import org.eclipse.jnosql.mapping.Converters;
 import org.eclipse.jnosql.mapping.criteria.api.CriteriaDocumentTemplate;
 import org.eclipse.jnosql.mapping.criteria.api.CriteriaDocumentTemplateProducer;
-import org.eclipse.jnosql.mapping.reflection.EntitiesMetadata;
+import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
 
 @ApplicationScoped
 public class DefaultCriteriaDocumentTemplateProducer implements CriteriaDocumentTemplateProducer {

diff --git a/...rc/test/java/org/eclipse/jnosql/mapping/criteria/DefaultCriteriaDocumentTemplateTest.java b/...rc/test/java/org/eclipse/jnosql/mapping/criteria/DefaultCriteriaDocumentTemplateTest.java
@@ -22,6 +22,7 @@
 import org.eclipse.jnosql.communication.document.DocumentManager;
 import org.eclipse.jnosql.communication.document.DocumentQuery;
 import org.eclipse.jnosql.mapping.Convert;
+import org.eclipse.jnosql.mapping.Converters;
 import org.eclipse.jnosql.mapping.criteria.api.CriteriaDocumentTemplate;
 import org.eclipse.jnosql.mapping.criteria.api.CriteriaDocumentTemplateProducer;
 import org.eclipse.jnosql.mapping.criteria.api.CriteriaQuery;
@@ -49,7 +50,7 @@
 import static org.mockito.Mockito.mock;
 
 @EnableAutoWeld
-@AddPackages(value = {Convert.class,
+@AddPackages(value = {Converters.class,
         DocumentEntityConverter.class, DefaultPath.class})
 @AddPackages(Person.class)
 @AddExtensions({EntityMetadataExtension.class,

diff --git a/...validation/src/test/java/org/eclipse/jnosql/mapping/validation/BucketManagerSupplier.java b/...validation/src/test/java/org/eclipse/jnosql/mapping/validation/BucketManagerSupplier.java
@@ -14,14 +14,14 @@
  */
 package org.eclipse.jnosql.mapping.validation;
 
-import org.eclipse.jnosql.communication.keyvalue.BucketManager;
-import org.mockito.Mockito;
-
 import jakarta.annotation.Priority;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.Alternative;
 import jakarta.enterprise.inject.Produces;
 import jakarta.interceptor.Interceptor;
+import org.eclipse.jnosql.communication.keyvalue.BucketManager;
+import org.mockito.Mockito;
+
 import java.util.function.Supplier;
 
 @ApplicationScoped

diff --git a/...ion/src/test/java/org/eclipse/jnosql/mapping/validation/ColumnTemplateValidationTest.java b/...ion/src/test/java/org/eclipse/jnosql/mapping/validation/ColumnTemplateValidationTest.java
@@ -18,7 +18,7 @@
 import jakarta.nosql.column.ColumnTemplate;
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
-import org.eclipse.jnosql.mapping.Convert;
+import org.eclipse.jnosql.mapping.Converters;
 import org.eclipse.jnosql.mapping.column.ColumnEntityConverter;
 import org.eclipse.jnosql.mapping.column.spi.ColumnExtension;
 import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
@@ -36,7 +36,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 @EnableAutoWeld
-@AddPackages(value = {Convert.class, ColumnEntityConverter.class, EntityObserver.class})
+@AddPackages(value = {Converters.class, ColumnEntityConverter.class, EntityObserver.class})
 @AddPackages(Person.class)
 @AddExtensions({EntityMetadataExtension.class, ColumnExtension.class})
 public class ColumnTemplateValidationTest {

diff --git a/...dation/src/test/java/org/eclipse/jnosql/mapping/validation/ConstructorValidationTest.java b/...dation/src/test/java/org/eclipse/jnosql/mapping/validation/ConstructorValidationTest.java
@@ -18,7 +18,7 @@
 import jakarta.inject.Inject;
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
-import org.eclipse.jnosql.mapping.Convert;
+import org.eclipse.jnosql.mapping.Converters;
 import org.eclipse.jnosql.mapping.reflection.ConstructorEvent;
 import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
 import org.jboss.weld.junit5.auto.AddExtensions;
@@ -31,7 +31,7 @@
 import java.util.Set;
 
 @EnableAutoWeld
-@AddPackages(value = {Convert.class})
+@AddPackages(value = {Converters.class})
 @AddPackages(Person.class)
 @AddExtensions({EntityMetadataExtension.class})
 public class ConstructorValidationTest {

diff --git a/...-validation/src/test/java/org/eclipse/jnosql/mapping/validation/DocumentMockProducer.java b/...-validation/src/test/java/org/eclipse/jnosql/mapping/validation/DocumentMockProducer.java
@@ -14,16 +14,16 @@
  */
 package org.eclipse.jnosql.mapping.validation;
 
-import org.eclipse.jnosql.communication.document.Document;
-import org.eclipse.jnosql.communication.document.DocumentEntity;
-import org.eclipse.jnosql.communication.document.DocumentManager;
-import org.mockito.Mockito;
-
 import jakarta.annotation.Priority;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.Alternative;
 import jakarta.enterprise.inject.Produces;
 import jakarta.interceptor.Interceptor;
+import org.eclipse.jnosql.communication.document.Document;
+import org.eclipse.jnosql.communication.document.DocumentEntity;
+import org.eclipse.jnosql.communication.document.DocumentManager;
+import org.mockito.Mockito;
+
 import java.math.BigDecimal;
 import java.util.function.Supplier;
 

diff --git a/...n/src/test/java/org/eclipse/jnosql/mapping/validation/DocumentTemplateValidationTest.java b/...n/src/test/java/org/eclipse/jnosql/mapping/validation/DocumentTemplateValidationTest.java
@@ -18,7 +18,7 @@
 import jakarta.nosql.document.DocumentTemplate;
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
-import org.eclipse.jnosql.mapping.Convert;
+import org.eclipse.jnosql.mapping.Converters;
 import org.eclipse.jnosql.mapping.document.DocumentEntityConverter;
 import org.eclipse.jnosql.mapping.document.spi.DocumentExtension;
 import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
@@ -36,7 +36,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @EnableAutoWeld
-@AddPackages(value = {Convert.class, DocumentEntityConverter.class, EntityObserver.class})
+@AddPackages(value = {Converters.class, DocumentEntityConverter.class, EntityObserver.class})
 @AddPackages(Person.class)
 @AddExtensions({EntityMetadataExtension.class, DocumentExtension.class})
 public class DocumentTemplateValidationTest {

diff --git a/...tion/src/test/java/org/eclipse/jnosql/mapping/validation/GraphTemplateValidationTest.java b/...tion/src/test/java/org/eclipse/jnosql/mapping/validation/GraphTemplateValidationTest.java
@@ -17,7 +17,7 @@
 import jakarta.inject.Inject;
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
-import org.eclipse.jnosql.mapping.Convert;
+import org.eclipse.jnosql.mapping.Converters;
 import org.eclipse.jnosql.mapping.graph.GraphTemplate;
 import org.eclipse.jnosql.mapping.graph.spi.GraphExtension;
 import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
@@ -35,7 +35,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @EnableAutoWeld
-@AddPackages(value = {Convert.class, GraphTemplate.class, EntityObserver.class})
+@AddPackages(value = {Converters.class, GraphTemplate.class, EntityObserver.class})
 @AddPackages(Person.class)
 @AddExtensions({EntityMetadataExtension.class, GraphExtension.class})
 public class GraphTemplateValidationTest {

diff --git a/...n/src/test/java/org/eclipse/jnosql/mapping/validation/KeyValueTemplateValidationTest.java b/...n/src/test/java/org/eclipse/jnosql/mapping/validation/KeyValueTemplateValidationTest.java
@@ -18,7 +18,7 @@
 import jakarta.nosql.keyvalue.KeyValueTemplate;
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
-import org.eclipse.jnosql.mapping.Convert;
+import org.eclipse.jnosql.mapping.Converters;
 import org.eclipse.jnosql.mapping.keyvalue.KeyValueEntityConverter;
 import org.eclipse.jnosql.mapping.keyvalue.spi.KeyValueExtension;
 import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
@@ -36,7 +36,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @EnableAutoWeld
-@AddPackages(value = {Convert.class, KeyValueEntityConverter.class, EntityObserver.class})
+@AddPackages(value = {Converters.class, KeyValueEntityConverter.class, EntityObserver.class})
 @AddPackages(Person.class)
 @AddExtensions({EntityMetadataExtension.class, KeyValueExtension.class})
 public class KeyValueTemplateValidationTest {

diff --git a/jnosql-mapping-validation/src/test/java/org/eclipse/jnosql/mapping/validation/Person.java b/jnosql-mapping-validation/src/test/java/org/eclipse/jnosql/mapping/validation/Person.java
@@ -18,11 +18,11 @@
 import jakarta.nosql.Column;
 import jakarta.nosql.Entity;
 import jakarta.nosql.Id;
-
 import jakarta.validation.constraints.DecimalMax;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
+
 import java.math.BigDecimal;
 import java.util.List;