(),
- new Link("self", "http://api.example.com"));
+ new Link("self", "https://api.example.com"));
}
@RequestMapping("/plain")
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManager.java b/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManager.java
index dbf66844e8d..b31914faf76 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManager.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManager.java
@@ -41,7 +41,7 @@ import org.springframework.web.util.UriTemplateHandler;
* {@link RequestExpectationManager} that strips the specified root URI from the request
* before verification. Can be used to simply test declarations when all REST calls start
* the same way. For example:
- * RestTemplate restTemplate = new RestTemplateBuilder().rootUri("http://example.com").build();
+ * RestTemplate restTemplate = new RestTemplateBuilder().rootUri("https://example.com").build();
* MockRestServiceServer server = RootUriRequestExpectationManager.bindTo(restTemplate);
* server.expect(requestTo("/hello")).andRespond(withSuccess());
* restTemplate.getForEntity("/hello", String.class);
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java b/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java
index 38015afcfa0..bba2488711a 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java
@@ -791,7 +791,7 @@ public class TestRestTemplate {
* {@link ParameterizedTypeReference} is used to pass generic type information:
*
* ParameterizedTypeReference<List<MyBean>> myBean = new ParameterizedTypeReference<List<MyBean>>() {};
- * ResponseEntity<List<MyBean>> response = template.exchange("http://example.com",HttpMethod.GET, null, myBean);
+ * ResponseEntity<List<MyBean>> response = template.exchange("https://example.com",HttpMethod.GET, null, myBean);
*
* @param url the URL
* @param method the HTTP method (GET, POST, etc)
@@ -819,7 +819,7 @@ public class TestRestTemplate {
* {@link ParameterizedTypeReference} is used to pass generic type information:
*
* ParameterizedTypeReference<List<MyBean>> myBean = new ParameterizedTypeReference<List<MyBean>>() {};
- * ResponseEntity<List<MyBean>> response = template.exchange("http://example.com",HttpMethod.GET, null, myBean);
+ * ResponseEntity<List<MyBean>> response = template.exchange("https://example.com",HttpMethod.GET, null, myBean);
*
* @param url the URL
* @param method the HTTP method (GET, POST, etc)
@@ -847,7 +847,7 @@ public class TestRestTemplate {
* {@link ParameterizedTypeReference} is used to pass generic type information:
*
* ParameterizedTypeReference<List<MyBean>> myBean = new ParameterizedTypeReference<List<MyBean>>() {};
- * ResponseEntity<List<MyBean>> response = template.exchange("http://example.com",HttpMethod.GET, null, myBean);
+ * ResponseEntity<List<MyBean>> response = template.exchange("https://example.com",HttpMethod.GET, null, myBean);
*
* @param url the URL
* @param method the HTTP method (GET, POST, etc)
@@ -873,7 +873,7 @@ public class TestRestTemplate {
* response as {@link ResponseEntity}. Typically used in combination with the static
* builder methods on {@code RequestEntity}, for instance:
* MyRequest body = ...
- * RequestEntity request = RequestEntity.post(new URI("http://example.com/foo")).accept(MediaType.APPLICATION_JSON).body(body);
+ * RequestEntity request = RequestEntity.post(new URI("https://example.com/foo")).accept(MediaType.APPLICATION_JSON).body(body);
* ResponseEntity<MyResponse> response = template.exchange(request, MyResponse.class);
*
* @param requestEntity the entity to write to the request
@@ -894,7 +894,7 @@ public class TestRestTemplate {
* response as {@link ResponseEntity}. The given {@link ParameterizedTypeReference} is
* used to pass generic type information:
* MyRequest body = ...
- * RequestEntity request = RequestEntity.post(new URI("http://example.com/foo")).accept(MediaType.APPLICATION_JSON).body(body);
+ * RequestEntity request = RequestEntity.post(new URI("https://example.com/foo")).accept(MediaType.APPLICATION_JSON).body(body);
* ParameterizedTypeReference<List<MyResponse>> myBean = new ParameterizedTypeReference<List<MyResponse>>() {};
* ResponseEntity<List<MyResponse>> response = template.exchange(request, myBean);
*
diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizerTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizerTests.java
index 292c0ee2112..1f76808a367 100644
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizerTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizerTests.java
@@ -78,7 +78,7 @@ public class MockServerRestTemplateCustomizerTests {
MockServerRestTemplateCustomizer customizer = new MockServerRestTemplateCustomizer(
UnorderedRequestExpectationManager.class);
customizer.customize(
- new RestTemplateBuilder().rootUri("http://example.com").build());
+ new RestTemplateBuilder().rootUri("https://example.com").build());
assertThat(customizer.getServer()).extracting("expectationManager")
.hasAtLeastOneElementOfType(RootUriRequestExpectationManager.class);
}
@@ -87,7 +87,7 @@ public class MockServerRestTemplateCustomizerTests {
public void setDetectRootUriShouldDisableRootUriDetection() throws Exception {
this.customizer.setDetectRootUri(false);
this.customizer.customize(
- new RestTemplateBuilder().rootUri("http://example.com").build());
+ new RestTemplateBuilder().rootUri("https://example.com").build());
assertThat(this.customizer.getServer()).extracting("expectationManager")
.hasAtLeastOneElementOfType(SimpleRequestExpectationManager.class);
diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManagerTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManagerTests.java
index 0767dc230d3..fc57d5ac1a3 100644
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManagerTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManagerTests.java
@@ -54,7 +54,7 @@ public class RootUriRequestExpectationManagerTests {
@Rule
public ExpectedException thrown = ExpectedException.none();
- private String uri = "http://example.com";
+ private String uri = "https://example.com";
@Mock
private RequestExpectationManager delegate;
@@ -97,7 +97,7 @@ public class RootUriRequestExpectationManagerTests {
public void validateRequestWhenUriDoesNotStartWithRootUriShouldDelegateToExpectationManager()
throws Exception {
ClientHttpRequest request = mock(ClientHttpRequest.class);
- given(request.getURI()).willReturn(new URI("http://spring.io/test"));
+ given(request.getURI()).willReturn(new URI("https://spring.io/test"));
this.manager.validateRequest(request);
verify(this.delegate).validateRequest(request);
}
@@ -121,9 +121,9 @@ public class RootUriRequestExpectationManagerTests {
given(request.getURI()).willReturn(new URI(this.uri + "/hello"));
given(this.delegate.validateRequest((ClientHttpRequest) any()))
.willThrow(new AssertionError(
- "Request URI expected: was:"));
+ "Request URI expected: was:"));
this.thrown.expect(AssertionError.class);
- this.thrown.expectMessage("Request URI expected:");
+ this.thrown.expectMessage("Request URI expected:");
this.manager.validateRequest(request);
}
@@ -172,7 +172,7 @@ public class RootUriRequestExpectationManagerTests {
@Test
public void boundRestTemplateShouldPrefixRootUri() {
RestTemplate restTemplate = new RestTemplateBuilder()
- .rootUri("http://example.com").build();
+ .rootUri("https://example.com").build();
MockRestServiceServer server = RootUriRequestExpectationManager
.bindTo(restTemplate);
server.expect(requestTo("/hello")).andRespond(withSuccess());
@@ -182,14 +182,14 @@ public class RootUriRequestExpectationManagerTests {
@Test
public void boundRestTemplateWhenUrlIncludesDomainShouldNotPrefixRootUri() {
RestTemplate restTemplate = new RestTemplateBuilder()
- .rootUri("http://example.com").build();
+ .rootUri("https://example.com").build();
MockRestServiceServer server = RootUriRequestExpectationManager
.bindTo(restTemplate);
server.expect(requestTo("/hello")).andRespond(withSuccess());
this.thrown.expect(AssertionError.class);
this.thrown.expectMessage(
- "expected: but was:");
- restTemplate.getForEntity("http://spring.io/hello", String.class);
+ "expected: but was:");
+ restTemplate.getForEntity("https://spring.io/hello", String.class);
}
}
diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.java
index 48db830f6c7..7de06f68c75 100644
--- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.java
+++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2016 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.
@@ -27,7 +27,7 @@ import org.springframework.boot.loader.data.RandomAccessData;
*
* @author Phillip Webb
* @author Andy Wilkinson
- * @see Zip File Format
+ * @see Zip File Format
*/
final class CentralDirectoryFileHeader implements FileHeader {
@@ -123,8 +123,8 @@ final class CentralDirectoryFileHeader implements FileHeader {
/**
* Decode MS-DOS Date Time details. See
- * mindprod.com/jgloss/zip.html for
- * more details of the format.
+ *
+ * Microsoft's documentation for more details of the format.
* @param date the date part
* @param time the time part
* @return a {@link Calendar} containing the decoded date.
diff --git a/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiColors.java b/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiColors.java
index 3401a52a97f..2b37386c115 100644
--- a/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiColors.java
+++ b/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiColors.java
@@ -121,7 +121,7 @@ public final class AnsiColors {
: (1.0 / 3.0) * Math.pow(29.0 / 6.0, 2) * t + (4.0 / 29.0));
}
- // See http://en.wikipedia.org/wiki/Color_difference#CIE94
+ // See https://en.wikipedia.org/wiki/Color_difference#CIE94
public double getDistance(LabColor other) {
double c1 = Math.sqrt(this.a * this.a + this.b * this.b);
double deltaC = c1 - Math.sqrt(other.a * other.a + other.b * other.b);
diff --git a/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java b/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java
index 64f5b3aa131..be3ac18f6ca 100644
--- a/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java
@@ -111,9 +111,9 @@ public class RestTemplateBuilderTests {
@Test
public void rootUriShouldApply() throws Exception {
- RestTemplate restTemplate = this.builder.rootUri("http://example.com").build();
+ RestTemplate restTemplate = this.builder.rootUri("https://example.com").build();
MockRestServiceServer server = MockRestServiceServer.bindTo(restTemplate).build();
- server.expect(requestTo("http://example.com/hello")).andRespond(withSuccess());
+ server.expect(requestTo("https://example.com/hello")).andRespond(withSuccess());
restTemplate.getForEntity("/hello", String.class);
server.verify();
}
@@ -122,11 +122,11 @@ public class RestTemplateBuilderTests {
public void rootUriShouldApplyAfterUriTemplateHandler() throws Exception {
UriTemplateHandler uriTemplateHandler = mock(UriTemplateHandler.class);
RestTemplate template = this.builder.uriTemplateHandler(uriTemplateHandler)
- .rootUri("http://example.com").build();
+ .rootUri("https://example.com").build();
UriTemplateHandler handler = template.getUriTemplateHandler();
handler.expand("/hello");
assertThat(handler).isInstanceOf(RootUriTemplateHandler.class);
- verify(uriTemplateHandler).expand("http://example.com/hello");
+ verify(uriTemplateHandler).expand("https://example.com/hello");
}
@Test
diff --git a/spring-boot/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java b/spring-boot/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java
index 0435414f948..523d1ba2760 100644
--- a/spring-boot/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java
@@ -58,8 +58,8 @@ public class RootUriTemplateHandlerTests {
@SuppressWarnings("unchecked")
public void setup() throws URISyntaxException {
MockitoAnnotations.initMocks(this);
- this.uri = new URI("http://example.com/hello");
- this.handler = new RootUriTemplateHandler("http://example.com", this.delegate);
+ this.uri = new URI("https://example.com/hello");
+ this.handler = new RootUriTemplateHandler("https://example.com", this.delegate);
given(this.delegate.expand(anyString(), anyMap())).willReturn(this.uri);
given(this.delegate.expand(anyString(), (Object[]) anyVararg()))
.willReturn(this.uri);
@@ -76,14 +76,14 @@ public class RootUriTemplateHandlerTests {
public void createWithNullHandlerShouldThrowException() throws Exception {
this.thrown.expect(IllegalArgumentException.class);
this.thrown.expectMessage("Handler must not be null");
- new RootUriTemplateHandler("http://example.com", null);
+ new RootUriTemplateHandler("https://example.com", null);
}
@Test
public void expandMapVariablesShouldPrefixRoot() throws Exception {
HashMap uriVariables = new HashMap();
URI expanded = this.handler.expand("/hello", uriVariables);
- verify(this.delegate).expand("http://example.com/hello", uriVariables);
+ verify(this.delegate).expand("https://example.com/hello", uriVariables);
assertThat(expanded).isEqualTo(this.uri);
}
@@ -91,8 +91,8 @@ public class RootUriTemplateHandlerTests {
public void expandMapVariablesWhenPathDoesNotStartWithSlashShouldNotPrefixRoot()
throws Exception {
HashMap uriVariables = new HashMap();
- URI expanded = this.handler.expand("http://spring.io/hello", uriVariables);
- verify(this.delegate).expand("http://spring.io/hello", uriVariables);
+ URI expanded = this.handler.expand("https://spring.io/hello", uriVariables);
+ verify(this.delegate).expand("https://spring.io/hello", uriVariables);
assertThat(expanded).isEqualTo(this.uri);
}
@@ -100,7 +100,7 @@ public class RootUriTemplateHandlerTests {
public void expandArrayVariablesShouldPrefixRoot() throws Exception {
Object[] uriVariables = new Object[0];
URI expanded = this.handler.expand("/hello", uriVariables);
- verify(this.delegate).expand("http://example.com/hello", uriVariables);
+ verify(this.delegate).expand("https://example.com/hello", uriVariables);
assertThat(expanded).isEqualTo(this.uri);
}
@@ -108,8 +108,8 @@ public class RootUriTemplateHandlerTests {
public void expandArrayVariablesWhenPathDoesNotStartWithSlashShouldNotPrefixRoot()
throws Exception {
Object[] uriVariables = new Object[0];
- URI expanded = this.handler.expand("http://spring.io/hello", uriVariables);
- verify(this.delegate).expand("http://spring.io/hello", uriVariables);
+ URI expanded = this.handler.expand("https://spring.io/hello", uriVariables);
+ verify(this.delegate).expand("https://spring.io/hello", uriVariables);
assertThat(expanded).isEqualTo(this.uri);
}
@@ -117,10 +117,10 @@ public class RootUriTemplateHandlerTests {
public void applyShouldWrapExistingTemplate() throws Exception {
RestTemplate restTemplate = new RestTemplate();
restTemplate.setUriTemplateHandler(this.delegate);
- this.handler = RootUriTemplateHandler.addTo(restTemplate, "http://example.com");
+ this.handler = RootUriTemplateHandler.addTo(restTemplate, "https://example.com");
Object[] uriVariables = new Object[0];
URI expanded = this.handler.expand("/hello", uriVariables);
- verify(this.delegate).expand("http://example.com/hello", uriVariables);
+ verify(this.delegate).expand("https://example.com/hello", uriVariables);
assertThat(expanded).isEqualTo(this.uri);
}