Format deployment integration test source code

Closes gh-17077

spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/test/java/sample/SampleGlassfishDeployApplicationIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,8 +35,7 @@ public class SampleGlassfishDeployApplicationIT {
 	public void testHome() throws Exception {
 		String url = "http://localhost:" + this.port + "/bootapp/";
 		System.out.println(url);
-		ResponseEntity<String> entity = new TestRestTemplate().getForEntity(url,
+		ResponseEntity<String> entity = new TestRestTemplate().getForEntity(url, String.class);
-				String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 		assertThat(entity.getBody()).isEqualTo("Hello World");
 	}

spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/test/java/sample/SampleTomcatDeployApplicationIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,70 +46,51 @@ public class SampleTomcatDeployApplicationIT {
 	}
 
 	@Test
-	public void errorFromExceptionForRequestAcceptingAnythingProducesAJsonResponse()
+	public void errorFromExceptionForRequestAcceptingAnythingProducesAJsonResponse() throws Exception {
-			throws Exception {
+		assertThatErrorFromExceptionProducesExpectedResponse(MediaType.ALL, MediaType.APPLICATION_JSON);
-		assertThatErrorFromExceptionProducesExpectedResponse(MediaType.ALL,
-				MediaType.APPLICATION_JSON);
 	}
 
 	@Test
-	public void errorFromExceptionForRequestAcceptingJsonProducesAJsonResponse()
+	public void errorFromExceptionForRequestAcceptingJsonProducesAJsonResponse() throws Exception {
-			throws Exception {
+		assertThatErrorFromExceptionProducesExpectedResponse(MediaType.APPLICATION_JSON, MediaType.APPLICATION_JSON);
-		assertThatErrorFromExceptionProducesExpectedResponse(MediaType.APPLICATION_JSON,
-				MediaType.APPLICATION_JSON);
 	}
 
 	@Test
-	public void errorFromExceptionForRequestAcceptingHtmlProducesAnHtmlResponse()
+	public void errorFromExceptionForRequestAcceptingHtmlProducesAnHtmlResponse() throws Exception {
-			throws Exception {
+		assertThatErrorFromExceptionProducesExpectedResponse(MediaType.TEXT_HTML, MediaType.TEXT_HTML);
-		assertThatErrorFromExceptionProducesExpectedResponse(MediaType.TEXT_HTML,
-				MediaType.TEXT_HTML);
 	}
 
 	@Test
-	public void sendErrorForRequestAcceptingAnythingProducesAJsonResponse()
+	public void sendErrorForRequestAcceptingAnythingProducesAJsonResponse() throws Exception {
-			throws Exception {
+		assertThatSendErrorProducesExpectedResponse(MediaType.ALL, MediaType.APPLICATION_JSON);
-		assertThatSendErrorProducesExpectedResponse(MediaType.ALL,
-				MediaType.APPLICATION_JSON);
 	}
 
 	@Test
 	public void sendErrorForRequestAcceptingJsonProducesAJsonResponse() throws Exception {
-		assertThatSendErrorProducesExpectedResponse(MediaType.APPLICATION_JSON,
+		assertThatSendErrorProducesExpectedResponse(MediaType.APPLICATION_JSON, MediaType.APPLICATION_JSON);
-				MediaType.APPLICATION_JSON);
 	}
 
 	@Test
-	public void sendErrorForRequestAcceptingHtmlProducesAnHtmlResponse()
+	public void sendErrorForRequestAcceptingHtmlProducesAnHtmlResponse() throws Exception {
-			throws Exception {
+		assertThatSendErrorProducesExpectedResponse(MediaType.TEXT_HTML, MediaType.TEXT_HTML);
-		assertThatSendErrorProducesExpectedResponse(MediaType.TEXT_HTML,
-				MediaType.TEXT_HTML);
 	}
 
-	private void assertThatSendErrorProducesExpectedResponse(MediaType accept,
+	private void assertThatSendErrorProducesExpectedResponse(MediaType accept, MediaType contentType) {
-			MediaType contentType) {
 		RequestEntity<Void> request = RequestEntity
-				.get(URI.create("http://localhost:" + this.port + "/bootapp/send-error"))
+				.get(URI.create("http://localhost:" + this.port + "/bootapp/send-error")).accept(accept).build();
-				.accept(accept).build();
 		ResponseEntity<String> response = this.rest.exchange(request, String.class);
 		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR);
 		assertThat(contentType.isCompatibleWith(response.getHeaders().getContentType()))
-				.as("%s is compatible with %s", contentType,
+				.as("%s is compatible with %s", contentType, response.getHeaders().getContentType()).isTrue();
-						response.getHeaders().getContentType())
-				.isTrue();
 	}
 
-	private void assertThatErrorFromExceptionProducesExpectedResponse(MediaType accept,
+	private void assertThatErrorFromExceptionProducesExpectedResponse(MediaType accept, MediaType contentType) {
-			MediaType contentType) {
 		RequestEntity<Void> request = RequestEntity
-				.get(URI.create("http://localhost:" + this.port + "/bootapp/exception"))
+				.get(URI.create("http://localhost:" + this.port + "/bootapp/exception")).accept(accept).build();
-				.accept(accept).build();
 		ResponseEntity<String> response = this.rest.exchange(request, String.class);
 		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR);
 		assertThat(contentType.isCompatibleWith(response.getHeaders().getContentType()))
-				.as("%s is compatible with %s", contentType,
+				.as("%s is compatible with %s", contentType, response.getHeaders().getContentType()).isTrue();
-						response.getHeaders().getContentType())
-				.isTrue();
 	}
 
 }

spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/test/java/sample/SampleTomEEDeployApplicationIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,8 +34,7 @@ public class SampleTomEEDeployApplicationIT {
 	@Test
 	public void testHome() throws Exception {
 		String url = "http://localhost:" + this.port + "/bootapp/";
-		ResponseEntity<String> entity = new TestRestTemplate().getForEntity(url,
+		ResponseEntity<String> entity = new TestRestTemplate().getForEntity(url, String.class);
-				String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 		assertThat(entity.getBody()).isEqualTo("Hello World");
 	}

spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/test/java/sample/SampleWildFlyDeployApplicationIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,8 +34,7 @@ public class SampleWildFlyDeployApplicationIT {
 	@Test
 	public void testHome() throws Exception {
 		String url = "http://localhost:" + this.port + "/bootapp/";
-		ResponseEntity<String> entity = new TestRestTemplate().getForEntity(url,
+		ResponseEntity<String> entity = new TestRestTemplate().getForEntity(url, String.class);
-				String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 		assertThat(entity.getBody()).isEqualTo("Hello World");
 	}

spring-boot-deployment-tests/spring-boot-deployment-test-wlp/src/test/java/sample/SampleWlpDeployApplicationIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,8 +34,7 @@ public class SampleWlpDeployApplicationIT {
 	@Test
 	public void testHome() throws Exception {
 		String url = "http://localhost:" + this.port + "/bootapp/";
-		ResponseEntity<String> entity = new TestRestTemplate().getForEntity(url,
+		ResponseEntity<String> entity = new TestRestTemplate().getForEntity(url, String.class);
-				String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 		assertThat(entity.getBody()).isEqualTo("Hello World");
 	}