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

Polish "Use HTTPS for externals links where possible"

Browse Source 
See gh-611
This commit is contained in:
Andy Wilkinson
2019-03-26 12:00:27 +00:00
parent cb5d7c2220
commit 2dda908c7e
4 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -68,7 +68,8 @@ public class LinkExtractorsPayloadTests {
public void singleLink() throws IOException { public void singleLink() throws IOException {
Map<String, List<Link>> links = this.linkExtractor Map<String, List<Link>> links = this.linkExtractor
.extractLinks(createResponse("single-link")); .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); links);
} }

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

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

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

@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -93,8 +93,8 @@ public class UriModifyingOperationPreprocessorTests {
@Test @Test
public void requestUriPathIsPreserved() { public void requestUriPathIsPreserved() {
this.preprocessor.removePort(); this.preprocessor.removePort();
OperationRequest processed = this.preprocessor OperationRequest processed = this.preprocessor.preprocess(
.preprocess(createRequestWithUri("https://api.example.com:12345/foo/bar")); createRequestWithUri("https://api.example.com:12345/foo/bar"));
assertThat(processed.getUri()) assertThat(processed.getUri())
.isEqualTo(URI.create("https://api.example.com/foo/bar")); .isEqualTo(URI.create("https://api.example.com/foo/bar"));
} }
@@ -102,8 +102,8 @@ public class UriModifyingOperationPreprocessorTests {
@Test @Test
public void requestUriQueryIsPreserved() { public void requestUriQueryIsPreserved() {
this.preprocessor.removePort(); this.preprocessor.removePort();
OperationRequest processed = this.preprocessor OperationRequest processed = this.preprocessor.preprocess(
.preprocess(createRequestWithUri("https://api.example.com:12345?foo=bar")); createRequestWithUri("https://api.example.com:12345?foo=bar"));
assertThat(processed.getUri()) assertThat(processed.getUri())
.isEqualTo(URI.create("https://api.example.com?foo=bar")); .isEqualTo(URI.create("https://api.example.com?foo=bar"));
} }
@@ -132,7 +132,7 @@ public class UriModifyingOperationPreprocessorTests {
this.preprocessor.host("api.example.com"); this.preprocessor.host("api.example.com");
OperationRequest processed = this.preprocessor OperationRequest processed = this.preprocessor
.preprocess(createRequestWithContent( .preprocess(createRequestWithContent(
"The uri 'http://localhost:12345' should be used")); "The uri 'https://localhost:12345' should be used"));
assertThat(new String(processed.getContent())) assertThat(new String(processed.getContent()))
.isEqualTo("The uri 'https://api.example.com:12345' should be used"); .isEqualTo("The uri 'https://api.example.com:12345' should be used");
} }
@@ -212,7 +212,7 @@ public class UriModifyingOperationPreprocessorTests {
this.preprocessor.host("api.example.com"); this.preprocessor.host("api.example.com");
OperationResponse processed = this.preprocessor OperationResponse processed = this.preprocessor
.preprocess(createResponseWithContent( .preprocess(createResponseWithContent(
"The uri 'http://localhost:12345' should be used")); "The uri 'https://localhost:12345' should be used"));
assertThat(new String(processed.getContent())) assertThat(new String(processed.getContent()))
.isEqualTo("The uri 'https://api.example.com:12345' should be used"); .isEqualTo("The uri 'https://api.example.com:12345' should be used");
} }
@@ -280,7 +280,7 @@ public class UriModifyingOperationPreprocessorTests {
@Test @Test
public void urisInRequestHeadersCanBeModified() { public void urisInRequestHeadersCanBeModified() {
OperationRequest processed = this.preprocessor.host("api.example.com") 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")) assertThat(processed.getHeaders().getFirst("Foo"))
.isEqualTo("https://api.example.com:12345"); .isEqualTo("https://api.example.com:12345");
assertThat(processed.getHeaders().getFirst("Host")).isEqualTo("api.example.com"); assertThat(processed.getHeaders().getFirst("Host")).isEqualTo("api.example.com");
@@ -289,7 +289,7 @@ public class UriModifyingOperationPreprocessorTests {
@Test @Test
public void urisInResponseHeadersCanBeModified() { public void urisInResponseHeadersCanBeModified() {
OperationResponse processed = this.preprocessor.host("api.example.com") 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")) assertThat(processed.getHeaders().getFirst("Foo"))
.isEqualTo("https://api.example.com:12345"); .isEqualTo("https://api.example.com:12345");
} }
@@ -297,7 +297,7 @@ public class UriModifyingOperationPreprocessorTests {
@Test @Test
public void urisInRequestPartHeadersCanBeModified() { public void urisInRequestPartHeadersCanBeModified() {
OperationRequest processed = this.preprocessor.host("api.example.com").preprocess( 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")) assertThat(processed.getParts().iterator().next().getHeaders().getFirst("Foo"))
.isEqualTo("https://api.example.com:12345"); .isEqualTo("https://api.example.com:12345");
} }
@@ -306,7 +306,7 @@ public class UriModifyingOperationPreprocessorTests {
public void urisInRequestPartContentCanBeModified() { public void urisInRequestPartContentCanBeModified() {
OperationRequest processed = this.preprocessor.host("api.example.com") OperationRequest processed = this.preprocessor.host("api.example.com")
.preprocess(createRequestWithPartWithContent( .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())) assertThat(new String(processed.getParts().iterator().next().getContent()))
.isEqualTo("The uri 'https://api.example.com:12345' should be used"); .isEqualTo("The uri 'https://api.example.com:12345' should be used");
} }