feat: update fieldmetadata scenario

Signed-off-by: Otavio Santana <otaviopolianasantana@gmail.com>
eclipse · Jul 31, 2023 · 013cb4a · 013cb4a
1 parent 2ed7709
commit 013cb4a
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/...pping-core/src/main/java/org/eclipse/jnosql/mapping/reflection/AbstractFieldMetadata.java b/...pping-core/src/main/java/org/eclipse/jnosql/mapping/reflection/AbstractFieldMetadata.java
@@ -112,7 +112,7 @@ public <T extends Annotation> Optional<String> value(Class<T> type){
         Optional<Method> method = Arrays.stream(type.getDeclaredMethods()).filter(m -> "value".equals(m.getName()))
                 .findFirst();
         T annotation = this.field.getAnnotation(type);
-        if (method.isEmpty() && annotation == null) {
+        if (method.isEmpty() || annotation == null) {
             return Optional.empty();
         }
         return method.map(m -> {

diff --git a/...l-mapping-core/src/test/java/org/eclipse/jnosql/mapping/reflection/FieldMetadataTest.java b/...l-mapping-core/src/test/java/org/eclipse/jnosql/mapping/reflection/FieldMetadataTest.java
@@ -166,10 +166,44 @@ public void shouldReadFromAnnotation(){
                 .get().isEqualTo("customAnnotationValue");
     }
 
-    public void shouldReturnEmptyWhenThereIsNotAnnotation(){}
+    @Test
+    public void shouldReturnEmptyWhenThereIsNotAnnotation(){
+        EntityMetadata entityMetadata = classConverter.create(ForClass.class);
+        List<FieldMetadata> fields = entityMetadata.fields();
+
+        FieldMetadata field = fields.stream()
+                .filter(f -> "list".equals(f.fieldName())).findFirst().get();
+
+        var value = field.value(Custom.class);
+        Assertions.assertThat(value)
+                .isEmpty();
+    }
 
+    @Test
     public void shouldReturnEmptyWhenThereIsValueMethod(){
+        EntityMetadata entityMetadata = classConverter.create(ForClass.class);
+        List<FieldMetadata> fields = entityMetadata.fields();
+
+        FieldMetadata field = fields.stream()
+                .filter(f -> "list".equals(f.fieldName())).findFirst().get();
+
+        var value = field.value(Custom2.class);
+        Assertions.assertThat(value)
+                .isEmpty();
+    }
+
+
+    @Test
+    public void shouldReturnEmptyWhenThereIsValueMethod2(){
+        EntityMetadata entityMetadata = classConverter.create(ForClass.class);
+        List<FieldMetadata> fields = entityMetadata.fields();
 
+        FieldMetadata field = fields.stream()
+                .filter(f -> "map".equals(f.fieldName())).findFirst().get();
+
+        var value = field.value(Custom3.class);
+        Assertions.assertThat(value)
+                .isEmpty();
     }