Re-Enable Checkstyle and resolve issues

cppwfs · cppwfs · commit 932c129cf147 · 2025-09-19T17:15:56.000-04:00
diff --git a/pom.xml b/pom.xml
@@ -234,11 +234,10 @@
 				</executions>
 				<version>0.8.13</version>
 			</plugin>
-			<!--Disabled until checkstyle format is updated-->
-<!--			<plugin>-->
-<!--				<groupId>org.apache.maven.plugins</groupId>-->
-<!--				<artifactId>maven-checkstyle-plugin</artifactId>-->
-<!--			</plugin>-->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+			</plugin>
 			<plugin>
 				<groupId>io.spring.javaformat</groupId>
 				<artifactId>spring-javaformat-maven-plugin</artifactId>
diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/package-info.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/package-info.java
@@ -18,4 +18,4 @@
  * Auto-configuration classes for flat file item readers and writers in single-step batch
  * jobs.
  */
-package org.springframework.cloud.task.batch.autoconfigure.flatfile;
+package org.springframework.cloud.task.batch.autoconfigure.flatfile;
diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/package-info.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Auto-configuration classes for JDBC item readers and writers in single-step batch jobs.
  */
-package org.springframework.cloud.task.batch.autoconfigure.jdbc;
+package org.springframework.cloud.task.batch.autoconfigure.jdbc;
diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/kafka/package-info.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/kafka/package-info.java
@@ -18,4 +18,4 @@
  * Auto-configuration classes for Kafka item readers and writers in single-step batch
  * jobs.
  */
-package org.springframework.cloud.task.batch.autoconfigure.kafka;
+package org.springframework.cloud.task.batch.autoconfigure.kafka;
diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/package-info.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Auto-configuration classes for Spring Cloud Task single-step batch jobs.
  */
-package org.springframework.cloud.task.batch.autoconfigure;
+package org.springframework.cloud.task.batch.autoconfigure;
diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/package-info.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/package-info.java
@@ -18,4 +18,4 @@
  * Auto-configuration classes for RabbitMQ item readers and writers in single-step batch
  * jobs.
  */
-package org.springframework.cloud.task.batch.autoconfigure.rabbit;
+package org.springframework.cloud.task.batch.autoconfigure.rabbit;
diff --git a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/package-info.java b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Configuration classes for Spring Cloud Task Batch integration.
  */
-package org.springframework.cloud.task.batch.configuration;
+package org.springframework.cloud.task.batch.configuration;
diff --git a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/handler/package-info.java b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/handler/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Handler components for Spring Cloud Task Batch integration.
  */
-package org.springframework.cloud.task.batch.handler;
+package org.springframework.cloud.task.batch.handler;
diff --git a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/listener/package-info.java b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/listener/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Listener components for Spring Cloud Task Batch integration.
  */
-package org.springframework.cloud.task.batch.listener;
+package org.springframework.cloud.task.batch.listener;
diff --git a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/listener/support/package-info.java b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/listener/support/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Support classes for Spring Cloud Task Batch listener implementations.
  */
-package org.springframework.cloud.task.batch.listener.support;
+package org.springframework.cloud.task.batch.listener.support;
diff --git a/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/configuration/TaskJobLauncherAutoConfigurationTests.java b/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/configuration/TaskJobLauncherAutoConfigurationTests.java
@@ -16,34 +16,32 @@
 
 package org.springframework.cloud.task.batch.configuration;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.batch.core.configuration.JobRegistry;
+import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
+import org.springframework.batch.core.configuration.support.MapJobRegistry;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.builder.JobBuilder;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.builder.StepBuilder;
+import org.springframework.batch.repeat.RepeatStatus;
+import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.batch.autoconfigure.BatchAutoConfiguration;
+import org.springframework.boot.batch.autoconfigure.BatchProperties;
 import org.springframework.boot.batch.autoconfigure.JobLauncherApplicationRunner;
 import org.springframework.boot.jdbc.autoconfigure.EmbeddedDataSourceConfiguration;
 import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.batch.core.job.Job;
-import org.springframework.batch.core.job.builder.JobBuilder;
-import org.springframework.batch.core.step.builder.StepBuilder;
-import org.springframework.batch.core.configuration.JobRegistry;
-import org.springframework.batch.core.configuration.support.MapJobRegistry;
-import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.boot.batch.autoconfigure.BatchProperties;
-import org.springframework.batch.repeat.RepeatStatus;
-import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.cloud.task.batch.handler.TaskJobLauncherApplicationRunner;
-import org.springframework.cloud.task.batch.listener.TaskBatchExecutionListenerTests;
 import org.springframework.cloud.task.configuration.SimpleTaskAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
-import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.test.util.ReflectionTestUtils;
+import org.springframework.transaction.PlatformTransactionManager;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/package-info.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Observation support for Spring Cloud Task configuration.
  */
-package org.springframework.cloud.task.configuration.observation;
+package org.springframework.cloud.task.configuration.observation;
diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/annotation/package-info.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/annotation/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Annotation-based listener support for Spring Cloud Task.
  */
-package org.springframework.cloud.task.listener.annotation;
+package org.springframework.cloud.task.listener.annotation;
diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/package-info.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Task lifecycle listener support for Spring Cloud Task.
  */
-package org.springframework.cloud.task.listener;
+package org.springframework.cloud.task.listener;
diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/database/package-info.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/database/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Database-specific components for Spring Cloud Task repository.
  */
-package org.springframework.cloud.task.repository.database;
+package org.springframework.cloud.task.repository.database;
diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/database/support/package-info.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/database/support/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Support classes for database-specific Spring Cloud Task repository implementations.
  */
-package org.springframework.cloud.task.repository.database.support;
+package org.springframework.cloud.task.repository.database.support;
diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/package-info.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Core repository interfaces and classes for Spring Cloud Task.
  */
-package org.springframework.cloud.task.repository;
+package org.springframework.cloud.task.repository;
diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/observation/ObservationIntegrationTests.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/observation/ObservationIntegrationTests.java
@@ -39,10 +39,10 @@
 import org.springframework.boot.micrometer.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration;
 import org.springframework.boot.micrometer.metrics.autoconfigure.MetricsAutoConfiguration;
 import org.springframework.boot.micrometer.observation.autoconfigure.ObservationAutoConfiguration;
-import org.springframework.boot.test.autoconfigure.actuate.observability.AutoConfigureObservability;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.micrometer.tracing.autoconfigure.BraveAutoConfiguration;
 import org.springframework.boot.micrometer.tracing.autoconfigure.MicrometerTracingAutoConfiguration;
+import org.springframework.boot.test.autoconfigure.actuate.observability.AutoConfigureObservability;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.zipkin.autoconfigure.ZipkinAutoConfiguration;
 import org.springframework.cloud.task.configuration.EnableTask;
 import org.springframework.cloud.task.configuration.SimpleTaskAutoConfiguration;
diff --git a/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/batch/listener/package-info.java b/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/batch/listener/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Stream-based batch listener components for Spring Cloud Task.
  */
-package org.springframework.cloud.task.batch.listener;
+package org.springframework.cloud.task.batch.listener;
diff --git a/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/batch/listener/support/package-info.java b/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/batch/listener/support/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Support classes for stream-based batch listener components in Spring Cloud Task.
  */
-package org.springframework.cloud.task.batch.listener.support;
+package org.springframework.cloud.task.batch.listener.support;
diff --git a/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/listener/package-info.java b/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/listener/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Stream-based task lifecycle listener support for Spring Cloud Task.
  */
-package org.springframework.cloud.task.listener;
+package org.springframework.cloud.task.listener;
