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

Author: artembilan

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

@@ -23,6 +23,7 @@
 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.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 void validateAllowAsHttpMethodArray() {
 	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 void validateAllowAsCollectionOfString() {
 	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 void validateLastModifiedAsDate() throws ParseException {
 	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 void validateCustomHeaderNamePatternsAndStandardResponseHeadersMappedToHt
 	}
 
 	@Test
-	public void validateCustomHeaderNamePatternsAndStandardResponseHeadersMappedToHttpHeadersWithCustomPrefixEmptyString() {
+	void validateCustomHeaderNamePatternsAndStandardResponseHeadersMappedToHttpHeadersWithCustomPrefixEmptyString() {
 		DefaultHttpHeaderMapper mapper = new DefaultHttpHeaderMapper();
 		mapper.setUserDefinedHeaderPrefix("");
 		mapper.setOutboundHeaderNames("foo*", "HTTP_RESPONSE_HEADERS");

spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java

@@ -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-jpa/src/test/resources/H2-PopulateData.sql

@@ -31,7 +31,9 @@
 <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-mail/src/test/java/org/springframework/integration/mail/config/test.html

@@ -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-sftp/src/main/resources/JSCH_LICENSE.txt

@@ -270,7 +270,7 @@ public StompSessionManager stompSessionManager(WebSocketStompClient stompClient)
 			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 DefaultHandshakeHandler handshakeHandler() {
 		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-stomp/src/test/java/org/springframework/integration/stomp/inbound/StompInboundChannelAdapterWebSocketIntegrationTests.java

@@ -196,7 +196,7 @@ public WebSocketClient webSocketClient() {
 		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 ServerWebSocketContainer serverWebSocketContainer() {
 			return new ServerWebSocketContainer("/ws")
 					.setHandshakeHandler(handshakeHandler())
 					.setDecoratorFactories(testWebSocketHandlerDecoratorFactory())
-					.setAllowedOrigins("http://www.foo.com/")
+					.setAllowedOrigins("https://www.example.com/")
 					.withSockJs();
 		}