Only apply declared join specs to write operations. Fixes #398 (#403)

micronaut-projects · Feb 13, 2020 · 80a7008 · 80a7008
1 parent dffd9b8
commit 80a7008
Show file tree

Hide file tree

Showing 13 changed files with 128 additions and 6 deletions.
diff --git a/...cessor/src/main/java/io/micronaut/data/processor/visitors/finders/AbstractListMethod.java b/...cessor/src/main/java/io/micronaut/data/processor/visitors/finders/AbstractListMethod.java
@@ -139,7 +139,14 @@ public MethodMatchInfo buildMatchInfo(@NonNull MethodMatchContext matchContext)
                 }
             }
 
-            List<AnnotationValue<Join>> joinSpecs = matchContext.getAnnotationMetadata().getAnnotationValuesByType(Join.class);
+            List<AnnotationValue<Join>> joinSpecs;
+
+            final MethodMatchInfo.OperationType operationType = getOperationType();
+            if (operationType != MethodMatchInfo.OperationType.QUERY) {
+                joinSpecs = matchContext.getAnnotationMetadata().getDeclaredAnnotationValuesByType(Join.class);
+            } else {
+                joinSpecs = matchContext.getAnnotationMetadata().getAnnotationValuesByType(Join.class);
+            }
             if (CollectionUtils.isNotEmpty(joinSpecs)) {
                 if (query == null) {
                     query = QueryModel.from(rootEntity);

diff --git a/...rc/main/java/io/micronaut/data/processor/visitors/finders/AbstractPatternBasedMethod.java b/...rc/main/java/io/micronaut/data/processor/visitors/finders/AbstractPatternBasedMethod.java
@@ -513,6 +513,13 @@ protected RawQuery buildRawQuery(@NonNull MethodMatchContext matchContext) {
         return new RawQuery(matchContext.getRootEntity(), parameterBinding);
     }
 
+    /**
+     * @return The operation type
+     */
+    protected @NonNull MethodMatchInfo.OperationType getOperationType() {
+        return MethodMatchInfo.OperationType.QUERY;
+    }
+
     /**
      * Internally used for dynamically defining a class element.
      */

diff --git a/...-processor/src/main/java/io/micronaut/data/processor/visitors/finders/DeleteByMethod.java b/...-processor/src/main/java/io/micronaut/data/processor/visitors/finders/DeleteByMethod.java
@@ -44,6 +44,12 @@ public DeleteByMethod() {
         super(PREFIXES);
     }
 
+    @NonNull
+    @Override
+    protected MethodMatchInfo.OperationType getOperationType() {
+        return MethodMatchInfo.OperationType.DELETE;
+    }
+
     @Override
     public boolean isMethodMatch(MethodElement methodElement, MatchContext matchContext) {
         return super.isMethodMatch(methodElement, matchContext) && TypeUtils.isValidBatchUpdateReturnType(methodElement); // void return

diff --git a/data-processor/src/main/java/io/micronaut/data/processor/visitors/finders/DeleteMethod.java b/data-processor/src/main/java/io/micronaut/data/processor/visitors/finders/DeleteMethod.java
@@ -62,6 +62,12 @@ public boolean isMethodMatch(MethodElement methodElement, MatchContext matchCont
                 TypeUtils.isValidBatchUpdateReturnType(methodElement);
     }
 
+    @NonNull
+    @Override
+    protected MethodMatchInfo.OperationType getOperationType() {
+        return MethodMatchInfo.OperationType.DELETE;
+    }
+
     @Nullable
     @Override
     public MethodMatchInfo buildMatchInfo(@NonNull MethodMatchContext matchContext) {
@@ -88,7 +94,7 @@ public MethodMatchInfo buildMatchInfo(@NonNull MethodMatchContext matchContext)
                             null,
                             null,
                             getInterceptorElement(matchContext, interceptor),
-                            MethodMatchInfo.OperationType.DELETE
+                            getOperationType()
                     );
                 } else {
                     QueryModel queryModel = QueryModel.from(rootEntity);
@@ -107,7 +113,7 @@ public MethodMatchInfo buildMatchInfo(@NonNull MethodMatchContext matchContext)
                             null,
                             queryModel,
                             getInterceptorElement(matchContext, interceptor),
-                            MethodMatchInfo.OperationType.DELETE
+                            getOperationType()
                     );
                 }
             }
