spring-projectsGH-3869: Add some minor improvements.

Author: adel-haidar

spring-integration-file/src/main/java/org/springframework/integration/file/remote/session/ContextHolderRequestHandlerAdvice.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 
 import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice;
 import org.springframework.messaging.Message;
+import org.springframework.util.Assert;
 
 /**
  * Provides a key for the context holder.This key could for example be stored in a message header.
@@ -29,11 +30,12 @@
  * @since 6.1
  */
 public class ContextHolderRequestHandlerAdvice extends AbstractRequestHandlerAdvice {
-	public Function<Message<?>, Object> keyProvider;
 
-	public Consumer<Object> contextSetHook;
+	public final Function<Message<?>, Object> keyProvider;
 
-	public Consumer<Object> contextClearHook;
+	public final Consumer<Object> contextSetHook;
+
+	public final Consumer<Object> contextClearHook;
 
 	/**
 	 * Constructor for the ContextHolderRequestHandlerAdvice.
@@ -42,86 +44,27 @@ public class ContextHolderRequestHandlerAdvice extends AbstractRequestHandlerAdv
 	 * @param contextSetHook The context set hook function.
 	 * @param contextClearHook The context clear hook function.
 	 */
-	public ContextHolderRequestHandlerAdvice(final Function<Message<?>, Object> keyProvider, final Consumer<Object> contextSetHook, final Consumer<Object> contextClearHook) {
+	public ContextHolderRequestHandlerAdvice(Function<Message<?>, Object> keyProvider, Consumer<Object> contextSetHook, Consumer<Object> contextClearHook) {
+		Assert.notNull(keyProvider, "'keyProvider' must not be null");
+		Assert.notNull(contextSetHook, "'contextSetHook' must not be null");
+		Assert.notNull(contextClearHook, "'contextClearHook' must not be null");
 		this.keyProvider = keyProvider;
 		this.contextSetHook = contextSetHook;
 		this.contextClearHook = contextClearHook;
 	}
 
-	/**
-	 * Returns the key provider function.
-	 * @return The key provider function.
-	 *
-	 */
-	public Function<Message<?>, Object> getKeyProvider() {
-		return this.keyProvider;
-	}
-
-	/**
-	 * Sets the key provider function.
-	 * @param keyProvider the key provider.
-	 */
-	public void setKeyProvider(Function<Message<?>, Object> keyProvider) {
-		this.keyProvider = keyProvider;
-	}
-
-	/**
-	 * Returns the context set hook function.
-	 * @return The context set hook function.
-	 *
-	 */
-	public Consumer<Object> getContextSetHook() {
-		return this.contextSetHook;
-	}
-
-	/**
-	 * Sets the context set hook function.
-	 * @param contextSetHook the context set hook function.
-	 */
-	public void setContextSetHook(Consumer<Object> contextSetHook) {
-		this.contextSetHook = contextSetHook;
-	}
-
-	/**
-	 * Returns the context clear hook function.
-	 * @return The context clear hook function.
-	 */
-	public Consumer<Object> getContextClearHook() {
-		return this.contextClearHook;
-	}
-
-	/**
-	 * Sets the context clear hook function.
-	 * @param contextClearHook the context clear hook function.
-	 */
-	public void setContextClearHook(Consumer<Object> contextClearHook) {
-		this.contextClearHook = contextClearHook;
-	}
-
 	@Override
 	protected Object doInvoke(ExecutionCallback callback, Object target, Message<?> message) {
 		Object result;
 		final Object key = this.keyProvider.apply(message);
 		try {
-			setContext(key);
+			this.contextSetHook.accept(key);
 			result = callback.execute();
 		}
-		catch (Exception e) {
-			result = e;
-			logger.error("Failure setting context for " + message + ": " + e.getMessage());
-		}
 		finally {
-			contextClearHook(key);
+			this.contextClearHook.accept(key);
 		}
 		return result;
 	}
 
-	private void setContext(Object key) {
-		this.contextSetHook.accept(key);
-	}
-
-	private void contextClearHook(Object key) {
-		this.contextClearHook.accept(key);
-	}
-
 }

spring-integration-file/src/test/java/org/springframework/integration/file/remote/session/ContextHolderRequestHandlerAdviceTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.integration.config.EnableIntegration;
 import org.springframework.integration.dsl.MessageChannels;
+import org.springframework.integration.test.util.TestUtils;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.PollableChannel;
@@ -61,18 +62,16 @@ public class ContextHolderRequestHandlerAdviceTests {
 	public void testFlow() {
 		final Map<String, Object> headers = Map.of("test-key", "foo");
 		config.in().send(new GenericMessage<>("any-payload", headers));
+
 		Message<?> received = config.out().receive(0);
 		assertThat(received).isNotNull();
-		assertThat(Config.testSessionDuringHandling).isNotNull().isEqualTo(foo.getSession());
-		assertThat(config.dsf().getSession()).isEqualTo(bar.getSession());
+		assertThat(TestUtils.getPropertyValue(config.dsf(), "threadKey", ThreadLocal.class).get()).isNull();
 	}
 
 	@Configuration
 	@EnableIntegration
 	public static class Config {
 
-		public static Session<String> testSessionDuringHandling = null;
-
 		@Bean
 		MessageChannel in() {
 			return MessageChannels.direct("in").get();
@@ -102,10 +101,7 @@ TestSessionFactory bar() {
 		ContextHolderRequestHandlerAdvice advice() {
 			final DelegatingSessionFactory<String> dsf = dsf();
 			final Function<Message<?>, Object> keyProviderFn = m -> m.getHeaders().get("test-key");
-			final Consumer<Object> contextSetHookFn = key -> {
-				dsf.setThreadKey(key);
-				testSessionDuringHandling = dsf.getSession();
-			};
+			final Consumer<Object> contextSetHookFn = dsf::setThreadKey;
 			final Consumer<Object> contextClearHookFn = key -> dsf.clearThreadKey();
 			return new ContextHolderRequestHandlerAdvice(keyProviderFn, contextSetHookFn, contextClearHookFn);
 		}