Added checkstyle

spring-cloud · Feb 3, 2019 · 60f1e21 · 60f1e21
1 parent 4d0acf1
commit 60f1e21
Show file tree

Hide file tree

Showing 249 changed files with 7,425 additions and 5,832 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,14 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = tab
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+
+[*.yml]
+indent_style = space
+indent_size = 2
diff --git a/.settings.xml b/.settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ /*
-  ~  * Copyright 2015 the original author or authors.
+  ~  * Copyright 2015-2019 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.
@@ -34,7 +34,9 @@
 				this settings file, or copy the profile into their ~/.m2/settings.xml.
 			-->
 			<id>spring</id>
-			<activation><activeByDefault>true</activeByDefault></activation>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
 			<repositories>
 				<repository>
 					<id>spring-snapshots</id>

diff --git a/.springformat b/.springformat
diff --git a/pom.xml b/pom.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.1.1.RELEASE</version>
-		<relativePath />
+		<version>2.1.3.BUILD-SNAPSHOT</version>
+		<relativePath/>
 	</parent>
 
 	<groupId>org.springframework.cloud</groupId>
@@ -126,15 +128,24 @@
 	<properties>
 		<spring-cloud-stream.version>2.1.0.RELEASE</spring-cloud-stream.version>
 		<spring-cloud-deployer.version>2.0.0.RELEASE</spring-cloud-deployer.version>
-		<spring-cloud-deployer-local.version>2.0.0.RELEASE</spring-cloud-deployer-local.version>
-		<spring-cloud-stream-binder-rabbit.version>2.1.0.RELEASE</spring-cloud-stream-binder-rabbit.version>
+		<spring-cloud-deployer-local.version>2.0.0.RELEASE
+		</spring-cloud-deployer-local.version>
+		<spring-cloud-stream-binder-rabbit.version>2.1.0.RELEASE
+		</spring-cloud-stream-binder-rabbit.version>
 		<spring-batch.version>4.1.1.RELEASE</spring-batch.version>
 		<commons-logging.version>1.1</commons-logging.version>
 		<java-ee-api.version>8.0</java-ee-api.version>
 		<junit.version>5.3.1</junit.version>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco-ut.exec</sonar.jacoco.reportPath>
+		<sonar.jacoco.reportPath>
+			${project.build.directory}/coverage-reports/jacoco-ut.exec
+		</sonar.jacoco.reportPath>
+		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
+		<maven-checkstyle-plugin.failsOnViolation>true
+		</maven-checkstyle-plugin.failsOnViolation>
+		<maven-checkstyle-plugin.includeTestSourceDirectory>true
+		</maven-checkstyle-plugin.includeTestSourceDirectory>
 	</properties>
 
 	<build>
@@ -211,7 +222,9 @@
 						</goals>
 						<configuration>
 							<!-- Sets the path to the file which contains the execution data. -->
-							<destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
+							<destFile>
+								${project.build.directory}/coverage-reports/jacoco-ut.exec
+							</destFile>
 							<!--
 								Sets the name of the property containing the settings
 								for JaCoCo runtime agent.
@@ -231,15 +244,38 @@
 						</goals>
 						<configuration>
 							<!-- Sets the path to the file which contains the execution data. -->
-							<dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
+							<dataFile>
+								${project.build.directory}/coverage-reports/jacoco-ut.exec
+							</dataFile>
 							<!-- Sets the output directory for the code coverage report. -->
-							<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+							<outputDirectory>
+								${project.reporting.outputDirectory}/jacoco-ut
+							</outputDirectory>
 						</configuration>
 					</execution>
 				</executions>
 			</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>
+			</plugin>
 		</plugins>
 	</build>
+
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</reporting>
+
 	<profiles>
 		<profile>
 			<id>spring</id>

diff --git a/spring-cloud-starter-task/pom.xml b/spring-cloud-starter-task/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/spring-cloud-task-batch/pom.xml b/spring-cloud-task-batch/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 
@@ -12,7 +14,8 @@
 	<artifactId>spring-cloud-task-batch</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Cloud Task Batch</name>
-	<description>Module for use when combining Spring Cloud Task with Spring Batch</description>
+	<description>Module for use when combining Spring Cloud Task with Spring Batch
+	</description>
 
 	<dependencies>
 		<dependency>
@@ -79,7 +82,7 @@
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
 			<scope>test</scope>
-        </dependency>
+		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>

diff --git a/...n/java/org/springframework/cloud/task/batch/configuration/TaskBatchAutoConfiguration.java b/...n/java/org/springframework/cloud/task/batch/configuration/TaskBatchAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2015-2019 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.cloud.task.batch.configuration;
 
 import org.springframework.batch.core.Job;
@@ -38,8 +39,9 @@
  * @author Michael Minella
  */
 @Configuration