@@ -124,14 +130,14 @@ protected MethodMatchInfo buildInfo(@NonNull MethodMatchContext matchContext, @N
                     null,
                     query,
                     getInterceptorElement(matchContext, interceptor),
-                    MethodMatchInfo.OperationType.DELETE
+                    getOperationType()
             );
         } else {
             return new MethodMatchInfo(
                     null,
                     matchContext.supportsImplicitQueries() ? null : QueryModel.from(matchContext.getRootEntity()),
                     getInterceptorElement(matchContext, interceptor),
-                    MethodMatchInfo.OperationType.DELETE
+                    getOperationType()
             );
         }
     }

diff --git a/data-processor/src/main/java/io/micronaut/data/processor/visitors/finders/DynamicFinder.java b/data-processor/src/main/java/io/micronaut/data/processor/visitors/finders/DynamicFinder.java
@@ -273,7 +273,15 @@ public MethodMatchInfo buildMatchInfo(@NonNull MethodMatchContext matchContext)
         QueryModel query = QueryModel.from(entity);
         ClassElement queryResultType = entity.getClassElement();
 
-        List<AnnotationValue<Join>> joinSpecs = methodElement.getAnnotationValuesByType(Join.class);
+        List<AnnotationValue<Join>> joinSpecs;
+
+        final MethodMatchInfo.OperationType operationType = getOperationType();
+        if (operationType != MethodMatchInfo.OperationType.QUERY) {
+            joinSpecs = matchContext.getAnnotationMetadata().getDeclaredAnnotationValuesByType(Join.class);
+        } else {
+            joinSpecs = matchContext.getAnnotationMetadata().getAnnotationValuesByType(Join.class);
+        }
+
         if (CollectionUtils.isNotEmpty(joinSpecs)) {
             if (applyJoinSpecs(matchContext, query, entity, joinSpecs)) {
                 return null;

diff --git a/data-processor/src/main/java/io/micronaut/data/processor/visitors/finders/SaveAllMethod.java b/data-processor/src/main/java/io/micronaut/data/processor/visitors/finders/SaveAllMethod.java
@@ -47,6 +47,12 @@ public SaveAllMethod() {
         super(Pattern.compile(METHOD_PATTERN));
     }
 
+    @NonNull
+    @Override
+    protected MethodMatchInfo.OperationType getOperationType() {
+        return MethodMatchInfo.OperationType.INSERT;
+    }
+
     @Override
     public boolean isMethodMatch(MethodElement methodElement, MatchContext matchContext) {
         ParameterElement[] parameters = methodElement.getParameters();

diff --git a/...rocessor/src/main/java/io/micronaut/data/processor/visitors/finders/SaveEntityMethod.java b/...rocessor/src/main/java/io/micronaut/data/processor/visitors/finders/SaveEntityMethod.java
@@ -51,6 +51,12 @@ public SaveEntityMethod() {
         super(METHOD_PATTERN);
     }
 
+    @NonNull
+    @Override
+    protected MethodMatchInfo.OperationType getOperationType() {
+        return MethodMatchInfo.OperationType.INSERT;
+    }
+
     @Override
     public boolean isMethodMatch(MethodElement methodElement, MatchContext matchContext) {
         ParameterElement[] parameters = matchContext.getParameters();

diff --git a/data-processor/src/main/java/io/micronaut/data/processor/visitors/finders/SaveOneMethod.java b/data-processor/src/main/java/io/micronaut/data/processor/visitors/finders/SaveOneMethod.java
@@ -52,6 +52,12 @@ public SaveOneMethod() {
         super(SaveEntityMethod.METHOD_PATTERN);
     }
 
+    @NonNull
+    @Override
+    protected MethodMatchInfo.OperationType getOperationType() {
+        return MethodMatchInfo.OperationType.INSERT;
+    }
+
     @Override
     public boolean isMethodMatch(@NonNull MethodElement methodElement, @NonNull MatchContext matchContext) {
         ParameterElement[] parameters = matchContext.getParameters();

diff --git a/...-processor/src/main/java/io/micronaut/data/processor/visitors/finders/UpdateByMethod.java b/...-processor/src/main/java/io/micronaut/data/processor/visitors/finders/UpdateByMethod.java
@@ -47,6 +47,12 @@ public UpdateByMethod() {
         super("update");
     }
 
+    @NonNull
+    @Override
+    protected MethodMatchInfo.OperationType getOperationType() {
+        return MethodMatchInfo.OperationType.UPDATE;
+    }
+
     @Override
     public boolean isMethodMatch(MethodElement methodElement, MatchContext matchContext) {
         return super.isMethodMatch(methodElement, matchContext) && TypeUtils.isValidBatchUpdateReturnType(methodElement);

diff --git a/...cessor/src/main/java/io/micronaut/data/processor/visitors/finders/UpdateEntityMethod.java b/...cessor/src/main/java/io/micronaut/data/processor/visitors/finders/UpdateEntityMethod.java
@@ -42,6 +42,12 @@ public UpdateEntityMethod() {
         super(METHOD_PATTERN);
     }
 
+    @NonNull
+    @Override
+    protected MethodMatchInfo.OperationType getOperationType() {
+        return MethodMatchInfo.OperationType.UPDATE;
+    }
+
     @Override
     public int getOrder() {
         return DEFAULT_POSITION - 100;

diff --git a/data-processor/src/main/java/io/micronaut/data/processor/visitors/finders/UpdateMethod.java b/data-processor/src/main/java/io/micronaut/data/processor/visitors/finders/UpdateMethod.java
@@ -53,6 +53,12 @@ public UpdateMethod() {
         super(Pattern.compile("^update\\w*$"));
     }
 
+    @NonNull
+    @Override
+    protected MethodMatchInfo.OperationType getOperationType() {
+        return MethodMatchInfo.OperationType.UPDATE;
+    }
+
     @Override
     public boolean isMethodMatch(MethodElement methodElement, MatchContext matchContext) {
         return super.isMethodMatch(methodElement, matchContext) &&

diff --git a/data-processor/src/test/groovy/io/micronaut/data/processor/sql/BuildQuerySpec.groovy b/data-processor/src/test/groovy/io/micronaut/data/processor/sql/BuildQuerySpec.groovy
@@ -9,6 +9,42 @@ import spock.lang.Unroll
 
 class BuildQuerySpec extends AbstractDataSpec {
 
+    void "test to-many join on repository type that inherits from CrudRepository"() {
+        given:
+        def repository = buildRepository('test.MyInterface', """
+import io.micronaut.data.jdbc.annotation.JdbcRepository;
+import io.micronaut.data.model.query.builder.sql.Dialect;
+import io.micronaut.data.tck.entities.*;
+
+@JdbcRepository(dialect= Dialect.MYSQL)
+@Join("books")
+interface MyInterface extends CrudRepository<Author, Long> {
+}
+"""
+        )
+
+        expect:"The repository to compile"
+        repository != null
+    }
+
+    void "test to-one join on repository type that inherits from CrudRepository"() {
+        given:
+        def repository = buildRepository('test.MyInterface', """
+import io.micronaut.data.jdbc.annotation.JdbcRepository;
+import io.micronaut.data.model.query.builder.sql.Dialect;
+import io.micronaut.data.tck.entities.Book;
+
+@JdbcRepository(dialect= Dialect.MYSQL)
+@Join("author")
+interface MyInterface extends CrudRepository<Book, Long> {
+}
+"""
+        )
+
+        expect:"The repository to compile"
+        repository != null
+    }
+
     void "test join query on collection with custom ID name"() {
         given:
         def repository = buildRepository('test.MealRepository', """

diff --git a/data-processor/src/test/groovy/io/micronaut/data/processor/visitors/JpaJoinSpec.groovy b/data-processor/src/test/groovy/io/micronaut/data/processor/visitors/JpaJoinSpec.groovy
@@ -26,6 +26,22 @@ import spock.lang.Unroll
 class JpaJoinSpec extends AbstractDataSpec {
 
 
+    void "test join on repository type that inherits from CrudRepository"() {
+        given:
+        def repository = buildRepository('test.MyInterface', """
+import io.micronaut.data.tck.entities.Book;
+
+@Repository
+@Join("author")
+interface MyInterface extends CrudRepository<Book, Long> {
+}
+"""
+        )
+
+        expect:"The repository to compile"
+        repository != null
+    }
+
     @Unroll
     void "test JPA projection across nested property path for #method"() {
         given: