Polish contribution

Closes gh-655

initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/MainControllerStatsIntegrationTests.java

@@ -163,8 +163,7 @@ public class MainControllerStatsIntegrationTests
 		assertThat(json.get("invalid").booleanValue()).isEqualTo(true);
 		assertThat(json.get("invalidType").booleanValue()).isEqualTo(true);
 		assertThat(json.get("errorMessage")).isNotNull();
-		assertThat(json.get("errorMessage").textValue().contains("invalid-type"))
+		assertThat(json.get("errorMessage").textValue()).contains("invalid-type");
-				.isTrue();
 	}
 
 	@Test

initializr-generator/src/main/java/io/spring/initializr/metadata/Defaultable.java

@@ -20,7 +20,7 @@ package io.spring.initializr.metadata;
  * Metadata with a default value.
  *
  * @param <T> The value type
- * @author Stephane Nicoll
+ * @author Dave Syer
  */
 public interface Defaultable<T> {
 

initializr-generator/src/main/java/io/spring/initializr/metadata/Describable.java

@@ -19,7 +19,7 @@ package io.spring.initializr.metadata;
 /**
  * An item that can describe itself.
  *
- * @author Stephane Nicoll
+ * @author Dave Syer
  */
 public interface Describable {
 

initializr-generator/src/test/java/io/spring/initializr/metadata/LinkTests.java

@@ -65,9 +65,7 @@ public class LinkTests {
 		Link link = Link.create("reference", "https://example.com/{a}/2/{b}");
 		link.resolve();
 		assertThat(link.isTemplated()).isTrue();
-		assertThat(link.getTemplateVariables()).hasSize(2);
+		assertThat(link.getTemplateVariables()).containsExactlyInAnyOrder("a", "b");
-		assertThat(link.getTemplateVariables().contains("a")).isTrue();
-		assertThat(link.getTemplateVariables().contains("b")).isTrue();
 	}
 
 	@Test

initializr-web/src/test/java/io/spring/initializr/web/AbstractInitializrIntegrationTests.java

@@ -106,6 +106,7 @@ public abstract class AbstractInitializrIntegrationTests {
 	protected void validateContentType(ResponseEntity<String> response,
 			MediaType expected) {
 		MediaType actual = response.getHeaders().getContentType();
+		assertThat(actual).isNotNull();
 		assertThat(actual.isCompatibleWith(expected))
 				.as("Non compatible media-type, expected " + expected + ", got " + actual)
 				.isTrue();

initializr-web/src/test/java/io/spring/initializr/web/mapper/InitializrMetadataJsonMapperTests.java

@@ -72,8 +72,8 @@ public class InitializrMetadataJsonMapperTests {
 		int first = json.indexOf("https://example.com/how-to");
 		int second = json.indexOf("https://example.com/doc");
 		// JSON objects are not ordered
-		assertThat(first > 0).isTrue();
+		assertThat(first).isGreaterThan(0);
-		assertThat(second > 0).isTrue();
+		assertThat(second).isGreaterThan(0);
 	}
 
 	private Object get(JsonNode result, String path) {

initializr-web/src/test/java/io/spring/initializr/web/mapper/LinkMapperTests.java

@@ -83,7 +83,7 @@ public class LinkMapperTests {
 		links.add(Link.create("second", "https://example.com"));
 		ObjectNode model = LinkMapper.mapLinks(links);
 		String json = model.toString();
-		assertThat(json.indexOf("first") < json.indexOf("second")).isTrue();
+		assertThat(json.indexOf("first")).isLessThan(json.indexOf("second"));
 	}
 
 	@Test
@@ -94,7 +94,7 @@ public class LinkMapperTests {
 		links.add(Link.create("first", "https://example.com"));
 		ObjectNode model = LinkMapper.mapLinks(links);
 		String json = model.toString();
-		assertThat(json.indexOf("first") < json.indexOf("second")).isTrue();
+		assertThat(json.indexOf("first")).isLessThan(json.indexOf("second"));
 	}
 
 }

initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerDefaultsIntegrationTests.java

@@ -46,12 +46,11 @@ public class MainControllerDefaultsIntegrationTests
 	@Test
 	public void defaultsAppliedToHome() {
 		String body = htmlHome();
-		assertThat(body.contains("org.foo")).as("custom groupId not found").isTrue();
+		assertThat(body).as("custom groupId not found").contains("org.foo");
-		assertThat(body.contains("foo-bar")).as("custom artifactId not found").isTrue();
+		assertThat(body).as("custom artifactId not found").contains("foo-bar");
-		assertThat(body.contains("FooBar")).as("custom name not found").isTrue();
+		assertThat(body).as("custom name not found").contains("FooBar");
-		assertThat(body.contains("FooBar Project")).as("custom description not found")
+		assertThat(body).as("custom description not found").contains("FooBar Project");
-				.isTrue();
+		assertThat(body).as("custom package not found").contains("org.foo.demo");
-		assertThat(body.contains("org.foo.demo")).as("custom package not found").isTrue();
 	}
 
 }

initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerEnvIntegrationTests.java

@@ -48,9 +48,8 @@ public class MainControllerEnvIntegrationTests
 	public void doNotForceSsl() {
 		ResponseEntity<String> response = invokeHome("curl/1.2.4", "*/*");
 		String body = response.getBody();
-		assertThat(body.contains("http://start.spring.io/")).as("Must not force https")
+		assertThat(body).as("Must not force https").contains("http://start.spring.io/");
-				.isTrue();
+		assertThat(body).as("Must not force https").doesNotContain("https://");
-		assertThat(body.contains("https://")).as("Must not force https").isFalse();
 	}
 
 	@Test

initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerIntegrationTests.java

@@ -406,7 +406,7 @@ public class MainControllerIntegrationTests
 		byte[] body = getRestTemplate().getForObject(createUrl("starter.zip"),
 				byte[].class);
 		assertThat(body).isNotNull();
-		assertThat(body.length > 100).isTrue();
+		assertThat(body.length).isGreaterThan(100);
 	}
 
 	@Test

initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationSmokeTests.java

@@ -374,7 +374,7 @@ public class ProjectGenerationSmokeTests
 
 	private File getArchive(String fileName) {
 		File archive = new File(this.downloadDir, fileName);
-		assertThat(archive.exists()).isTrue();
+		assertThat(archive).exists();
 		return archive;
 	}