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

Merge branch '2.1.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2019-03-28 11:48:47 +00:00
parent 3e3353e0e9 b7bca872a6
commit 878a635bfb
125 changed files with 450 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/AnotherExampleRestClient.java
View File

@@ -31,7 +31,7 @@ public class AnotherExampleRestClient {
private RestTemplate restTemplate;
public AnotherExampleRestClient(RestTemplateBuilder builder) {
this.restTemplate = builder.rootUri("http://example.com").build();
this.restTemplate = builder.rootUri("https://example.com").build();
}
protected RestTemplate getRestTemplate() {

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/ExampleRestClient.java
View File

@@ -31,7 +31,7 @@ public class ExampleRestClient {
private RestTemplate restTemplate;
public ExampleRestClient(RestTemplateBuilder builder) {
this.restTemplate = builder.rootUri("http://example.com").build();
this.restTemplate = builder.rootUri("https://example.com").build();
}
protected RestTemplate getRestTemplate() {

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/HateoasController.java
View File

@@ -36,7 +36,7 @@ class HateoasController {
@RequestMapping("/resource")
public EntityModel<Map<String, String>> resource() {
return new EntityModel<>(new HashMap<>(),
new Link("self", "http://api.example.com"));
new Link("self", "https://api.example.com"));
}
@RequestMapping("/plain")