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

@@ -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

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<String, String> form = new LinkedHashMap<String, String>();
+		Map<String, String> 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<String, Object> form = new LinkedHashMap<String, Object>();
+		Map<String, Object> 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<Object, Object> form = new LinkedHashMap<Object, Object>();
+		Map<Object, Object> 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<String, Object> form = new LinkedHashMap<String, Object>();
+		Map<String, Object> 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<String, Object> form = new LinkedHashMap<String, Object>();
+		Map<String, Object> 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<String, Object> form = new LinkedHashMap<String, Object>();
+		Map<String, Object> 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<String, Object> form = new LinkedHashMap<String, Object>();
-		List<Object> list = new ArrayList<Object>();
+		Map<String, Object> form = new LinkedHashMap<>();
+		List<Object> 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<String, Object> form = new LinkedHashMap<String, Object>();
-		List<Object> list = new ArrayList<Object>();
+		Map<String, Object> form = new LinkedHashMap<>();
+		List<Object> 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<String, Object> form = new LinkedHashMap<String, Object>();
-		List<String> listA = new ArrayList<String>();
+		Map<String, Object> form = new LinkedHashMap<>();
+		List<String> 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<String, Object> form = new LinkedHashMap<String, Object>();
-		List<Object> listA = new ArrayList<Object>();
+		Map<String, Object> form = new LinkedHashMap<>();
+		List<Object> 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<String, Object> form = new LinkedHashMap<String, Object>();
+		Map<String, Object> 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<HttpMessageConverter<?>> converters = new ArrayList<HttpMessageConverter<?>>();
+		List<HttpMessageConverter<?>> 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<MediaType> 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<HttpMessageConverter<?>> converters = new ArrayList<HttpMessageConverter<?>>();
+		List<HttpMessageConverter<?>> 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<MediaType> 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<HttpEntity<?>> lastRequestEntity = new AtomicReference<HttpEntity<?>>();
+		private final AtomicReference<HttpEntity<?>> lastRequestEntity = new AtomicReference<>();
 
-		private final AtomicReference<String> actualUrl = new AtomicReference<String>();
+		private final AtomicReference<String> actualUrl = new AtomicReference<>();
 
 		@Override
 		public <T> ResponseEntity<T> exchange(URI uri, HttpMethod method, HttpEntity<?> requestEntity,
 				Class<T> responseType) throws RestClientException {
+
 			this.actualUrl.set(uri.toString());
 			this.lastRequestEntity.set(requestEntity);
 			throw new RuntimeException("intentional");

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<HttpHeaders> mapper = DefaultHttpHeaderMapper.inboundMapper();
 		Map<String, Object> 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<HttpHeaders> mapper = DefaultHttpHeaderMapper.inboundMapper();
 		Map<String, Object> 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<HttpHeaders> mapper = DefaultHttpHeaderMapper.inboundMapper();
 		Map<String, Object> 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");

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());
+values ('1003', 'First Three','Last Three','F','1984-3-3',NOW());

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
 <meta content="n" name="session-loggedin" />
   <title id="page_title">Twitter</title>
   <link href="https://a1.twimg.com/a/1295478501/images/twitter_57.png" rel="apple-touch-icon" />
+<!--// CHECKSTYLE:OFF-->
 <link href="/oexchange.xrd" rel="http://www.oexchange.org/spec/0.8/rel/related-target" type="application/xrd+xml" />
+<!--// CHECKSTYLE:ON-->
 <link href="https://a1.twimg.com/a/1295478501/images/favicon.ico" rel="shortcut icon" type="image/x-icon" />
   <link href="https://a1.twimg.com/a/1295478501/stylesheets/fronts.css?1295482593" media="screen" rel="stylesheet" type="text/css" />
 

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.
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

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

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();
 		}