unify logger declarations and replace deprecated nullable annotations

Oblio · olegz · commit 65cd25372e1a · 2026-03-24T11:36:00.000+01:00
Signed-off-by: Oblio &lt;oblio.leitch@vermont.gov&gt;
diff --git a/spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/FunctionClassUtils.java b/spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/FunctionClassUtils.java
@@ -42,7 +42,7 @@
  */
 public final class FunctionClassUtils {
 
-	private static Log logger = LogFactory.getLog(FunctionClassUtils.class);
+	private static final Log LOGGER = LogFactory.getLog(FunctionClassUtils.class);
 
 	private static Class<?> MAIN_CLASS;
 
@@ -91,20 +91,20 @@ else if (System.getProperty("MAIN_CLASS") != null) {
 						+ "entry in META-INF/MANIFEST.MF (in that order).", ex);
 			}
 		}
-		logger.info("Main class: " + mainClass);
+		LOGGER.info("Main class: " + mainClass);
 		return mainClass;
 	}
 
 	private static Class<?> getStartClass(List<URL> list, ClassLoader classLoader) {
-		if (logger.isTraceEnabled()) {
-			logger.trace("Searching manifests: " + list);
+		if (LOGGER.isTraceEnabled()) {
+			LOGGER.trace("Searching manifests: " + list);
 		}
 		for (URL url : list) {
 			try {
 				InputStream inputStream = null;
 				Manifest manifest = new Manifest(url.openStream());
-				logger.info("Searching for start class in manifest: " + url);
-				if (logger.isDebugEnabled()) {
+				LOGGER.info("Searching for start class in manifest: " + url);
+				if (LOGGER.isDebugEnabled()) {
 					manifest.write(System.out);
 				}
 				try {
@@ -135,7 +135,7 @@ private static Class<?> getStartClass(List<URL> list, ClassLoader classLoader) {
 				}
 			}
 			catch (Exception ex) {
-				logger.debug("Failed to determine Start-Class in manifest file of " + url, ex);
+				LOGGER.debug("Failed to determine Start-Class in manifest file of " + url, ex);
 			}
 		}
 		return null;
diff --git a/spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ServerlessAsyncContext.java b/spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ServerlessAsyncContext.java
@@ -31,8 +31,8 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.beans.BeanUtils;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.web.util.WebUtils;
 
diff --git a/spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ServerlessAutoConfiguration.java b/spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ServerlessAutoConfiguration.java
@@ -43,7 +43,7 @@
 @AutoConfiguration(beforeName = "org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration")
 @Configuration(proxyBeanMethods = false)
 public class ServerlessAutoConfiguration {
-	private static Log logger = LogFactory.getLog(ServerlessAutoConfiguration.class);
+	private static final Log LOGGER = LogFactory.getLog(ServerlessAutoConfiguration.class);
 
 	@Bean
 	@ConditionalOnMissingBean
@@ -85,14 +85,14 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
 		@Override
 		public void afterPropertiesSet() throws Exception {
 			if (applicationContext instanceof ServletWebServerApplicationContext servletApplicationContext) {
-				logger.info("Configuring Serverless Web Container");
+				LOGGER.info("Configuring Serverless Web Container");
 				ServerlessServletContext servletContext = new ServerlessServletContext();
 				servletApplicationContext.setServletContext(servletContext);
 				DispatcherServlet dispatcher = applicationContext.getBean(DispatcherServlet.class);
 				try {
-					logger.info("Initializing DispatcherServlet");
+					LOGGER.info("Initializing DispatcherServlet");
 					dispatcher.init(new ProxyServletConfig(servletApplicationContext.getServletContext()));
-					logger.info("Initialized DispatcherServlet");
+					LOGGER.info("Initialized DispatcherServlet");
 				}
 				catch (Exception e) {
 					throw new IllegalStateException("Failed to create Spring MVC DispatcherServlet proxy", e);
@@ -102,7 +102,7 @@ public void afterPropertiesSet() throws Exception {
 				}
 			}
 			else {
-				logger.debug("Skipping Serverless configuration for " + this.applicationContext);
+				LOGGER.debug("Skipping Serverless configuration for " + this.applicationContext);
 			}
 		}
 	}
diff --git a/spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ServerlessHttpServletRequest.java b/spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ServerlessHttpServletRequest.java
@@ -59,8 +59,8 @@
 import jakarta.servlet.http.HttpUpgradeHandler;
 import jakarta.servlet.http.Part;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.http.HttpHeaders;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedMultiValueMap;
diff --git a/spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ServerlessHttpServletResponse.java b/spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ServerlessHttpServletResponse.java
@@ -39,8 +39,8 @@
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletResponse;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.http.HttpHeaders;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.web.util.WebUtils;
 
diff --git a/spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ServerlessMVC.java b/spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ServerlessMVC.java
@@ -47,11 +47,11 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.web.server.servlet.context.ServletWebServerApplicationContext;
 import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;
 import org.springframework.http.HttpStatus;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -74,7 +74,7 @@ public final class ServerlessMVC {
 	 */
 	public static String INIT_TIMEOUT = "contextInitTimeout";
 
-	private static Log LOG = LogFactory.getLog(ServerlessMVC.class);
+	private static final Log LOGGER = LogFactory.getLog(ServerlessMVC.class);
 
 	private volatile DispatcherServlet dispatcher;
 
@@ -109,16 +109,16 @@ private ServerlessMVC() {
 	private void initializeContextAsync(Class<?>... componentClasses) {
 		new Thread(() -> {
 			try {
-				LOG.info("Starting application with the following configuration classes:");
-				Stream.of(componentClasses).forEach(clazz -> LOG.info(clazz.getSimpleName()));
+				LOGGER.info("Starting application with the following configuration classes:");
+				Stream.of(componentClasses).forEach(clazz -> LOGGER.info(clazz.getSimpleName()));
 				initContext(componentClasses);
 			}
 			catch (Exception e) {
 				throw new IllegalStateException(e);
 			}
 			finally {
 				contextStartupLatch.countDown();
-				LOG.info("Application is started successfully.");
+				LOGGER.info("Application is started successfully.");
 			}
 		}).start();
 	}
@@ -230,7 +230,7 @@ private static class ProxyFilterChain implements FilterChain {
 					filters.add(serverlessFilterRegistration.getFilter());
 				}
 				else {
-					LOG.debug("Skipping unsupported filter registration type '" + registration.getClass().getName()
+					LOGGER.debug("Skipping unsupported filter registration type '" + registration.getClass().getName()
 							+ "' for filter '" + entry.getKey() + "'");
 				}
 			}
@@ -325,7 +325,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
 						((ServerlessHttpServletRequest) request).setRequestURI("/error");
 					}
 
-					LOG.error("Failed processing the request to: " + ((HttpServletRequest) request).getRequestURI(), e);
+					LOGGER.error("Failed processing the request to: " + ((HttpServletRequest) request).getRequestURI(), e);
 
 					this.delegateServlet.service(request, response);
 				}
diff --git a/spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ServerlessServletContext.java b/spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ServerlessServletContext.java
@@ -58,7 +58,7 @@
  */
 public class ServerlessServletContext implements ServletContext {
 
-	private Log logger = LogFactory.getLog(ServerlessServletContext.class);
+	private static final Log LOGGER = LogFactory.getLog(ServerlessServletContext.class);
 
 	private HashMap<String, Object> attributes = new HashMap<>();
 
@@ -145,12 +145,12 @@ public RequestDispatcher getNamedDispatcher(String name) {
 
 	@Override
 	public void log(String msg) {
-		this.logger.info(msg);
+		this.LOGGER.info(msg);
 	}
 
 	@Override
 	public void log(String message, Throwable throwable) {
-		this.logger.error(message, throwable);
+		this.LOGGER.error(message, throwable);
 	}
 
 	@Override
diff --git a/spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ServerlessWebApplication.java b/spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ServerlessWebApplication.java
@@ -74,7 +74,7 @@
  */
 public class ServerlessWebApplication extends SpringApplication {
 
-	private static final Log logger = LogFactory.getLog(ServerlessWebApplication.class);
+	private static final Log LOGGER = LogFactory.getLog(ServerlessWebApplication.class);
 
 	private ApplicationStartup applicationStartup = ApplicationStartup.DEFAULT;
 
@@ -151,7 +151,7 @@ private SpringApplicationRunListeners getRunListeners(String[] args) {
 		ArgumentResolver argumentResolver = ArgumentResolver.of(SpringApplication.class, this);
 		argumentResolver = argumentResolver.and(String[].class, args);
 		List<SpringApplicationRunListener> listeners = getSpringFactoriesInstances(SpringApplicationRunListener.class, argumentResolver);
-		return new SpringApplicationRunListeners(logger, listeners, this.applicationStartup);
+		return new SpringApplicationRunListeners(LOGGER, listeners, this.applicationStartup);
 	}
 
 	private Banner printBanner(ConfigurableEnvironment environment) {

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`*/`
`43`	`43`	`public final class FunctionClassUtils {`
`44`	`44`
`45`		`- private static Log logger = LogFactory.getLog(FunctionClassUtils.class);`
	`45`	`+ private static final Log LOGGER = LogFactory.getLog(FunctionClassUtils.class);`
`46`	`46`
`47`	`47`	`private static Class<?> MAIN_CLASS;`
`48`	`48`
`@@ -91,20 +91,20 @@ else if (System.getProperty("MAIN_CLASS") != null) {`
`91`	`91`	`+ "entry in META-INF/MANIFEST.MF (in that order).", ex);`
`92`	`92`	`}`
`93`	`93`	`}`
`94`		`- logger.info("Main class: " + mainClass);`
	`94`	`+ LOGGER.info("Main class: " + mainClass);`
`95`	`95`	`return mainClass;`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`private static Class<?> getStartClass(List<URL> list, ClassLoader classLoader) {`
`99`		`- if (logger.isTraceEnabled()) {`
`100`		`- logger.trace("Searching manifests: " + list);`
	`99`	`+ if (LOGGER.isTraceEnabled()) {`
	`100`	`+ LOGGER.trace("Searching manifests: " + list);`
`101`	`101`	`}`
`102`	`102`	`for (URL url : list) {`
`103`	`103`	`try {`
`104`	`104`	`InputStream inputStream = null;`
`105`	`105`	`Manifest manifest = new Manifest(url.openStream());`
`106`		`- logger.info("Searching for start class in manifest: " + url);`
`107`		`- if (logger.isDebugEnabled()) {`
	`106`	`+ LOGGER.info("Searching for start class in manifest: " + url);`
	`107`	`+ if (LOGGER.isDebugEnabled()) {`
`108`	`108`	`manifest.write(System.out);`
`109`	`109`	`}`
`110`	`110`	`try {`
`@@ -135,7 +135,7 @@ private static Class<?> getStartClass(List<URL> list, ClassLoader classLoader) {`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`	`catch (Exception ex) {`
`138`		`- logger.debug("Failed to determine Start-Class in manifest file of " + url, ex);`
	`138`	`+ LOGGER.debug("Failed to determine Start-Class in manifest file of " + url, ex);`
`139`	`139`	`}`
`140`	`140`	`}`
`141`	`141`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`@AutoConfiguration(beforeName = "org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration")`
`44`	`44`	`@Configuration(proxyBeanMethods = false)`
`45`	`45`	`public class ServerlessAutoConfiguration {`
`46`		`- private static Log logger = LogFactory.getLog(ServerlessAutoConfiguration.class);`
	`46`	`+ private static final Log LOGGER = LogFactory.getLog(ServerlessAutoConfiguration.class);`
`47`	`47`
`48`	`48`	`@Bean`
`49`	`49`	`@ConditionalOnMissingBean`
`@@ -85,14 +85,14 @@ public void setApplicationContext(ApplicationContext applicationContext) throws`
`85`	`85`	`@Override`
`86`	`86`	`public void afterPropertiesSet() throws Exception {`
`87`	`87`	`if (applicationContext instanceof ServletWebServerApplicationContext servletApplicationContext) {`
`88`		`- logger.info("Configuring Serverless Web Container");`
	`88`	`+ LOGGER.info("Configuring Serverless Web Container");`
`89`	`89`	`ServerlessServletContext servletContext = new ServerlessServletContext();`
`90`	`90`	`servletApplicationContext.setServletContext(servletContext);`
`91`	`91`	`DispatcherServlet dispatcher = applicationContext.getBean(DispatcherServlet.class);`
`92`	`92`	`try {`
`93`		`- logger.info("Initializing DispatcherServlet");`
	`93`	`+ LOGGER.info("Initializing DispatcherServlet");`
`94`	`94`	`dispatcher.init(new ProxyServletConfig(servletApplicationContext.getServletContext()));`
`95`		`- logger.info("Initialized DispatcherServlet");`
	`95`	`+ LOGGER.info("Initialized DispatcherServlet");`
`96`	`96`	`}`
`97`	`97`	`catch (Exception e) {`
`98`	`98`	`throw new IllegalStateException("Failed to create Spring MVC DispatcherServlet proxy", e);`
`@@ -102,7 +102,7 @@ public void afterPropertiesSet() throws Exception {`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`	`else {`
`105`		`- logger.debug("Skipping Serverless configuration for " + this.applicationContext);`
	`105`	`+ LOGGER.debug("Skipping Serverless configuration for " + this.applicationContext);`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`	`}`