Merge pull request #94 from eclipse/reflection-module

Update the API based on the Metadata core updates
eclipse · Aug 9, 2023 · 96290c8 · 96290c8
2 parents 9acd3ce + 61b6c59
commit 96290c8
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 12 deletions.
diff --git a/...teria-extension/src/main/java/org/eclipse/jnosql/mapping/criteria/CriteriaQueryUtils.java b/...teria-extension/src/main/java/org/eclipse/jnosql/mapping/criteria/CriteriaQueryUtils.java
@@ -39,7 +39,6 @@
 import java.util.Optional;
 import java.util.function.BiFunction;
 import java.util.function.Function;
-import org.eclipse.jnosql.mapping.util.StringUtils;
 
 /**
  * Utility to convert {@link Predicate}s in {@link DocumentCondition}s
@@ -64,8 +63,7 @@ public static String unfold(Path path) {
         }
         return join(
                 attributes.stream().filter(
-                        value -> StringUtils.isNotBlank(
-                                value.trim()
+                        value -> isNotBlank(value.trim()
                         )
                 ).toArray(
                         String[]::new
@@ -236,4 +234,21 @@ public static <X> DocumentQuery convert(SelectQuery<X, ?, ?, ?> selectQuery) {
         return skip.build();
     }
 
+
+    private static boolean isBlank(final CharSequence cs) {
+        if (cs == null || cs.isEmpty()) {
+            return true;
+        }
+
+        for (int i = 0; i < cs.length(); i++) {
+            if (!Character.isWhitespace(cs.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private static boolean isNotBlank(final CharSequence cs) {
+        return !isBlank(cs);
+    }
 }
diff --git a/...rc/test/java/org/eclipse/jnosql/mapping/criteria/DefaultCriteriaDocumentTemplateTest.java b/...rc/test/java/org/eclipse/jnosql/mapping/criteria/DefaultCriteriaDocumentTemplateTest.java
@@ -21,7 +21,6 @@
 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.Convert;
 import org.eclipse.jnosql.mapping.Converters;
 import org.eclipse.jnosql.mapping.criteria.api.CriteriaDocumentTemplate;
 import org.eclipse.jnosql.mapping.criteria.api.CriteriaDocumentTemplateProducer;
@@ -33,7 +32,8 @@
 import org.eclipse.jnosql.mapping.criteria.api.StringExpression;
 import org.eclipse.jnosql.mapping.document.DocumentEntityConverter;
 import org.eclipse.jnosql.mapping.document.spi.DocumentExtension;
-import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
+import org.eclipse.jnosql.mapping.reflection.Reflections;
+import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension;
 import org.jboss.weld.junit5.auto.AddExtensions;
 import org.jboss.weld.junit5.auto.AddPackages;
 import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -53,6 +53,7 @@
 @AddPackages(value = {Converters.class,
         DocumentEntityConverter.class, DefaultPath.class})
 @AddPackages(Person.class)
+@AddPackages(Reflections.class)
 @AddExtensions({EntityMetadataExtension.class,
         DocumentExtension.class})
 class DefaultCriteriaDocumentTemplateTest {

diff --git a/...ping-validation/src/main/java/org/eclipse/jnosql/mapping/validation/MappingValidator.java b/...ping-validation/src/main/java/org/eclipse/jnosql/mapping/validation/MappingValidator.java
@@ -76,8 +76,8 @@ public void validate(ConstructorEvent event) {
         Objects.requireNonNull(event, "event is required");
         ExecutableValidator executableValidator = validator.forExecutables();
         Set<? extends ConstraintViolation<?>> violations =
-                executableValidator.validateConstructorParameters(event.getConstructor(),
-                        event.getParams());
+                executableValidator.validateConstructorParameters(event.constructor(),
+                        event.params());
 
         if (!violations.isEmpty()) {
             throw new ConstraintViolationException(new HashSet<>(violations));

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
@@ -21,7 +21,8 @@
 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;
+import org.eclipse.jnosql.mapping.reflection.Reflections;
+import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension;
 import org.jboss.weld.junit5.auto.AddExtensions;
 import org.jboss.weld.junit5.auto.AddPackages;
 import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -38,6 +39,7 @@
 @EnableAutoWeld
 @AddPackages(value = {Converters.class, ColumnEntityConverter.class, EntityObserver.class})
 @AddPackages(Person.class)
+@AddPackages(Reflections.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
@@ -20,7 +20,8 @@
 import jakarta.validation.ConstraintViolationException;
 import org.eclipse.jnosql.mapping.Converters;
 import org.eclipse.jnosql.mapping.reflection.ConstructorEvent;
-import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
+import org.eclipse.jnosql.mapping.reflection.Reflections;
+import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension;
 import org.jboss.weld.junit5.auto.AddExtensions;
 import org.jboss.weld.junit5.auto.AddPackages;
 import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -33,6 +34,7 @@
 @EnableAutoWeld
 @AddPackages(value = {Converters.class})
 @AddPackages(Person.class)
+@AddPackages(Reflections.class)
 @AddExtensions({EntityMetadataExtension.class})
 public class ConstructorValidationTest {
 

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
@@ -21,7 +21,8 @@
 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;
+import org.eclipse.jnosql.mapping.reflection.Reflections;
+import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension;
 import org.jboss.weld.junit5.auto.AddExtensions;
 import org.jboss.weld.junit5.auto.AddPackages;
 import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -38,6 +39,7 @@
 @EnableAutoWeld
 @AddPackages(value = {Converters.class, DocumentEntityConverter.class, EntityObserver.class})
 @AddPackages(Person.class)
+@AddPackages(Reflections.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
@@ -20,7 +20,8 @@
 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;
+import org.eclipse.jnosql.mapping.reflection.Reflections;
+import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension;
 import org.jboss.weld.junit5.auto.AddExtensions;
 import org.jboss.weld.junit5.auto.AddPackages;
 import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -37,6 +38,7 @@
 @EnableAutoWeld
 @AddPackages(value = {Converters.class, GraphTemplate.class, EntityObserver.class})
 @AddPackages(Person.class)
+@AddPackages(Reflections.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
@@ -21,7 +21,8 @@
 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;
+import org.eclipse.jnosql.mapping.reflection.Reflections;
+import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension;
 import org.jboss.weld.junit5.auto.AddExtensions;
 import org.jboss.weld.junit5.auto.AddPackages;
 import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -38,6 +39,7 @@
 @EnableAutoWeld
 @AddPackages(value = {Converters.class, KeyValueEntityConverter.class, EntityObserver.class})
 @AddPackages(Person.class)
+@AddPackages(Reflections.class)
 @AddExtensions({EntityMetadataExtension.class, KeyValueExtension.class})
 public class KeyValueTemplateValidationTest {