Merge pull request #10636 from izeye:polish-20171014

snicoll · snicoll · commit 3e18213362aa · 2017-10-17T15:29:56.000+02:00
* pr/10636:
  Polish
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/EndpointEnablementProviderTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/EndpointEnablementProviderTests.java
@@ -153,7 +153,7 @@ public void defaultEnablementNeutralWithGeneralDisablement() {
 	}
 
 	@Test
-	public void defaultEnablementNeutralWebWithTechDisablement() {
+	public void defaultEnablementNeutralJmxWithTechDisablement() {
 		EndpointEnablement enablement = getEndpointEnablement("biz",
 				DefaultEnablement.NEUTRAL, EndpointExposure.JMX,
 				"endpoints.default.jmx.enabled=false");
@@ -177,7 +177,7 @@ public void defaultEnablementNeutralWebWithTechEnablement() {
 	}
 
 	@Test
-	public void defaultEnablementNeutralWebWithUnrelatedTechDisablement() {
+	public void defaultEnablementNeutralJmxWithUnrelatedTechDisablement() {
 		EndpointEnablement enablement = getEndpointEnablement("biz",
 				DefaultEnablement.NEUTRAL, EndpointExposure.JMX,
 				"endpoints.default.web.enabled=false");
@@ -235,20 +235,20 @@ public void defaultEnablementNeutralDefaultTechTakesPrecedenceOnGeneralDefault()
 	}
 
 	private EndpointEnablement getEndpointEnablement(String id,
-			DefaultEnablement enabledByDefault, String... environment) {
-		return getEndpointEnablement(id, enabledByDefault, null, environment);
+			DefaultEnablement defaultEnablement, String... environment) {
+		return getEndpointEnablement(id, defaultEnablement, null, environment);
 	}
 
 	private EndpointEnablement getEndpointEnablement(String id,
-			DefaultEnablement enabledByDefault, EndpointExposure exposure,
+			DefaultEnablement defaultEnablement, EndpointExposure exposure,
 			String... environment) {
 		MockEnvironment env = new MockEnvironment();
 		TestPropertyValues.of(environment).applyTo(env);
 		EndpointEnablementProvider provider = new EndpointEnablementProvider(env);
 		if (exposure != null) {
-			return provider.getEndpointEnablement(id, enabledByDefault, exposure);
+			return provider.getEndpointEnablement(id, defaultEnablement, exposure);
 		}
-		return provider.getEndpointEnablement(id, enabledByDefault);
+		return provider.getEndpointEnablement(id, defaultEnablement);
 	}
 
 	private void validate(EndpointEnablement enablement, boolean enabled,
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointAutoConfigurationTests.java
@@ -89,7 +89,7 @@ public void runShouldHaveStatusEndpointBeanEvenIfDefaultIsDisabled() {
 	}
 
 	@Test
-	public void runWhenEnabledPropertyIsFalseShouldNotHaveEndpointBean()
+	public void runWhenEnabledPropertyIsFalseShouldNotHaveStatusEndpointBean()
 			throws Exception {
 		this.contextRunner.withPropertyValues("endpoints.status.enabled:false").run(
 				(context) -> assertThat(context).doesNotHaveBean(StatusEndpoint.class));
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/WebFluxEndpointHandlerMapping.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/WebFluxEndpointHandlerMapping.java
@@ -108,7 +108,7 @@ public WebFluxEndpointHandlerMapping(EndpointMapping endpointMapping,
 	/**
 	 * Creates a new {@code WebEndpointHandlerMapping} that provides mappings for the
 	 * operations of the given {@code webEndpoints}.
-	 * @param endpointMapping the path beneath which all endpoints should be mapped
+	 * @param endpointMapping the base mapping for all endpoints
 	 * @param webEndpoints the web endpoints
 	 * @param endpointMediaTypes media types consumed and produced by the endpoints
 	 * @param corsConfiguration the CORS configuration for the endpoints
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/AnnotationEndpointDiscovererTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/AnnotationEndpointDiscovererTests.java
@@ -68,7 +68,7 @@ public void endpointIsDiscovered() {
 	}
 
 	@Test
-	public void endpointIsInParentContextIsDiscovered() {
+	public void endpointInParentContextIsDiscovered() {
 		AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext(
 				TestEndpointConfiguration.class);
 		loadWithParent(parent, EmptyConfiguration.class, hasTestEndpoint());
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientProperties.java
@@ -37,12 +37,12 @@ public class OAuth2ClientProperties {
 	/**
 	 * OAuth provider details.
 	 */
-	private Map<String, Provider> provider = new HashMap<>();
+	private final Map<String, Provider> provider = new HashMap<>();
 
 	/**
 	 * OAuth client registrations.
 	 */
-	private Map<String, Registration> registration = new HashMap<>();
+	private final Map<String, Registration> registration = new HashMap<>();
 
 	public Map<String, Provider> getProvider() {
 		return this.provider;
@@ -92,28 +92,28 @@ public static class Registration {
 		private String clientSecret;
 
 		/**
-		 * Client authentication method. May be left bank then using a pre-defined
+		 * Client authentication method. May be left blank then using a pre-defined
 		 * provider.
 		 */
 		private String clientAuthenticationMethod;
 
 		/**
-		 * Authorization grant type. May be left bank then using a pre-defined provider.
+		 * Authorization grant type. May be left blank then using a pre-defined provider.
 		 */
 		private String authorizationGrantType;
 
 		/**
-		 * Redirect URI. May be left bank then using a pre-defined provider.
+		 * Redirect URI. May be left blank then using a pre-defined provider.
 		 */
 		private String redirectUri;
 
 		/**
-		 * Authorization scopes. May be left bank then using a pre-defined provider.
+		 * Authorization scopes. May be left blank then using a pre-defined provider.
 		 */
 		private Set<String> scope;
 
 		/**
-		 * Client name. May be left bank then using a pre-defined provider.
+		 * Client name. May be left blank then using a pre-defined provider.
 		 */
 		private String clientName;
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/NonUniqueSessionRepositoryFailureAnalyzer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/NonUniqueSessionRepositoryFailureAnalyzer.java
@@ -20,7 +20,7 @@
 import org.springframework.boot.diagnostics.FailureAnalysis;
 
 /**
- * A {@link AbstractFailureAnalyzer} for {@link NonUniqueSessionRepositoryException}.
+ * An {@link AbstractFailureAnalyzer} for {@link NonUniqueSessionRepositoryException}.
  *
  * @author Stephane Nicoll
  */
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfigurationTests.java
@@ -29,9 +29,7 @@
 import org.apache.tomcat.jdbc.pool.DataSourceProxy;
 import org.apache.tomcat.jdbc.pool.jmx.ConnectionPool;
 import org.junit.After;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
 import org.springframework.boot.test.util.TestPropertyValues;
@@ -47,9 +45,6 @@
  */
 public class DataSourceJmxConfigurationTests {
 
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
-
 	private ConfigurableApplicationContext context;
 
 	@After
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactoryTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactoryTests.java
@@ -23,9 +23,7 @@
 import com.mongodb.ServerAddress;
 import com.mongodb.connection.Cluster;
 import com.mongodb.connection.ClusterSettings;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
@@ -45,9 +43,6 @@
  */
 public class MongoClientFactoryTests {
 
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
-
 	private MockEnvironment environment = new MockEnvironment();
 
 	@Test
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java
@@ -48,7 +48,7 @@ public void getClientRegistrationsWhenUsingDefinedProviderShouldAdapt()
 		provider.setAuthorizationUri("http://example.com/auth");
 		provider.setTokenUri("http://example.com/token");
 		provider.setUserInfoUri("http://example.com/info");
-		provider.setJwkSetUri("http://example.com/jkw");
+		provider.setJwkSetUri("http://example.com/jwk");
 		Registration registration = new Registration();
 		registration.setProvider("provider");
 		registration.setClientId("clientId");
@@ -69,7 +69,7 @@ public void getClientRegistrationsWhenUsingDefinedProviderShouldAdapt()
 		assertThat(adaptedProvider.getTokenUri()).isEqualTo("http://example.com/token");
 		assertThat(adaptedProvider.getUserInfoEndpoint().getUri())
 				.isEqualTo("http://example.com/info");
-		assertThat(adaptedProvider.getJwkSetUri()).isEqualTo("http://example.com/jkw");
+		assertThat(adaptedProvider.getJwkSetUri()).isEqualTo("http://example.com/jwk");
 		assertThat(adapted.getRegistrationId()).isEqualTo("registration");
 		assertThat(adapted.getClientId()).isEqualTo("clientId");
 		assertThat(adapted.getClientSecret()).isEqualTo("clientSecret");
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/documentation-overview.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/documentation-overview.adoc
@@ -123,7 +123,7 @@ When you're ready to push your Spring Boot application to production, we've got
 <<production-ready-features.adoc#production-ready-customizing-endpoints, Customization>>
 * *Connection options:*
 <<production-ready-features.adoc#production-ready-monitoring, HTTP>> |
-<<production-ready-features.adoc#production-ready-jmx, JMX>> |
+<<production-ready-features.adoc#production-ready-jmx, JMX>>
 * *Monitoring:*
 <<production-ready-features.adoc#production-ready-metrics, Metrics>> |
 <<production-ready-features.adoc#production-ready-auditing, Auditing>> |
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc
@@ -252,7 +252,7 @@ endif::[]
 [[getting-started-installing-the-cli]]
 === Installing the Spring Boot CLI
 The Spring Boot CLI is a command line tool that can be used if you want to quickly
-prototype with Spring. It allows you to run http://groovy.codehaus.org/[Groovy] scripts,
+prototype with Spring. It allows you to run http://groovy-lang.org/[Groovy] scripts,
 which means that you have a familiar Java-like syntax, without so much boilerplate code.
 
 You don't need to use the CLI to work with Spring Boot but it's definitely the quickest
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
@@ -581,7 +581,7 @@ The `application.properties` example above will change the endpoint from `/appli
 NOTE: Unless the management port has been configured to
 <<production-ready-customizing-management-server-port,expose endpoints using a different
 HTTP port>>, `management.endpoints.web.base-path` is relative to `server.context-path`. If `management.server.port`
-is configured, `management.endpoints.web.base-path`, is relative to `management.server.context-path`.
+is configured, `management.endpoints.web.base-path`, is relative to `management.server.servlet.context-path`.
 
 
 
diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/runner/ApplicationContextRunner.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/runner/ApplicationContextRunner.java
@@ -27,7 +27,7 @@
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 /**
- * A {@link AbstractApplicationContextRunner ApplicationContext runner} for a standard,
+ * An {@link AbstractApplicationContextRunner ApplicationContext runner} for a standard,
  * non-web environment {@link ConfigurableApplicationContext}.
  * <p>
  * See {@link AbstractApplicationContextRunner} for details.
diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/runner/ReactiveWebApplicationContextRunner.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/runner/ReactiveWebApplicationContextRunner.java
@@ -27,7 +27,7 @@
 import org.springframework.context.ApplicationContext;
 
 /**
- * A {@link AbstractApplicationContextRunner ApplicationContext runner} for a
+ * An {@link AbstractApplicationContextRunner ApplicationContext runner} for a
  * {@link ConfigurableReactiveWebApplicationContext}.
  * <p>
  * See {@link AbstractApplicationContextRunner} for details.
diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/runner/WebApplicationContextRunner.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/runner/WebApplicationContextRunner.java
@@ -29,7 +29,7 @@
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 
 /**
- * A {@link AbstractApplicationContextRunner ApplicationContext runner} for a Servlet
+ * An {@link AbstractApplicationContextRunner ApplicationContext runner} for a Servlet
  * based {@link ConfigurableWebApplicationContext}.
  * <p>
  * See {@link AbstractApplicationContextRunner} for details.
diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/assertj/ApplicationContextAssertTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/assertj/ApplicationContextAssertTests.java
@@ -74,7 +74,6 @@ public void hasBeanWhenHasNoBeanShouldFail() {
 	@Test
 	public void hasBeanWhenNotStartedShouldFail() {
 		this.thrown.expect(AssertionError.class);
-		this.thrown.expectMessage("failed to start");
 		this.thrown.expectMessage(String
 				.format("but context failed to start:%n java.lang.RuntimeException"));
 		assertThat(getAssert(this.failure)).hasBean("foo");
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/EnabledEndpoint.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/EnabledEndpoint.java
@@ -20,7 +20,7 @@
 import org.springframework.boot.configurationsample.Endpoint;
 
 /**
- * An endpoint that is enabled unless configured explicitly..
+ * An endpoint that is enabled unless configured explicitly.
  *
  * @author Stephane Nicoll
  */
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/UnresolvedDependenciesAnalyzer.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/UnresolvedDependenciesAnalyzer.java
@@ -52,7 +52,7 @@ void buildFinished(Project project) {
 			StringBuilder message = new StringBuilder();
 			message.append("\nDuring the build, one or more dependencies that were "
 					+ "declared without a version failed to resolve:\n");
-			this.dependenciesWithNoVersion.stream()
+			this.dependenciesWithNoVersion
 					.forEach((dependency) -> message.append("    " + dependency + "\n"));
 			message.append("\nDid you forget to apply the "
 					+ "io.spring.dependency-management plugin to the " + project.getName()

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public void runShouldHaveStatusEndpointBeanEvenIfDefaultIsDisabled() {`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`@Test`
`92`		`- public void runWhenEnabledPropertyIsFalseShouldNotHaveEndpointBean()`
	`92`	`+ public void runWhenEnabledPropertyIsFalseShouldNotHaveStatusEndpointBean()`
`93`	`93`	`throws Exception {`
`94`	`94`	`this.contextRunner.withPropertyValues("endpoints.status.enabled:false").run(`
`95`	`95`	`(context) -> assertThat(context).doesNotHaveBean(StatusEndpoint.class));`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public void endpointIsDiscovered() {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`@Test`
`71`		`- public void endpointIsInParentContextIsDiscovered() {`
	`71`	`+ public void endpointInParentContextIsDiscovered() {`
`72`	`72`	`AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext(`
`73`	`73`	`TestEndpointConfiguration.class);`
`74`	`74`	`loadWithParent(parent, EmptyConfiguration.class, hasTestEndpoint());`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`import org.springframework.boot.diagnostics.FailureAnalysis;`
`21`	`21`
`22`	`22`	`/**`
`23`		`- * A {@link AbstractFailureAnalyzer} for {@link NonUniqueSessionRepositoryException}.`
	`23`	`+ * An {@link AbstractFailureAnalyzer} for {@link NonUniqueSessionRepositoryException}.`
`24`	`24`	`*`
`25`	`25`	`* @author Stephane Nicoll`
`26`	`26`	`*/`