Update to Spring Javaformat / checkstyle (prepare for JSpecify)

This commit updates to Javaformat to 0.0.47 and the Checkstyle
tools to 10.25.0.

The `SpringAnnotationLocationCheck` has also been added to the
checkstyle rules in order to prepare for the migration to Jspecify
for nullability constraints.

Also, various code has been updated to abide by the new format and
checkstyle rules in the updated versions.

See #1150

Signed-off-by: Chris Bono <[email protected]>

Author: onobc

buildSrc/src/main/java/org/springframework/pulsar/gradle/JavaConventionsPlugin.java

@@ -120,10 +120,12 @@ private void configureSpringJavaFormat(Project project) {
 		});
 		project.getPlugins().apply(CheckstylePlugin.class);
 		CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class);
-		checkstyle.setToolVersion("10.12.4");
+		checkstyle.setToolVersion("10.25.0");
 		checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle"));
 		String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion();
 		DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies();
+		checkstyleDependencies
+				.add(project.getDependencies().create("com.puppycrawl.tools:checkstyle:" + checkstyle.getToolVersion()));
 		checkstyleDependencies
 				.add(project.getDependencies().create("io.spring.javaformat:spring-javaformat-checkstyle:" + version));
 	}

integration-tests/src/intTest/java/org/springframework/pulsar/inttest/config/DefaultTenantAndNamespaceTests.java

@@ -87,7 +87,7 @@ void produceConsumeWithDefaultTenantNamespace(CapturedOutput output,
 
 	}
 
-	private static class TestVerifyUtils {
+	private static final class TestVerifyUtils {
 
 		static void verifyProduceConsume(CapturedOutput output, int numExpectedMessages,
 				Function<Integer, Object> expectedMessageFactory) {

integration-tests/src/intTest/java/org/springframework/pulsar/inttest/logging/PulsarTemplateLambdaWarnLoggerTests.java

@@ -148,7 +148,7 @@ static class TestAppConfig {
 
 	}
 
-	private static class TestUtils {
+	private static final class TestUtils {
 
 		private static void sendRequestsWithCustomizer(String testPrefix, int numberOfSends,
 				PulsarTemplate<String> template) {

spring-pulsar-sample-apps/sample-pulsar-functions/sample-signup-app/src/main/java/org/springframework/pulsar/sample/signup/config/AppConfig.java

@@ -34,6 +34,7 @@
 import org.springframework.pulsar.function.PulsarSource;
 import org.springframework.pulsar.sample.signup.model.SignupGenerator;
 
+@SuppressWarnings("removal")
 @Configuration(proxyBeanMethods = false)
 class AppConfig {
 
@@ -42,6 +43,7 @@ SignupGenerator signupGenerator() {
 		return new SignupGenerator();
 	}
 
+
 	@Bean
 	Jackson2JsonMessageConverter jackson2JsonMessageConverter() {
 		return new Jackson2JsonMessageConverter();

spring-pulsar/src/main/java/org/springframework/pulsar/config/ConcurrentPulsarListenerContainerFactory.java

@@ -54,6 +54,8 @@ public ConcurrentPulsarListenerContainerFactory(PulsarConsumerFactory<? super T>
 	/**
 	 * Specify the container concurrency.
 	 * @param concurrency the number of consumers to create.
+	 * @deprecated since 1.2.0 for removal in 2.0.0 in favor of
+	 * {@link PulsarContainerProperties#setConcurrency}
 	 */
 	@Deprecated(since = "1.2.0", forRemoval = true)
 	public void setConcurrency(Integer concurrency) {

spring-pulsar/src/test/java/org/springframework/pulsar/core/SchemaResolverTests.java

@@ -103,7 +103,7 @@ void schemaTypeNoneWithMessageTypeAndKeyType() {
 
 	}
 
-	private static class TestSchemaResolver implements SchemaResolver {
+	private static final class TestSchemaResolver implements SchemaResolver {
 
 		private final SchemaResolver delegate = mock(SchemaResolver.class);
 

src/checkstyle/checkstyle.xml

@@ -27,12 +27,10 @@
 		<module name="AnnotationUseStyle">
 			<property name="elementStyle" value="compact"/>
 		</module>
-		<module name="MissingOverride"/>
-		<module name="PackageAnnotation"/>
-		<module name="AnnotationLocation">
-			<property name="allowSamelineSingleParameterlessAnnotation"
-					  value="false"/>
-		</module>
+		<module name="MissingOverride" />
+		<module name="MissingDeprecated" />
+		<module name="PackageAnnotation" />
+		<module name="io.spring.javaformat.checkstyle.check.SpringAnnotationLocationCheck" />
 
 		<!-- Block Checks -->
 		<module name="EmptyBlock">
@@ -119,7 +117,7 @@
 		<module name="JavadocMethod">
 		</module>
 		<module name="JavadocVariable">
-			<property name="scope" value="public"/>
+			<property name="accessModifiers" value="public"/>
 		</module>
 		<module name="JavadocStyle">
 			<property name="checkEmptyJavadoc" value="true"/>