From c9e5f99de56d990bd3a0c156ed0579cb7ee69e26 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Wed, 20 Mar 2019 11:24:44 -0400
Subject: [PATCH] Fix tests according HTTPS for origin urls

---
 build.gradle                                               | 4 ++--
 .../integration/http/inbound/CrossOriginTests-context.xml  | 2 +-
 .../integration/http/inbound/CrossOriginTests.java         | 7 ++++---
 .../websocket/config/WebSocketParserTests-context.xml      | 2 +-
 .../integration/websocket/config/WebSocketParserTests.java | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index e8cbc6724b..f307812659 100644
--- a/build.gradle
+++ b/build.gradle
@@ -142,7 +142,7 @@ subprojects { subproject ->
 		springSecurityVersion = '5.2.0.BUILD-SNAPSHOT'
 		springRetryVersion = '1.2.4.RELEASE'
 		springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.0.BUILD-SNAPSHOT'
-		springWsVersion = '3.0.6.RELEASE'
+		springWsVersion = '3.0.7.RELEASE'
 		tomcatVersion = "9.0.16"
 		xstreamVersion = '1.4.11.1'
 	}
@@ -301,7 +301,7 @@ subprojects { subproject ->
 
 	checkstyle {
 		configFile = file("$rootDir/src/checkstyle/checkstyle.xml")
-		toolVersion = "8.17"
+		toolVersion = "8.18"
 	}
 
 	artifacts {
diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/CrossOriginTests-context.xml b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/CrossOriginTests-context.xml
index 14f05a3c4d..c2ce58336a 100644
--- a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/CrossOriginTests-context.xml
+++ b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/CrossOriginTests-context.xml
@@ -31,7 +31,7 @@
 	</int-http:inbound-channel-adapter>
 
 	<int-http:inbound-channel-adapter path="/customized" supported-methods="GET,POST" channel="nullChannel">
-		<int-http:cross-origin origin="https://site1.com,http://site2.com"
+		<int-http:cross-origin origin="https://site1.com,https://site2.com"
 							   allowed-headers="header1, header2"
 							   exposed-headers="header3, header4"
 							   method="DELETE"
diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/CrossOriginTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/CrossOriginTests.java
index 4a68f0512b..246dfc0429 100644
--- a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/CrossOriginTests.java
+++ b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/CrossOriginTests.java
@@ -36,6 +36,7 @@ import org.springframework.web.servlet.HandlerInterceptor;
 
 /**
  * @author Artem Bilan
+ *
  * @since 4.2
  */
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -52,7 +53,7 @@ public class CrossOriginTests {
 	public void setUp() {
 		this.request = new MockHttpServletRequest();
 		this.request.setMethod("GET");
-		this.request.addHeader(HttpHeaders.ORIGIN, "http://domain.com/");
+		this.request.addHeader(HttpHeaders.ORIGIN, "https://domain.com/");
 	}
 
 	@Test
@@ -102,7 +103,7 @@ public class CrossOriginTests {
 		assertThat(config).isNotNull();
 		assertThat(config.getAllowedMethods().toArray()).isEqualTo(new String[] { "DELETE" });
 		assertThat(config.getAllowedOrigins().toArray())
-				.isEqualTo(new String[] { "http://site1.com", "http://site2.com" });
+				.isEqualTo(new String[] { "https://site1.com", "https://site2.com" });
 		assertThat(config.getAllowedHeaders().toArray()).isEqualTo(new String[] { "header1", "header2" });
 		assertThat(config.getExposedHeaders().toArray()).isEqualTo(new String[] { "header3", "header4" });
 		assertThat(config.getMaxAge()).isEqualTo(new Long(123));
@@ -161,7 +162,7 @@ public class CrossOriginTests {
 	@Test
 	public void testOptionsHeaderHandling() throws Exception {
 		MockHttpServletRequest request = new MockHttpServletRequest("OPTIONS", "/default");
-		request.addHeader(HttpHeaders.ORIGIN, "http://domain2.com");
+		request.addHeader(HttpHeaders.ORIGIN, "https://domain2.com");
 		HandlerExecutionChain handler = this.handlerMapping.getHandler(request);
 		assertThat(handler).isNotNull();
 		Object handlerMethod = handler.getHandler();
diff --git a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/config/WebSocketParserTests-context.xml b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/config/WebSocketParserTests-context.xml
index cd56cc86b5..bf4d4079dc 100644
--- a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/config/WebSocketParserTests-context.xml
+++ b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/config/WebSocketParserTests-context.xml
@@ -20,7 +20,7 @@
 									handshake-handler="handshakeHandler"
 									handshake-interceptors="handshakeInterceptor"
 									decorator-factories="decoratorFactory"
-									allowed-origins="http://www.foo.com/">
+									allowed-origins="https://foo.com">
 		<int-websocket:sockjs client-library-url="https://foo.sock.js"
 							  disconnect-delay="4000"
 							  heartbeat-time="30000"
diff --git a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/config/WebSocketParserTests.java b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/config/WebSocketParserTests.java
index 5221e9d756..95732a6e12 100644
--- a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/config/WebSocketParserTests.java
+++ b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/config/WebSocketParserTests.java
@@ -159,7 +159,7 @@ public class WebSocketParserTests {
 		assertThat(TestUtils.getPropertyValue(this.serverWebSocketContainer, "sendTimeLimit")).isEqualTo(100);
 		assertThat(TestUtils.getPropertyValue(this.serverWebSocketContainer, "sendBufferSizeLimit")).isEqualTo(100000);
 		assertThat(TestUtils.getPropertyValue(this.serverWebSocketContainer, "origins", String[].class))
-				.isEqualTo(new String[] { "http://foo.com" });
+				.isEqualTo(new String[] { "https://foo.com" });
 
 		WebSocketHandlerDecoratorFactory[] decoratorFactories =
 				TestUtils.getPropertyValue(this.serverWebSocketContainer, "decoratorFactories",