Fix new Sonar smells for scripts

Fix `ImapMailReceiverTests.testConnectionException()` for several
`ImapIdleExceptionEvent` instances

Author: artembilan

spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyCommandMessageProcessor.java

@@ -47,7 +47,7 @@
  */
 public class GroovyCommandMessageProcessor extends AbstractScriptExecutingMessageProcessor<Object> {
 
-	private volatile GroovyObjectCustomizer customizer;
+	private GroovyObjectCustomizer customizer;
 
 	private Binding binding;
 
@@ -125,20 +125,15 @@ protected Object executeScript(ScriptSource scriptSource, Map<String, Object> va
 			customizerDecorator.setVariables(variables);
 		}
 		GroovyScriptFactory factory = new GroovyScriptFactory(getClass().getSimpleName(), customizerDecorator);
-		if (this.beanClassLoader != null) {
-			factory.setBeanClassLoader(this.beanClassLoader);
-		}
-		if (this.beanFactory != null) {
-			factory.setBeanFactory(this.beanFactory);
-		}
+		factory.setBeanClassLoader(getBeanClassLoader());
+		factory.setBeanFactory(getBeanFactory());
 		try {
 			Object result = factory.getScriptedObject(scriptSource);
 			return (result instanceof GString) ? result.toString() : result;
 		}
 		catch (IOException e) {
 			throw new UncheckedIOException(e);
 		}
-
 	}
 
 	protected String generateScriptName(Message<?> message) {

spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessor.java

@@ -27,6 +27,7 @@
 import org.codehaus.groovy.control.CompilerConfiguration;
 import org.codehaus.groovy.control.customizers.ASTTransformationCustomizer;
 
+import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -144,8 +145,9 @@ protected ScriptSource getScriptSource(Message<?> message) {
 
 	@Override
 	public void afterPropertiesSet() {
-		if (this.beanFactory != null && this.beanFactory instanceof ConfigurableListableBeanFactory) {
-			((ConfigurableListableBeanFactory) this.beanFactory).ignoreDependencyType(MetaClass.class);
+		BeanFactory beanFactory = getBeanFactory();
+		if (beanFactory instanceof ConfigurableListableBeanFactory) {
+			((ConfigurableListableBeanFactory) beanFactory).ignoreDependencyType(MetaClass.class);
 		}
 
 		CompilerConfiguration compilerConfig = this.compilerConfiguration;
@@ -154,7 +156,7 @@ public void afterPropertiesSet() {
 			compilerConfig.addCompilationCustomizers(new ASTTransformationCustomizer(CompileStatic.class));
 		}
 
-		this.groovyClassLoader = new GroovyClassLoader(this.beanClassLoader, compilerConfig);
+		this.groovyClassLoader = new GroovyClassLoader(getBeanClassLoader(), compilerConfig);
 	}
 
 	@Override
@@ -218,8 +220,7 @@ private Object execute(Map<String, Object> variables) throws ScriptCompilationEx
 		}
 		catch (IllegalAccessException ex) {
 			throw new ScriptCompilationException(
-					this.scriptSource, "Could not access Groovy script constructor: " + this.scriptClass.getName(),
-					ex);
+					this.scriptSource, "Could not access Groovy script constructor: " + this.scriptClass.getName(), ex);
 		}
 	}
 
@@ -234,20 +235,20 @@ public Object getVariable(String name) {
 			try {
 				return super.getVariable(name);
 			}
-			catch (MissingPropertyException e) {
+			catch (MissingPropertyException ex) {
 				// Original {@link Binding} doesn't have 'variable' for the given 'name'.
 				// Try to resolve it as 'bean' from the given <code>beanFactory</code>.
 			}
 
-			if (GroovyScriptExecutingMessageProcessor.this.beanFactory == null) {
-				throw new MissingPropertyException(name, this.getClass());
+			BeanFactory beanFactory = getBeanFactory();
+			if (beanFactory == null) {
+				throw new MissingPropertyException(name, getClass());
 			}
-
 			try {
-				return GroovyScriptExecutingMessageProcessor.this.beanFactory.getBean(name);
+				return beanFactory.getBean(name);
 			}
 			catch (NoSuchBeanDefinitionException e) {
-				throw new MissingPropertyException(name, this.getClass(), e);
+				throw new MissingPropertyException(name, getClass(), e);
 			}
 		}
 

spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java

@@ -74,7 +74,6 @@
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
 import org.springframework.integration.history.MessageHistory;
-import org.springframework.integration.mail.ImapIdleChannelAdapter.ImapIdleExceptionEvent;
 import org.springframework.integration.mail.support.DefaultMailHeaderMapper;
 import org.springframework.integration.test.mail.TestMailServer;
 import org.springframework.integration.test.mail.TestMailServer.ImapServer;
@@ -689,11 +688,10 @@ public void testInitialIdleDelayWhenRecentIsSupported() throws Exception {
 	public void testConnectionException() throws Exception {
 		ImapMailReceiver mailReceiver = new ImapMailReceiver("imap:foo");
 		ImapIdleChannelAdapter adapter = new ImapIdleChannelAdapter(mailReceiver);
-		final AtomicReference<ImapIdleExceptionEvent> theEvent = new AtomicReference<>();
+		final AtomicReference<Object> theEvent = new AtomicReference<>();
 		final CountDownLatch latch = new CountDownLatch(1);
 		adapter.setApplicationEventPublisher(event -> {
-			assertThat(theEvent.get()).as("only one event expected").isNull();
-			theEvent.set((ImapIdleExceptionEvent) event);
+			theEvent.set(event);
 			latch.countDown();
 		});
 		ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler();

spring-integration-scripting/src/main/java/org/springframework/integration/scripting/AbstractScriptExecutingMessageProcessor.java

@@ -43,9 +43,9 @@ public abstract class AbstractScriptExecutingMessageProcessor<T>
 
 	private final ScriptVariableGenerator scriptVariableGenerator;
 
-	protected ClassLoader beanClassLoader;
+	private ClassLoader beanClassLoader;
 
-	protected BeanFactory beanFactory;
+	private BeanFactory beanFactory;
 
 	protected AbstractScriptExecutingMessageProcessor() {
 		this(new DefaultScriptVariableGenerator());
@@ -67,6 +67,18 @@ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 		this.beanFactory = beanFactory;
 	}
 
+	protected ScriptVariableGenerator getScriptVariableGenerator() {
+		return this.scriptVariableGenerator;
+	}
+
+	protected ClassLoader getBeanClassLoader() {
+		return this.beanClassLoader;
+	}
+
+	protected BeanFactory getBeanFactory() {
+		return this.beanFactory;
+	}
+
 	/**
 	 * Executes the script and returns the result.
 	 */

spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/ScriptExecutorFactory.java

@@ -52,7 +52,7 @@ else if (language.equalsIgnoreCase("kotlin")) {
 	 * @since 5.2
 	 */
 	public static String deriveLanguageFromFileExtension(String scriptLocation) {
-		int index = scriptLocation.lastIndexOf(".") + 1;
+		int index = scriptLocation.lastIndexOf('.') + 1;
 		Assert.state(index > 0, () -> "Unable to determine language for script '" + scriptLocation + "'");
 		String extension = scriptLocation.substring(index);
 		if (extension.equals("kts")) {