diff --git a/jnosql-criteria-extension/src/main/java/org/eclipse/jnosql/mapping/criteria/DefaultCriteriaDocumentTemplate.java b/jnosql-criteria-extension/src/main/java/org/eclipse/jnosql/mapping/criteria/DefaultCriteriaDocumentTemplate.java index 11be3a90..9eaee4eb 100644 --- a/jnosql-criteria-extension/src/main/java/org/eclipse/jnosql/mapping/criteria/DefaultCriteriaDocumentTemplate.java +++ b/jnosql-criteria-extension/src/main/java/org/eclipse/jnosql/mapping/criteria/DefaultCriteriaDocumentTemplate.java @@ -20,7 +20,6 @@ import org.eclipse.jnosql.mapping.Converters; import org.eclipse.jnosql.mapping.document.DocumentEntityConverter; import org.eclipse.jnosql.mapping.document.DocumentEventPersistManager; -import org.eclipse.jnosql.mapping.document.DocumentWorkflow; import static java.util.Objects.requireNonNull; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -45,8 +44,6 @@ public class DefaultCriteriaDocumentTemplate extends AbstractDocumentTemplate im private DocumentEntityConverter converter; - private DocumentWorkflow workflow; - private EntitiesMetadata entities; private Converters converters; @@ -56,13 +53,11 @@ public class DefaultCriteriaDocumentTemplate extends AbstractDocumentTemplate im public DefaultCriteriaDocumentTemplate( DocumentManager manager, DocumentEntityConverter converter, - DocumentWorkflow workflow, EntitiesMetadata entities, Converters converters, DocumentEventPersistManager persistManager) { this.manager = manager; this.converter = converter; - this.workflow = workflow; this.entities = entities; this.converters = converters; this.persistManager = persistManager; @@ -113,11 +108,6 @@ protected DocumentManager getManager() { return manager; } - @Override - protected DocumentWorkflow getWorkflow() { - return workflow; - } - @Override protected DocumentEventPersistManager getEventManager() { return persistManager; diff --git a/jnosql-criteria-extension/src/main/java/org/eclipse/jnosql/mapping/criteria/DefaultCriteriaDocumentTemplateProducer.java b/jnosql-criteria-extension/src/main/java/org/eclipse/jnosql/mapping/criteria/DefaultCriteriaDocumentTemplateProducer.java index 80ceb594..56a7dfa9 100644 --- a/jnosql-criteria-extension/src/main/java/org/eclipse/jnosql/mapping/criteria/DefaultCriteriaDocumentTemplateProducer.java +++ b/jnosql-criteria-extension/src/main/java/org/eclipse/jnosql/mapping/criteria/DefaultCriteriaDocumentTemplateProducer.java @@ -20,7 +20,6 @@ import jakarta.inject.Inject; import org.eclipse.jnosql.communication.document.DocumentManager; import org.eclipse.jnosql.mapping.Converters; -import org.eclipse.jnosql.mapping.document.DocumentWorkflow; import org.eclipse.jnosql.mapping.criteria.api.CriteriaDocumentTemplate; import org.eclipse.jnosql.mapping.criteria.api.CriteriaDocumentTemplateProducer; import org.eclipse.jnosql.mapping.reflection.EntitiesMetadata; @@ -30,13 +29,10 @@ public class DefaultCriteriaDocumentTemplateProducer implements CriteriaDocument @Inject private DocumentEntityConverter converter; - - @Inject - private DocumentWorkflow workflow; - + @Inject private EntitiesMetadata entities; - + @Inject private Converters converters; @@ -48,7 +44,6 @@ public CriteriaDocumentTemplate get(DocumentManager dm) { return new DefaultCriteriaDocumentTemplate( dm, converter, - workflow, entities, converters, persistManager diff --git a/jnosql-mapping-validation/pom.xml b/jnosql-mapping-validation/pom.xml index 6e1109a1..46c74445 100644 --- a/jnosql-mapping-validation/pom.xml +++ b/jnosql-mapping-validation/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jnosql.mapping - jnosql-mapping-parent + jnosql-mapping-extensions 1.0.1-SNAPSHOT diff --git a/jnosql-mapping-validation/src/test/java/org/eclipse/jnosql/mapping/validation/ColumnTemplateValidationTest.java b/jnosql-mapping-validation/src/test/java/org/eclipse/jnosql/mapping/validation/ColumnTemplateValidationTest.java index f52977bb..131e5022 100644 --- a/jnosql-mapping-validation/src/test/java/org/eclipse/jnosql/mapping/validation/ColumnTemplateValidationTest.java +++ b/jnosql-mapping-validation/src/test/java/org/eclipse/jnosql/mapping/validation/ColumnTemplateValidationTest.java @@ -19,7 +19,7 @@ import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; import org.eclipse.jnosql.mapping.Convert; -import org.eclipse.jnosql.mapping.column.ColumnWorkflow; +import org.eclipse.jnosql.mapping.column.ColumnEntityConverter; import org.eclipse.jnosql.mapping.column.spi.ColumnExtension; import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension; import org.jboss.weld.junit5.auto.AddExtensions; @@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; @EnableAutoWeld -@AddPackages(value = {Convert.class, ColumnWorkflow.class, EntityObserver.class}) +@AddPackages(value = {Convert.class, ColumnEntityConverter.class, EntityObserver.class}) @AddPackages(Person.class) @AddExtensions({EntityMetadataExtension.class, ColumnExtension.class}) public class ColumnTemplateValidationTest { diff --git a/jnosql-mapping-validation/src/test/java/org/eclipse/jnosql/mapping/validation/DocumentTemplateValidationTest.java b/jnosql-mapping-validation/src/test/java/org/eclipse/jnosql/mapping/validation/DocumentTemplateValidationTest.java index 6d89dd96..11fb49c9 100644 --- a/jnosql-mapping-validation/src/test/java/org/eclipse/jnosql/mapping/validation/DocumentTemplateValidationTest.java +++ b/jnosql-mapping-validation/src/test/java/org/eclipse/jnosql/mapping/validation/DocumentTemplateValidationTest.java @@ -19,7 +19,7 @@ import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; import org.eclipse.jnosql.mapping.Convert; -import org.eclipse.jnosql.mapping.document.DocumentWorkflow; +import org.eclipse.jnosql.mapping.document.DocumentEntityConverter; import org.eclipse.jnosql.mapping.document.spi.DocumentExtension; import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension; import org.jboss.weld.junit5.auto.AddExtensions; @@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @EnableAutoWeld -@AddPackages(value = {Convert.class, DocumentWorkflow.class, EntityObserver.class}) +@AddPackages(value = {Convert.class, DocumentEntityConverter.class, EntityObserver.class}) @AddPackages(Person.class) @AddExtensions({EntityMetadataExtension.class, DocumentExtension.class}) public class DocumentTemplateValidationTest { diff --git a/jnosql-mapping-validation/src/test/java/org/eclipse/jnosql/mapping/validation/KeyValueTemplateValidationTest.java b/jnosql-mapping-validation/src/test/java/org/eclipse/jnosql/mapping/validation/KeyValueTemplateValidationTest.java index 34a27b85..c8aaa3e4 100644 --- a/jnosql-mapping-validation/src/test/java/org/eclipse/jnosql/mapping/validation/KeyValueTemplateValidationTest.java +++ b/jnosql-mapping-validation/src/test/java/org/eclipse/jnosql/mapping/validation/KeyValueTemplateValidationTest.java @@ -19,7 +19,7 @@ import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; import org.eclipse.jnosql.mapping.Convert; -import org.eclipse.jnosql.mapping.keyvalue.KeyValueWorkflow; +import org.eclipse.jnosql.mapping.keyvalue.KeyValueEntityConverter; import org.eclipse.jnosql.mapping.keyvalue.spi.KeyValueExtension; import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension; import org.jboss.weld.junit5.auto.AddExtensions; @@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @EnableAutoWeld -@AddPackages(value = {Convert.class, KeyValueWorkflow.class, EntityObserver.class}) +@AddPackages(value = {Convert.class, KeyValueEntityConverter.class, EntityObserver.class}) @AddPackages(Person.class) @AddExtensions({EntityMetadataExtension.class, KeyValueExtension.class}) public class KeyValueTemplateValidationTest {