Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove code deprecated in 2.0

Browse Source 
Closes gh-12962
This commit is contained in:
Stephane Nicoll
2018-05-22 14:48:25 +02:00
parent 1ea3e95ff6
commit 4464a5f5bd
12 changed files with 6 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationTests.java
View File

@@ -96,18 +96,6 @@ public class CouchbaseAutoConfigurationTests {
"spring.couchbase.env.endpoints.viewservice.max-endpoints=6");
}
@Test
@Deprecated
public void customizeEnvEndpointsWithDeprecatedProperties() {
testCouchbaseEnv((env) -> {
assertThat(env.queryServiceConfig().minEndpoints()).isEqualTo(3);
assertThat(env.queryServiceConfig().maxEndpoints()).isEqualTo(3);
assertThat(env.viewServiceConfig().minEndpoints()).isEqualTo(4);
assertThat(env.viewServiceConfig().maxEndpoints()).isEqualTo(4);
}, "spring.couchbase.env.endpoints.query=3",
"spring.couchbase.env.endpoints.view=4");
}
@Test
public void customizeEnvEndpointsUsesNewInfrastructure() {
testCouchbaseEnv((env) -> {
@@ -115,10 +103,8 @@ public class CouchbaseAutoConfigurationTests {
assertThat(env.queryServiceConfig().maxEndpoints()).isEqualTo(5);
assertThat(env.viewServiceConfig().minEndpoints()).isEqualTo(4);
assertThat(env.viewServiceConfig().maxEndpoints()).isEqualTo(6);
}, "spring.couchbase.env.endpoints.query=33",
"spring.couchbase.env.endpoints.queryservice.min-endpoints=3",
}, "spring.couchbase.env.endpoints.queryservice.min-endpoints=3",
"spring.couchbase.env.endpoints.queryservice.max-endpoints=5",
"spring.couchbase.env.endpoints.view=44",
"spring.couchbase.env.endpoints.viewservice.min-endpoints=4",
"spring.couchbase.env.endpoints.viewservice.max-endpoints=6");
}
@@ -130,9 +116,7 @@ public class CouchbaseAutoConfigurationTests {
assertThat(env.queryServiceConfig().maxEndpoints()).isEqualTo(5);
assertThat(env.viewServiceConfig().minEndpoints()).isEqualTo(1);
assertThat(env.viewServiceConfig().maxEndpoints()).isEqualTo(6);
}, "spring.couchbase.env.endpoints.query=33",
"spring.couchbase.env.endpoints.queryservice.max-endpoints=5",
"spring.couchbase.env.endpoints.view=44",
}, "spring.couchbase.env.endpoints.queryservice.max-endpoints=5",
"spring.couchbase.env.endpoints.viewservice.max-endpoints=6");
}