From 65c884cec7fe7e1b90689b4992f36b61a31baec5 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 29 May 2019 14:59:08 -0400 Subject: [PATCH] Enable nohttp Gradle plugin * Add `io.spring.nohttp` Gradle plugin into the build script and allow it only on CI server, since it is going to parse every file * Fix tests do not use `http` any more * Fix `test.html` in the `mail` modules tests to exclude a Namespace for OExchange XRD protocol * Fix some files for new line in the end of file according Checkstyle violations --- build.gradle | 12 +++ ...tpRequestExecutingMessageHandlerTests.java | 93 ++++++++++--------- ...tpHeaderMapperFromMessageInboundTests.java | 12 +-- .../src/test/resources/H2-PopulateData.sql | 2 +- .../integration/mail/config/test.html | 2 + .../src/main/resources/JSCH_LICENSE.txt | 2 +- ...annelAdapterWebSocketIntegrationTests.java | 4 +- .../server/WebSocketServerTests.java | 4 +- 8 files changed, 73 insertions(+), 58 deletions(-) diff --git a/build.gradle b/build.gradle index 2808e97141..2cd38e3f13 100644 --- a/build.gradle +++ b/build.gradle @@ -8,6 +8,7 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion" classpath "org.asciidoctor:asciidoctor-gradle-plugin:1.5.6" classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16' + classpath 'io.spring.nohttp:nohttp-gradle:0.0.1.RELEASE' } } @@ -67,6 +68,9 @@ subprojects { subproject -> apply plugin: 'checkstyle' apply plugin: 'kotlin' apply plugin: 'kotlin-spring' + if (System.getenv('TRAVIS') || System.getenv('bamboo_buildKey')) { + apply plugin: 'io.spring.nohttp' + } sourceSets { test { @@ -307,6 +311,14 @@ subprojects { subproject -> toolVersion = "8.20" } + + if (System.getenv('TRAVIS') || System.getenv('bamboo_buildKey')) { + nohttp { + source.include 'src/**' + source.exclude '**/*.gif', '**/*.ks' + } + } + artifacts { archives sourcesJar archives javadocJar diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java index 9fb845f90d..4a569c0870 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java @@ -84,7 +84,7 @@ public class HttpRequestExecutingMessageHandlerTests { } @Test - public void simpleStringKeyStringValueFormData() throws Exception { + public void simpleStringKeyStringValueFormData() { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); @@ -92,7 +92,7 @@ public class HttpRequestExecutingMessageHandlerTests { handler.setHttpMethod(HttpMethod.POST); setBeanFactory(handler); handler.afterPropertiesSet(); - Map form = new LinkedHashMap(); + Map form = new LinkedHashMap<>(); form.put("a", "1"); form.put("b", "2"); form.put("c", "3"); @@ -119,7 +119,7 @@ public class HttpRequestExecutingMessageHandlerTests { } @Test - public void simpleStringKeyObjectValueFormData() throws Exception { + public void simpleStringKeyObjectValueFormData() { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); @@ -127,7 +127,7 @@ public class HttpRequestExecutingMessageHandlerTests { handler.setHttpMethod(HttpMethod.POST); setBeanFactory(handler); handler.afterPropertiesSet(); - Map form = new LinkedHashMap(); + Map form = new LinkedHashMap<>(); form.put("a", new City("Philadelphia")); form.put("b", new City("Ambler")); form.put("c", new City("Mohnton")); @@ -153,7 +153,7 @@ public class HttpRequestExecutingMessageHandlerTests { } @Test - public void simpleObjectKeyObjectValueFormData() throws Exception { + public void simpleObjectKeyObjectValueFormData() { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); @@ -161,7 +161,7 @@ public class HttpRequestExecutingMessageHandlerTests { handler.setHttpMethod(HttpMethod.POST); setBeanFactory(handler); handler.afterPropertiesSet(); - Map form = new LinkedHashMap(); + Map form = new LinkedHashMap<>(); form.put(1, new City("Philadelphia")); form.put(2, new City("Ambler")); form.put(3, new City("Mohnton")); @@ -188,7 +188,7 @@ public class HttpRequestExecutingMessageHandlerTests { } @Test - public void stringKeyStringArrayValueFormData() throws Exception { + public void stringKeyStringArrayValueFormData() { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); @@ -196,7 +196,7 @@ public class HttpRequestExecutingMessageHandlerTests { handler.setHttpMethod(HttpMethod.POST); setBeanFactory(handler); handler.afterPropertiesSet(); - Map form = new LinkedHashMap(); + Map form = new LinkedHashMap<>(); form.put("a", new String[] { "1", "2", "3" }); form.put("b", "4"); form.put("c", new String[] { "5" }); @@ -236,7 +236,7 @@ public class HttpRequestExecutingMessageHandlerTests { } @Test - public void stringKeyPrimitiveArrayValueMixedFormData() throws Exception { + public void stringKeyPrimitiveArrayValueMixedFormData() { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); @@ -244,7 +244,7 @@ public class HttpRequestExecutingMessageHandlerTests { handler.setHttpMethod(HttpMethod.POST); setBeanFactory(handler); handler.afterPropertiesSet(); - Map form = new LinkedHashMap(); + Map form = new LinkedHashMap<>(); form.put("a", new int[] { 1, 2, 3 }); form.put("b", "4"); form.put("c", new String[] { "5" }); @@ -287,7 +287,7 @@ public class HttpRequestExecutingMessageHandlerTests { } @Test - public void stringKeyNullArrayValueMixedFormData() throws Exception { + public void stringKeyNullArrayValueMixedFormData() { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); @@ -295,7 +295,7 @@ public class HttpRequestExecutingMessageHandlerTests { handler.setHttpMethod(HttpMethod.POST); setBeanFactory(handler); handler.afterPropertiesSet(); - Map form = new LinkedHashMap(); + Map form = new LinkedHashMap<>(); form.put("a", new Object[] { null, 4, null }); form.put("b", "4"); Message message = MessageBuilder.withPayload(form).build(); @@ -331,7 +331,7 @@ public class HttpRequestExecutingMessageHandlerTests { * application/x-www-form-urlencoded */ @Test - public void stringKeyNullCollectionValueMixedFormDataString() throws Exception { + public void stringKeyNullCollectionValueMixedFormDataString() { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); @@ -339,8 +339,8 @@ public class HttpRequestExecutingMessageHandlerTests { handler.setHttpMethod(HttpMethod.POST); setBeanFactory(handler); handler.afterPropertiesSet(); - Map form = new LinkedHashMap(); - List list = new ArrayList(); + Map form = new LinkedHashMap<>(); + List list = new ArrayList<>(); list.add(null); list.add("5"); list.add(null); @@ -378,7 +378,7 @@ public class HttpRequestExecutingMessageHandlerTests { * injected 5 into the list as int resulting in Content-type being multipart/form-data */ @Test - public void stringKeyNullCollectionValueMixedFormDataObject() throws Exception { + public void stringKeyNullCollectionValueMixedFormDataObject() { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); @@ -386,8 +386,8 @@ public class HttpRequestExecutingMessageHandlerTests { handler.setHttpMethod(HttpMethod.POST); setBeanFactory(handler); handler.afterPropertiesSet(); - Map form = new LinkedHashMap(); - List list = new ArrayList(); + Map form = new LinkedHashMap<>(); + List list = new ArrayList<>(); list.add(null); list.add(5); list.add(null); @@ -421,7 +421,7 @@ public class HttpRequestExecutingMessageHandlerTests { } @Test - public void stringKeyStringCollectionValueFormData() throws Exception { + public void stringKeyStringCollectionValueFormData() { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); @@ -429,8 +429,8 @@ public class HttpRequestExecutingMessageHandlerTests { handler.setHttpMethod(HttpMethod.POST); setBeanFactory(handler); handler.afterPropertiesSet(); - Map form = new LinkedHashMap(); - List listA = new ArrayList(); + Map form = new LinkedHashMap<>(); + List listA = new ArrayList<>(); listA.add("1"); listA.add("2"); form.put("a", listA); @@ -466,7 +466,7 @@ public class HttpRequestExecutingMessageHandlerTests { } @Test - public void stringKeyObjectCollectionValueFormData() throws Exception { + public void stringKeyObjectCollectionValueFormData() { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); @@ -474,8 +474,8 @@ public class HttpRequestExecutingMessageHandlerTests { handler.setHttpMethod(HttpMethod.POST); setBeanFactory(handler); handler.afterPropertiesSet(); - Map form = new LinkedHashMap(); - List listA = new ArrayList(); + Map form = new LinkedHashMap<>(); + List listA = new ArrayList<>(); listA.add(new City("Philadelphia")); listA.add(new City("Ambler")); form.put("a", listA); @@ -511,7 +511,7 @@ public class HttpRequestExecutingMessageHandlerTests { } @Test - public void nameOnlyWithNullValues() throws Exception { + public void nameOnlyWithNullValues() { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); @@ -519,7 +519,7 @@ public class HttpRequestExecutingMessageHandlerTests { handler.setHttpMethod(HttpMethod.POST); setBeanFactory(handler); handler.afterPropertiesSet(); - Map form = new LinkedHashMap(); + Map form = new LinkedHashMap<>(); form.put("a", null); form.put("b", "foo"); form.put("c", null); @@ -549,7 +549,7 @@ public class HttpRequestExecutingMessageHandlerTests { @SuppressWarnings("cast") @Test - public void contentAsByteArray() throws Exception { + public void contentAsByteArray() { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); @@ -576,7 +576,7 @@ public class HttpRequestExecutingMessageHandlerTests { } @Test - public void contentAsXmlSource() throws Exception { + public void contentAsXmlSource() { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); @@ -601,7 +601,7 @@ public class HttpRequestExecutingMessageHandlerTests { } @Test // no assertions just a warn message in a log - public void testWarnMessageForNonPostPutAndExtractPayload() throws Exception { + public void testWarnMessageForNonPostPutAndExtractPayload() { // should see a warn message HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( @@ -634,7 +634,7 @@ public class HttpRequestExecutingMessageHandlerTests { } @Test - public void contentTypeIsNotSetForGetAndHeadRequest() throws Exception { + public void contentTypeIsNotSetForGetAndHeadRequest() { // GET HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); @@ -711,7 +711,7 @@ public class HttpRequestExecutingMessageHandlerTests { } @Test // INT-1029 - public void testHttpOutboundGatewayWithinChain() throws IOException, URISyntaxException { + public void testHttpOutboundGatewayWithinChain() throws URISyntaxException { ConfigurableApplicationContext ctx = new ClassPathXmlApplicationContext( "HttpOutboundWithinChainTests-context.xml", this.getClass()); MessageChannel channel = ctx.getBean("httpOutboundGatewayWithinChain", MessageChannel.class); @@ -753,8 +753,8 @@ public class HttpRequestExecutingMessageHandlerTests { MockRestTemplate restTemplate = new MockRestTemplate(); HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://example.com?query={query}", - restTemplate + "https://example.com?query={query}", + restTemplate ); // This flag is set by default to true, but for sake of clarity for the reader we explicitly set it here again @@ -769,7 +769,7 @@ public class HttpRequestExecutingMessageHandlerTests { } catch (Exception ignored) { } - assertThat(restTemplate.actualUrl.get()).isEqualTo("http://example.com?query=test-%C3%A4%C3%B6%C3%BC%26%25"); + assertThat(restTemplate.actualUrl.get()).isEqualTo("https://example.com?query=test-%C3%A4%C3%B6%C3%BC%26%25"); } @Test @@ -778,7 +778,7 @@ public class HttpRequestExecutingMessageHandlerTests { MockRestTemplate restTemplate = new MockRestTemplate(); HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://example.com?query={query}", + "https://example.com?query={query}", restTemplate ); @@ -792,7 +792,7 @@ public class HttpRequestExecutingMessageHandlerTests { } catch (Exception ignored) { } - assertThat(restTemplate.actualUrl.get()).isEqualTo("http://example.com?query=test-äöü"); + assertThat(restTemplate.actualUrl.get()).isEqualTo("https://example.com?query=test-äöü"); } @Test @@ -814,13 +814,13 @@ public class HttpRequestExecutingMessageHandlerTests { } @Test - public void acceptHeaderForSerializableResponse() throws Exception { + public void acceptHeaderForSerializableResponse() throws IOException { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( "https://www.springsource.org/spring-integration"); handler.setHttpMethod(HttpMethod.GET); handler.setExpectedResponseType(Foo.class); - List> converters = new ArrayList>(); + List> converters = new ArrayList<>(); converters.add(new SerializingHttpMessageConverter()); handler.setMessageConverters(converters); setBeanFactory(handler); @@ -838,17 +838,17 @@ public class HttpRequestExecutingMessageHandlerTests { catch (Exception e) { exception = e; } - assertThat(requestHeaders.getAccept() != null).isTrue(); + assertThat(requestHeaders.getAccept()).isNotNull(); assertThat(requestHeaders.getAccept().size() > 0).isTrue(); assertThat(exception.getCause().getMessage()).isEqualTo("404 Not Found"); List accept = requestHeaders.getAccept(); - assertThat(accept != null && accept.size() > 0).isTrue(); + assertThat(accept.size() > 0).isTrue(); assertThat(accept.get(0).getType()).isEqualTo("application"); assertThat(accept.get(0).getSubtype()).isEqualTo("x-java-serialized-object"); } @Test - public void acceptHeaderForSerializableResponseMessageExchange() throws Exception { + public void acceptHeaderForSerializableResponseMessageExchange() throws IOException { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( "https://www.springsource.org/spring-integration"); @@ -856,7 +856,7 @@ public class HttpRequestExecutingMessageHandlerTests { handler.setExtractPayload(false); handler.setExpectedResponseType(GenericMessage.class); - List> converters = new ArrayList>(); + List> converters = new ArrayList<>(); converters.add(new SerializingHttpMessageConverter()); handler.setMessageConverters(converters); setBeanFactory(handler); @@ -874,11 +874,11 @@ public class HttpRequestExecutingMessageHandlerTests { catch (Exception e) { exception = e; } - assertThat(requestHeaders.getAccept() != null).isTrue(); + assertThat(requestHeaders.getAccept()).isNotNull(); assertThat(requestHeaders.getAccept().size() > 0).isTrue(); assertThat(exception.getCause().getMessage()).isEqualTo("404 Not Found"); List accept = requestHeaders.getAccept(); - assertThat(accept != null && accept.size() > 0).isTrue(); + assertThat(accept.size() > 0).isTrue(); assertThat(accept.get(0).getType()).isEqualTo("application"); assertThat(accept.get(0).getSubtype()).isEqualTo("x-java-serialized-object"); } @@ -929,13 +929,14 @@ public class HttpRequestExecutingMessageHandlerTests { private static class MockRestTemplate extends RestTemplate { - private final AtomicReference> lastRequestEntity = new AtomicReference>(); + private final AtomicReference> lastRequestEntity = new AtomicReference<>(); - private final AtomicReference actualUrl = new AtomicReference(); + private final AtomicReference actualUrl = new AtomicReference<>(); @Override public ResponseEntity exchange(URI uri, HttpMethod method, HttpEntity requestEntity, Class responseType) throws RestClientException { + this.actualUrl.set(uri.toString()); this.lastRequestEntity.set(requestEntity); throw new RuntimeException("intentional"); diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java index e6ccd956b6..29a0b1938a 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java @@ -23,6 +23,7 @@ import java.net.URI; import java.net.URISyntaxException; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.Arrays; import java.util.Calendar; import java.util.Collections; import java.util.Date; @@ -43,7 +44,6 @@ import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; import org.springframework.integration.mapping.HeaderMapper; import org.springframework.messaging.MessageHeaders; -import org.springframework.util.CollectionUtils; /** * @author Oleg Zhurakousky @@ -146,7 +146,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { public void validateAllowAsCollectionOfString() { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); Map messageHeaders = new HashMap<>(); - messageHeaders.put("Allow", CollectionUtils.arrayToList(new String[] { "GET", "POST" })); + messageHeaders.put("Allow", Arrays.asList("GET", "POST")); HttpHeaders headers = new HttpHeaders(); mapper.fromHeaders(new MessageHeaders(messageHeaders), headers); @@ -159,7 +159,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { public void validateAllowAsCollectionOfHttpMethods() { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); Map messageHeaders = new HashMap<>(); - messageHeaders.put("Allow", CollectionUtils.arrayToList(new HttpMethod[] { HttpMethod.GET, HttpMethod.POST })); + messageHeaders.put("Allow", Arrays.asList(HttpMethod.GET, HttpMethod.POST)); HttpHeaders headers = new HttpHeaders(); mapper.fromHeaders(new MessageHeaders(messageHeaders), headers); @@ -277,11 +277,11 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { public void validateLocation() throws URISyntaxException { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); Map messageHeaders = new HashMap<>(); - messageHeaders.put("Location", "http://www.foo.com/"); + messageHeaders.put("Location", "https://www.example.com/"); HttpHeaders headers = new HttpHeaders(); mapper.fromHeaders(new MessageHeaders(messageHeaders), headers); - assertThat(headers.getLocation().toString()).isEqualTo(new URI("http://www.foo.com/").toString()); + assertThat(headers.getLocation().toString()).isEqualTo(new URI("https://www.example.com/").toString()); } // Transfer Encoding tests @@ -406,7 +406,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { } @Test - public void validateCustomHeaderNamePatternsAndStandardResponseHeadersMappedToHttpHeadersWithCustomPrefixEmptyString() { + void validateCustomHeaderNamePatternsAndStandardResponseHeadersMappedToHttpHeadersWithCustomPrefixEmptyString() { DefaultHttpHeaderMapper mapper = new DefaultHttpHeaderMapper(); mapper.setUserDefinedHeaderPrefix(""); mapper.setOutboundHeaderNames("foo*", "HTTP_RESPONSE_HEADERS"); diff --git a/spring-integration-jpa/src/test/resources/H2-PopulateData.sql b/spring-integration-jpa/src/test/resources/H2-PopulateData.sql index 77702e9c82..58d2513a3f 100644 --- a/spring-integration-jpa/src/test/resources/H2-PopulateData.sql +++ b/spring-integration-jpa/src/test/resources/H2-PopulateData.sql @@ -3,4 +3,4 @@ values ('1001', 'First One','Last One','M','1980-1-1',NOW()); insert into Student(rollNumber, firstName,lastName, gender, dateOfBirth,lastUpdated) values ('1002', 'First Two','Last Two','F','1984-1-1',NOW()); insert into Student(rollNumber, firstName,lastName, gender, dateOfBirth,lastUpdated) -values ('1003', 'First Three','Last Three','F','1984-3-3',NOW()); \ No newline at end of file +values ('1003', 'First Three','Last Three','F','1984-3-3',NOW()); diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/test.html b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/test.html index 7616f98162..3f42b4f200 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/test.html +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/test.html @@ -31,7 +31,9 @@ var page={};var onCondition=function(D,C,A,B){D=D;A=A?Math.min(A,5):5;B=B||100;i Twitter + + diff --git a/spring-integration-sftp/src/main/resources/JSCH_LICENSE.txt b/spring-integration-sftp/src/main/resources/JSCH_LICENSE.txt index 644a17459b..aa38f5ac1f 100644 --- a/spring-integration-sftp/src/main/resources/JSCH_LICENSE.txt +++ b/spring-integration-sftp/src/main/resources/JSCH_LICENSE.txt @@ -27,4 +27,4 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/inbound/StompInboundChannelAdapterWebSocketIntegrationTests.java b/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/inbound/StompInboundChannelAdapterWebSocketIntegrationTests.java index 708790a73a..02e524af89 100644 --- a/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/inbound/StompInboundChannelAdapterWebSocketIntegrationTests.java +++ b/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/inbound/StompInboundChannelAdapterWebSocketIntegrationTests.java @@ -270,7 +270,7 @@ public class StompInboundChannelAdapterWebSocketIntegrationTests { webSocketStompSessionManager.setAutoReceipt(true); webSocketStompSessionManager.setRecoveryInterval(1000); WebSocketHttpHeaders handshakeHeaders = new WebSocketHttpHeaders(); - handshakeHeaders.setOrigin("http://www.foo.com/"); + handshakeHeaders.setOrigin("https://www.example.com/"); webSocketStompSessionManager.setHandshakeHeaders(handshakeHeaders); StompHeaders stompHeaders = new StompHeaders(); stompHeaders.setHeartbeat(new long[] { 10000, 10000 }); @@ -327,7 +327,7 @@ public class StompInboundChannelAdapterWebSocketIntegrationTests { public void registerStompEndpoints(StompEndpointRegistry registry) { registry.addEndpoint("/ws") .setHandshakeHandler(handshakeHandler()) - .setAllowedOrigins("http://www.foo.com/") + .setAllowedOrigins("https://www.example.com/") .addInterceptors(new HandshakeInterceptor() { @Override diff --git a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/server/WebSocketServerTests.java b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/server/WebSocketServerTests.java index 4b44dd248d..18b1eb9fcd 100644 --- a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/server/WebSocketServerTests.java +++ b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/server/WebSocketServerTests.java @@ -196,7 +196,7 @@ public class WebSocketServerTests { public IntegrationWebSocketContainer clientWebSocketContainer() { ClientWebSocketContainer clientWebSocketContainer = new ClientWebSocketContainer(webSocketClient(), server().getWsBaseUrl() + "/ws"); - clientWebSocketContainer.setOrigin("http://www.foo.com/"); + clientWebSocketContainer.setOrigin("https://www.example.com/"); return clientWebSocketContainer; } @@ -271,7 +271,7 @@ public class WebSocketServerTests { return new ServerWebSocketContainer("/ws") .setHandshakeHandler(handshakeHandler()) .setDecoratorFactories(testWebSocketHandlerDecoratorFactory()) - .setAllowedOrigins("http://www.foo.com/") + .setAllowedOrigins("https://www.example.com/") .withSockJs(); }