Merge branch '2.0.x'

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java

@@ -237,8 +237,9 @@ public class JerseyAutoConfiguration implements ServletContextAware {
 				final ObjectMapper objectMapper) {
 			addJaxbAnnotationIntrospectorIfPresent(objectMapper);
 			return (ResourceConfig config) -> {
-				config.register(JacksonFeature.class);
+				JerseyAutoConfiguration.this.config.register(JacksonFeature.class);
-				config.register(new ObjectMapperContextResolver(objectMapper),
+				JerseyAutoConfiguration.this.config.register(
+						new ObjectMapperContextResolver(objectMapper),
 						ContextResolver.class);
 			};
 		}

spring-boot-project/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml

@@ -5,8 +5,7 @@
 <suppressions>
 	<suppress files="SpringApplicationTests\.java" checks="FinalClass" />
 	<suppress files=".+Configuration\.java" checks="HideUtilityClassConstructor" />
-	<suppress files="LaunchScriptTestApplication\.java" checks="HideUtilityClassConstructor" />
+	<suppress files=".+Application\.java" checks="HideUtilityClassConstructor" />
-	<suppress files="DevToolsTestApplication\.java" checks="HideUtilityClassConstructor" />
 	<suppress files="SignalUtils\.java" checks="IllegalImport" />
 	<suppress files="[\\/]src[\\/]test[\\/]java[\\/]cli[\\/]command[\\/]" checks="ImportControl" />
 	<suppress files="[\\/]src[\\/]main[\\/]java[\\/]sample[\\/]" checks="ImportControl" />
@@ -23,4 +22,8 @@
 	<suppress files="LogLevel\.java" checks="JavadocVariable" />
 	<suppress files="HelpMojo\.java" checks=".*"/>
 	<suppress files="[\\/]org.springframework.boot.configurationprocessor.json[\\/].*\.java$" checks=".*"/>
+	<suppress files="TripType\.java" checks="JavadocVariable" />
+	<suppress files="Rating\.java" checks="JavadocVariable" />
+	<suppress files="Direction\.java" checks="JavadocVariable" />
+	<suppress files="JooqExamples\.java" checks="AvoidStaticImport"/>
 </suppressions>

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/ZipCompression.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.

spring-boot-samples/spring-boot-sample-ant/src/test/java/sample/ant/SampleAntApplicationIT.java

@@ -16,17 +16,18 @@
 
 package sample.ant;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import java.io.File;
 import java.io.FileFilter;
 import java.io.InputStreamReader;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
+
 import org.springframework.boot.loader.tools.JavaExecutable;
 import org.springframework.util.FileCopyUtils;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * Integration Tests for {@code SampleAntApplication}.
  *

spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/SampleAtmosphereApplication.java

@@ -59,6 +59,10 @@ public class SampleAtmosphereApplication {
 		return registration;
 	}
 
+	public static void main(String[] args) throws Exception {
+		SpringApplication.run(SampleAtmosphereApplication.class, args);
+	}
+
 	@Configuration
 	static class MvcConfiguration implements WebMvcConfigurer {
 
@@ -79,8 +83,4 @@ public class SampleAtmosphereApplication {
 
 	}
 
-	public static void main(String[] args) {
-		SpringApplication.run(SampleAtmosphereApplication.class, args);
-	}
-
 }

spring-boot-samples/spring-boot-sample-cache/src/main/java/sample/cache/SampleClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -53,7 +53,7 @@ class SampleClient {
 
 	private final Random random;
 
-	public SampleClient(CountryRepository countryService) {
+	SampleClient(CountryRepository countryService) {
 		this.countryService = countryService;
 		this.random = new Random();
 	}

spring-boot-samples/spring-boot-sample-custom-layout/src/main/java/sample/layout/SampleLayout.java

@@ -24,6 +24,8 @@ import org.springframework.boot.loader.tools.Layouts;
 import org.springframework.boot.loader.tools.LoaderClassesWriter;
 
 /**
+ * An example layout.
+ *
  * @author Phillip Webb
  */
 public class SampleLayout extends Layouts.Jar implements CustomLoaderLayout {

spring-boot-samples/spring-boot-sample-data-cassandra/src/main/java/sample/data/cassandra/CustomerRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -24,9 +24,9 @@ import org.springframework.data.repository.CrudRepository;
 public interface CustomerRepository extends CrudRepository<Customer, String> {
 
 	@Query("Select * from customer where firstname=?0")
-	public Customer findByFirstName(String firstName);
+	Customer findByFirstName(String firstName);
 
 	@Query("Select * from customer where lastname=?0")
-	public List<Customer> findByLastName(String lastName);
+	List<Customer> findByLastName(String lastName);
 
 }

spring-boot-samples/spring-boot-sample-data-elasticsearch/src/main/java/sample/data/elasticsearch/CustomerRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -22,8 +22,8 @@ import org.springframework.data.elasticsearch.repository.ElasticsearchRepository
 
 public interface CustomerRepository extends ElasticsearchRepository<Customer, String> {
 
-	public Customer findByFirstName(String firstName);
+	Customer findByFirstName(String firstName);
 
-	public List<Customer> findByLastName(String lastName);
+	List<Customer> findByLastName(String lastName);
 
 }

spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityServiceImpl.java

@@ -34,8 +34,7 @@ class CityServiceImpl implements CityService {
 
 	private final HotelRepository hotelRepository;
 
-	public CityServiceImpl(CityRepository cityRepository,
+	CityServiceImpl(CityRepository cityRepository, HotelRepository hotelRepository) {
-			HotelRepository hotelRepository) {
 		this.cityRepository = cityRepository;
 		this.hotelRepository = hotelRepository;
 	}

spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelServiceImpl.java

@@ -41,8 +41,7 @@ class HotelServiceImpl implements HotelService {
 
 	private final ReviewRepository reviewRepository;
 
-	public HotelServiceImpl(HotelRepository hotelRepository,
+	HotelServiceImpl(HotelRepository hotelRepository, ReviewRepository reviewRepository) {
-			ReviewRepository reviewRepository) {
 		this.hotelRepository = hotelRepository;
 		this.reviewRepository = reviewRepository;
 	}
@@ -82,7 +81,7 @@ class HotelServiceImpl implements HotelService {
 
 		private final Map<Rating, Long> ratingCount;
 
-		public ReviewsSummaryImpl(List<RatingCount> ratingCounts) {
+		ReviewsSummaryImpl(List<RatingCount> ratingCounts) {
 			this.ratingCount = new HashMap<>();
 			for (RatingCount ratingCount : ratingCounts) {
 				this.ratingCount.put(ratingCount.getRating(), ratingCount.getCount());
@@ -92,7 +91,7 @@ class HotelServiceImpl implements HotelService {
 		@Override
 		public long getNumberOfReviewsWithRating(Rating rating) {
 			Long count = this.ratingCount.get(rating);
-			return count == null ? 0 : count;
+			return (count != null ? count : 0);
 		}
 
 	}

spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/sample/data/mongo/Customer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -24,6 +24,7 @@ public class Customer {
 	private String id;
 
 	private String firstName;
+
 	private String lastName;
 
 	public Customer() {
@@ -36,8 +37,8 @@ public class Customer {
 
 	@Override
 	public String toString() {
-		return String.format("Customer[id=%s, firstName='%s', lastName='%s']", id,
+		return String.format("Customer[id=%s, firstName='%s', lastName='%s']", this.id,
-				firstName, lastName);
+				this.firstName, this.lastName);
 	}
 
 }

spring-boot-samples/spring-boot-sample-data-neo4j/src/main/java/sample/data/neo4j/Customer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -28,6 +28,7 @@ public class Customer {
 	private Long id;
 
 	private String firstName;
+
 	private String lastName;
 
 	public Customer() {

spring-boot-samples/spring-boot-sample-data-neo4j/src/main/java/sample/data/neo4j/CustomerRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -22,8 +22,8 @@ import org.springframework.data.neo4j.repository.Neo4jRepository;
 
 public interface CustomerRepository extends Neo4jRepository<Customer, Long> {
 
-	public Customer findByFirstName(String firstName);
+	Customer findByFirstName(String firstName);
 
-	public List<Customer> findByLastName(String lastName);
+	List<Customer> findByLastName(String lastName);
 
 }

spring-boot-samples/spring-boot-sample-data-neo4j/src/test/java/sample/data/neo4j/SampleNeo4jApplicationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -22,7 +22,7 @@ import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;
 
 import org.springframework.boot.test.rule.OutputCapture;
 
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Tests for {@link SampleNeo4jApplication}.
@@ -45,8 +45,7 @@ public class SampleNeo4jApplicationTests {
 			}
 		}
 		String output = this.outputCapture.toString();
-		assertTrue("Wrong output: " + output,
+		assertThat(output).contains("firstName='Alice', lastName='Smith'");
-				output.contains("firstName='Alice', lastName='Smith'"));
 	}
 
 	private boolean neo4jServerRunning(Throwable ex) {

spring-boot-samples/spring-boot-sample-devtools/src/main/java/sample/devtools/Message.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -16,8 +16,14 @@
 
 package sample.devtools;
 
-public class Message {
+public final class Message {
 
+	/**
+	 * Sample message.
+	 */
 	public static String MESSAGE = "Message";
 
+	private Message() {
+	}
+
 }

spring-boot-samples/spring-boot-sample-flyway/src/main/java/sample/flyway/Person.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -23,11 +23,14 @@ import javax.persistence.SequenceGenerator;
 
 @Entity
 public class Person {
+
 	@Id
 	@SequenceGenerator(name = "person_generator", sequenceName = "person_sequence", allocationSize = 1)
 	@GeneratedValue(generator = "person_generator")
 	private Long id;
+
 	private String firstName;
+
 	private String lastName;
 
 	public String getFirstName() {
@@ -51,4 +54,5 @@ public class Person {
 		return "Person [firstName=" + this.firstName + ", lastName=" + this.lastName
 				+ "]";
 	}
+
 }

spring-boot-samples/spring-boot-sample-integration/src/test/java/sample/integration/consumer/SampleIntegrationApplicationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -119,4 +119,5 @@ public class SampleIntegrationApplicationTests {
 		}
 		return candidates;
 	}
+
 }

spring-boot-samples/spring-boot-sample-jooq/src/main/java/sample/jooq/JooqExamples.java

@@ -76,4 +76,5 @@ public class JooqExamples implements CommandLineRunner {
 				});
 		System.out.println("jOOQ SQL " + list);
 	}
+
 }

spring-boot-samples/spring-boot-sample-liquibase/src/test/java/sample/liquibase/SampleLiquibaseApplicationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -68,4 +68,5 @@ public class SampleLiquibaseApplicationTests {
 		}
 		return false;
 	}
+
 }

spring-boot-samples/spring-boot-sample-oauth2-client/src/main/java/sample/oauth2/client/SampleOAuth2ClientApplication.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.

spring-boot-samples/spring-boot-sample-oauth2-client/src/test/java/sample/oauth2/client/SampleOAuth2ClientApplicationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.

spring-boot-samples/spring-boot-sample-parent-context/src/main/java/sample/parent/SampleParentContextApplication.java

@@ -36,6 +36,11 @@ import org.springframework.integration.file.FileWritingMessageHandler;
 @EnableConfigurationProperties(ServiceProperties.class)
 public class SampleParentContextApplication {
 
+	public static void main(String[] args) throws Exception {
+		new SpringApplicationBuilder(Parent.class)
+				.child(SampleParentContextApplication.class).run(args);
+	}
+
 	@EnableAutoConfiguration
 	protected static class Parent {
 
@@ -83,9 +88,4 @@ public class SampleParentContextApplication {
 
 	}
 
-	public static void main(String[] args) {
-		new SpringApplicationBuilder(Parent.class)
-				.child(SampleParentContextApplication.class).run(args);
-	}
-
 }

spring-boot-samples/spring-boot-sample-parent-context/src/test/java/sample/parent/consumer/SampleIntegrationParentApplicationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -99,4 +99,5 @@ public class SampleIntegrationParentApplicationTests {
 		}
 		return builder.toString();
 	}
+
 }

spring-boot-samples/spring-boot-sample-profile/src/main/java/sample/profile/service/MessageService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -16,9 +16,6 @@
 
 package sample.profile.service;
 
-/**
- * @author Dave Syer
- */
 public interface MessageService {
 
 	String getMessage();

spring-boot-samples/spring-boot-sample-quartz/src/main/java/sample/quartz/SampleJob.java

@@ -1,5 +1,9 @@
 /*
+<<<<<<< HEAD:spring-boot-samples/spring-boot-sample-quartz/src/main/java/sample/quartz/SampleJob.java
  * Copyright 2012-2017 the original author or authors.
+=======
+ * Copyright 2012-2018 the original author or authors.
+>>>>>>> local15x/1.5.x:spring-boot-samples/spring-boot-sample-hibernate4/src/main/java/sample/hibernate4/service/CitySearchCriteria.java
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-samples/spring-boot-sample-quartz/src/main/java/sample/quartz/SampleQuartzApplication.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.

spring-boot-samples/spring-boot-sample-secure/src/main/java/sample/secure/SampleService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -20,10 +20,6 @@ import org.springframework.security.access.annotation.Secured;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Service;
 
-/**
- * @author Dave Syer
- *
- */
 @Service
 public class SampleService {
 

spring-boot-samples/spring-boot-sample-secure/src/test/java/sample/secure/SampleSecureApplicationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.

spring-boot-samples/spring-boot-sample-servlet/src/test/java/sample/servlet/SampleServletApplicationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -67,4 +67,5 @@ public class SampleServletApplicationTests {
 	private String getPassword() {
 		return "password";
 	}
+
 }

spring-boot-samples/spring-boot-sample-test/src/main/java/sample/test/service/VehicleIdentificationNumberNotFoundException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -25,7 +25,7 @@ import sample.test.domain.VehicleIdentificationNumber;
  */
 public class VehicleIdentificationNumberNotFoundException extends RuntimeException {
 
-	private VehicleIdentificationNumber vehicleIdentificationNumber;
+	private final VehicleIdentificationNumber vehicleIdentificationNumber;
 
 	public VehicleIdentificationNumberNotFoundException(VehicleIdentificationNumber vin) {
 		this(vin, null);
@@ -40,4 +40,5 @@ public class VehicleIdentificationNumberNotFoundException extends RuntimeExcepti
 	public VehicleIdentificationNumber getVehicleIdentificationNumber() {
 		return this.vehicleIdentificationNumber;
 	}
+
 }

spring-boot-samples/spring-boot-sample-test/src/main/java/sample/test/web/UserNameNotFoundException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.ResponseStatus;
 @ResponseStatus(HttpStatus.NOT_FOUND)
 public class UserNameNotFoundException extends RuntimeException {
 
-	private String username;
+	private final String username;
 
 	public UserNameNotFoundException(String username) {
 		this.username = username;

spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/main/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplication.java

@@ -25,7 +25,7 @@ import org.springframework.boot.web.servlet.server.ServletWebServerFactory;
 import org.springframework.context.annotation.Bean;
 
 /**
- * Sample Application to show Tomcat running two connectors
+ * Sample Application to show Tomcat running two connectors.
  *
  * @author Brock Mills
  * @author Andy Wilkinson

spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/test/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplicationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.

spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -52,6 +52,13 @@ public class NonAutoConfigurationSampleTomcatApplicationTests {
 	@Autowired
 	private TestRestTemplate restTemplate;
 
+	@Test
+	public void testHome() throws Exception {
+		ResponseEntity<String> entity = this.restTemplate.getForEntity("/", String.class);
+		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
+		assertThat(entity.getBody()).isEqualTo("Hello World");
+	}
+
 	@Configuration
 	@Import({ ServletWebServerFactoryAutoConfiguration.class,
 			DispatcherServletAutoConfiguration.class, WebMvcAutoConfiguration.class,
@@ -67,11 +74,4 @@ public class NonAutoConfigurationSampleTomcatApplicationTests {
 
 	}
 
-	@Test
-	public void testHome() {
-		ResponseEntity<String> entity = this.restTemplate.getForEntity("/", String.class);
-		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
-		assertThat(entity.getBody()).isEqualTo("Hello World");
-	}
-
 }

spring-boot-samples/spring-boot-sample-traditional/src/main/java/sample/traditional/config/WebConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -55,4 +55,5 @@ public class WebConfig implements WebMvcConfigurer {
 			DefaultServletHandlerConfigurer configurer) {
 		configurer.enable();
 	}
+
 }

spring-boot-samples/spring-boot-sample-war/src/main/java/sample/war/SampleWarApplication.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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,11 +21,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.PropertySource;
 
-/**
- * Sample WAR application
- */
 @SpringBootApplication
-@PropertySource(value = { "WEB-INF/custom.properties" })
+@PropertySource("WEB-INF/custom.properties")
 public class SampleWarApplication extends SpringBootServletInitializer {
 
 	public static void main(String[] args) {

spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/groovytemplates/Message.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.

spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/groovytemplates/MessageControllerWebTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -82,14 +82,10 @@ public class MessageControllerWebTests {
 
 		private final String regex;
 
-		public RegexMatcher(String regex) {
+		RegexMatcher(String regex) {
 			this.regex = regex;
 		}
 
-		public static org.hamcrest.Matcher<java.lang.String> matches(String regex) {
-			return new RegexMatcher(regex);
-		}
-
 		@Override
 		public boolean matchesSafely(String item) {
 			return Pattern.compile(this.regex).matcher(item).find();
@@ -106,6 +102,10 @@ public class MessageControllerWebTests {
 					.appendText(this.regex);
 		}
 
+		public static org.hamcrest.Matcher<java.lang.String> matches(String regex) {
+			return new RegexMatcher(regex);
+		}
+
 	}
 
 }

spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/security/method/SampleMethodSecurityApplication.java

@@ -42,20 +42,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 @EnableGlobalMethodSecurity(securedEnabled = true)
 public class SampleMethodSecurityApplication implements WebMvcConfigurer {
 
-	@Controller
-	protected static class HomeController {
-
-		@GetMapping("/")
-		@Secured("ROLE_ADMIN")
-		public String home(Map<String, Object> model) {
-			model.put("message", "Hello World");
-			model.put("title", "Hello Home");
-			model.put("date", new Date());
-			return "home";
-		}
-
-	}
-
 	@Override
 	public void addViewControllers(ViewControllerRegistry registry) {
 		registry.addViewController("/login").setViewName("login");
@@ -118,4 +104,18 @@ public class SampleMethodSecurityApplication implements WebMvcConfigurer {
 
 	}
 
+	@Controller
+	protected static class HomeController {
+
+		@GetMapping("/")
+		@Secured("ROLE_ADMIN")
+		public String home(Map<String, Object> model) {
+			model.put("message", "Hello World");
+			model.put("title", "Hello Home");
+			model.put("date", new Date());
+			return "home";
+		}
+
+	}
+
 }

spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/resources/application.properties

@@ -1,5 +1,4 @@
 spring.thymeleaf.cache: false
 logging.level.org.springframework.security: INFO
-
 spring.security.user.name=user
 spring.security.user.password=password

spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/application.properties

@@ -2,6 +2,5 @@ spring.thymeleaf.cache: false
 # demo only:
 logging.level.org.springframework.security: INFO
 logging.level.org.springframework.boot.actuate.audit.listener.AuditListener: DEBUG
-
 spring.security.user.name=user
 spring.security.user.password=password

spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/web/ui/InMemoryMessageRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -20,9 +20,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicLong;
 
-/**
- * @author Dave Syer
- */
 public class InMemoryMessageRepository implements MessageRepository {
 
 	private static AtomicLong counter = new AtomicLong();

spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/web/ui/Message.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -20,9 +20,6 @@ import java.util.Calendar;
 
 import javax.validation.constraints.NotEmpty;
 
-/**
- * @author Rob Winch
- */
 public class Message {
 
 	private Long id;

spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/web/ui/MessageRepository.java

@@ -1,21 +1,21 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2018 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
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * the License. You may obtain a copy of the License at
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * Unless required by applicable law or agreed to in writing, software
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * specific language governing permissions and limitations under the License.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package sample.web.ui;
 
-/**
- * @author Rob Winch
- */
 public interface MessageRepository {
 
 	Iterable<Message> findAll();

spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/web/ui/mvc/MessageController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -31,10 +31,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-/**
- * @author Rob Winch
- * @author Doo-Hwan Kwak
- */
 @Controller
 @RequestMapping("/")
 public class MessageController {
@@ -77,14 +73,14 @@ public class MessageController {
 		throw new RuntimeException("Expected exception in controller");
 	}
 
-	@GetMapping(value = "delete/{id}")
+	@GetMapping("delete/{id}")
 	public ModelAndView delete(@PathVariable("id") Long id) {
 		this.messageRepository.deleteMessage(id);
 		Iterable<Message> messages = this.messageRepository.findAll();
 		return new ModelAndView("messages/list", "messages", messages);
 	}
 
-	@GetMapping(value = "modify/{id}")
+	@GetMapping("modify/{id}")
 	public ModelAndView modifyForm(@PathVariable("id") Message message) {
 		return new ModelAndView("messages/form", "message", message);
 	}

spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/web/ui/MessageControllerWebTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -81,16 +81,13 @@ public class MessageControllerWebTests {
 	}
 
 	private static class RegexMatcher extends TypeSafeMatcher<String> {
+
 		private final String regex;
 
-		public RegexMatcher(String regex) {
+		RegexMatcher(String regex) {
 			this.regex = regex;
 		}
 
-		public static org.hamcrest.Matcher<java.lang.String> matches(String regex) {
-			return new RegexMatcher(regex);
-		}
-
 		@Override
 		public boolean matchesSafely(String item) {
 			return Pattern.compile(this.regex).matcher(item).find();
@@ -106,5 +103,11 @@ public class MessageControllerWebTests {
 			description.appendText("a string that matches regex: ")
 					.appendText(this.regex);
 		}
+
+		public static org.hamcrest.Matcher<java.lang.String> matches(String regex) {
+			return new RegexMatcher(regex);
 		}
+
+	}
+
 }

spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/echo/DefaultEchoService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2018 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,7 +21,7 @@ public class DefaultEchoService implements EchoService {
 	private final String echoFormat;
 
 	public DefaultEchoService(String echoFormat) {
-		this.echoFormat = (echoFormat != null) ? echoFormat : "%s";
+		this.echoFormat = (echoFormat != null ? echoFormat : "%s");
 	}
 
 	@Override

spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/reverse/ReverseWebSocketEndpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -30,4 +30,5 @@ public class ReverseWebSocketEndpoint {
 		session.getBasicRemote()
 				.sendText("Reversed: " + new StringBuilder(message).reverse());
 	}
+
 }

spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/Direction.java

@@ -1,10 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 2012-2018 the original author or authors.
- * contributor license agreements.  See the NOTICE file distributed with
+ *
- * this work for additional information regarding copyright ownership.
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * you may not use this file except in compliance with the License.
- * (the "License"); you may not use this file except in compliance with
+ * You may obtain a copy of the License at
- * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -18,5 +17,7 @@
 package samples.websocket.jetty.snake;
 
 public enum Direction {
+
 	NONE, NORTH, SOUTH, EAST, WEST
+
 }

spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/Location.java

@@ -1,10 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 2012-2018 the original author or authors.
- * contributor license agreements.  See the NOTICE file distributed with
+ *
- * this work for additional information regarding copyright ownership.
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * you may not use this file except in compliance with the License.
- * (the "License"); you may not use this file except in compliance with
+ * You may obtain a copy of the License at
- * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -19,11 +18,15 @@ package samples.websocket.jetty.snake;
 
 public class Location {
 
+	/**
+	 * The X location.
+	 */
 	public int x;
+
+	/**
+	 * The Y location.
+	 */
 	public int y;
-	public static final int GRID_SIZE = 10;
-	public static final int PLAYFIELD_HEIGHT = 480;
-	public static final int PLAYFIELD_WIDTH = 640;
 
 	public Location(int x, int y) {
 		this.x = x;
@@ -33,13 +36,13 @@ public class Location {
 	public Location getAdjacentLocation(Direction direction) {
 		switch (direction) {
 		case NORTH:
-			return new Location(this.x, this.y - Location.GRID_SIZE);
+			return new Location(this.x, this.y - SnakeUtils.GRID_SIZE);
 		case SOUTH:
-			return new Location(this.x, this.y + Location.GRID_SIZE);
+			return new Location(this.x, this.y + SnakeUtils.GRID_SIZE);
 		case EAST:
-			return new Location(this.x + Location.GRID_SIZE, this.y);
+			return new Location(this.x + SnakeUtils.GRID_SIZE, this.y);
 		case WEST:
-			return new Location(this.x - Location.GRID_SIZE, this.y);
+			return new Location(this.x - SnakeUtils.GRID_SIZE, this.y);
 		case NONE:
 			// fall through
 		default:
@@ -55,16 +58,13 @@ public class Location {
 		if (o == null || getClass() != o.getClass()) {
 			return false;
 		}
-
 		Location location = (Location) o;
-
 		if (this.x != location.x) {
 			return false;
 		}
 		if (this.y != location.y) {
 			return false;
 		}
-
 		return true;
 	}
 
@@ -74,4 +74,5 @@ public class Location {
 		result = 31 * result + this.y;
 		return result;
 	}
+
 }

spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/Snake.java

@@ -1,10 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 2012-2018 the original author or authors.
- * contributor license agreements.  See the NOTICE file distributed with
+ *
- * this work for additional information regarding copyright ownership.
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * you may not use this file except in compliance with the License.
- * (the "License"); you may not use this file except in compliance with
+ * You may obtain a copy of the License at
- * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -157,4 +156,5 @@ public class Snake {
 	public String getHexColor() {
 		return this.hexColor;
 	}
+
 }

spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/SnakeTimer.java

@@ -1,10 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 2012-2018 the original author or authors.
- * contributor license agreements.  See the NOTICE file distributed with
+ *
- * this work for additional information regarding copyright ownership.
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * you may not use this file except in compliance with the License.
- * (the "License"); you may not use this file except in compliance with
+ * You may obtain a copy of the License at
- * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -31,7 +30,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Sets up the timer for the multi-player snake game WebSocket example.
  */
-public class SnakeTimer {
+public final class SnakeTimer {
 
 	private static final long TICK_DELAY = 100;
 
@@ -43,6 +42,9 @@ public class SnakeTimer {
 
 	private static Timer gameTimer = null;
 
+	private SnakeTimer() {
+	}
+
 	public static void addSnake(Snake snake) {
 		synchronized (MONITOR) {
 			if (snakes.isEmpty()) {
@@ -112,4 +114,5 @@ public class SnakeTimer {
 			gameTimer.cancel();
 		}
 	}
+
 }

spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/SnakeUtils.java

@@ -1,10 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 2012-2018 the original author or authors.
- * contributor license agreements.  See the NOTICE file distributed with
+ *
- * this work for additional information regarding copyright ownership.
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * you may not use this file except in compliance with the License.
- * (the "License"); you may not use this file except in compliance with
+ * You may obtain a copy of the License at
- * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -20,14 +19,28 @@ package samples.websocket.jetty.snake;
 import java.awt.Color;
 import java.util.Random;
 
-public class SnakeUtils {
+public final class SnakeUtils {
 
+	/**
+	 * The width of the playfield.
+	 */
 	public static final int PLAYFIELD_WIDTH = 640;
+
+	/**
+	 * The height of the playfield.
+	 */
 	public static final int PLAYFIELD_HEIGHT = 480;
+
+	/**
+	 * The grid size.
+	 */
 	public static final int GRID_SIZE = 10;
 
 	private static final Random random = new Random();
 
+	private SnakeUtils() {
+	}
+
 	public static String getRandomHexColor() {
 		float hue = random.nextFloat();
 		// sat between 0.1 and 0.3

spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/SnakeWebSocketHandler.java

@@ -1,10 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 2012-2018 the original author or authors.
- * contributor license agreements.  See the NOTICE file distributed with
+ *
- * this work for additional information regarding copyright ownership.
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * you may not use this file except in compliance with the License.
- * (the "License"); you may not use this file except in compliance with
+ * You may obtain a copy of the License at
- * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -29,14 +28,12 @@ import org.springframework.web.socket.handler.TextWebSocketHandler;
 
 public class SnakeWebSocketHandler extends TextWebSocketHandler {
 
-	public static final int PLAYFIELD_WIDTH = 640;
-	public static final int PLAYFIELD_HEIGHT = 480;
-	public static final int GRID_SIZE = 10;
-
 	private static final AtomicInteger snakeIds = new AtomicInteger(0);
+
 	private static final Random random = new Random();
 
 	private final int id;
+
 	private Snake snake;
 
 	public static String getRandomHexColor() {
@@ -50,15 +47,15 @@ public class SnakeWebSocketHandler extends TextWebSocketHandler {
 	}
 
 	public static Location getRandomLocation() {
-		int x = roundByGridSize(random.nextInt(PLAYFIELD_WIDTH));
+		int x = roundByGridSize(random.nextInt(SnakeUtils.PLAYFIELD_WIDTH));
-		int y = roundByGridSize(random.nextInt(PLAYFIELD_HEIGHT));
+		int y = roundByGridSize(random.nextInt(SnakeUtils.PLAYFIELD_HEIGHT));
 		return new Location(x, y);
 	}
 
 	private static int roundByGridSize(int value) {
-		value = value + (GRID_SIZE / 2);
+		value = value + (SnakeUtils.GRID_SIZE / 2);
-		value = value / GRID_SIZE;
+		value = value / SnakeUtils.GRID_SIZE;
-		value = value * GRID_SIZE;
+		value = value * SnakeUtils.GRID_SIZE;
 		return value;
 	}
 
@@ -109,4 +106,5 @@ public class SnakeWebSocketHandler extends TextWebSocketHandler {
 		SnakeTimer.broadcast(
 				String.format("{'type': 'leave', 'id': %d}", Integer.valueOf(this.id)));
 	}
+
 }

spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/SampleWebSocketsApplicationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -130,6 +130,7 @@ public class SampleWebSocketsApplicationTests {
 		public GreetingService greetingService() {
 			return new SimpleGreetingService();
 		}
+
 	}
 
 }

spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/echo/DefaultEchoService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2018 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,7 +21,7 @@ public class DefaultEchoService implements EchoService {
 	private final String echoFormat;
 
 	public DefaultEchoService(String echoFormat) {
-		this.echoFormat = (echoFormat != null) ? echoFormat : "%s";
+		this.echoFormat = (echoFormat != null ? echoFormat : "%s");
 	}
 
 	@Override

spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/reverse/ReverseWebSocketEndpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -30,4 +30,5 @@ public class ReverseWebSocketEndpoint {
 		session.getBasicRemote()
 				.sendText("Reversed: " + new StringBuilder(message).reverse());
 	}
+
 }

spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/Direction.java

@@ -1,10 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 2012-2018 the original author or authors.
- * contributor license agreements.  See the NOTICE file distributed with
+ *
- * this work for additional information regarding copyright ownership.
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * you may not use this file except in compliance with the License.
- * (the "License"); you may not use this file except in compliance with
+ * You may obtain a copy of the License at
- * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -18,5 +17,7 @@
 package samples.websocket.tomcat.snake;
 
 public enum Direction {
+
 	NONE, NORTH, SOUTH, EAST, WEST
+
 }

spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/Location.java

@@ -1,10 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 2012-2018 the original author or authors.
- * contributor license agreements.  See the NOTICE file distributed with
+ *
- * this work for additional information regarding copyright ownership.
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * you may not use this file except in compliance with the License.
- * (the "License"); you may not use this file except in compliance with
+ * You may obtain a copy of the License at
- * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -19,11 +18,15 @@ package samples.websocket.tomcat.snake;
 
 public class Location {
 
+	/**
+	 * The X location.
+	 */
 	public int x;
+
+	/**
+	 * The Y location.
+	 */
 	public int y;
-	public static final int GRID_SIZE = 10;
-	public static final int PLAYFIELD_HEIGHT = 480;
-	public static final int PLAYFIELD_WIDTH = 640;
 
 	public Location(int x, int y) {
 		this.x = x;
@@ -33,13 +36,13 @@ public class Location {
 	public Location getAdjacentLocation(Direction direction) {
 		switch (direction) {
 		case NORTH:
-			return new Location(this.x, this.y - Location.GRID_SIZE);
+			return new Location(this.x, this.y - SnakeUtils.GRID_SIZE);
 		case SOUTH:
-			return new Location(this.x, this.y + Location.GRID_SIZE);
+			return new Location(this.x, this.y + SnakeUtils.GRID_SIZE);
 		case EAST:
-			return new Location(this.x + Location.GRID_SIZE, this.y);
+			return new Location(this.x + SnakeUtils.GRID_SIZE, this.y);
 		case WEST:
-			return new Location(this.x - Location.GRID_SIZE, this.y);
+			return new Location(this.x - SnakeUtils.GRID_SIZE, this.y);
 		case NONE:
 			// fall through
 		default:
@@ -55,16 +58,13 @@ public class Location {
 		if (o == null || getClass() != o.getClass()) {
 			return false;
 		}
-
 		Location location = (Location) o;
-
 		if (this.x != location.x) {
 			return false;
 		}
 		if (this.y != location.y) {
 			return false;
 		}
-
 		return true;
 	}
 
@@ -74,4 +74,5 @@ public class Location {
 		result = 31 * result + this.y;
 		return result;
 	}
+
 }

spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/Snake.java

@@ -1,10 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 2012-2018 the original author or authors.
- * contributor license agreements.  See the NOTICE file distributed with
+ *
- * this work for additional information regarding copyright ownership.
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * you may not use this file except in compliance with the License.
- * (the "License"); you may not use this file except in compliance with
+ * You may obtain a copy of the License at
- * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -157,4 +156,5 @@ public class Snake {
 	public String getHexColor() {
 		return this.hexColor;
 	}
+
 }

spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/SnakeTimer.java

@@ -1,10 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 2012-2018 the original author or authors.
- * contributor license agreements.  See the NOTICE file distributed with
+ *
- * this work for additional information regarding copyright ownership.
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * you may not use this file except in compliance with the License.
- * (the "License"); you may not use this file except in compliance with
+ * You may obtain a copy of the License at
- * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -25,24 +24,27 @@ import java.util.TimerTask;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.apache.juli.logging.Log;
+import org.slf4j.Logger;
-import org.apache.juli.logging.LogFactory;
+import org.slf4j.LoggerFactory;
 
 /**
  * Sets up the timer for the multi-player snake game WebSocket example.
  */
-public class SnakeTimer {
+public final class SnakeTimer {
 
 	private static final long TICK_DELAY = 100;
 
 	private static final Object MONITOR = new Object();
 
-	private static final Log log = LogFactory.getLog(SnakeTimer.class);
+	private static final Logger log = LoggerFactory.getLogger(SnakeTimer.class);
 
 	private static final ConcurrentHashMap<Integer, Snake> snakes = new ConcurrentHashMap<>();
 
 	private static Timer gameTimer = null;
 
+	private SnakeTimer() {
+	}
+
 	public static void addSnake(Snake snake) {
 		synchronized (MONITOR) {
 			if (snakes.isEmpty()) {
@@ -112,4 +114,5 @@ public class SnakeTimer {
 			gameTimer.cancel();
 		}
 	}
+
 }

spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/SnakeUtils.java

@@ -1,10 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 2012-2018 the original author or authors.
- * contributor license agreements.  See the NOTICE file distributed with
+ *
- * this work for additional information regarding copyright ownership.
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * you may not use this file except in compliance with the License.
- * (the "License"); you may not use this file except in compliance with
+ * You may obtain a copy of the License at
- * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -20,14 +19,28 @@ package samples.websocket.tomcat.snake;
 import java.awt.Color;
 import java.util.Random;
 
-public class SnakeUtils {
+public final class SnakeUtils {
 
+	/**
+	 * The width of the playfield.
+	 */
 	public static final int PLAYFIELD_WIDTH = 640;
+
+	/**
+	 * The height of the playfield.
+	 */
 	public static final int PLAYFIELD_HEIGHT = 480;
+
+	/**
+	 * The grid size.
+	 */
 	public static final int GRID_SIZE = 10;
 
 	private static final Random random = new Random();
 
+	private SnakeUtils() {
+	}
+
 	public static String getRandomHexColor() {
 		float hue = random.nextFloat();
 		// sat between 0.1 and 0.3

spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/SnakeWebSocketHandler.java

@@ -1,10 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 2012-2018 the original author or authors.
- * contributor license agreements.  See the NOTICE file distributed with
+ *
- * this work for additional information regarding copyright ownership.
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * you may not use this file except in compliance with the License.
- * (the "License"); you may not use this file except in compliance with
+ * You may obtain a copy of the License at
- * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -29,14 +28,12 @@ import org.springframework.web.socket.handler.TextWebSocketHandler;
 
 public class SnakeWebSocketHandler extends TextWebSocketHandler {
 
-	public static final int PLAYFIELD_WIDTH = 640;
-	public static final int PLAYFIELD_HEIGHT = 480;
-	public static final int GRID_SIZE = 10;
-
 	private static final AtomicInteger snakeIds = new AtomicInteger(0);
+
 	private static final Random random = new Random();
 
 	private final int id;
+
 	private Snake snake;
 
 	public static String getRandomHexColor() {
@@ -50,15 +47,15 @@ public class SnakeWebSocketHandler extends TextWebSocketHandler {
 	}
 
 	public static Location getRandomLocation() {
-		int x = roundByGridSize(random.nextInt(PLAYFIELD_WIDTH));
+		int x = roundByGridSize(random.nextInt(SnakeUtils.PLAYFIELD_WIDTH));
-		int y = roundByGridSize(random.nextInt(PLAYFIELD_HEIGHT));
+		int y = roundByGridSize(random.nextInt(SnakeUtils.PLAYFIELD_HEIGHT));
 		return new Location(x, y);
 	}
 
 	private static int roundByGridSize(int value) {
-		value = value + (GRID_SIZE / 2);
+		value = value + (SnakeUtils.GRID_SIZE / 2);
-		value = value / GRID_SIZE;
+		value = value / SnakeUtils.GRID_SIZE;
-		value = value * GRID_SIZE;
+		value = value * SnakeUtils.GRID_SIZE;
 		return value;
 	}
 
@@ -109,4 +106,5 @@ public class SnakeWebSocketHandler extends TextWebSocketHandler {
 		SnakeTimer.broadcast(
 				String.format("{'type': 'leave', 'id': %d}", Integer.valueOf(this.id)));
 	}
+
 }

spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/snake/SnakeTimerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -32,8 +32,8 @@ public class SnakeTimerTests {
 		Snake snake = mock(Snake.class);
 		willThrow(new IOException()).given(snake).sendMessage(anyString());
 		SnakeTimer.addSnake(snake);
-
 		SnakeTimer.broadcast("");
 		assertThat(SnakeTimer.getSnakes()).hasSize(0);
 	}
+
 }

spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/echo/DefaultEchoService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2018 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,7 +21,7 @@ public class DefaultEchoService implements EchoService {
 	private final String echoFormat;
 
 	public DefaultEchoService(String echoFormat) {
-		this.echoFormat = (echoFormat != null) ? echoFormat : "%s";
+		this.echoFormat = (echoFormat != null ? echoFormat : "%s");
 	}
 
 	@Override

spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/reverse/ReverseWebSocketEndpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -30,4 +30,5 @@ public class ReverseWebSocketEndpoint {
 		session.getBasicRemote()
 				.sendText("Reversed: " + new StringBuilder(message).reverse());
 	}
+
 }

spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/Direction.java

@@ -1,10 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 2012-2018 the original author or authors.
- * contributor license agreements.  See the NOTICE file distributed with
+ *
- * this work for additional information regarding copyright ownership.
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * you may not use this file except in compliance with the License.
- * (the "License"); you may not use this file except in compliance with
+ * You may obtain a copy of the License at
- * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -18,5 +17,7 @@
 package samples.websocket.undertow.snake;
 
 public enum Direction {
+
 	NONE, NORTH, SOUTH, EAST, WEST
+
 }

spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/Location.java

@@ -1,10 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 2012-2018 the original author or authors.
- * contributor license agreements.  See the NOTICE file distributed with
+ *
- * this work for additional information regarding copyright ownership.
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * you may not use this file except in compliance with the License.
- * (the "License"); you may not use this file except in compliance with
+ * You may obtain a copy of the License at
- * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -19,11 +18,15 @@ package samples.websocket.undertow.snake;
 
 public class Location {
 
+	/**
+	 * The X location.
+	 */
 	public int x;
+
+	/**
+	 * The Y location.
+	 */
 	public int y;
-	public static final int GRID_SIZE = 10;
-	public static final int PLAYFIELD_HEIGHT = 480;
-	public static final int PLAYFIELD_WIDTH = 640;
 
 	public Location(int x, int y) {
 		this.x = x;
@@ -33,13 +36,13 @@ public class Location {
 	public Location getAdjacentLocation(Direction direction) {
 		switch (direction) {
 		case NORTH:
-			return new Location(this.x, this.y - Location.GRID_SIZE);
+			return new Location(this.x, this.y - SnakeUtils.GRID_SIZE);
 		case SOUTH:
-			return new Location(this.x, this.y + Location.GRID_SIZE);
+			return new Location(this.x, this.y + SnakeUtils.GRID_SIZE);
 		case EAST:
-			return new Location(this.x + Location.GRID_SIZE, this.y);
+			return new Location(this.x + SnakeUtils.GRID_SIZE, this.y);
 		case WEST:
-			return new Location(this.x - Location.GRID_SIZE, this.y);
+			return new Location(this.x - SnakeUtils.GRID_SIZE, this.y);
 		case NONE:
 			// fall through
 		default:
@@ -55,16 +58,13 @@ public class Location {
 		if (o == null || getClass() != o.getClass()) {
 			return false;
 		}
-
 		Location location = (Location) o;
-
 		if (this.x != location.x) {
 			return false;
 		}
 		if (this.y != location.y) {
 			return false;
 		}
-
 		return true;
 	}
 
@@ -74,4 +74,5 @@ public class Location {
 		result = 31 * result + this.y;
 		return result;
 	}
+
 }

spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/Snake.java

@@ -1,10 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 2012-2018 the original author or authors.
- * contributor license agreements.  See the NOTICE file distributed with
+ *
- * this work for additional information regarding copyright ownership.
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * you may not use this file except in compliance with the License.
- * (the "License"); you may not use this file except in compliance with
+ * You may obtain a copy of the License at
- * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -157,4 +156,5 @@ public class Snake {
 	public String getHexColor() {
 		return this.hexColor;
 	}
+
 }

spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/SnakeTimer.java

@@ -1,10 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 2012-2018 the original author or authors.
- * contributor license agreements.  See the NOTICE file distributed with
+ *
- * this work for additional information regarding copyright ownership.
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * you may not use this file except in compliance with the License.
- * (the "License"); you may not use this file except in compliance with
+ * You may obtain a copy of the License at
- * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -31,7 +30,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Sets up the timer for the multi-player snake game WebSocket example.
  */
-public class SnakeTimer {
+public final class SnakeTimer {
 
 	private static final long TICK_DELAY = 100;
 
@@ -43,6 +42,9 @@ public class SnakeTimer {
 
 	private static Timer gameTimer = null;
 
+	private SnakeTimer() {
+	}
+
 	public static void addSnake(Snake snake) {
 		synchronized (MONITOR) {
 			if (snakes.isEmpty()) {
@@ -112,4 +114,5 @@ public class SnakeTimer {
 			gameTimer.cancel();
 		}
 	}
+
 }

spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/SnakeUtils.java

@@ -1,10 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 2012-2018 the original author or authors.
- * contributor license agreements.  See the NOTICE file distributed with
+ *
- * this work for additional information regarding copyright ownership.
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * you may not use this file except in compliance with the License.
- * (the "License"); you may not use this file except in compliance with
+ * You may obtain a copy of the License at
- * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -20,14 +19,28 @@ package samples.websocket.undertow.snake;
 import java.awt.Color;
 import java.util.Random;
 
-public class SnakeUtils {
+public final class SnakeUtils {
 
+	/**
+	 * The width of the playfield.
+	 */
 	public static final int PLAYFIELD_WIDTH = 640;
+
+	/**
+	 * The height of the playfield.
+	 */
 	public static final int PLAYFIELD_HEIGHT = 480;
+
+	/**
+	 * The grid size.
+	 */
 	public static final int GRID_SIZE = 10;
 
 	private static final Random random = new Random();
 
+	private SnakeUtils() {
+	}
+
 	public static String getRandomHexColor() {
 		float hue = random.nextFloat();
 		// sat between 0.1 and 0.3

spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/SnakeWebSocketHandler.java

@@ -1,10 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 2012-2018 the original author or authors.
- * contributor license agreements.  See the NOTICE file distributed with
+ *
- * this work for additional information regarding copyright ownership.
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * you may not use this file except in compliance with the License.
- * (the "License"); you may not use this file except in compliance with
+ * You may obtain a copy of the License at
- * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -29,14 +28,12 @@ import org.springframework.web.socket.handler.TextWebSocketHandler;
 
 public class SnakeWebSocketHandler extends TextWebSocketHandler {
 
-	public static final int PLAYFIELD_WIDTH = 640;
-	public static final int PLAYFIELD_HEIGHT = 480;
-	public static final int GRID_SIZE = 10;
-
 	private static final AtomicInteger snakeIds = new AtomicInteger(0);
+
 	private static final Random random = new Random();
 
 	private final int id;
+
 	private Snake snake;
 
 	public static String getRandomHexColor() {
@@ -50,15 +47,15 @@ public class SnakeWebSocketHandler extends TextWebSocketHandler {
 	}
 
 	public static Location getRandomLocation() {
-		int x = roundByGridSize(random.nextInt(PLAYFIELD_WIDTH));
+		int x = roundByGridSize(random.nextInt(SnakeUtils.PLAYFIELD_WIDTH));
-		int y = roundByGridSize(random.nextInt(PLAYFIELD_HEIGHT));
+		int y = roundByGridSize(random.nextInt(SnakeUtils.PLAYFIELD_HEIGHT));
 		return new Location(x, y);
 	}
 
 	private static int roundByGridSize(int value) {
-		value = value + (GRID_SIZE / 2);
+		value = value + (SnakeUtils.GRID_SIZE / 2);
-		value = value / GRID_SIZE;
+		value = value / SnakeUtils.GRID_SIZE;
-		value = value * GRID_SIZE;
+		value = value * SnakeUtils.GRID_SIZE;
 		return value;
 	}
 
@@ -109,4 +106,5 @@ public class SnakeWebSocketHandler extends TextWebSocketHandler {
 		SnakeTimer.broadcast(
 				String.format("{'type': 'leave', 'id': %d}", Integer.valueOf(this.id)));
 	}
+
 }

spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/snake/SnakeTimerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -32,8 +32,8 @@ public class SnakeTimerTests {
 		Snake snake = mock(Snake.class);
 		willThrow(new IOException()).given(snake).sendMessage(anyString());
 		SnakeTimer.addSnake(snake);
-
 		SnakeTimer.broadcast("");
 		assertThat(SnakeTimer.getSnakes()).hasSize(0);
 	}
+
 }