Merge branch '1.5.x' into 2.0.x

Author: philwebb

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

@@ -237,8 +237,9 @@ public ResourceConfigCustomizer resourceConfigCustomizer(
 				final ObjectMapper objectMapper) {
 			addJaxbAnnotationIntrospectorIfPresent(objectMapper);
 			return (ResourceConfig config) -> {
-				config.register(JacksonFeature.class);
-				config.register(new ObjectMapperContextResolver(objectMapper),
+				JerseyAutoConfiguration.this.config.register(JacksonFeature.class);
+				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="DevToolsTestApplication\.java" checks="HideUtilityClassConstructor" />
+	<suppress files=".+Application\.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-ant/src/test/resources/application.properties

@@ -1 +1 @@
-name: Phil
+name: Phil

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

@@ -1 +1 @@
-name: Phil
+name: Phil

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

@@ -59,6 +59,10 @@ public ServletRegistrationBean<AtmosphereServlet> atmosphereServlet() {
 		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 void onStartup(ServletContext servletContext) throws ServletException {
 
 	}
 
-	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.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 @@
 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 @@
 
 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,
-			HotelRepository hotelRepository) {
+	CityServiceImpl(CityRepository cityRepository, 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,
-			ReviewRepository reviewRepository) {
+	HotelServiceImpl(HotelRepository hotelRepository, ReviewRepository reviewRepository) {
 		this.hotelRepository = hotelRepository;
 		this.reviewRepository = reviewRepository;
 	}
@@ -82,7 +81,7 @@ private static class ReviewsSummaryImpl implements ReviewsSummary {
 
 		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 @@ public ReviewsSummaryImpl(List<RatingCount> ratingCounts) {
 		@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-jpa/src/test/resources/application-scratch.properties

@@ -1,2 +1,2 @@
 spring.datasource.name=scratchdb
-spring.jmx.default-domain=jpa.sample
+spring.jmx.default-domain=jpa.sample

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 Customer(String firstName, String lastName) {
 
 	@Override
 	public String toString() {
-		return String.format("Customer[id=%s, firstName='%s', lastName='%s']", id,
-				firstName, lastName);
+		return String.format("Customer[id=%s, firstName='%s', lastName='%s']", this.id,
+				this.firstName, this.lastName);
 	}
 
 }

spring-boot-samples/spring-boot-sample-data-mongodb/src/main/resources/application.properties

@@ -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/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.
@@ -22,8 +22,8 @@
 
 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/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,7 +22,7 @@
 
 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 void testDefaultSettings() {
 			}
 		}
 		String output = this.outputCapture.toString();
-		assertTrue("Wrong output: " + output,
-				output.contains("firstName='Alice', lastName='Smith'"));
+		assertThat(output).contains("firstName='Alice', lastName='Smith'");
 	}
 
 	private boolean neo4jServerRunning(Throwable ex) {

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

@@ -1 +1 @@
-spring.data.rest.base-path=/api
+spring.data.rest.base-path=/api

spring-boot-samples/spring-boot-sample-data-rest/src/main/resources/application.properties

@@ -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-devtools/src/main/java/sample/devtools/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.
@@ -23,11 +23,14 @@
 
 @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 String toString() {
 		return "Person [firstName=" + this.firstName + ", lastName=" + this.lastName
 				+ "]";
 	}
+
 }

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.
@@ -119,4 +119,5 @@ private Resource[] getResourcesWithContent() throws IOException {
 		}
 		return candidates;
 	}
+
 }

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

@@ -1,4 +1,4 @@
 server.port = 8443
 server.ssl.key-store = classpath:sample.jks
 server.ssl.key-store-password = secret
-server.ssl.key-password = password
+server.ssl.key-password = password

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

@@ -76,4 +76,5 @@ public String mapRow(ResultSet rs, int rowNum) throws SQLException {
 				});
 		System.out.println("jOOQ SQL " + list);
 	}
+
 }

spring-boot-samples/spring-boot-sample-jetty-ssl/src/main/resources/application.properties

@@ -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 @@ private boolean serverNotRunning(IllegalStateException ex) {
 		}
 		return false;
 	}
+
 }

spring-boot-samples/spring-boot-sample-jooq/src/main/java/sample/jooq/JooqExamples.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-liquibase/src/test/java/sample/liquibase/SampleLiquibaseApplicationTests.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.