Enable composer for embeddable: adding test

Cosium · Dec 13, 2023 · 20bc96b · 20bc96b
1 parent 75b44bf
commit 20bc96b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/...est/java/com/cosium/spring/data/jpa/entity/graph/repository/GeneratedEntityGraphTest.java b/...est/java/com/cosium/spring/data/jpa/entity/graph/repository/GeneratedEntityGraphTest.java
@@ -8,6 +8,7 @@
 import com.github.springtestdbunit.annotation.DatabaseSetup;
 import javax.inject.Inject;
 import org.hibernate.Hibernate;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -43,5 +44,12 @@ void test() {
     assertThat(Hibernate.isInitialized(product.getMaker().getCountry())).isTrue();
   }
 
+  @Test
+  @DisplayName("EntityGraph with embedded part is well generated")
+  @Transactional
+  void test2() {
+    ProductEntityGraph.____().tracking().creator().____.tracking().modifier().____.____();
+  }
+
   public interface ProductRepository extends EntityGraphCrudRepository<Product, Long> {}
 }
diff --git a/generator/src/main/java/com/cosium/spring/data/jpa/graph/generator/MetamodelAttribute.java b/generator/src/main/java/com/cosium/spring/data/jpa/graph/generator/MetamodelAttribute.java
@@ -75,14 +75,17 @@ public Optional<MetamodelAttributeTarget> jpaTarget() {
       return Optional.empty();
     }
 
-    if ((targetTypeElement.getAnnotation(Entity.class) == null
-            && targetTypeElement.getAnnotation(Embeddable.class) == null)
-        && !pluralAttribute) {
+    if (!isRelatedToEntityConcept(targetTypeElement) && !pluralAttribute) {
       return Optional.empty();
     }
 
     return Optional.of(
         new MetamodelAttributeTarget(
             variableElement.getSimpleName().toString(), targetTypeElement));
   }
+
+  private boolean isRelatedToEntityConcept(TypeElement targetTypeElement) {
+    return targetTypeElement.getAnnotation(Entity.class) != null
+        || targetTypeElement.getAnnotation(Embeddable.class) != null;
+  }
 }