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

Merge branch '2.0.x' into 2.1.x

Browse Source
This commit is contained in:
Andy Wilkinson
2019-03-28 09:35:53 +00:00
parent f417fa5c5b 7f69e410cb
commit 864942ad4f
124 changed files with 412 additions and 411 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() {

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

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2019 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.
@@ -36,7 +36,7 @@ class HateoasController {
@RequestMapping("/resource")
public Resource<Map<String, String>> resource() {
return new Resource<>(new HashMap<String, String>(),
new Link("self", "http://api.example.com"));
new Link("self", "https://api.example.com"));
}
@RequestMapping("/plain")