Restore formatting & fix bad merges

Author: jdaugherty

grails-async/plugin/src/main/groovy/org/grails/async/transform/internal/DefaultDelegateAsyncTransactionalMethodTransformer.groovy

@@ -102,27 +102,29 @@ class DefaultDelegateAsyncTransactionalMethodTransformer implements DelegateAsyn
             }
             final promiseLookupExpression = new BinaryExpression(new PropertyExpression(EXPRESSION_THIS, FIELD_NAME_PROMISE_DECORATORS), Token.newSymbol(Types.LEFT_SQUARE_BRACKET, -1, -1), new ConstantExpression(currentIndex))
             setTransactionManagerMethodBody.addStatement(
-                    new ExpressionStatement(
+                new ExpressionStatement(
                     new BinaryExpression(
-                    promiseLookupExpression,
-                    OPERATOR_ASSIGNMENT,
-                    new MethodCallExpression(
-                    new ClassExpression(new ClassNode(TransactionalAsyncTransformUtils).getPlainNodeReference()),
-                    'createTransactionalPromiseDecorator',
-                    new ArgumentListExpression(new VariableExpression(VARIABLE_TRANSACTION_MANAGER),
-                    new MethodCallExpression(
-                    new ClassExpression(delegateClassNode),
-                    'getDeclaredMethod', methodLookupArguments
-                    )
-                    )
-                    )
+                        promiseLookupExpression,
+                        OPERATOR_ASSIGNMENT,
+                        new MethodCallExpression(
+                             new ClassExpression(new ClassNode(TransactionalAsyncTransformUtils).getPlainNodeReference()),
+                            'createTransactionalPromiseDecorator',
+                             new ArgumentListExpression(new VariableExpression(VARIABLE_TRANSACTION_MANAGER),
+                                                        new MethodCallExpression(
+                                                            new ClassExpression(delegateClassNode),
+                                                            'getDeclaredMethod', methodLookupArguments
+                                                        )
+                             )
+                        )
 
                     )
-                    )
-                    )
+                )
+            )
 
             promiseDecorators.addExpression(promiseLookupExpression)
+
         }
+
     }
 
     static BlockStatement getSetTransactionManagerMethodBody(ClassNode classNode) {
@@ -147,25 +149,26 @@ class DefaultDelegateAsyncTransactionalMethodTransformer implements DelegateAsyn
             def parameters = [transactionManagerParameter] as Parameter[]
             final txMgrParam = new VariableExpression(transactionManagerParameter)
             methodBody.addStatement(
-                    new ExpressionStatement(
+                new ExpressionStatement(
                     new BinaryExpression(
-                    new PropertyExpression(EXPRESSION_THIS, FIELD_NAME_TRANSACTION_MANAGER),
-                    OPERATOR_ASSIGNMENT,
-                    txMgrParam
-                    )
-                    )
+                        new PropertyExpression(EXPRESSION_THIS, FIELD_NAME_TRANSACTION_MANAGER),
+                        OPERATOR_ASSIGNMENT,
+                        txMgrParam
                     )
+                )
+            )
             methodBody.addStatement(
-                    new ExpressionStatement(
+                new ExpressionStatement(
                     new DeclarationExpression(
-                    new VariableExpression(VARIABLE_TRANSACTION_MANAGER, INTERFACE_TRANSACTION_MANAGER),
-                    OPERATOR_ASSIGNMENT,
-                    txMgrParam
-                    )
-                    )
+                        new VariableExpression(VARIABLE_TRANSACTION_MANAGER, INTERFACE_TRANSACTION_MANAGER),
+                        OPERATOR_ASSIGNMENT,
+                        txMgrParam
                     )
+                )
+            )
             method = new MethodNode(METHOD_NAME_SET_TRANSACTION_MANAGER, Modifier.PUBLIC, ClassHelper.VOID_TYPE, parameters, [] as ClassNode[], methodBody)
             classNode.addMethod(method)
+
         }
 
         return (BlockStatement) method.getCode()

grails-async/plugin/src/main/groovy/org/grails/plugins/web/async/ControllersAsyncGrailsPlugin.groovy

