From 2da4897aa839c30008ba5448a39395751f4afd19 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 16 Mar 2018 09:57:35 +0000 Subject: [PATCH] Polish --- .../boot/actuate/endpoint/web/EndpointLinksResolver.java | 3 --- .../couchbase/CouchbaseAutoConfigurationTests.java | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/EndpointLinksResolver.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/EndpointLinksResolver.java index ae103eb60c..de2348b524 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/EndpointLinksResolver.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/EndpointLinksResolver.java @@ -41,10 +41,7 @@ public class EndpointLinksResolver { * Creates a new {@code EndpointLinksResolver} that will resolve links to the given * {@code endpoints}. * @param endpoints the endpoints - * @deprecated since 2.0.1 in favor of - * {@link #EndpointLinksResolver(Collection, String)} */ - @Deprecated public EndpointLinksResolver(Collection> endpoints) { this.endpoints = endpoints; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationTests.java index 7c3ca63e9c..c69b4a09a0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationTests.java @@ -85,7 +85,7 @@ public class CouchbaseAutoConfigurationTests { @Test public void customizeEnvEndpoints() { - testCouchbaseEnv(env -> { + testCouchbaseEnv((env) -> { assertThat(env.kvEndpoints()).isEqualTo(4); assertThat(env.queryEndpoints()).isEqualTo(5); assertThat(env.viewEndpoints()).isEqualTo(6); @@ -96,7 +96,7 @@ public class CouchbaseAutoConfigurationTests { @Test public void customizeEnvTimeouts() { - testCouchbaseEnv(env -> { + testCouchbaseEnv((env) -> { assertThat(env.connectTimeout()).isEqualTo(100); assertThat(env.kvTimeout()).isEqualTo(200); assertThat(env.queryTimeout()).isEqualTo(300); @@ -111,7 +111,7 @@ public class CouchbaseAutoConfigurationTests { @Test public void enableSslNoEnabledFlag() { - testCouchbaseEnv(env -> { + testCouchbaseEnv((env) -> { assertThat(env.sslEnabled()).isTrue(); assertThat(env.sslKeystoreFile()).isEqualTo("foo"); assertThat(env.sslKeystorePassword()).isEqualTo("secret"); @@ -121,7 +121,7 @@ public class CouchbaseAutoConfigurationTests { @Test public void disableSslEvenWithKeyStore() { - testCouchbaseEnv(env -> { + testCouchbaseEnv((env) -> { assertThat(env.sslEnabled()).isFalse(); assertThat(env.sslKeystoreFile()).isNull(); assertThat(env.sslKeystorePassword()).isNull();