Fix #1124 @WithoutTenant does not work on class (#1242)

* #1124 Test @WithoutTenant on class

* #1124 Fix @WithoutTenant on class

* Changed signature of `prepareNewMethodParameters` in order to check if `@WithoutTenant` annotation is added to class.

* #1124 Update TransactionalTransform

* Change signature of `prepareNewMethodParameters` to include ClassNode parameter.

* #1124 Update CurrentTenantTransformSpec.groovy

* Added accidentally removed TeamService.

Author: puneetbehl

grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/CurrentTenantTransformSpec.groovy

@@ -13,7 +13,6 @@ import org.grails.datastore.mapping.multitenancy.MultiTenancySettings
 import org.grails.datastore.mapping.multitenancy.exceptions.TenantNotFoundException
 import org.grails.datastore.mapping.multitenancy.resolvers.SystemPropertyTenantResolver
 import org.grails.datastore.mapping.simple.SimpleMapDatastore
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.transaction.TransactionStatus
 import spock.lang.AutoCleanup
 import spock.lang.Shared
@@ -38,6 +37,30 @@ class CurrentTenantTransformSpec  extends Specification {
         System.setProperty(SystemPropertyTenantResolver.PROPERTY_NAME, "")
     }
 
+    void "Test parsing of @WithoutTenant"() {
+        Class testServiceClass = new GroovyShell().evaluate('''
+import grails.gorm.multitenancy.WithoutTenant
+import grails.gorm.transactions.Transactional
+
+@Transactional
+@WithoutTenant
+class TestService {
+
+    Integer count() {
+        return 10;
+    }
+   
+}
+
+return TestService
+''')
+        PlayService playService = new PlayService()
+
+        expect:
+        testServiceClass.getDeclaredMethod('$mt__count')
+        playService.countPlays() == 10
+    }
+
     void "Test parsing of @CurrentTenant"() {
         given:
         Class testServiceClass = new GroovyShell().evaluate('''
@@ -140,6 +163,14 @@ return TestService
     }
 }
 
+@WithoutTenant
+class PlayService {
+    int countPlays() {
+        return 10;
+    }
+
+}
+
 @CurrentTenant
 class TeamService {
 

grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/multitenancy/transform/TenantTransform.groovy

@@ -126,8 +126,8 @@ class TenantTransform extends AbstractDatastoreMethodDecoratingTransformation im
     }
 
     @Override
-    protected Parameter[] prepareNewMethodParameters(MethodNode methodNode, Map<String, ClassNode> genericsSpec) {
-        if(methodNode.getAnnotations(WITHOUT_TENANT_ANNOTATION_TYPE).isEmpty()) {
+    protected Parameter[] prepareNewMethodParameters(MethodNode methodNode, Map<String, ClassNode> genericsSpec, ClassNode classNode = null) {
+        if(methodNode.getAnnotations(WITHOUT_TENANT_ANNOTATION_TYPE).isEmpty() && (!classNode || classNode.getAnnotations(WITHOUT_TENANT_ANNOTATION_TYPE).isEmpty())) {
             final Parameter tenantIdParameter = param(make(Serializable), VAR_TENANT_ID)
             Parameter[] parameters = methodNode.getParameters()
             Parameter[] newParameters = parameters.length > 0 ? (copyParameters(((parameters as List) + [tenantIdParameter]) as Parameter[], genericsSpec)) : [tenantIdParameter] as Parameter[]
@@ -137,6 +137,7 @@ class TenantTransform extends AbstractDatastoreMethodDecoratingTransformation im
             return copyParameters(methodNode.getParameters())
         }
     }
+
     @Override
     protected boolean isValidAnnotation(AnnotationNode annotationNode, AnnotatedNode classNode) {
         ClassNode annotationClassNode = annotationNode.getClassNode()

grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/transactions/transform/TransactionalTransform.groovy

@@ -96,12 +96,12 @@ import static org.grails.datastore.mapping.reflect.AstUtils.*
 @CompileStatic
 @GroovyASTTransformation(phase = CompilePhase.CANONICALIZATION)
 class TransactionalTransform extends AbstractDatastoreMethodDecoratingTransformation implements Ordered {
-    private static final Set<String> ANNOTATION_NAME_EXCLUDES = new HashSet<String>([Transactional.class.getName(), "grails.transaction.Rollback", Rollback.class.getName(), NotTransactional.class.getName(), "grails.transaction.NotTransactional", "grails.gorm.transactions.ReadOnly"]);
+    private static final Set<String> ANNOTATION_NAME_EXCLUDES = new HashSet<String>([Transactional.class.getName(), "grails.transaction.Rollback", Rollback.class.getName(), NotTransactional.class.getName(), "grails.transaction.NotTransactional", "grails.gorm.transactions.ReadOnly"])
     public static final ClassNode MY_TYPE = new ClassNode(Transactional)
     public static final ClassNode READ_ONLY_TYPE = new ClassNode(ReadOnly)
     private static final String PROPERTY_TRANSACTION_MANAGER = "transactionManager"
     private static final String METHOD_EXECUTE = "execute"
-    private static final Object APPLIED_MARKER = new Object();
+    private static final Object APPLIED_MARKER = new Object()
     private static final String SET_TRANSACTION_MANAGER = "setTransactionManager"
     private static final Set<String> VALID_ANNOTATION_NAMES = Collections.unmodifiableSet(
         new HashSet<String>([Transactional.simpleName, Rollback.simpleName, ReadOnly.simpleName])
@@ -152,7 +152,7 @@ class TransactionalTransform extends AbstractDatastoreMethodDecoratingTransforma
     }
 
     @Override
-    protected Parameter[] prepareNewMethodParameters(MethodNode methodNode, Map<String, ClassNode> genericsSpec) {
+    protected Parameter[] prepareNewMethodParameters(MethodNode methodNode, Map<String, ClassNode> genericsSpec, ClassNode classNode = null) {
         final Parameter transactionStatusParameter = param(make(TransactionStatus), "transactionStatus")
         Parameter[] parameters = methodNode.getParameters()
         Parameter[] newParameters = parameters.length > 0 ? (copyParameters(((parameters as List) + [transactionStatusParameter]) as Parameter[], genericsSpec)) : [transactionStatusParameter] as Parameter[]

grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/transform/AbstractMethodDecoratingTransformation.groovy

@@ -48,8 +48,8 @@ import static org.grails.datastore.mapping.reflect.AstUtils.*
 @CompileStatic
 abstract class AbstractMethodDecoratingTransformation extends AbstractGormASTTransformation {
 
-    private static final Set<String> METHOD_NAME_EXCLUDES = new HashSet<String>(Arrays.asList("afterPropertiesSet", "destroy"));
-    private static final Set<String> ANNOTATION_NAME_EXCLUDES = new HashSet<String>(Arrays.asList(PostConstruct.class.getName(), PreDestroy.class.getName(), "grails.web.controllers.ControllerMethod"));
+    private static final Set<String> METHOD_NAME_EXCLUDES = new HashSet<String>(Arrays.asList("afterPropertiesSet", "destroy"))
+    private static final Set<String> ANNOTATION_NAME_EXCLUDES = new HashSet<String>(Arrays.asList(PostConstruct.class.getName(), PreDestroy.class.getName(), "grails.web.controllers.ControllerMethod"))
     /**
      * Key used to store within the original method node metadata, all previous decorated methods
      */
@@ -181,7 +181,7 @@ abstract class AbstractMethodDecoratingTransformation extends AbstractGormASTTra
             renamedMethodName = getRenamedMethodPrefix() + methodNode.getName()
         }
 
-        Parameter[] newParameters = prepareNewMethodParameters(methodNode, GenericsUtils.addMethodGenerics(methodNode, genericsSpec) )
+        Parameter[] newParameters = prepareNewMethodParameters(methodNode, GenericsUtils.addMethodGenerics(methodNode, genericsSpec), classNode)
         MethodNode renamedMethod = moveOriginalCodeToNewMethod(methodNode, renamedMethodName, newParameters, classNode, sourceUnit, genericsSpec)
         MethodCallExpression originalMethodCall = buildCallToOriginalMethod(classNode, renamedMethod)
 
@@ -226,7 +226,7 @@ abstract class AbstractMethodDecoratingTransformation extends AbstractGormASTTra
         }
     }
 
-    protected Parameter[] prepareNewMethodParameters(MethodNode methodNode, Map<String, ClassNode> genericsSpec) {
+    protected Parameter[] prepareNewMethodParameters(MethodNode methodNode, Map<String, ClassNode> genericsSpec, ClassNode classNode = null) {
         return copyParameters(methodNode.getParameters(), genericsSpec)
     }