Polish "Use HTTPS for externals links where possible"

See gh-611

Author: wilkinsona

spring-restdocs-core/src/main/java/org/springframework/restdocs/operation/preprocess/PrettyPrintingContentModifier.java

@@ -82,7 +82,7 @@ private static final class XmlPrettyPrinter implements PrettyPrinter {
 		public byte[] prettyPrint(byte[] original) throws Exception {
 			Transformer transformer = TransformerFactory.newInstance().newTransformer();
 			transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-			transformer.setOutputProperty("{https://xml.apache.org/xslt}indent-amount",
+			transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount",
 					"4");
 			transformer.setOutputProperty(OutputKeys.DOCTYPE_PUBLIC, "yes");
 			ByteArrayOutputStream transformed = new ByteArrayOutputStream();

spring-restdocs-core/src/test/java/org/springframework/restdocs/hypermedia/LinkExtractorsPayloadTests.java

@@ -68,7 +68,8 @@ public LinkExtractorsPayloadTests(LinkExtractor linkExtractor, String linkType)
 	public void singleLink() throws IOException {
 		Map<String, List<Link>> links = this.linkExtractor
 				.extractLinks(createResponse("single-link"));
-		assertLinks(Arrays.asList(new Link("alpha", "https://alpha.example.com", "Alpha")),
+		assertLinks(
+				Arrays.asList(new Link("alpha", "https://alpha.example.com", "Alpha")),
 				links);
 	}
 

spring-restdocs-restassured/src/test/java/org/springframework/restdocs/restassured/operation/preprocess/UriModifyingOperationPreprocessorTests.java

@@ -94,17 +94,17 @@ public void requestUriPortCanBeRemoved() {
 	@Test
 	public void requestUriPathIsPreserved() {
 		this.preprocessor.removePort();
-		OperationRequest processed = this.preprocessor
-				.preprocess(createRequestWithUri("https://api.example.com:12345/foo/bar"));
+		OperationRequest processed = this.preprocessor.preprocess(
+				createRequestWithUri("https://api.example.com:12345/foo/bar"));
 		assertThat(processed.getUri())
 				.isEqualTo(URI.create("https://api.example.com/foo/bar"));
 	}
 
 	@Test
 	public void requestUriQueryIsPreserved() {
 		this.preprocessor.removePort();
-		OperationRequest processed = this.preprocessor
-				.preprocess(createRequestWithUri("https://api.example.com:12345?foo=bar"));
+		OperationRequest processed = this.preprocessor.preprocess(
+				createRequestWithUri("https://api.example.com:12345?foo=bar"));
 		assertThat(processed.getUri())
 				.isEqualTo(URI.create("https://api.example.com?foo=bar"));
 	}

spring-restdocs-restassured/src/test/java/org/springframework/restdocs/restassured3/operation/preprocess/UriModifyingOperationPreprocessorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-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.
@@ -93,17 +93,17 @@ public void requestUriPortCanBeRemoved() {
 	@Test
 	public void requestUriPathIsPreserved() {
 		this.preprocessor.removePort();
-		OperationRequest processed = this.preprocessor
-				.preprocess(createRequestWithUri("https://api.example.com:12345/foo/bar"));
+		OperationRequest processed = this.preprocessor.preprocess(
+				createRequestWithUri("https://api.example.com:12345/foo/bar"));
 		assertThat(processed.getUri())
 				.isEqualTo(URI.create("https://api.example.com/foo/bar"));
 	}
 
 	@Test
 	public void requestUriQueryIsPreserved() {
 		this.preprocessor.removePort();
-		OperationRequest processed = this.preprocessor
-				.preprocess(createRequestWithUri("https://api.example.com:12345?foo=bar"));
+		OperationRequest processed = this.preprocessor.preprocess(
+				createRequestWithUri("https://api.example.com:12345?foo=bar"));
 		assertThat(processed.getUri())
 				.isEqualTo(URI.create("https://api.example.com?foo=bar"));
 	}
@@ -132,7 +132,7 @@ public void requestContentUriHostCanBeModified() {
 		this.preprocessor.host("api.example.com");
 		OperationRequest processed = this.preprocessor
 				.preprocess(createRequestWithContent(
-						"The uri 'http://localhost:12345' should be used"));
+						"The uri 'https://localhost:12345' should be used"));
 		assertThat(new String(processed.getContent()))
 				.isEqualTo("The uri 'https://api.example.com:12345' should be used");
 	}
@@ -212,7 +212,7 @@ public void responseContentUriHostCanBeModified() {
 		this.preprocessor.host("api.example.com");
 		OperationResponse processed = this.preprocessor
 				.preprocess(createResponseWithContent(
-						"The uri 'http://localhost:12345' should be used"));
+						"The uri 'https://localhost:12345' should be used"));
 		assertThat(new String(processed.getContent()))
 				.isEqualTo("The uri 'https://api.example.com:12345' should be used");
 	}
@@ -280,7 +280,7 @@ public void responseContentUriAnchorIsPreserved() {
 	@Test
 	public void urisInRequestHeadersCanBeModified() {
 		OperationRequest processed = this.preprocessor.host("api.example.com")
-				.preprocess(createRequestWithHeader("Foo", "http://locahost:12345"));
+				.preprocess(createRequestWithHeader("Foo", "https://locahost:12345"));
 		assertThat(processed.getHeaders().getFirst("Foo"))
 				.isEqualTo("https://api.example.com:12345");
 		assertThat(processed.getHeaders().getFirst("Host")).isEqualTo("api.example.com");
@@ -289,15 +289,15 @@ public void urisInRequestHeadersCanBeModified() {
 	@Test
 	public void urisInResponseHeadersCanBeModified() {
 		OperationResponse processed = this.preprocessor.host("api.example.com")
-				.preprocess(createResponseWithHeader("Foo", "http://locahost:12345"));
+				.preprocess(createResponseWithHeader("Foo", "https://locahost:12345"));
 		assertThat(processed.getHeaders().getFirst("Foo"))
 				.isEqualTo("https://api.example.com:12345");
 	}
 
 	@Test
 	public void urisInRequestPartHeadersCanBeModified() {
 		OperationRequest processed = this.preprocessor.host("api.example.com").preprocess(
-				createRequestWithPartWithHeader("Foo", "http://locahost:12345"));
+				createRequestWithPartWithHeader("Foo", "https://locahost:12345"));
 		assertThat(processed.getParts().iterator().next().getHeaders().getFirst("Foo"))
 				.isEqualTo("https://api.example.com:12345");
 	}
@@ -306,7 +306,7 @@ public void urisInRequestPartHeadersCanBeModified() {
 	public void urisInRequestPartContentCanBeModified() {
 		OperationRequest processed = this.preprocessor.host("api.example.com")
 				.preprocess(createRequestWithPartWithContent(
-						"The uri 'http://localhost:12345' should be used"));
+						"The uri 'https://localhost:12345' should be used"));
 		assertThat(new String(processed.getParts().iterator().next().getContent()))
 				.isEqualTo("The uri 'https://api.example.com:12345' should be used");
 	}