-@ConditionalOnBean({Job.class})
-@ConditionalOnProperty(name = {"spring.cloud.task.batch.listener.enable", "spring.cloud.task.batch.listener.enabled"}, havingValue = "true", matchIfMissing = true)
+@ConditionalOnBean({ Job.class })
+@ConditionalOnProperty(name = { "spring.cloud.task.batch.listener.enable",
+		"spring.cloud.task.batch.listener.enabled" }, havingValue = "true", matchIfMissing = true)
 public class TaskBatchAutoConfiguration {
 
 	@Bean
@@ -48,6 +50,9 @@ public TaskBatchExecutionListenerBeanPostProcessor batchTaskExecutionListenerBea
 		return new TaskBatchExecutionListenerBeanPostProcessor();
 	}
 
+	/**
+	 * Auto configuration for Task Batch Execution Listener.
+	 */
 	@Configuration
 	@ConditionalOnMissingBean(name = "taskBatchExecutionListener")
 	@EnableConfigurationProperties(TaskProperties.class)
@@ -60,20 +65,23 @@ public static class TaskBatchExecutionListenerAutoconfiguration {
 		private TaskProperties taskProperties;
 
 		@Bean
-		public TaskBatchExecutionListenerFactoryBean taskBatchExecutionListener(TaskExplorer taskExplorer) {
+		public TaskBatchExecutionListenerFactoryBean taskBatchExecutionListener(
+				TaskExplorer taskExplorer) {
 			TaskConfigurer taskConfigurer = null;
-			if(!this.context.getBeansOfType(TaskConfigurer.class).isEmpty()) {
+			if (!this.context.getBeansOfType(TaskConfigurer.class).isEmpty()) {
 				taskConfigurer = this.context.getBean(TaskConfigurer.class);
 			}
-			if(taskConfigurer != null && taskConfigurer.getTaskDataSource() != null) {
+			if (taskConfigurer != null && taskConfigurer.getTaskDataSource() != null) {
 				return new TaskBatchExecutionListenerFactoryBean(
-						taskConfigurer.getTaskDataSource(),
-						taskExplorer, taskProperties.getTablePrefix());
+						taskConfigurer.getTaskDataSource(), taskExplorer,
+						this.taskProperties.getTablePrefix());
 			}
 			else {
-				return new TaskBatchExecutionListenerFactoryBean(null,
-						taskExplorer, taskProperties.getTablePrefix());
+				return new TaskBatchExecutionListenerFactoryBean(null, taskExplorer,
+						this.taskProperties.getTablePrefix());
 			}
 		}
+
 	}
+
 }
diff --git a/...framework/cloud/task/batch/configuration/TaskBatchExecutionListenerBeanPostProcessor.java b/...framework/cloud/task/batch/configuration/TaskBatchExecutionListenerBeanPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2015-2019 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.cloud.task.batch.configuration;
 
 import java.util.ArrayList;
@@ -28,7 +29,7 @@
 
 /**
  * Injects a configured {@link TaskBatchExecutionListener} into any batch jobs (beans
- * assignable to {@link AbstractJob}) that are executed within the scope of a task.  The
+ * assignable to {@link AbstractJob}) that are executed within the scope of a task. The
  * context this is used within is expected to have only one bean of type
  * {@link TaskBatchExecutionListener}.
  *
@@ -50,17 +51,17 @@ public Object postProcessBeforeInitialization(Object bean, String beanName)
 	@Override
 	public Object postProcessAfterInitialization(Object bean, String beanName)
 			throws BeansException {
-		if(jobNames.size() > 0 && !jobNames.contains(beanName)) {
-				return bean;
+		if (this.jobNames.size() > 0 && !this.jobNames.contains(beanName)) {
+			return bean;
 		}
 		int length = this.applicationContext
 				.getBeanNamesForType(TaskBatchExecutionListener.class).length;
 
-		if(bean instanceof AbstractJob) {
-			if(length != 1) {
-				throw new IllegalStateException("The application context is required to " +
-						"have exactly 1 instance of the TaskBatchExecutionListener but has " +
-						length);
+		if (bean instanceof AbstractJob) {
+			if (length != 1) {
+				throw new IllegalStateException("The application context is required to "
+						+ "have exactly 1 instance of the TaskBatchExecutionListener but has "
+						+ length);
 			}
 			((AbstractJob) bean).registerJobExecutionListener(
 					this.applicationContext.getBean(TaskBatchExecutionListener.class));
@@ -73,4 +74,5 @@ public void setJobNames(List<String> jobNames) {
 
 		this.jobNames = jobNames;
 	}
+
 }