Add duplicated property test case

graphql-jpa-query-schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/IntrospectionUtils.java

@@ -17,6 +17,7 @@
 import java.util.Optional;
 import java.util.Spliterator;
 import java.util.Spliterators;
+import java.util.function.BinaryOperator;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -33,7 +34,7 @@
 import com.introproventures.graphql.jpa.query.schema.impl.IntrospectionUtils.EntityIntrospectionResult.AttributePropertyDescriptor;
 
 public class IntrospectionUtils {
-    private static final Logger log = LoggerFactory.getLogger(IntrospectionUtils.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(IntrospectionUtils.class);
 
     private static final Map<Class<?>, EntityIntrospectionResult> map = new LinkedHashMap<>();
 
@@ -115,15 +116,21 @@ public EntityIntrospectionResult(Class<?> entity) {
 
             this.fields = getClasses().flatMap(k -> Arrays.stream(k.getDeclaredFields()))
                                       .filter(f -> map.containsKey(Introspector.decapitalize(f.getName())))
-                                      .collect(Collectors.toMap(Field::getName, 
-                                                                Function.identity()));
-            
+                                      .collect(Collectors.toMap(Field::getName,
+                                                                Function.identity(), fieldMergeFunction()));
+
             this.descriptors = map.values()
                                   .stream()
                                   .map(AttributePropertyDescriptor::new)
                                   .collect(Collectors.toMap(AttributePropertyDescriptor::getName, 
                                                             Function.identity()));
-
+        }
+
+        private BinaryOperator<Field> fieldMergeFunction() {
+            return (field1, field2) -> {
+                LOGGER.warn("Duplicated field " + field1.getName() + " found in " + field1.getDeclaringClass() + " and " + field2.getDeclaringClass());
+                return field1;
+            };
         }
 
         public Collection<AttributePropertyDescriptor> getPropertyDescriptors() {

graphql-jpa-query-schema/src/test/java/com/introproventures/graphql/jpa/query/schema/impl/IntrospectionUtilsTest.java

@@ -1,6 +1,7 @@
 package com.introproventures.graphql.jpa.query.schema.impl;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.mockito.Mockito.when;
 
 import java.util.Optional;
@@ -208,6 +209,28 @@ public void testUppercasePropertyNamesAreSupported() throws Exception {
                          .get())
                          .extracting(AttributePropertyDescriptor::isIgnored)
                          .isEqualTo(true);
-    }    
-
+    }
+
+    @Test
+    public void shouldNotFailWhenPropertyIsDuplicatedInParentAndChild() {
+        // given
+        // There is a duplicated property in parent and child
+
+        // then
+        assertThatCode(() -> IntrospectionUtils.introspect(CalculatedEntity.class)).doesNotThrowAnyException();
+    }
+
+    @Test
+    public void shouldCorrectlyIntrospectPropertyDuplicatedInParentAndChild() {
+        // given
+        // There is a duplicated property in parent and child
+
+        // when
+        EntityIntrospectionResult introspectionResult = IntrospectionUtils.introspect(CalculatedEntity.class);
+
+        // then
+        Optional<AttributePropertyDescriptor> propertyOverriddenInChild = introspectionResult.getPropertyDescriptor("propertyDuplicatedInChild");
+        assertThat(propertyOverriddenInChild).isPresent();
+    }
+
 }

graphql-jpa-query-schema/src/test/java/com/introproventures/graphql/jpa/query/schema/model/calculated/CalculatedEntity.java

@@ -75,6 +75,8 @@ public class CalculatedEntity extends ParentCalculatedEntity {
     String hideField = "hideField";
 
     String propertyIgnoredOnGetter;
+
+    String propertyDuplicatedInChild;
 
     @Transient
     @GraphQLDescription("i desc function")

graphql-jpa-query-schema/src/test/java/com/introproventures/graphql/jpa/query/schema/model/calculated/ParentCalculatedEntity.java

@@ -35,8 +35,10 @@ public class ParentCalculatedEntity {
 
     private String parentGraphQLIgnoreGetter; 
 
-    private String parentTransientGraphQLIgnoreGetter; 
-
+    private String parentTransientGraphQLIgnoreGetter;
+
+    private String propertyDuplicatedInChild;
+
     @Transient // transient getter property
     @GraphQLDescription("getParentTransientGetter")
     public String getParentTransientGetter() {