Merge pull request #20108 from dreis2211

snicoll · snicoll · commit b18db5eea707 · 2020-02-10T15:37:33.000+01:00
* pr/20108: Fix some deprecation warnings Closes gh-20108
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java
@@ -267,7 +267,7 @@ void redisCacheWithRedisCacheConfiguration() {
 					assertThat(cacheManager.getCacheNames()).isEmpty();
 					RedisCacheConfiguration redisCacheConfiguration = getDefaultRedisCacheConfiguration(cacheManager);
 					assertThat(redisCacheConfiguration.getTtl()).isEqualTo(java.time.Duration.ofSeconds(30));
-					assertThat(redisCacheConfiguration.getKeyPrefixFor("")).isEqualTo("bar");
+					assertThat(redisCacheConfiguration.getKeyPrefixFor("")).isEqualTo("bar::");
 				});
 	}
 
@@ -758,7 +758,7 @@ static class RedisWithCacheConfigurationConfiguration {
 		@Bean
 		org.springframework.data.redis.cache.RedisCacheConfiguration customRedisCacheConfiguration() {
 			return org.springframework.data.redis.cache.RedisCacheConfiguration.defaultCacheConfig()
-					.entryTtl(java.time.Duration.ofSeconds(30)).prefixKeysWith("bar");
+					.entryTtl(java.time.Duration.ofSeconds(30)).prefixCacheNameWith("bar");
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/city/City.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/city/City.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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 @@
 import org.springframework.data.annotation.Id;
 import org.springframework.data.elasticsearch.annotations.Document;
 
-@Document(indexName = "city", type = "city", shards = 1, replicas = 0, refreshInterval = "-1")
+@Document(indexName = "city", shards = 1, replicas = 0, refreshInterval = "-1")
 public class City implements Serializable {
 
 	private static final long serialVersionUID = 1L;
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -145,9 +145,9 @@ void restClientCanQueryElasticsearchNode() {
 					Map<String, String> source = new HashMap<>();
 					source.put("a", "alpha");
 					source.put("b", "bravo");
-					IndexRequest index = new IndexRequest("foo", "bar", "1").source(source);
+					IndexRequest index = new IndexRequest("test").id("1").source(source);
 					client.index(index, RequestOptions.DEFAULT);
-					GetRequest getRequest = new GetRequest("foo", "bar", "1");
+					GetRequest getRequest = new GetRequest("test").id("1");
 					assertThat(client.get(getRequest, RequestOptions.DEFAULT).isExists()).isTrue();
 				});
 	}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java
@@ -230,11 +230,12 @@ void disableParserFeature() {
 
 	@Test
 	void enableGeneratorFeature() {
-		this.contextRunner.withPropertyValues("spring.jackson.generator.write_numbers_as_strings:true")
+		this.contextRunner.withPropertyValues("spring.jackson.generator.strict_duplicate_detection:true")
 				.run((context) -> {
 					ObjectMapper mapper = context.getBean(ObjectMapper.class);
-					assertThat(JsonGenerator.Feature.WRITE_NUMBERS_AS_STRINGS.enabledByDefault()).isFalse();
-					assertThat(mapper.getFactory().isEnabled(JsonGenerator.Feature.WRITE_NUMBERS_AS_STRINGS)).isTrue();
+					JsonGenerator.Feature feature = JsonGenerator.Feature.STRICT_DUPLICATE_DETECTION;
+					assertThat(feature.enabledByDefault()).isFalse();
+					assertThat(mapper.getFactory().isEnabled(feature)).isTrue();
 				});
 	}
 
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/HateoasController.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/HateoasController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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,6 +21,7 @@
 
 import org.springframework.hateoas.EntityModel;
 import org.springframework.hateoas.Link;
+import org.springframework.hateoas.LinkRelation;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -36,7 +37,7 @@ class HateoasController {
 
 	@RequestMapping("/resource")
 	EntityModel<Map<String, String>> resource() {
-		return new EntityModel<>(new HashMap<>(), new Link("self", "https://api.example.com"));
+		return EntityModel.of(new HashMap<>(), Link.of("self", LinkRelation.of("https://api.example.com")));
 	}
 
 	@RequestMapping("/plain")
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -123,9 +123,8 @@ protected Mono<String> testSslWithAlias(String alias) {
 		ReactorClientHttpConnector connector = buildTrustAllSslConnector();
 		WebClient client = WebClient.builder().baseUrl("https://localhost:" + this.webServer.getPort())
 				.clientConnector(connector).build();
-		return client.post().uri("/test").contentType(MediaType.TEXT_PLAIN)
-				.body(BodyInserters.fromObject("Hello World")).exchange()
-				.flatMap((response) -> response.bodyToMono(String.class));
+		return client.post().uri("/test").contentType(MediaType.TEXT_PLAIN).body(BodyInserters.fromValue("Hello World"))
+				.exchange().flatMap((response) -> response.bodyToMono(String.class));
 	}
 
 }
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/main/java/smoketest/data/elasticsearch/Customer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/main/java/smoketest/data/elasticsearch/Customer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -19,7 +19,7 @@
 import org.springframework.data.annotation.Id;
 import org.springframework.data.elasticsearch.annotations.Document;
 
-@Document(indexName = "customer", type = "customer", shards = 1, replicas = 0, refreshInterval = "-1")
+@Document(indexName = "customer", shards = 1, replicas = 0, refreshInterval = "-1")
 public class Customer {
 
 	@Id
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/src/main/java/smoketest/data/solr/Product.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-solr/src/main/java/smoketest/data/solr/Product.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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,7 +24,7 @@
 import org.springframework.data.solr.core.geo.Point;
 import org.springframework.data.solr.core.mapping.SolrDocument;
 
-@SolrDocument(solrCoreName = "collection1")
+@SolrDocument(collection = "collection1")
 public class Product {
 
 	@Id
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-rsocket/src/test/java/smoketest/rsocket/SampleRSocketApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-rsocket/src/test/java/smoketest/rsocket/SampleRSocketApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -18,6 +18,7 @@
 
 import java.time.Duration;
 
+import io.rsocket.metadata.WellKnownMimeType;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
@@ -27,8 +28,9 @@
 import org.springframework.boot.rsocket.context.LocalRSocketServerPort;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.messaging.rsocket.RSocketRequester;
-import org.springframework.security.rsocket.metadata.BasicAuthenticationEncoder;
+import org.springframework.security.rsocket.metadata.SimpleAuthenticationEncoder;
 import org.springframework.security.rsocket.metadata.UsernamePasswordMetadata;
+import org.springframework.util.MimeTypeUtils;
 
 @SpringBootTest(properties = "spring.rsocket.server.port=0")
 public class SampleRSocketApplicationTests {
@@ -49,9 +51,9 @@ void unauthenticatedAccessToRSocketEndpoint() {
 	@Test
 	void rSocketEndpoint() {
 		RSocketRequester requester = this.builder
-				.rsocketStrategies((builder) -> builder.encoder(new BasicAuthenticationEncoder()))
+				.rsocketStrategies((builder) -> builder.encoder(new SimpleAuthenticationEncoder()))
 				.setupMetadata(new UsernamePasswordMetadata("user", "password"),
-						UsernamePasswordMetadata.BASIC_AUTHENTICATION_MIME_TYPE)
+						MimeTypeUtils.parseMimeType(WellKnownMimeType.MESSAGE_RSOCKET_AUTHENTICATION.getString()))
 				.connectTcp("localhost", this.port).block(Duration.ofSeconds(5));
 		Mono<Project> result = requester.route("find.project.spring-boot").retrieveMono(Project.class);
 		StepVerifier.create(result)

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ void redisCacheWithRedisCacheConfiguration() {`
`267`	`267`	`assertThat(cacheManager.getCacheNames()).isEmpty();`
`268`	`268`	`RedisCacheConfiguration redisCacheConfiguration = getDefaultRedisCacheConfiguration(cacheManager);`
`269`	`269`	`assertThat(redisCacheConfiguration.getTtl()).isEqualTo(java.time.Duration.ofSeconds(30));`
`270`		`- assertThat(redisCacheConfiguration.getKeyPrefixFor("")).isEqualTo("bar");`
	`270`	`+ assertThat(redisCacheConfiguration.getKeyPrefixFor("")).isEqualTo("bar::");`
`271`	`271`	`});`
`272`	`272`	`}`
`273`	`273`
`@@ -758,7 +758,7 @@ static class RedisWithCacheConfigurationConfiguration {`
`758`	`758`	`@Bean`
`759`	`759`	`org.springframework.data.redis.cache.RedisCacheConfiguration customRedisCacheConfiguration() {`
`760`	`760`	`return org.springframework.data.redis.cache.RedisCacheConfiguration.defaultCacheConfig()`
`761`		`- .entryTtl(java.time.Duration.ofSeconds(30)).prefixKeysWith("bar");`
	`761`	`+ .entryTtl(java.time.Duration.ofSeconds(30)).prefixCacheNameWith("bar");`
`762`	`762`	`}`
`763`	`763`
`764`	`764`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2012-2019 the original author or authors.`
	`2`	`+ * Copyright 2012-2020 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -123,9 +123,8 @@ protected Mono<String> testSslWithAlias(String alias) {`
`123`	`123`	`ReactorClientHttpConnector connector = buildTrustAllSslConnector();`
`124`	`124`	`WebClient client = WebClient.builder().baseUrl("https://localhost:" + this.webServer.getPort())`
`125`	`125`	`.clientConnector(connector).build();`
`126`		`- return client.post().uri("/test").contentType(MediaType.TEXT_PLAIN)`
`127`		`- .body(BodyInserters.fromObject("Hello World")).exchange()`
`128`		`- .flatMap((response) -> response.bodyToMono(String.class));`
	`126`	`+ return client.post().uri("/test").contentType(MediaType.TEXT_PLAIN).body(BodyInserters.fromValue("Hello World"))`
	`127`	`+ .exchange().flatMap((response) -> response.bodyToMono(String.class));`
`129`	`128`	`}`
`130`	`129`
`131`	`130`	`}`