@@ -33,9 +33,8 @@ class ControllersAsyncGrailsPlugin extends Plugin {
 
     def grailsVersion = '7.0.0-SNAPSHOT > *'
     def loadAfter = ['controllers']
-    Closure doWithSpring() { {
-
-            ->
+    Closure doWithSpring() {
+        { ->
             asyncPromiseResponseActionResultTransformer(AsyncActionResultTransformer)
             grailsPromiseFactory(PromiseFactoryBean)
         }

grails-async/plugin/src/main/groovy/org/grails/plugins/web/async/GrailsAsyncContext.groovy

@@ -75,7 +75,7 @@ class GrailsAsyncContext implements AsyncContext {
 
     void complete() {
         delegate.complete()
-    }
+     }
 
     protected Collection<PersistenceContextInterceptor> getPersistenceInterceptors(GrailsWebRequest webRequest) {
         def servletContext = webRequest.servletContext

grails-async/plugin/src/test/groovy/grails/async/services/AsyncTransactionalServiceSpec.groovy

@@ -29,7 +29,6 @@ import org.springframework.transaction.annotation.Transactional
 import org.springframework.transaction.support.SimpleTransactionStatus
 import spock.lang.Specification
 
-
 class AsyncTransactionalServiceSpec extends Specification {
 
     void 'Test that an async transactional service is transaction manager aware'() {

grails-core/src/main/groovy/grails/core/DefaultGrailsApplication.java

@@ -99,7 +99,7 @@ public class DefaultGrailsApplication extends AbstractGrailsApplication implemen
     protected static final Pattern GETCLASS_PATTERN = Pattern.compile("(get)(\\w+)Class");
 
     protected Class<?>[] allClasses = new Class[0];
-    protected static final Log log = LogFactory.getLog(DefaultGrailsApplication.class);
+    protected static Log log = LogFactory.getLog(DefaultGrailsApplication.class);
 
     protected Set<Class<?>> loadedClasses = new LinkedHashSet<>();
     protected ArtefactHandler[] artefactHandlers;

grails-datamapping-core-test/src/test/groovy/grails/gorm/services/ServiceImplSpec.groovy

@@ -18,6 +18,8 @@
  */
 package grails.gorm.services
 
+import spock.lang.Requires
+
 import grails.gorm.annotation.Entity
 import grails.gorm.validation.PersistentEntityValidator
 import grails.validation.ValidationException
@@ -56,7 +58,7 @@ class ServiceImplSpec extends Specification {
 
     }
 
-    @spock.lang.Requires({ System.getProperty('hibernate5.gorm.suite') == 'true' || System.getProperty('hibernate7.gorm.suite') == 'true' || System.getProperty('mongodb.gorm.suite') == 'true' })
+    @Requires({ System.getProperty('hibernate5.gorm.suite') == 'true' || System.getProperty('hibernate7.gorm.suite') == 'true' || System.getProperty('mongodb.gorm.suite') == 'true' })
     void "test list products"() {
         given:
         Product p1 = new Product(name: "Apple", type:"Fruit").save(flush:true)
@@ -327,7 +329,7 @@ class ServiceImplSpec extends Specification {
 
     }
 
-    @spock.lang.Requires({ System.getProperty('hibernate5.gorm.suite') == 'true' || System.getProperty('hibernate7.gorm.suite') == 'true' || System.getProperty('mongodb.gorm.suite') == 'true' })
+    @Requires({ System.getProperty('hibernate5.gorm.suite') == 'true' || System.getProperty('hibernate7.gorm.suite') == 'true' || System.getProperty('mongodb.gorm.suite') == 'true' })
     void "test interface projection"() {
         given:
         ProductService productService = datastore.getService(ProductService)

grails-datamapping-core-test/src/test/groovy/org/apache/grails/data/simple/core/GrailsDataCoreTckManager.groovy

@@ -43,7 +43,6 @@ class GrailsDataCoreTckManager extends GrailsDataTckManager {
 
     @Override
     Session createSession() {
-        System.setProperty('core.gorm.suite', 'true')
         def ctx = new GenericApplicationContext()
         ctx.refresh()
         def simple = new SimpleMapDatastore(ctx)

grails-datamapping-core/src/main/groovy/grails/gorm/DetachedCriteria.groovy

@@ -20,6 +20,7 @@
 package grails.gorm
 
 import groovy.transform.CompileStatic
+import groovy.util.logging.Slf4j
 
 import jakarta.persistence.criteria.JoinType
 
@@ -41,6 +42,7 @@ import org.grails.datastore.mapping.query.api.QueryableCriteria
  * @author Graeme Rocher
  * @since 1.0
  */
+@Slf4j
 @CompileStatic
 class DetachedCriteria<T> extends AbstractDetachedCriteria<T> implements GormOperations<T>, QueryableCriteria<T>, Iterable<T> {