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

Merge branch '1.2.x'

Browse Source
This commit is contained in:
Phillip Webb
2015-10-07 23:34:08 -07:00
parent 47576354f7 6ab376e2e8
commit e473364e4e
507 changed files with 2659 additions and 2478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/test/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplicationTests.java
View File

@@ -71,15 +71,13 @@ public class SampleTomcatTwoConnectorsApplicationTests {
X509TrustManager tm = new X509TrustManager() {
@Override
public void checkClientTrusted(
java.security.cert.X509Certificate[] chain, String authType)
throws java.security.cert.CertificateException {
public void checkClientTrusted(java.security.cert.X509Certificate[] chain,
String authType) throws java.security.cert.CertificateException {
}
@Override
public void checkServerTrusted(
java.security.cert.X509Certificate[] chain, String authType)
throws java.security.cert.CertificateException {
public void checkServerTrusted(java.security.cert.X509Certificate[] chain,
String authType) throws java.security.cert.CertificateException {
}
@Override
@@ -103,19 +101,21 @@ public class SampleTomcatTwoConnectorsApplicationTests {
new HostnameVerifier() {
@Override
public boolean verify(final String hostname, final SSLSession session) {
public boolean verify(final String hostname,
final SSLSession session) {
return true; // these guys are alright by me...
}
});
template.setRequestFactory(factory);
ResponseEntity<String> entity = template.getForEntity("http://localhost:"
+ this.port + "/hello", String.class);
ResponseEntity<String> entity = template
.getForEntity("http://localhost:" + this.port + "/hello", String.class);
assertEquals(HttpStatus.OK, entity.getStatusCode());
assertEquals("hello", entity.getBody());
ResponseEntity<String> httpsEntity = template.getForEntity("https://localhost:"
+ this.context.getBean("port") + "/hello", String.class);
ResponseEntity<String> httpsEntity = template.getForEntity(
"https://localhost:" + this.context.getBean("port") + "/hello",
String.class);
assertEquals(HttpStatus.OK, httpsEntity.getStatusCode());
assertEquals("hello", httpsEntity.getBody());