diff --git a/initializr-actuator/src/main/java/io/spring/initializr/actuate/autoconfigure/InitializrStatsAutoConfiguration.java b/initializr-actuator/src/main/java/io/spring/initializr/actuate/autoconfigure/InitializrStatsAutoConfiguration.java index 894c807a..295d97fa 100644 --- a/initializr-actuator/src/main/java/io/spring/initializr/actuate/autoconfigure/InitializrStatsAutoConfiguration.java +++ b/initializr-actuator/src/main/java/io/spring/initializr/actuate/autoconfigure/InitializrStatsAutoConfiguration.java @@ -58,7 +58,7 @@ class InitializrStatsAutoConfiguration { InitializrMetadataProvider provider, RestTemplateBuilder restTemplateBuilder) { return new ProjectGenerationStatPublisher( - new ProjectRequestDocumentFactory(provider), statsProperties, + new ProjectRequestDocumentFactory(provider), this.statsProperties, restTemplateBuilder, statsRetryTemplate()); } @@ -70,7 +70,7 @@ class InitializrStatsAutoConfiguration { backOffPolicy.setInitialInterval(3000L); backOffPolicy.setMultiplier(3); SimpleRetryPolicy retryPolicy = new SimpleRetryPolicy( - statsProperties.getElastic().getMaxAttempts(), + this.statsProperties.getElastic().getMaxAttempts(), Collections.singletonMap(Exception.class, true)); retryTemplate.setBackOffPolicy(backOffPolicy); retryTemplate.setRetryPolicy(retryPolicy); diff --git a/initializr-actuator/src/main/java/io/spring/initializr/actuate/info/BomRangesInfoContributor.java b/initializr-actuator/src/main/java/io/spring/initializr/actuate/info/BomRangesInfoContributor.java index a9da02ba..673dbc2d 100644 --- a/initializr-actuator/src/main/java/io/spring/initializr/actuate/info/BomRangesInfoContributor.java +++ b/initializr-actuator/src/main/java/io/spring/initializr/actuate/info/BomRangesInfoContributor.java @@ -41,17 +41,18 @@ public class BomRangesInfoContributor implements InfoContributor { @Override public void contribute(Info.Builder builder) { Map details = new LinkedHashMap<>(); - metadataProvider.get().getConfiguration().getEnv().getBoms().forEach((k, v) -> { - if (v.getMappings() != null && !v.getMappings().isEmpty()) { - Map bom = new LinkedHashMap<>(); - v.getMappings().forEach(it -> { - String requirement = "Spring Boot " - + it.determineVersionRangeRequirement(); - bom.put(it.getVersion(), requirement); + this.metadataProvider.get().getConfiguration().getEnv().getBoms() + .forEach((k, v) -> { + if (v.getMappings() != null && !v.getMappings().isEmpty()) { + Map bom = new LinkedHashMap<>(); + v.getMappings().forEach(it -> { + String requirement = "Spring Boot " + + it.determineVersionRangeRequirement(); + bom.put(it.getVersion(), requirement); + }); + details.put(k, bom); + } }); - details.put(k, bom); - } - }); if (!details.isEmpty()) { builder.withDetail("bom-ranges", details); } diff --git a/initializr-actuator/src/main/java/io/spring/initializr/actuate/info/DependencyRangesInfoContributor.java b/initializr-actuator/src/main/java/io/spring/initializr/actuate/info/DependencyRangesInfoContributor.java index a98c77af..fa1a586a 100644 --- a/initializr-actuator/src/main/java/io/spring/initializr/actuate/info/DependencyRangesInfoContributor.java +++ b/initializr-actuator/src/main/java/io/spring/initializr/actuate/info/DependencyRangesInfoContributor.java @@ -44,7 +44,7 @@ public class DependencyRangesInfoContributor implements InfoContributor { @Override public void contribute(Info.Builder builder) { Map details = new LinkedHashMap<>(); - metadataProvider.get().getDependencies().getAll().forEach(d -> { + this.metadataProvider.get().getDependencies().getAll().forEach(d -> { if (d.getBom() == null) { if (!ObjectUtils.isEmpty(d.getMappings())) { Map dep = new LinkedHashMap<>(); diff --git a/initializr-actuator/src/main/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListener.java b/initializr-actuator/src/main/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListener.java index c419e05f..97746f9a 100644 --- a/initializr-actuator/src/main/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListener.java +++ b/initializr-actuator/src/main/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListener.java @@ -122,7 +122,7 @@ public class ProjectGenerationMetricsListener { } protected void increment(String key) { - meterRegistry.counter(key).increment(); + this.meterRegistry.counter(key).increment(); } protected String key(String part) { diff --git a/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectGenerationStatPublisher.java b/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectGenerationStatPublisher.java index 61d1a286..2867b536 100644 --- a/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectGenerationStatPublisher.java +++ b/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectGenerationStatPublisher.java @@ -76,7 +76,7 @@ public class ProjectGenerationStatPublisher { public void handleEvent(ProjectRequestEvent event) { String json = null; try { - ProjectRequestDocument document = documentFactory.createDocument(event); + ProjectRequestDocument document = this.documentFactory.createDocument(event); if (log.isDebugEnabled()) { log.debug("Publishing " + document); } @@ -88,7 +88,7 @@ public class ProjectGenerationStatPublisher { this.retryTemplate .execute((RetryCallback) context -> { - restTemplate.exchange(request, String.class); + this.restTemplate.exchange(request, String.class); return null; }); } diff --git a/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocument.java b/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocument.java index f2d8e7e3..0048d9a7 100644 --- a/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocument.java +++ b/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocument.java @@ -71,7 +71,7 @@ public class ProjectRequestDocument { private final List invalidDependencies = new ArrayList<>(); public long getGenerationTimestamp() { - return generationTimestamp; + return this.generationTimestamp; } public void setGenerationTimestamp(long generationTimestamp) { @@ -79,7 +79,7 @@ public class ProjectRequestDocument { } public String getRequestIp() { - return requestIp; + return this.requestIp; } public void setRequestIp(String requestIp) { @@ -87,7 +87,7 @@ public class ProjectRequestDocument { } public String getRequestIpv4() { - return requestIpv4; + return this.requestIpv4; } public void setRequestIpv4(String requestIpv4) { @@ -95,7 +95,7 @@ public class ProjectRequestDocument { } public String getRequestCountry() { - return requestCountry; + return this.requestCountry; } public void setRequestCountry(String requestCountry) { @@ -103,7 +103,7 @@ public class ProjectRequestDocument { } public String getClientId() { - return clientId; + return this.clientId; } public void setClientId(String clientId) { @@ -111,7 +111,7 @@ public class ProjectRequestDocument { } public String getClientVersion() { - return clientVersion; + return this.clientVersion; } public void setClientVersion(String clientVersion) { @@ -119,7 +119,7 @@ public class ProjectRequestDocument { } public String getGroupId() { - return groupId; + return this.groupId; } public void setGroupId(String groupId) { @@ -127,7 +127,7 @@ public class ProjectRequestDocument { } public String getArtifactId() { - return artifactId; + return this.artifactId; } public void setArtifactId(String artifactId) { @@ -135,7 +135,7 @@ public class ProjectRequestDocument { } public String getPackageName() { - return packageName; + return this.packageName; } public void setPackageName(String packageName) { @@ -143,7 +143,7 @@ public class ProjectRequestDocument { } public String getBootVersion() { - return bootVersion; + return this.bootVersion; } public void setBootVersion(String bootVersion) { @@ -151,7 +151,7 @@ public class ProjectRequestDocument { } public String getJavaVersion() { - return javaVersion; + return this.javaVersion; } public void setJavaVersion(String javaVersion) { @@ -159,7 +159,7 @@ public class ProjectRequestDocument { } public String getLanguage() { - return language; + return this.language; } public void setLanguage(String language) { @@ -167,7 +167,7 @@ public class ProjectRequestDocument { } public String getPackaging() { - return packaging; + return this.packaging; } public void setPackaging(String packaging) { @@ -175,7 +175,7 @@ public class ProjectRequestDocument { } public String getType() { - return type; + return this.type; } public void setType(String type) { @@ -183,7 +183,7 @@ public class ProjectRequestDocument { } public String getErrorMessage() { - return errorMessage; + return this.errorMessage; } public void setErrorMessage(String errorMessage) { @@ -191,7 +191,7 @@ public class ProjectRequestDocument { } public boolean isInvalid() { - return invalid; + return this.invalid; } public void setInvalid(boolean invalid) { @@ -199,7 +199,7 @@ public class ProjectRequestDocument { } public boolean isInvalidJavaVersion() { - return invalidJavaVersion; + return this.invalidJavaVersion; } public void setInvalidJavaVersion(boolean invalidJavaVersion) { @@ -207,7 +207,7 @@ public class ProjectRequestDocument { } public boolean isInvalidLanguage() { - return invalidLanguage; + return this.invalidLanguage; } public void setInvalidLanguage(boolean invalidLanguage) { @@ -215,7 +215,7 @@ public class ProjectRequestDocument { } public boolean isInvalidPackaging() { - return invalidPackaging; + return this.invalidPackaging; } public void setInvalidPackaging(boolean invalidPackaging) { @@ -223,7 +223,7 @@ public class ProjectRequestDocument { } public boolean isInvalidType() { - return invalidType; + return this.invalidType; } public void setInvalidType(boolean invalidType) { @@ -231,37 +231,45 @@ public class ProjectRequestDocument { } public List getDependencies() { - return dependencies; + return this.dependencies; } public List getInvalidDependencies() { - return invalidDependencies; + return this.invalidDependencies; } @Override public String toString() { - return "ProjectRequestDocument [generationTimestamp=" + generationTimestamp + ", " - + (requestIp != null ? "requestIp=" + requestIp + ", " : "") - + (requestIpv4 != null ? "requestIpv4=" + requestIpv4 + ", " : "") - + (requestCountry != null ? "requestCountry=" + requestCountry + ", " + return "ProjectRequestDocument [generationTimestamp=" + this.generationTimestamp + + ", " + + (this.requestIp != null ? "requestIp=" + this.requestIp + ", " : "") + + (this.requestIpv4 != null ? "requestIpv4=" + this.requestIpv4 + ", " : "") - + (clientId != null ? "clientId=" + clientId + ", " : "") - + (clientVersion != null ? "clientVersion=" + clientVersion + ", " : "") - + (groupId != null ? "groupId=" + groupId + ", " : "") - + (artifactId != null ? "artifactId=" + artifactId + ", " : "") - + (packageName != null ? "packageName=" + packageName + ", " : "") - + (bootVersion != null ? "bootVersion=" + bootVersion + ", " : "") - + (javaVersion != null ? "javaVersion=" + javaVersion + ", " : "") - + (language != null ? "language=" + language + ", " : "") - + (packaging != null ? "packaging=" + packaging + ", " : "") - + (type != null ? "type=" + type + ", " : "") - + (dependencies != null ? "dependencies=" + dependencies + ", " : "") - + (errorMessage != null ? "errorMessage=" + errorMessage + ", " : "") - + "invalid=" + invalid + ", invalidJavaVersion=" + invalidJavaVersion - + ", invalidLanguage=" + invalidLanguage + ", invalidPackaging=" - + invalidPackaging + ", invalidType=" + invalidType + ", " - + (invalidDependencies != null - ? "invalidDependencies=" + invalidDependencies : "") + + (this.requestCountry != null + ? "requestCountry=" + this.requestCountry + ", " : "") + + (this.clientId != null ? "clientId=" + this.clientId + ", " : "") + + (this.clientVersion != null + ? "clientVersion=" + this.clientVersion + ", " : "") + + (this.groupId != null ? "groupId=" + this.groupId + ", " : "") + + (this.artifactId != null ? "artifactId=" + this.artifactId + ", " : "") + + (this.packageName != null ? "packageName=" + this.packageName + ", " + : "") + + (this.bootVersion != null ? "bootVersion=" + this.bootVersion + ", " + : "") + + (this.javaVersion != null ? "javaVersion=" + this.javaVersion + ", " + : "") + + (this.language != null ? "language=" + this.language + ", " : "") + + (this.packaging != null ? "packaging=" + this.packaging + ", " : "") + + (this.type != null ? "type=" + this.type + ", " : "") + + (this.dependencies != null ? "dependencies=" + this.dependencies + ", " + : "") + + (this.errorMessage != null ? "errorMessage=" + this.errorMessage + ", " + : "") + + "invalid=" + this.invalid + ", invalidJavaVersion=" + + this.invalidJavaVersion + ", invalidLanguage=" + this.invalidLanguage + + ", invalidPackaging=" + this.invalidPackaging + ", invalidType=" + + this.invalidType + ", " + (this.invalidDependencies != null + ? "invalidDependencies=" + this.invalidDependencies : "") + "]"; } diff --git a/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactory.java b/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactory.java index 06e90ba0..76e33a3f 100644 --- a/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactory.java +++ b/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactory.java @@ -47,7 +47,7 @@ public class ProjectRequestDocumentFactory { } public ProjectRequestDocument createDocument(ProjectRequestEvent event) { - InitializrMetadata metadata = metadataProvider.get(); + InitializrMetadata metadata = this.metadataProvider.get(); ProjectRequest request = event.getProjectRequest(); ProjectRequestDocument document = new ProjectRequestDocument(); diff --git a/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/StatsProperties.java b/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/StatsProperties.java index 309eed76..fa3ac05b 100644 --- a/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/StatsProperties.java +++ b/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/StatsProperties.java @@ -35,7 +35,7 @@ public class StatsProperties { private final Elastic elastic = new Elastic(); public Elastic getElastic() { - return elastic; + return this.elastic; } public static final class Elastic { @@ -71,7 +71,7 @@ public class StatsProperties { private int maxAttempts = 3; public String getUsername() { - return username; + return this.username; } public void setUsername(String username) { @@ -79,7 +79,7 @@ public class StatsProperties { } public String getPassword() { - return password; + return this.password; } public void setPassword(String password) { @@ -87,7 +87,7 @@ public class StatsProperties { } public String getIndexName() { - return indexName; + return this.indexName; } public void setIndexName(String indexName) { @@ -95,7 +95,7 @@ public class StatsProperties { } public String getEntityName() { - return entityName; + return this.entityName; } public void setEntityName(String entityName) { @@ -103,7 +103,7 @@ public class StatsProperties { } public int getMaxAttempts() { - return maxAttempts; + return this.maxAttempts; } public void setMaxAttempts(int maxAttempts) { @@ -111,7 +111,7 @@ public class StatsProperties { } public String getUri() { - return uri; + return this.uri; } public void setUri(String uri) { @@ -119,7 +119,7 @@ public class StatsProperties { } public URI getEntityUrl() { - String string = uri + "/" + indexName + "/" + entityName; + String string = this.uri + "/" + this.indexName + "/" + this.entityName; try { return new URI(string); } diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/ActuatorIntegrationTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/ActuatorIntegrationTests.java index d1fb4cc4..a372612b 100644 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/ActuatorIntegrationTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/ActuatorIntegrationTests.java @@ -21,12 +21,12 @@ import java.util.List; import com.fasterxml.jackson.databind.JsonNode; import io.spring.initializr.web.AbstractFullStackInitializrIntegrationTests; +import io.spring.initializr.web.AbstractInitializrIntegrationTests.Config; import org.junit.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; -import static io.spring.initializr.web.AbstractInitializrIntegrationTests.*; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListenerTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListenerTests.java index 4ab9a205..e28ec3c8 100644 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListenerTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListenerTests.java @@ -44,43 +44,43 @@ public class ProjectGenerationMetricsListenerTests { @Before public void setup() { SimpleMeterRegistry meterRegistry = new SimpleMeterRegistry(); - listener = new ProjectGenerationMetricsListener(meterRegistry); - metricsAssert = new MetricsAssert(meterRegistry); + this.listener = new ProjectGenerationMetricsListener(meterRegistry); + this.metricsAssert = new MetricsAssert(meterRegistry); } @Test public void projectGenerationCount() { ProjectRequest request = initialize(); - request.resolve(metadata); + request.resolve(this.metadata); fireProjectGeneratedEvent(request); - metricsAssert.hasValue(1, "initializr.requests"); + this.metricsAssert.hasValue(1, "initializr.requests"); } @Test public void projectGenerationCountWithFailure() { ProjectRequest request = initialize(); - request.resolve(metadata); + request.resolve(this.metadata); fireProjectFailedEvent(request); - metricsAssert.hasValue(1, "initializr.requests"); - metricsAssert.hasValue(1, "initializr.failures"); + this.metricsAssert.hasValue(1, "initializr.requests"); + this.metricsAssert.hasValue(1, "initializr.failures"); } @Test public void dependencies() { ProjectRequest request = initialize(); request.getStyle().addAll(Arrays.asList("security", "spring-data")); - request.resolve(metadata); + request.resolve(this.metadata); fireProjectGeneratedEvent(request); - metricsAssert.hasValue(1, "initializr.dependency.security", + this.metricsAssert.hasValue(1, "initializr.dependency.security", "initializr.dependency.spring-data"); } @Test public void noDependencies() { ProjectRequest request = initialize(); - request.resolve(metadata); + request.resolve(this.metadata); fireProjectGeneratedEvent(request); - metricsAssert.hasNoValue("initializr.dependency."); + this.metricsAssert.hasNoValue("initializr.dependency."); } @Test @@ -88,9 +88,9 @@ public class ProjectGenerationMetricsListenerTests { ProjectRequest request = initialize(); request.getStyle().add("spring-data"); request.setPackaging("war"); - request.resolve(metadata); + request.resolve(this.metadata); fireProjectGeneratedEvent(request); - metricsAssert.hasValue(1, "initializr.dependency.web", + this.metricsAssert.hasValue(1, "initializr.dependency.web", "initializr.dependency.spring-data"); } @@ -106,110 +106,111 @@ public class ProjectGenerationMetricsListenerTests { request.getStyle().add("foo-old"); request.resolve(metadata); fireProjectGeneratedEvent(request); - metricsAssert.hasValue(1, "initializr.dependency.foo"); // standard id is used + this.metricsAssert.hasValue(1, "initializr.dependency.foo"); // standard id is + // used } @Test public void defaultType() { ProjectRequest request = initialize(); - request.resolve(metadata); + request.resolve(this.metadata); fireProjectGeneratedEvent(request); - metricsAssert.hasValue(1, "initializr.type.maven-project"); + this.metricsAssert.hasValue(1, "initializr.type.maven-project"); } @Test public void explicitType() { ProjectRequest request = initialize(); request.setType("gradle-build"); - request.resolve(metadata); + request.resolve(this.metadata); fireProjectGeneratedEvent(request); - metricsAssert.hasValue(1, "initializr.type.gradle-build"); + this.metricsAssert.hasValue(1, "initializr.type.gradle-build"); } @Test public void defaultPackaging() { ProjectRequest request = initialize(); - request.resolve(metadata); + request.resolve(this.metadata); fireProjectGeneratedEvent(request); - metricsAssert.hasValue(1, "initializr.packaging.jar"); + this.metricsAssert.hasValue(1, "initializr.packaging.jar"); } @Test public void explicitPackaging() { ProjectRequest request = initialize(); request.setPackaging("war"); - request.resolve(metadata); + request.resolve(this.metadata); fireProjectGeneratedEvent(request); - metricsAssert.hasValue(1, "initializr.packaging.war"); + this.metricsAssert.hasValue(1, "initializr.packaging.war"); } @Test public void defaultJavaVersion() { ProjectRequest request = initialize(); - request.resolve(metadata); + request.resolve(this.metadata); fireProjectGeneratedEvent(request); - metricsAssert.hasValue(1, "initializr.java_version.1_8"); + this.metricsAssert.hasValue(1, "initializr.java_version.1_8"); } @Test public void explicitJavaVersion() { ProjectRequest request = initialize(); request.setJavaVersion("1.7"); - request.resolve(metadata); + request.resolve(this.metadata); fireProjectGeneratedEvent(request); - metricsAssert.hasValue(1, "initializr.java_version.1_7"); + this.metricsAssert.hasValue(1, "initializr.java_version.1_7"); } @Test public void defaultLanguage() { ProjectRequest request = initialize(); - request.resolve(metadata); + request.resolve(this.metadata); fireProjectGeneratedEvent(request); - metricsAssert.hasValue(1, "initializr.language.java"); + this.metricsAssert.hasValue(1, "initializr.language.java"); } @Test public void explicitGroovyLanguage() { ProjectRequest request = initialize(); request.setLanguage("groovy"); - request.resolve(metadata); + request.resolve(this.metadata); fireProjectGeneratedEvent(request); - metricsAssert.hasValue(1, "initializr.language.groovy"); + this.metricsAssert.hasValue(1, "initializr.language.groovy"); } @Test public void explicitKotlinLanguage() { ProjectRequest request = initialize(); request.setLanguage("kotlin"); - request.resolve(metadata); + request.resolve(this.metadata); fireProjectGeneratedEvent(request); - metricsAssert.hasValue(1, "initializr.language.kotlin"); + this.metricsAssert.hasValue(1, "initializr.language.kotlin"); } @Test public void defaultBootVersion() { ProjectRequest request = initialize(); - request.resolve(metadata); + request.resolve(this.metadata); fireProjectGeneratedEvent(request); - metricsAssert.hasValue(1, "initializr.boot_version.1_2_3_RELEASE"); + this.metricsAssert.hasValue(1, "initializr.boot_version.1_2_3_RELEASE"); } @Test public void explicitBootVersion() { ProjectRequest request = initialize(); request.setBootVersion("1.0.2.RELEASE"); - request.resolve(metadata); + request.resolve(this.metadata); fireProjectGeneratedEvent(request); - metricsAssert.hasValue(1, "initializr.boot_version.1_0_2_RELEASE"); + this.metricsAssert.hasValue(1, "initializr.boot_version.1_0_2_RELEASE"); } @Test public void userAgentAvailable() { ProjectRequest request = initialize(); request.getParameters().put("user-agent", "HTTPie/0.9.2"); - request.resolve(metadata); + request.resolve(this.metadata); fireProjectGeneratedEvent(request); - metricsAssert.hasValue(1, "initializr.client_id.httpie"); + this.metricsAssert.hasValue(1, "initializr.client_id.httpie"); } @Test @@ -223,9 +224,9 @@ public class ProjectGenerationMetricsListenerTests { request.setBootVersion("1.0.2.RELEASE"); request.getParameters().put("user-agent", "SpringBootCli/1.3.0.RELEASE"); - request.resolve(metadata); + request.resolve(this.metadata); fireProjectGeneratedEvent(request); - metricsAssert.hasValue(1, "initializr.requests", "initializr.dependency.web", + this.metricsAssert.hasValue(1, "initializr.requests", "initializr.dependency.web", "initializr.dependency.security", "initializr.type.gradle-project", "initializr.packaging.jar", "initializr.java_version.1_6", "initializr.language.groovy", "initializr.boot_version.1_0_2_RELEASE", @@ -236,32 +237,32 @@ public class ProjectGenerationMetricsListenerTests { public void incrementMetrics() { ProjectRequest request = initialize(); request.getStyle().addAll(Arrays.asList("security", "spring-data")); - request.resolve(metadata); + request.resolve(this.metadata); fireProjectGeneratedEvent(request); - metricsAssert.hasValue(1, "initializr.requests", "initializr.dependency.security", - "initializr.dependency.spring-data"); + this.metricsAssert.hasValue(1, "initializr.requests", + "initializr.dependency.security", "initializr.dependency.spring-data"); ProjectRequest anotherRequest = initialize(); anotherRequest.getStyle().addAll(Arrays.asList("web", "spring-data")); - anotherRequest.resolve(metadata); + anotherRequest.resolve(this.metadata); fireProjectGeneratedEvent(anotherRequest); - metricsAssert.hasValue(2, "initializr.dependency.spring-data", + this.metricsAssert.hasValue(2, "initializr.dependency.spring-data", "initializr.dependency.spring-data"); - metricsAssert.hasValue(1, "initializr.dependency.web", + this.metricsAssert.hasValue(1, "initializr.dependency.web", "initializr.dependency.security"); } private void fireProjectGeneratedEvent(ProjectRequest projectRequest) { - listener.onGeneratedProject(new ProjectGeneratedEvent(projectRequest)); + this.listener.onGeneratedProject(new ProjectGeneratedEvent(projectRequest)); } private void fireProjectFailedEvent(ProjectRequest projectRequest) { - listener.onFailedProject(new ProjectFailedEvent(projectRequest, null)); + this.listener.onFailedProject(new ProjectFailedEvent(projectRequest, null)); } private ProjectRequest initialize() { ProjectRequest request = new ProjectRequest(); - request.initialize(metadata); + request.initialize(this.metadata); return request; } diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/AbstractInitializrStatTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/AbstractInitializrStatTests.java index b9455dad..27daef82 100644 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/AbstractInitializrStatTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/AbstractInitializrStatTests.java @@ -39,12 +39,12 @@ abstract class AbstractInitializrStatTests { protected ProjectRequest createProjectRequest() { ProjectRequest request = new ProjectRequest(); - request.initialize(metadata); + request.initialize(this.metadata); return request; } public InitializrMetadata getMetadata() { - return metadata; + return this.metadata; } } diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/MainControllerStatsIntegrationTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/MainControllerStatsIntegrationTests.java index 00a2a4f0..13b00270 100644 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/MainControllerStatsIntegrationTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/MainControllerStatsIntegrationTests.java @@ -63,14 +63,15 @@ public class MainControllerStatsIntegrationTests public void setup() { this.statsMockController.stats.clear(); // Make sure our mock is going to be invoked with the stats - this.statsProperties.getElastic().setUri("http://localhost:" + port + "/elastic"); + this.statsProperties.getElastic() + .setUri("http://localhost:" + this.port + "/elastic"); } @Test public void simpleProject() { downloadArchive("/starter.zip?groupId=com.foo&artifactId=bar&dependencies=web"); - assertEquals("No stat got generated", 1, statsMockController.stats.size()); - StatsMockController.Content content = statsMockController.stats.get(0); + assertEquals("No stat got generated", 1, this.statsMockController.stats.size()); + StatsMockController.Content content = this.statsMockController.stats.get(0); JsonNode json = parseJson(content.json); assertEquals("com.foo", json.get("groupId").textValue()); @@ -83,8 +84,8 @@ public class MainControllerStatsIntegrationTests @Test public void authorizationHeaderIsSet() { downloadArchive("/starter.zip"); - assertEquals("No stat got generated", 1, statsMockController.stats.size()); - StatsMockController.Content content = statsMockController.stats.get(0); + assertEquals("No stat got generated", 1, this.statsMockController.stats.size()); + StatsMockController.Content content = this.statsMockController.stats.get(0); String authorization = content.authorization; assertNotNull("Authorization header must be set", authorization); @@ -99,8 +100,8 @@ public class MainControllerStatsIntegrationTests @Test public void requestIpNotSetByDefault() { downloadArchive("/starter.zip?groupId=com.foo&artifactId=bar&dependencies=web"); - assertEquals("No stat got generated", 1, statsMockController.stats.size()); - StatsMockController.Content content = statsMockController.stats.get(0); + assertEquals("No stat got generated", 1, this.statsMockController.stats.size()); + StatsMockController.Content content = this.statsMockController.stats.get(0); JsonNode json = parseJson(content.json); assertFalse("requestIp property should not be set", json.has("requestIp")); @@ -111,8 +112,8 @@ public class MainControllerStatsIntegrationTests RequestEntity request = RequestEntity.get(new URI(createUrl("/starter.zip"))) .header("X-FORWARDED-FOR", "10.0.0.123").build(); getRestTemplate().exchange(request, String.class); - assertEquals("No stat got generated", 1, statsMockController.stats.size()); - StatsMockController.Content content = statsMockController.stats.get(0); + assertEquals("No stat got generated", 1, this.statsMockController.stats.size()); + StatsMockController.Content content = this.statsMockController.stats.get(0); JsonNode json = parseJson(content.json); assertEquals("Wrong requestIp", "10.0.0.123", json.get("requestIp").textValue()); @@ -123,8 +124,8 @@ public class MainControllerStatsIntegrationTests RequestEntity request = RequestEntity.get(new URI(createUrl("/starter.zip"))) .header("x-forwarded-for", "foo-bar").build(); getRestTemplate().exchange(request, String.class); - assertEquals("No stat got generated", 1, statsMockController.stats.size()); - StatsMockController.Content content = statsMockController.stats.get(0); + assertEquals("No stat got generated", 1, this.statsMockController.stats.size()); + StatsMockController.Content content = this.statsMockController.stats.get(0); JsonNode json = parseJson(content.json); assertFalse("requestIpv4 property should not be set if value is not a valid IPv4", @@ -136,8 +137,8 @@ public class MainControllerStatsIntegrationTests RequestEntity request = RequestEntity.get(new URI(createUrl("/starter.zip"))) .header("cf-ipcountry", "XX").build(); getRestTemplate().exchange(request, String.class); - assertEquals("No stat got generated", 1, statsMockController.stats.size()); - StatsMockController.Content content = statsMockController.stats.get(0); + assertEquals("No stat got generated", 1, this.statsMockController.stats.size()); + StatsMockController.Content content = this.statsMockController.stats.get(0); JsonNode json = parseJson(content.json); assertFalse("requestCountry property should not be set if value is set to xx", @@ -153,8 +154,8 @@ public class MainControllerStatsIntegrationTests catch (HttpClientErrorException ex) { assertEquals(HttpStatus.BAD_REQUEST, ex.getStatusCode()); } - assertEquals("No stat got generated", 1, statsMockController.stats.size()); - StatsMockController.Content content = statsMockController.stats.get(0); + assertEquals("No stat got generated", 1, this.statsMockController.stats.size()); + StatsMockController.Content content = this.statsMockController.stats.get(0); JsonNode json = parseJson(content.json); assertEquals("com.example", json.get("groupId").textValue()); @@ -168,9 +169,10 @@ public class MainControllerStatsIntegrationTests @Test public void errorPublishingStatsDoesNotBubbleUp() { this.statsProperties.getElastic() - .setUri("http://localhost:" + port + "/elastic-error"); + .setUri("http://localhost:" + this.port + "/elastic-error"); downloadArchive("/starter.zip"); - assertEquals("No stat should be available", 0, statsMockController.stats.size()); + assertEquals("No stat should be available", 0, + this.statsMockController.stats.size()); } @RestController @@ -198,7 +200,7 @@ public class MainControllerStatsIntegrationTests Content(String authorization, String body) { this.authorization = authorization; - json = body; + this.json = body; } } diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectGenerationStatPublisherTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectGenerationStatPublisherTests.java index 19228831..c45c3433 100644 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectGenerationStatPublisherTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectGenerationStatPublisherTests.java @@ -56,8 +56,8 @@ public class ProjectGenerationStatPublisherTests extends AbstractInitializrStatT createProvider(getMetadata())); this.retryTemplate = new RetryTemplate(); this.statPublisher = new ProjectGenerationStatPublisher(documentFactory, - properties, new RestTemplateBuilder(), retryTemplate); - mockServer = MockRestServiceServer + properties, new RestTemplateBuilder(), this.retryTemplate); + this.mockServer = MockRestServiceServer .createServer(this.statPublisher.getRestTemplate()); } @@ -67,7 +67,7 @@ public class ProjectGenerationStatPublisherTests extends AbstractInitializrStatT request.setGroupId("com.example.foo"); request.setArtifactId("my-project"); - mockServer.expect(requestTo("http://example.com/elastic/initializr/request")) + this.mockServer.expect(requestTo("http://example.com/elastic/initializr/request")) .andExpect(method(HttpMethod.POST)) .andExpect(jsonPath("$.groupId").value("com.example.foo")) .andExpect(jsonPath("$.artifactId").value("my-project")) @@ -76,29 +76,29 @@ public class ProjectGenerationStatPublisherTests extends AbstractInitializrStatT .contentType(MediaType.APPLICATION_JSON)); this.statPublisher.handleEvent(new ProjectGeneratedEvent(request)); - mockServer.verify(); + this.mockServer.verify(); } @Test public void recoverFromError() { ProjectRequest request = createProjectRequest(); - mockServer.expect(requestTo("http://example.com/elastic/initializr/request")) + this.mockServer.expect(requestTo("http://example.com/elastic/initializr/request")) .andExpect(method(HttpMethod.POST)) .andRespond(withStatus(HttpStatus.INTERNAL_SERVER_ERROR)); - mockServer.expect(requestTo("http://example.com/elastic/initializr/request")) + this.mockServer.expect(requestTo("http://example.com/elastic/initializr/request")) .andExpect(method(HttpMethod.POST)) .andRespond(withStatus(HttpStatus.INTERNAL_SERVER_ERROR)); - mockServer.expect(requestTo("http://example.com/elastic/initializr/request")) + this.mockServer.expect(requestTo("http://example.com/elastic/initializr/request")) .andExpect(method(HttpMethod.POST)) .andRespond(withStatus(HttpStatus.CREATED) .body(mockResponse(UUID.randomUUID().toString(), true)) .contentType(MediaType.APPLICATION_JSON)); this.statPublisher.handleEvent(new ProjectGeneratedEvent(request)); - mockServer.verify(); + this.mockServer.verify(); } @Test @@ -107,16 +107,16 @@ public class ProjectGenerationStatPublisherTests extends AbstractInitializrStatT this.retryTemplate.setRetryPolicy(new SimpleRetryPolicy(2, Collections.singletonMap(Exception.class, true))); - mockServer.expect(requestTo("http://example.com/elastic/initializr/request")) + this.mockServer.expect(requestTo("http://example.com/elastic/initializr/request")) .andExpect(method(HttpMethod.POST)) .andRespond(withStatus(HttpStatus.INTERNAL_SERVER_ERROR)); - mockServer.expect(requestTo("http://example.com/elastic/initializr/request")) + this.mockServer.expect(requestTo("http://example.com/elastic/initializr/request")) .andExpect(method(HttpMethod.POST)) .andRespond(withStatus(HttpStatus.INTERNAL_SERVER_ERROR)); this.statPublisher.handleEvent(new ProjectGeneratedEvent(request)); - mockServer.verify(); + this.mockServer.verify(); } private static String mockResponse(String id, boolean created) { diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactoryTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactoryTests.java index cb10bcb9..e4422cb9 100644 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactoryTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactoryTests.java @@ -40,7 +40,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe public void createDocumentForSimpleProject() { ProjectRequest request = createProjectRequest(); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request); - ProjectRequestDocument document = factory.createDocument(event); + ProjectRequestDocument document = this.factory.createDocument(event); assertEquals(event.getTimestamp(), document.getGenerationTimestamp()); assertEquals(null, document.getRequestIp()); assertEquals("com.example", document.getGroupId()); @@ -60,7 +60,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe ProjectRequest request = createProjectRequest(); request.getParameters().put("x-forwarded-for", "10.0.0.123"); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request); - ProjectRequestDocument document = factory.createDocument(event); + ProjectRequestDocument document = this.factory.createDocument(event); assertEquals("10.0.0.123", document.getRequestIp()); assertEquals("10.0.0.123", document.getRequestIpv4()); assertNull(document.getRequestCountry()); @@ -71,7 +71,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe ProjectRequest request = createProjectRequest(); request.getParameters().put("x-forwarded-for", "2001:db8:a0b:12f0::1"); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request); - ProjectRequestDocument document = factory.createDocument(event); + ProjectRequestDocument document = this.factory.createDocument(event); assertEquals("2001:db8:a0b:12f0::1", document.getRequestIp()); assertNull(document.getRequestIpv4()); assertNull(document.getRequestCountry()); @@ -83,7 +83,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe request.getParameters().put("cf-connecting-ip", "10.0.0.123"); request.getParameters().put("cf-ipcountry", "BE"); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request); - ProjectRequestDocument document = factory.createDocument(event); + ProjectRequestDocument document = this.factory.createDocument(event); assertEquals("10.0.0.123", document.getRequestIp()); assertEquals("10.0.0.123", document.getRequestIpv4()); assertEquals("BE", document.getRequestCountry()); @@ -94,7 +94,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe ProjectRequest request = createProjectRequest(); request.getParameters().put("cf-connecting-ip", "2001:db8:a0b:12f0::1"); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request); - ProjectRequestDocument document = factory.createDocument(event); + ProjectRequestDocument document = this.factory.createDocument(event); assertEquals("2001:db8:a0b:12f0::1", document.getRequestIp()); assertNull(document.getRequestIpv4()); assertNull(document.getRequestCountry()); @@ -106,7 +106,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe request.getParameters().put("cf-connecting-ip", "10.0.0.123"); request.getParameters().put("x-forwarded-for", "192.168.1.101"); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request); - ProjectRequestDocument document = factory.createDocument(event); + ProjectRequestDocument document = this.factory.createDocument(event); assertEquals("10.0.0.123", document.getRequestIp()); assertEquals("10.0.0.123", document.getRequestIpv4()); assertNull(document.getRequestCountry()); @@ -117,7 +117,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe ProjectRequest request = createProjectRequest(); request.getParameters().put("cf-connecting-ip", "Xx"); // case insensitive ProjectGeneratedEvent event = new ProjectGeneratedEvent(request); - ProjectRequestDocument document = factory.createDocument(event); + ProjectRequestDocument document = this.factory.createDocument(event); assertNull(document.getRequestCountry()); } @@ -126,7 +126,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe ProjectRequest request = createProjectRequest(); request.getParameters().put("user-agent", "HTTPie/0.8.0"); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request); - ProjectRequestDocument document = factory.createDocument(event); + ProjectRequestDocument document = this.factory.createDocument(event); assertEquals("httpie", document.getClientId()); assertEquals("0.8.0", document.getClientVersion()); } @@ -136,7 +136,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe ProjectRequest request = createProjectRequest(); request.getParameters().put("user-agent", "IntelliJ IDEA"); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request); - ProjectRequestDocument document = factory.createDocument(event); + ProjectRequestDocument document = this.factory.createDocument(event); assertEquals("intellijidea", document.getClientId()); assertEquals(null, document.getClientVersion()); } @@ -146,7 +146,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe ProjectRequest request = createProjectRequest(); request.setJavaVersion("1.2"); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request); - ProjectRequestDocument document = factory.createDocument(event); + ProjectRequestDocument document = this.factory.createDocument(event); assertEquals("1.2", document.getJavaVersion()); assertTrue(document.isInvalid()); assertTrue(document.isInvalidJavaVersion()); @@ -157,7 +157,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe ProjectRequest request = createProjectRequest(); request.setLanguage("c++"); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request); - ProjectRequestDocument document = factory.createDocument(event); + ProjectRequestDocument document = this.factory.createDocument(event); assertEquals("c++", document.getLanguage()); assertTrue(document.isInvalid()); assertTrue(document.isInvalidLanguage()); @@ -168,7 +168,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe ProjectRequest request = createProjectRequest(); request.setPackaging("ear"); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request); - ProjectRequestDocument document = factory.createDocument(event); + ProjectRequestDocument document = this.factory.createDocument(event); assertEquals("ear", document.getPackaging()); assertTrue(document.isInvalid()); assertTrue(document.isInvalidPackaging()); @@ -179,7 +179,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe ProjectRequest request = createProjectRequest(); request.setType("ant-project"); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request); - ProjectRequestDocument document = factory.createDocument(event); + ProjectRequestDocument document = this.factory.createDocument(event); assertEquals("ant-project", document.getType()); assertTrue(document.isInvalid()); assertTrue(document.isInvalidType()); @@ -190,7 +190,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe ProjectRequest request = createProjectRequest(); request.setDependencies(Arrays.asList("web", "invalid", "data-jpa", "invalid-2")); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request); - ProjectRequestDocument document = factory.createDocument(event); + ProjectRequestDocument document = this.factory.createDocument(event); assertEquals("web", document.getDependencies().get(0)); assertEquals("data-jpa", document.getDependencies().get(1)); assertEquals(2, document.getDependencies().size()); @@ -205,7 +205,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe ProjectRequest request = createProjectRequest(); ProjectFailedEvent event = new ProjectFailedEvent(request, new IllegalStateException("my test message")); - ProjectRequestDocument document = factory.createDocument(event); + ProjectRequestDocument document = this.factory.createDocument(event); assertTrue(document.isInvalid()); assertEquals("my test message", document.getErrorMessage()); } diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/StatsPropertiesTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/StatsPropertiesTests.java index d4d6ba98..2dcda36e 100644 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/StatsPropertiesTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/StatsPropertiesTests.java @@ -30,16 +30,16 @@ public class StatsPropertiesTests { @Test public void cleanTrailingSlash() { - properties.getElastic().setUri("http://example.com/"); - assertThat(properties.getElastic().getUri(), is("http://example.com")); + this.properties.getElastic().setUri("http://example.com/"); + assertThat(this.properties.getElastic().getUri(), is("http://example.com")); } @Test public void provideEntityUrl() { - properties.getElastic().setUri("http://example.com/"); - properties.getElastic().setIndexName("my-index"); - properties.getElastic().setEntityName("foo"); - assertThat(properties.getElastic().getEntityUrl().toString(), + this.properties.getElastic().setUri("http://example.com/"); + this.properties.getElastic().setIndexName("my-index"); + this.properties.getElastic().setEntityName("foo"); + assertThat(this.properties.getElastic().getEntityUrl().toString(), is("http://example.com/my-index/foo")); } diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/test/MetricsAssert.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/test/MetricsAssert.java index 5256b5f0..a4428e78 100644 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/test/MetricsAssert.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/test/MetricsAssert.java @@ -37,8 +37,8 @@ public class MetricsAssert { } public MetricsAssert hasValue(long value, String... metrics) { - Arrays.asList(metrics) - .forEach(metric -> assertThat(meterRegistry.get(metric).counter().count()) + Arrays.asList(metrics).forEach( + metric -> assertThat(this.meterRegistry.get(metric).counter().count()) .isEqualTo(value)); return this; } diff --git a/initializr-docs/src/test/java/io/spring/initializr/stub/ClientApplicationTests.java b/initializr-docs/src/test/java/io/spring/initializr/stub/ClientApplicationTests.java index 535a96e8..3117e45e 100644 --- a/initializr-docs/src/test/java/io/spring/initializr/stub/ClientApplicationTests.java +++ b/initializr-docs/src/test/java/io/spring/initializr/stub/ClientApplicationTests.java @@ -7,6 +7,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.cloud.contract.stubrunner.StubFinder; @@ -19,8 +20,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.web.client.RestTemplate; -import static org.assertj.core.api.Assertions.*; -import static org.springframework.boot.test.context.SpringBootTest.*; +import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.NONE) diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/BasicProjectRequest.java b/initializr-generator/src/main/java/io/spring/initializr/generator/BasicProjectRequest.java index 6e93975d..1476fb3f 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/BasicProjectRequest.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/BasicProjectRequest.java @@ -60,7 +60,7 @@ public class BasicProjectRequest { private String baseDir; public List getStyle() { - return style; + return this.style; } public void setStyle(List style) { @@ -68,7 +68,7 @@ public class BasicProjectRequest { } public List getDependencies() { - return dependencies; + return this.dependencies; } public void setDependencies(List dependencies) { @@ -76,7 +76,7 @@ public class BasicProjectRequest { } public String getName() { - return name; + return this.name; } public void setName(String name) { @@ -84,7 +84,7 @@ public class BasicProjectRequest { } public String getType() { - return type; + return this.type; } public void setType(String type) { @@ -92,7 +92,7 @@ public class BasicProjectRequest { } public String getDescription() { - return description; + return this.description; } public void setDescription(String description) { @@ -100,7 +100,7 @@ public class BasicProjectRequest { } public String getGroupId() { - return groupId; + return this.groupId; } public void setGroupId(String groupId) { @@ -108,7 +108,7 @@ public class BasicProjectRequest { } public String getArtifactId() { - return artifactId; + return this.artifactId; } public void setArtifactId(String artifactId) { @@ -116,7 +116,7 @@ public class BasicProjectRequest { } public String getVersion() { - return version; + return this.version; } public void setVersion(String version) { @@ -124,7 +124,7 @@ public class BasicProjectRequest { } public String getBootVersion() { - return bootVersion; + return this.bootVersion; } public void setBootVersion(String bootVersion) { @@ -132,7 +132,7 @@ public class BasicProjectRequest { } public String getPackaging() { - return packaging; + return this.packaging; } public void setPackaging(String packaging) { @@ -140,7 +140,7 @@ public class BasicProjectRequest { } public String getApplicationName() { - return applicationName; + return this.applicationName; } public void setApplicationName(String applicationName) { @@ -148,7 +148,7 @@ public class BasicProjectRequest { } public String getLanguage() { - return language; + return this.language; } public void setLanguage(String language) { @@ -156,10 +156,10 @@ public class BasicProjectRequest { } public String getPackageName() { - if (StringUtils.hasText(packageName)) { - return packageName; + if (StringUtils.hasText(this.packageName)) { + return this.packageName; } - if (StringUtils.hasText(groupId) && StringUtils.hasText(artifactId)) { + if (StringUtils.hasText(this.groupId) && StringUtils.hasText(this.artifactId)) { return getGroupId() + "." + getArtifactId(); } return null; @@ -170,7 +170,7 @@ public class BasicProjectRequest { } public String getJavaVersion() { - return javaVersion; + return this.javaVersion; } public void setJavaVersion(String javaVersion) { @@ -178,7 +178,7 @@ public class BasicProjectRequest { } public String getBaseDir() { - return baseDir; + return this.baseDir; } public void setBaseDir(String baseDir) { diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/BuildProperties.java b/initializr-generator/src/main/java/io/spring/initializr/generator/BuildProperties.java index 9385088c..fe06bba7 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/BuildProperties.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/BuildProperties.java @@ -46,15 +46,15 @@ public class BuildProperties { private final TreeMap> versions = new TreeMap<>(); public Map> getMaven() { - return maven; + return this.maven; } public Map> getGradle() { - return gradle; + return this.gradle; } public Map> getVersions() { - return versions; + return this.versions; } } diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/CommandLineHelpGenerator.java b/initializr-generator/src/main/java/io/spring/initializr/generator/CommandLineHelpGenerator.java index 772bb474..7551d523 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/CommandLineHelpGenerator.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/CommandLineHelpGenerator.java @@ -58,7 +58,7 @@ public class CommandLineHelpGenerator { String serviceUrl) { Map model = initializeCommandLineModel(metadata, serviceUrl); model.put("hasExamples", false); - return template.process("cli-capabilities.txt", model); + return this.template.process("cli-capabilities.txt", model); } /** @@ -67,9 +67,9 @@ public class CommandLineHelpGenerator { public String generateCurlCapabilities(InitializrMetadata metadata, String serviceUrl) { Map model = initializeCommandLineModel(metadata, serviceUrl); - model.put("examples", template.process("curl-examples.txt", model)); + model.put("examples", this.template.process("curl-examples.txt", model)); model.put("hasExamples", true); - return template.process("cli-capabilities.txt", model); + return this.template.process("cli-capabilities.txt", model); } /** @@ -78,9 +78,9 @@ public class CommandLineHelpGenerator { public String generateHttpieCapabilities(InitializrMetadata metadata, String serviceUrl) { Map model = initializeCommandLineModel(metadata, serviceUrl); - model.put("examples", template.process("httpie-examples.txt", model)); + model.put("examples", this.template.process("httpie-examples.txt", model)); model.put("hasExamples", true); - return template.process("cli-capabilities.txt", model); + return this.template.process("cli-capabilities.txt", model); } /** @@ -91,7 +91,7 @@ public class CommandLineHelpGenerator { String serviceUrl) { Map model = initializeSpringBootCliModel(metadata, serviceUrl); model.put("hasExamples", false); - return template.process("boot-cli-capabilities.txt", model); + return this.template.process("boot-cli-capabilities.txt", model); } protected Map initializeCommandLineModel(InitializrMetadata metadata, diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectFailedEvent.java b/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectFailedEvent.java index 83cccd93..514d79ed 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectFailedEvent.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectFailedEvent.java @@ -34,7 +34,7 @@ public class ProjectFailedEvent extends ProjectRequestEvent { * Return the cause of the failure. */ public Exception getCause() { - return cause; + return this.cause; } } diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectGenerator.java b/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectGenerator.java index cab56a90..c5e809ca 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectGenerator.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectGenerator.java @@ -105,7 +105,7 @@ public class ProjectGenerator { private transient Map> temporaryFiles = new LinkedHashMap<>(); public InitializrMetadataProvider getMetadataProvider() { - return metadataProvider; + return this.metadataProvider; } public void setEventPublisher(ApplicationEventPublisher eventPublisher) { @@ -277,11 +277,11 @@ public class ProjectGenerator { } private File getTemporaryDirectory() { - if (temporaryDirectory == null) { - temporaryDirectory = new File(tmpdir, "initializr"); - temporaryDirectory.mkdirs(); + if (this.temporaryDirectory == null) { + this.temporaryDirectory = new File(this.tmpdir, "initializr"); + this.temporaryDirectory.mkdirs(); } - return temporaryDirectory; + return this.temporaryDirectory; } /** @@ -289,7 +289,7 @@ public class ProjectGenerator { * @see #createDistributionFile */ public void cleanTempFiles(File dir) { - List tempFiles = temporaryFiles.remove(dir.getName()); + List tempFiles = this.temporaryFiles.remove(dir.getName()); if (!tempFiles.isEmpty()) { tempFiles.forEach((File file) -> { if (file.isDirectory()) { @@ -304,12 +304,12 @@ public class ProjectGenerator { private void publishProjectGeneratedEvent(ProjectRequest request) { ProjectGeneratedEvent event = new ProjectGeneratedEvent(request); - eventPublisher.publishEvent(event); + this.eventPublisher.publishEvent(event); } private void publishProjectFailedEvent(ProjectRequest request, Exception cause) { ProjectFailedEvent event = new ProjectFailedEvent(request, cause); - eventPublisher.publishEvent(event); + this.eventPublisher.publishEvent(event); } /** @@ -338,9 +338,9 @@ public class ProjectGenerator { protected Map resolveModel(ProjectRequest originalRequest) { Assert.notNull(originalRequest.getBootVersion(), "boot version must not be null"); Map model = new LinkedHashMap<>(); - InitializrMetadata metadata = metadataProvider.get(); + InitializrMetadata metadata = this.metadataProvider.get(); - ProjectRequest request = requestResolver.resolve(originalRequest, metadata); + ProjectRequest request = this.requestResolver.resolve(originalRequest, metadata); // request resolved so we can log what has been requested Version bootVersion = Version.safeParse(request.getBootVersion()); @@ -590,15 +590,15 @@ public class ProjectGenerator { } private byte[] doGenerateMavenPom(Map model) { - return templateRenderer.process("starter-pom.xml", model).getBytes(); + return this.templateRenderer.process("starter-pom.xml", model).getBytes(); } private byte[] doGenerateGradleBuild(Map model) { - return templateRenderer.process("starter-build.gradle", model).getBytes(); + return this.templateRenderer.process("starter-build.gradle", model).getBytes(); } private byte[] doGenerateGradleSettings(Map model) { - return templateRenderer.process("starter-settings.gradle", model).getBytes(); + return this.templateRenderer.process("starter-settings.gradle", model).getBytes(); } private void writeGradleWrapper(File dir, Version bootVersion) { @@ -639,11 +639,11 @@ public class ProjectGenerator { boolean binary) { File target = new File(dir, name); if (binary) { - writeBinary(target, projectResourceLocator + writeBinary(target, this.projectResourceLocator .getBinaryResource("classpath:project/" + location)); } else { - writeText(target, projectResourceLocator + writeText(target, this.projectResourceLocator .getTextResource("classpath:project/" + location)); } return target; @@ -661,7 +661,7 @@ public class ProjectGenerator { } public void write(File target, String templateName, Map model) { - String body = templateRenderer.process(templateName, model); + String body = this.templateRenderer.process(templateName, model); writeText(target, body); } @@ -684,7 +684,7 @@ public class ProjectGenerator { } private void addTempFile(String group, File file) { - temporaryFiles.computeIfAbsent(group, key -> new ArrayList<>()).add(file); + this.temporaryFiles.computeIfAbsent(group, key -> new ArrayList<>()).add(file); } private static List filterDependencies(List dependencies, @@ -734,7 +734,7 @@ public class ProjectGenerator { } public Imports add(String type) { - this.statements.add(generateImport(type, language)); + this.statements.add(generateImport(type, this.language)); return this; } @@ -749,12 +749,13 @@ public class ProjectGenerator { return "import " + type + end; } + @Override public String toString() { if (this.statements.isEmpty()) { return ""; } String content = String.join(String.format("%n"), this.statements); - return (finalCarriageReturn ? String.format("%s%n", content) : content); + return (this.finalCarriageReturn ? String.format("%s%n", content) : content); } } @@ -775,12 +776,13 @@ public class ProjectGenerator { return this; } + @Override public String toString() { if (this.statements.isEmpty()) { return ""; } String content = String.join(String.format("%n"), this.statements); - return (finalCarriageReturn ? String.format("%s%n", content) : content); + return (this.finalCarriageReturn ? String.format("%s%n", content) : content); } } diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectRequest.java b/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectRequest.java index 623698b0..0152ddd1 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectRequest.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectRequest.java @@ -63,7 +63,7 @@ public class ProjectRequest extends BasicProjectRequest { private String build; public List getResolvedDependencies() { - return resolvedDependencies; + return this.resolvedDependencies; } public void setResolvedDependencies(List resolvedDependencies) { @@ -71,7 +71,7 @@ public class ProjectRequest extends BasicProjectRequest { } public List getFacets() { - return facets; + return this.facets; } public void setFacets(List facets) { @@ -79,7 +79,7 @@ public class ProjectRequest extends BasicProjectRequest { } public String getBuild() { - return build; + return this.build; } public void setBuild(String build) { @@ -90,22 +90,22 @@ public class ProjectRequest extends BasicProjectRequest { * Return the additional parameters that can be used to further identify the request. */ public Map getParameters() { - return parameters; + return this.parameters; } public Map getBoms() { - return boms; + return this.boms; } public Map getRepositories() { - return repositories; + return this.repositories; } /** * Return the build properties. */ public BuildProperties getBuildProperties() { - return buildProperties; + return this.buildProperties; } /** @@ -143,8 +143,8 @@ public class ProjectRequest extends BasicProjectRequest { }).collect(Collectors.toList()); this.resolvedDependencies.forEach(it -> { it.getFacets().forEach(facet -> { - if (!facets.contains(facet)) { - facets.add(facet); + if (!this.facets.contains(facet)) { + this.facets.add(facet); } }); if (!it.match(requestedVersion)) { @@ -209,13 +209,13 @@ public class ProjectRequest extends BasicProjectRequest { protected void initializeRepositories(InitializrMetadata metadata, Version requestedVersion) { if (!"RELEASE".equals(requestedVersion.getQualifier().getQualifier())) { - repositories.put("spring-snapshots", metadata.getConfiguration().getEnv() + this.repositories.put("spring-snapshots", metadata.getConfiguration().getEnv() .getRepositories().get("spring-snapshots")); - repositories.put("spring-milestones", metadata.getConfiguration().getEnv() - .getRepositories().get("spring-milestones")); + this.repositories.put("spring-milestones", metadata.getConfiguration() + .getEnv().getRepositories().get("spring-milestones")); } - boms.values().forEach(it -> it.getRepositories().forEach(key -> { - repositories.computeIfAbsent(key, + this.boms.values().forEach(it -> it.getRepositories().forEach(key -> { + this.repositories.computeIfAbsent(key, s -> metadata.getConfiguration().getEnv().getRepositories().get(s)); })); } @@ -224,33 +224,36 @@ public class ProjectRequest extends BasicProjectRequest { Version requestedVersion) { String kotlinVersion = metadata.getConfiguration().getEnv().getKotlin() .resolveKotlinVersion(requestedVersion); - if ("gradle".equals(build)) { - buildProperties.getGradle().put("springBootVersion", this::getBootVersion); + if ("gradle".equals(this.build)) { + this.buildProperties.getGradle().put("springBootVersion", + this::getBootVersion); if ("kotlin".equals(getLanguage())) { - buildProperties.getGradle().put("kotlinVersion", () -> kotlinVersion); + this.buildProperties.getGradle().put("kotlinVersion", + () -> kotlinVersion); } } else { - buildProperties.getMaven().put("project.build.sourceEncoding", () -> "UTF-8"); - buildProperties.getMaven().put("project.reporting.outputEncoding", + this.buildProperties.getMaven().put("project.build.sourceEncoding", () -> "UTF-8"); - buildProperties.getVersions().put(new VersionProperty("java.version"), + this.buildProperties.getMaven().put("project.reporting.outputEncoding", + () -> "UTF-8"); + this.buildProperties.getVersions().put(new VersionProperty("java.version"), this::getJavaVersion); if ("kotlin".equals(getLanguage())) { - buildProperties.getVersions().put(new VersionProperty("kotlin.version"), - () -> kotlinVersion); + this.buildProperties.getVersions() + .put(new VersionProperty("kotlin.version"), () -> kotlinVersion); } } } private void resolveBom(InitializrMetadata metadata, String bomId, Version requestedVersion) { - if (!boms.containsKey(bomId)) { + if (!this.boms.containsKey(bomId)) { BillOfMaterials bom = metadata.getConfiguration().getEnv().getBoms() .get(bomId).resolve(requestedVersion); bom.getAdditionalBoms() .forEach(id -> resolveBom(metadata, id, requestedVersion)); - boms.put(bomId, bom); + this.boms.put(bomId, bom); } } @@ -262,15 +265,15 @@ public class ProjectRequest extends BasicProjectRequest { if ("war".equals(getPackaging())) { if (!hasWebFacet()) { // Need to be able to bootstrap the web app - resolvedDependencies.add(metadata.getDependencies().get("web")); - facets.add("web"); + this.resolvedDependencies.add(metadata.getDependencies().get("web")); + this.facets.add("web"); } // Add the tomcat starter in provided scope Dependency tomcat = new Dependency().asSpringBootStarter("tomcat"); tomcat.setScope(Dependency.SCOPE_PROVIDED); - resolvedDependencies.add(tomcat); + this.resolvedDependencies.add(tomcat); } - if (resolvedDependencies.stream().noneMatch(Dependency::isStarter)) { + if (this.resolvedDependencies.stream().noneMatch(Dependency::isStarter)) { // There"s no starter so we add the default one addDefaultDependency(); } @@ -283,7 +286,7 @@ public class ProjectRequest extends BasicProjectRequest { Dependency root = new Dependency(); root.setId(DEFAULT_STARTER); root.asSpringBootStarter(""); - resolvedDependencies.add(root); + this.resolvedDependencies.add(root); } /** @@ -297,18 +300,18 @@ public class ProjectRequest extends BasicProjectRequest { * Specify if this request has the specified facet enabled */ public boolean hasFacet(String facet) { - return facets.contains(facet); + return this.facets.contains(facet); } @Override public String toString() { - return "ProjectRequest [" + "parameters=" + parameters + ", " - + (resolvedDependencies != null - ? "resolvedDependencies=" + resolvedDependencies + ", " : "") - + "boms=" + boms + ", " + "repositories=" + repositories + ", " - + "buildProperties=" + buildProperties + ", " - + (facets != null ? "facets=" + facets + ", " : "") - + (build != null ? "build=" + build : "") + "]"; + return "ProjectRequest [" + "parameters=" + this.parameters + ", " + + (this.resolvedDependencies != null + ? "resolvedDependencies=" + this.resolvedDependencies + ", " : "") + + "boms=" + this.boms + ", " + "repositories=" + this.repositories + ", " + + "buildProperties=" + this.buildProperties + ", " + + (this.facets != null ? "facets=" + this.facets + ", " : "") + + (this.build != null ? "build=" + this.build : "") + "]"; } } diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectRequestEvent.java b/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectRequestEvent.java index 857ecc28..7599dacb 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectRequestEvent.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectRequestEvent.java @@ -38,14 +38,14 @@ public abstract class ProjectRequestEvent { * Return the {@link ProjectRequest} used to generate the project. */ public ProjectRequest getProjectRequest() { - return projectRequest; + return this.projectRequest; } /** * Return the timestamp at which the request was processed. */ public long getTimestamp() { - return timestamp; + return this.timestamp; } } diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectRequestResolver.java b/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectRequestResolver.java index eafbfc6e..5404488f 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectRequestResolver.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectRequestResolver.java @@ -46,14 +46,14 @@ public class ProjectRequestResolver { private void applyPostProcessBeforeResolution(ProjectRequest request, InitializrMetadata metadata) { - for (ProjectRequestPostProcessor processor : postProcessors) { + for (ProjectRequestPostProcessor processor : this.postProcessors) { processor.postProcessBeforeResolution(request, metadata); } } private void applyPostProcessAfterResolution(ProjectRequest request, InitializrMetadata metadata) { - for (ProjectRequestPostProcessor processor : postProcessors) { + for (ProjectRequestPostProcessor processor : this.postProcessors) { processor.postProcessAfterResolution(request, metadata); } } diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/BillOfMaterials.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/BillOfMaterials.java index 8682ce8a..89ae80e6 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/metadata/BillOfMaterials.java +++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/BillOfMaterials.java @@ -67,7 +67,7 @@ public class BillOfMaterials { } public String getGroupId() { - return groupId; + return this.groupId; } public void setGroupId(String groupId) { @@ -75,7 +75,7 @@ public class BillOfMaterials { } public String getArtifactId() { - return artifactId; + return this.artifactId; } public void setArtifactId(String artifactId) { @@ -86,7 +86,7 @@ public class BillOfMaterials { * Return the version of the BOM. Can be {@code null} if it is provided via a mapping. */ public String getVersion() { - return version; + return this.version; } public void setVersion(String version) { @@ -99,7 +99,7 @@ public class BillOfMaterials { * version in the bom declaration itself. */ public VersionProperty getVersionProperty() { - return versionProperty; + return this.versionProperty; } public void setVersionProperty(VersionProperty versionProperty) { @@ -116,7 +116,7 @@ public class BillOfMaterials { * Boot dependencies bom has an order of 100. */ public Integer getOrder() { - return order; + return this.order; } public void setOrder(Integer order) { @@ -128,7 +128,7 @@ public class BillOfMaterials { * Can be {@code null} if it is provided via a mapping. */ public List getAdditionalBoms() { - return additionalBoms; + return this.additionalBoms; } public void setAdditionalBoms(List additionalBoms) { @@ -140,7 +140,7 @@ public class BillOfMaterials { * {@code null} if it is provided via a mapping. */ public List getRepositories() { - return repositories; + return this.repositories; } public void setRepositories(List repositories) { @@ -148,11 +148,11 @@ public class BillOfMaterials { } public List getMappings() { - return mappings; + return this.mappings; } public void validate() { - if (version == null && mappings.isEmpty()) { + if (this.version == null && this.mappings.isEmpty()) { throw new InvalidInitializrMetadataException( "No version available for " + this); } @@ -160,7 +160,7 @@ public class BillOfMaterials { } public void updateVersionRange(VersionParser versionParser) { - mappings.forEach(it -> { + this.mappings.forEach(it -> { try { it.range = versionParser.parseRange(it.versionRange); } @@ -177,20 +177,20 @@ public class BillOfMaterials { * additional BOMs to use, if any. */ public BillOfMaterials resolve(Version bootVersion) { - if (mappings.isEmpty()) { + if (this.mappings.isEmpty()) { return this; } - for (Mapping mapping : mappings) { + for (Mapping mapping : this.mappings) { if (mapping.range.match(bootVersion)) { - BillOfMaterials resolvedBom = new BillOfMaterials(groupId, artifactId, - mapping.version); - resolvedBom.setVersionProperty(versionProperty); - resolvedBom.setOrder(order); + BillOfMaterials resolvedBom = new BillOfMaterials(this.groupId, + this.artifactId, mapping.version); + resolvedBom.setVersionProperty(this.versionProperty); + resolvedBom.setOrder(this.order); resolvedBom.repositories.addAll(!mapping.repositories.isEmpty() - ? mapping.repositories : repositories); + ? mapping.repositories : this.repositories); resolvedBom.additionalBoms.addAll(!mapping.additionalBoms.isEmpty() - ? mapping.additionalBoms : additionalBoms); + ? mapping.additionalBoms : this.additionalBoms); return resolvedBom; } } @@ -200,15 +200,17 @@ public class BillOfMaterials { @Override public String toString() { - return "BillOfMaterials [" + (groupId != null ? "groupId=" + groupId + ", " : "") - + (artifactId != null ? "artifactId=" + artifactId + ", " : "") - + (version != null ? "version=" + version + ", " : "") - + (versionProperty != null - ? "versionProperty=" + versionProperty + ", " : "") - + (order != null ? "order=" + order + ", " : "") - + (additionalBoms != null ? "additionalBoms=" + additionalBoms + ", " - : "") - + (repositories != null ? "repositories=" + repositories : "") + "]"; + return "BillOfMaterials [" + + (this.groupId != null ? "groupId=" + this.groupId + ", " : "") + + (this.artifactId != null ? "artifactId=" + this.artifactId + ", " : "") + + (this.version != null ? "version=" + this.version + ", " : "") + + (this.versionProperty != null + ? "versionProperty=" + this.versionProperty + ", " : "") + + (this.order != null ? "order=" + this.order + ", " : "") + + (this.additionalBoms != null + ? "additionalBoms=" + this.additionalBoms + ", " : "") + + (this.repositories != null ? "repositories=" + this.repositories : "") + + "]"; } public static class Mapping { @@ -234,7 +236,7 @@ public class BillOfMaterials { } public String determineVersionRangeRequirement() { - return range.toString(); + return this.range.toString(); } public static Mapping create(String range, String version) { @@ -247,23 +249,23 @@ public class BillOfMaterials { } public String getVersionRange() { - return versionRange; + return this.versionRange; } public String getVersion() { - return version; + return this.version; } public List getRepositories() { - return repositories; + return this.repositories; } public List getAdditionalBoms() { - return additionalBoms; + return this.additionalBoms; } public VersionRange getRange() { - return range; + return this.range; } public void setVersionRange(String versionRange) { @@ -289,12 +291,14 @@ public class BillOfMaterials { @Override public String toString() { return "Mapping [" - + (versionRange != null ? "versionRange=" + versionRange + ", " : "") - + (version != null ? "version=" + version + ", " : "") - + (repositories != null ? "repositories=" + repositories + ", " : "") - + (additionalBoms != null ? "additionalBoms=" + additionalBoms + ", " - : "") - + (range != null ? "range=" + range : "") + "]"; + + (this.versionRange != null + ? "versionRange=" + this.versionRange + ", " : "") + + (this.version != null ? "version=" + this.version + ", " : "") + + (this.repositories != null + ? "repositories=" + this.repositories + ", " : "") + + (this.additionalBoms != null + ? "additionalBoms=" + this.additionalBoms + ", " : "") + + (this.range != null ? "range=" + this.range : "") + "]"; } } diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/DependenciesCapability.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/DependenciesCapability.java index 16176cb3..5abb0e07 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/metadata/DependenciesCapability.java +++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/DependenciesCapability.java @@ -46,7 +46,7 @@ public class DependenciesCapability extends ServiceCapability getContent() { - return content; + return this.content; } /** @@ -54,14 +54,14 @@ public class DependenciesCapability extends ServiceCapability getAll() { - return Collections.unmodifiableCollection(indexedDependencies.values()); + return Collections.unmodifiableCollection(this.indexedDependencies.values()); } public void validate() { @@ -69,23 +69,24 @@ public class DependenciesCapability extends ServiceCapability it.updateVersionRanges(versionParser)); + this.indexedDependencies.values() + .forEach(it -> it.updateVersionRanges(versionParser)); } @Override public void merge(List otherContent) { otherContent.forEach(group -> { - if (content.stream().noneMatch(it -> group.getName() != null + if (this.content.stream().noneMatch(it -> group.getName() != null && group.getName().equals(it.getName()))) { - content.add(group); + this.content.add(group); } }); index(); } private void index() { - indexedDependencies.clear(); - content.forEach(group -> group.content.forEach(dependency -> { + this.indexedDependencies.clear(); + this.content.forEach(group -> group.content.forEach(dependency -> { // Apply defaults if (dependency.getVersionRange() == null && group.getVersionRange() != null) { dependency.setVersionRange(group.getVersionRange()); @@ -106,13 +107,13 @@ public class DependenciesCapability extends ServiceCapability { + this.mappings.forEach(it -> { try { it.range = versionParser.parseRange(it.versionRange); } @@ -219,7 +220,7 @@ public class Dependency extends MetadataElement implements Describable { * specified version. */ public Dependency resolve(Version bootVersion) { - for (Mapping mapping : mappings) { + for (Mapping mapping : this.mappings) { if (mapping.range.match(bootVersion)) { Dependency dependency = new Dependency(this); dependency.groupId = mapping.groupId != null ? mapping.groupId @@ -240,8 +241,8 @@ public class Dependency extends MetadataElement implements Describable { * Specify if this dependency is available for the specified Spring Boot version. */ public boolean match(Version version) { - if (range != null) { - return range.match(version); + if (this.range != null) { + return this.range.match(version); } return true; } @@ -250,16 +251,16 @@ public class Dependency extends MetadataElement implements Describable { * Generate an id using the groupId and artifactId */ public String generateId() { - if (groupId == null || artifactId == null) { + if (this.groupId == null || this.artifactId == null) { throw new IllegalArgumentException("Could not generate id for " + this + ": at least groupId and artifactId must be set."); } - setId(groupId + ":" + artifactId); + setId(this.groupId + ":" + this.artifactId); return getId(); } public List getAliases() { - return aliases; + return this.aliases; } public void setAliases(List aliases) { @@ -267,7 +268,7 @@ public class Dependency extends MetadataElement implements Describable { } public List getFacets() { - return facets; + return this.facets; } public void setFacets(List facets) { @@ -275,7 +276,7 @@ public class Dependency extends MetadataElement implements Describable { } public String getGroupId() { - return groupId; + return this.groupId; } public void setGroupId(String groupId) { @@ -283,7 +284,7 @@ public class Dependency extends MetadataElement implements Describable { } public String getArtifactId() { - return artifactId; + return this.artifactId; } public void setArtifactId(String artifactId) { @@ -295,7 +296,7 @@ public class Dependency extends MetadataElement implements Describable { * managed by the project and does not need to be specified. */ public String getVersion() { - return version; + return this.version; } public void setVersion(String version) { @@ -307,7 +308,7 @@ public class Dependency extends MetadataElement implements Describable { * used (i.e. {@code jar}). */ public String getType() { - return type; + return this.type; } public void setType(String type) { @@ -319,7 +320,7 @@ public class Dependency extends MetadataElement implements Describable { * to the Spring Boot version. If no mapping matches, default attributes are used. */ public List getMappings() { - return mappings; + return this.mappings; } public void setMappings(List mappings) { @@ -328,7 +329,7 @@ public class Dependency extends MetadataElement implements Describable { @Override public String getDescription() { - return description; + return this.description; } public void setDescription(String description) { @@ -336,7 +337,7 @@ public class Dependency extends MetadataElement implements Describable { } public String getVersionRequirement() { - return versionRequirement; + return this.versionRequirement; } public void setVersionRequirement(String versionRequirement) { @@ -344,7 +345,7 @@ public class Dependency extends MetadataElement implements Describable { } public VersionRange getRange() { - return range; + return this.range; } public void setRange(VersionRange range) { @@ -352,7 +353,7 @@ public class Dependency extends MetadataElement implements Describable { } public String getBom() { - return bom; + return this.bom; } public void setBom(String bom) { @@ -360,7 +361,7 @@ public class Dependency extends MetadataElement implements Describable { } public String getRepository() { - return repository; + return this.repository; } public void setRepository(String repository) { @@ -368,7 +369,7 @@ public class Dependency extends MetadataElement implements Describable { } public int getWeight() { - return weight; + return this.weight; } public void setWeight(int weight) { @@ -376,7 +377,7 @@ public class Dependency extends MetadataElement implements Describable { } public boolean isStarter() { - return starter; + return this.starter; } public void setStarter(boolean starter) { @@ -384,7 +385,7 @@ public class Dependency extends MetadataElement implements Describable { } public List getKeywords() { - return keywords; + return this.keywords; } public void setKeywords(List keywords) { @@ -392,7 +393,7 @@ public class Dependency extends MetadataElement implements Describable { } public List getLinks() { - return links; + return this.links; } public void setLinks(List links) { @@ -400,18 +401,18 @@ public class Dependency extends MetadataElement implements Describable { } public String getScope() { - return scope; + return this.scope; } public String getVersionRange() { - return versionRange; + return this.versionRange; } @Override public String toString() { - return "Dependency{" + "id='" + getId() + '\'' + ", groupId='" + groupId + '\'' - + ", artifactId='" + artifactId + '\'' + ", version='" + version + '\'' - + '}'; + return "Dependency{" + "id='" + getId() + '\'' + ", groupId='" + this.groupId + + '\'' + ", artifactId='" + this.artifactId + '\'' + ", version='" + + this.version + '\'' + '}'; } /** @@ -443,7 +444,7 @@ public class Dependency extends MetadataElement implements Describable { private VersionRange range; public String getGroupId() { - return groupId; + return this.groupId; } public void setGroupId(String groupId) { @@ -451,7 +452,7 @@ public class Dependency extends MetadataElement implements Describable { } public String getArtifactId() { - return artifactId; + return this.artifactId; } public void setArtifactId(String artifactId) { @@ -459,7 +460,7 @@ public class Dependency extends MetadataElement implements Describable { } public String getVersion() { - return version; + return this.version; } public void setVersion(String version) { @@ -467,11 +468,11 @@ public class Dependency extends MetadataElement implements Describable { } public VersionRange getRange() { - return range; + return this.range; } public String getVersionRange() { - return versionRange; + return this.versionRange; } public void setVersionRange(String versionRange) { diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/DependencyGroup.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/DependencyGroup.java index f73768b2..f4e5538d 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/metadata/DependencyGroup.java +++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/DependencyGroup.java @@ -45,7 +45,7 @@ public class DependencyGroup { * Return the name of this group. */ public String getName() { - return name; + return this.name; } public void setName(String name) { @@ -57,7 +57,7 @@ public class DependencyGroup { * specified otherwise. */ public String getVersionRange() { - return versionRange; + return this.versionRange; } public void setVersionRange(String versionRange) { @@ -69,7 +69,7 @@ public class DependencyGroup { * specified otherwise. */ public String getBom() { - return bom; + return this.bom; } public void setBom(String bom) { @@ -81,7 +81,7 @@ public class DependencyGroup { * specified otherwise. */ public String getRepository() { - return repository; + return this.repository; } public void setRepository(String repository) { @@ -92,7 +92,7 @@ public class DependencyGroup { * Return the {@link Dependency dependencies} of this group. */ public List getContent() { - return content; + return this.content; } public static DependencyGroup create(String name) { diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/DependencyMetadata.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/DependencyMetadata.java index 5a386f9f..7cdb8a97 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/metadata/DependencyMetadata.java +++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/DependencyMetadata.java @@ -48,19 +48,19 @@ public class DependencyMetadata { } public Version getBootVersion() { - return bootVersion; + return this.bootVersion; } public Map getDependencies() { - return dependencies; + return this.dependencies; } public Map getRepositories() { - return repositories; + return this.repositories; } public Map getBoms() { - return boms; + return this.boms; } } diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrConfiguration.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrConfiguration.java index 33d5b6a5..a5e713a8 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrConfiguration.java +++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrConfiguration.java @@ -24,7 +24,6 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import com.fasterxml.jackson.annotation.JsonIgnore; import io.spring.initializr.util.InvalidVersionException; @@ -49,15 +48,15 @@ public class InitializrConfiguration { private final Env env = new Env(); public Env getEnv() { - return env; + return this.env; } public void validate() { - env.validate(); + this.env.validate(); } public void merge(InitializrConfiguration other) { - env.merge(other.env); + this.env.merge(other.env); } /** @@ -72,7 +71,7 @@ public class InitializrConfiguration { */ public String generateApplicationName(String name) { if (!StringUtils.hasText(name)) { - return env.fallbackApplicationName; + return this.env.fallbackApplicationName; } String text = splitCamelCase(name.trim()); // TODO: fix this @@ -82,8 +81,8 @@ public class InitializrConfiguration { } String candidate = StringUtils.capitalize(result); if (hasInvalidChar(candidate) - || env.invalidApplicationNames.contains(candidate)) { - return env.fallbackApplicationName; + || this.env.invalidApplicationNames.contains(candidate)) { + return this.env.fallbackApplicationName; } else { return candidate; @@ -105,7 +104,7 @@ public class InitializrConfiguration { } String candidate = cleanPackageName(packageName); if (hasInvalidChar(candidate.replace(".", "")) - || env.invalidPackageNames.contains(candidate)) { + || this.env.invalidPackageNames.contains(candidate)) { return defaultPackageName; } else { @@ -229,10 +228,12 @@ public class InitializrConfiguration { public Env() { try { - repositories.put("spring-snapshots", new Repository("Spring Snapshots", - new URL("https://repo.spring.io/snapshot"), true)); - repositories.put("spring-milestones", new Repository("Spring Milestones", - new URL("https://repo.spring.io/milestone"), false)); + this.repositories.put("spring-snapshots", + new Repository("Spring Snapshots", + new URL("https://repo.spring.io/snapshot"), true)); + this.repositories.put("spring-milestones", + new Repository("Spring Milestones", + new URL("https://repo.spring.io/milestone"), false)); } catch (MalformedURLException e) { throw new IllegalStateException("Cannot parse URL", e); @@ -240,7 +241,7 @@ public class InitializrConfiguration { } public String getSpringBootMetadataUrl() { - return springBootMetadataUrl; + return this.springBootMetadataUrl; } public void setSpringBootMetadataUrl(String springBootMetadataUrl) { @@ -248,7 +249,7 @@ public class InitializrConfiguration { } public String getGoogleAnalyticsTrackingCode() { - return googleAnalyticsTrackingCode; + return this.googleAnalyticsTrackingCode; } public void setGoogleAnalyticsTrackingCode(String googleAnalyticsTrackingCode) { @@ -256,7 +257,7 @@ public class InitializrConfiguration { } public String getFallbackApplicationName() { - return fallbackApplicationName; + return this.fallbackApplicationName; } public void setFallbackApplicationName(String fallbackApplicationName) { @@ -264,7 +265,7 @@ public class InitializrConfiguration { } public List getInvalidApplicationNames() { - return invalidApplicationNames; + return this.invalidApplicationNames; } public void setInvalidApplicationNames(List invalidApplicationNames) { @@ -272,7 +273,7 @@ public class InitializrConfiguration { } public List getInvalidPackageNames() { - return invalidPackageNames; + return this.invalidPackageNames; } public void setInvalidPackageNames(List invalidPackageNames) { @@ -280,7 +281,7 @@ public class InitializrConfiguration { } public boolean isForceSsl() { - return forceSsl; + return this.forceSsl; } public void setForceSsl(boolean forceSsl) { @@ -288,27 +289,27 @@ public class InitializrConfiguration { } public String getArtifactRepository() { - return artifactRepository; + return this.artifactRepository; } public Map getBoms() { - return boms; + return this.boms; } public Map getRepositories() { - return repositories; + return this.repositories; } public Gradle getGradle() { - return gradle; + return this.gradle; } public Kotlin getKotlin() { - return kotlin; + return this.kotlin; } public Maven getMaven() { - return maven; + return this.maven; } public void setArtifactRepository(String artifactRepository) { @@ -319,23 +320,23 @@ public class InitializrConfiguration { } public void validate() { - maven.parent.validate(); - boms.forEach((k, v) -> v.validate()); - kotlin.validate(); + this.maven.parent.validate(); + this.boms.forEach((k, v) -> v.validate()); + this.kotlin.validate(); } public void merge(Env other) { - artifactRepository = other.artifactRepository; - springBootMetadataUrl = other.springBootMetadataUrl; - googleAnalyticsTrackingCode = other.googleAnalyticsTrackingCode; - fallbackApplicationName = other.fallbackApplicationName; - invalidApplicationNames = other.invalidApplicationNames; - forceSsl = other.forceSsl; - gradle.merge(other.gradle); - kotlin.merge(other.kotlin); - maven.merge(other.maven); - other.boms.forEach(boms::putIfAbsent); - other.repositories.forEach(repositories::putIfAbsent); + this.artifactRepository = other.artifactRepository; + this.springBootMetadataUrl = other.springBootMetadataUrl; + this.googleAnalyticsTrackingCode = other.googleAnalyticsTrackingCode; + this.fallbackApplicationName = other.fallbackApplicationName; + this.invalidApplicationNames = other.invalidApplicationNames; + this.forceSsl = other.forceSsl; + this.gradle.merge(other.gradle); + this.kotlin.merge(other.kotlin); + this.maven.merge(other.maven); + other.boms.forEach(this.boms::putIfAbsent); + other.repositories.forEach(this.repositories::putIfAbsent); } public static class Gradle { @@ -346,11 +347,11 @@ public class InitializrConfiguration { private String dependencyManagementPluginVersion = "1.0.0.RELEASE"; private void merge(Gradle other) { - dependencyManagementPluginVersion = other.dependencyManagementPluginVersion; + this.dependencyManagementPluginVersion = other.dependencyManagementPluginVersion; } public String getDependencyManagementPluginVersion() { - return dependencyManagementPluginVersion; + return this.dependencyManagementPluginVersion; } public void setDependencyManagementPluginVersion( @@ -383,7 +384,7 @@ public class InitializrConfiguration { return mapping.version; } } - if (defaultVersion == null) { + if (this.defaultVersion == null) { throw new InvalidInitializrMetadataException( "No Kotlin version mapping available for " + bootVersion); } @@ -404,7 +405,7 @@ public class InitializrConfiguration { public void validate() { VersionParser simpleParser = new VersionParser(Collections.emptyList()); - mappings.forEach(m -> { + this.mappings.forEach(m -> { if (m.versionRange == null) { throw new InvalidInitializrMetadataException( "VersionRange is mandatory, invalid version mapping for " @@ -420,7 +421,7 @@ public class InitializrConfiguration { } public void updateVersionRange(VersionParser versionParser) { - mappings.forEach(it -> { + this.mappings.forEach(it -> { try { it.range = versionParser.parseRange(it.versionRange); } @@ -485,14 +486,14 @@ public class InitializrConfiguration { private final ParentPom parent = new ParentPom(); public ParentPom getParent() { - return parent; + return this.parent; } private void merge(Maven other) { - parent.groupId = other.parent.groupId; - parent.artifactId = other.parent.artifactId; - parent.version = other.parent.version; - parent.includeSpringBootBom = other.parent.includeSpringBootBom; + this.parent.groupId = other.parent.groupId; + this.parent.artifactId = other.parent.artifactId; + this.parent.version = other.parent.version; + this.parent.includeSpringBootBom = other.parent.includeSpringBootBom; } /** @@ -500,7 +501,7 @@ public class InitializrConfiguration { * spring boot parent pom with the specified {@code bootVersion} is used. */ public ParentPom resolveParentPom(String bootVersion) { - return StringUtils.hasText(parent.groupId) ? parent + return StringUtils.hasText(this.parent.groupId) ? this.parent : new ParentPom("org.springframework.boot", "spring-boot-starter-parent", bootVersion); } @@ -537,7 +538,7 @@ public class InitializrConfiguration { } public String getGroupId() { - return groupId; + return this.groupId; } public void setGroupId(String groupId) { @@ -545,7 +546,7 @@ public class InitializrConfiguration { } public String getArtifactId() { - return artifactId; + return this.artifactId; } public void setArtifactId(String artifactId) { @@ -553,7 +554,7 @@ public class InitializrConfiguration { } public String getVersion() { - return version; + return this.version; } public void setVersion(String version) { @@ -561,7 +562,7 @@ public class InitializrConfiguration { } public boolean isIncludeSpringBootBom() { - return includeSpringBootBom; + return this.includeSpringBootBom; } public void setIncludeSpringBootBom(boolean includeSpringBootBom) { @@ -569,12 +570,12 @@ public class InitializrConfiguration { } public void validate() { - if (!((!StringUtils.hasText(groupId) - && !StringUtils.hasText(artifactId) - && !StringUtils.hasText(version)) - || (StringUtils.hasText(groupId) - && StringUtils.hasText(artifactId) - && StringUtils.hasText(version)))) { + if (!((!StringUtils.hasText(this.groupId) + && !StringUtils.hasText(this.artifactId) + && !StringUtils.hasText(this.version)) + || (StringUtils.hasText(this.groupId) + && StringUtils.hasText(this.artifactId) + && StringUtils.hasText(this.version)))) { throw new InvalidInitializrMetadataException("Custom maven pom " + "requires groupId, artifactId and version"); } diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrMetadata.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrMetadata.java index 8826e1e1..a199a97a 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrMetadata.java +++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrMetadata.java @@ -60,12 +60,13 @@ public class InitializrMetadata { private final TextCapability groupId = new TextCapability("groupId", "Group", "project coordinates"); - private final TextCapability artifactId = new ArtifactIdCapability(name); + private final TextCapability artifactId = new ArtifactIdCapability(this.name); private final TextCapability version = new TextCapability("version", "Version", "project version"); - private final TextCapability packageName = new PackageCapability(groupId, artifactId); + private final TextCapability packageName = new PackageCapability(this.groupId, + this.artifactId); public InitializrMetadata() { this(new InitializrConfiguration()); @@ -76,55 +77,55 @@ public class InitializrMetadata { } public InitializrConfiguration getConfiguration() { - return configuration; + return this.configuration; } public DependenciesCapability getDependencies() { - return dependencies; + return this.dependencies; } public TypeCapability getTypes() { - return types; + return this.types; } public SingleSelectCapability getBootVersions() { - return bootVersions; + return this.bootVersions; } public SingleSelectCapability getPackagings() { - return packagings; + return this.packagings; } public SingleSelectCapability getJavaVersions() { - return javaVersions; + return this.javaVersions; } public SingleSelectCapability getLanguages() { - return languages; + return this.languages; } public TextCapability getName() { - return name; + return this.name; } public TextCapability getDescription() { - return description; + return this.description; } public TextCapability getGroupId() { - return groupId; + return this.groupId; } public TextCapability getArtifactId() { - return artifactId; + return this.artifactId; } public TextCapability getVersion() { - return version; + return this.version; } public TextCapability getPackageName() { - return packageName; + return this.packageName; } /** @@ -152,11 +153,12 @@ public class InitializrMetadata { */ public void validate() { this.configuration.validate(); - dependencies.validate(); + this.dependencies.validate(); - Map repositories = configuration.getEnv().getRepositories(); - Map boms = configuration.getEnv().getBoms(); - for (Dependency dependency : dependencies.getAll()) { + Map repositories = this.configuration.getEnv() + .getRepositories(); + Map boms = this.configuration.getEnv().getBoms(); + for (Dependency dependency : this.dependencies.getAll()) { if (dependency.getBom() != null && !boms.containsKey(dependency.getBom())) { throw new InvalidInitializrMetadataException( "Dependency " + dependency + "defines an invalid BOM id " @@ -215,10 +217,10 @@ public class InitializrMetadata { List bootVersions = this.bootVersions.getContent().stream() .map(it -> Version.parse(it.getId())).collect(Collectors.toList()); VersionParser parser = new VersionParser(bootVersions); - dependencies.updateVersionRange(parser); - configuration.getEnv().getBoms().values() + this.dependencies.updateVersionRange(parser); + this.configuration.getEnv().getBoms().values() .forEach(it -> it.updateVersionRange(parser)); - configuration.getEnv().getKotlin().updateVersionRange(parser); + this.configuration.getEnv().getKotlin().updateVersionRange(parser); } /** @@ -226,8 +228,8 @@ public class InitializrMetadata { * extension. */ public String createCliDistributionURl(String extension) { - String bootVersion = defaultId(bootVersions); - return configuration.getEnv().getArtifactRepository() + String bootVersion = defaultId(this.bootVersions); + return this.configuration.getEnv().getArtifactRepository() + "org/springframework/boot/spring-boot-cli/" + bootVersion + "/spring-boot-cli-" + bootVersion + "-bin." + extension; } @@ -249,17 +251,17 @@ public class InitializrMetadata { */ public Map defaults() { Map defaults = new LinkedHashMap<>(); - defaults.put("type", defaultId(types)); - defaults.put("bootVersion", defaultId(bootVersions)); - defaults.put("packaging", defaultId(packagings)); - defaults.put("javaVersion", defaultId(javaVersions)); - defaults.put("language", defaultId(languages)); - defaults.put("groupId", groupId.getContent()); - defaults.put("artifactId", artifactId.getContent()); - defaults.put("version", version.getContent()); - defaults.put("name", name.getContent()); - defaults.put("description", description.getContent()); - defaults.put("packageName", packageName.getContent()); + defaults.put("type", defaultId(this.types)); + defaults.put("bootVersion", defaultId(this.bootVersions)); + defaults.put("packaging", defaultId(this.packagings)); + defaults.put("javaVersion", defaultId(this.javaVersions)); + defaults.put("language", defaultId(this.languages)); + defaults.put("groupId", this.groupId.getContent()); + defaults.put("artifactId", this.artifactId.getContent()); + defaults.put("version", this.version.getContent()); + defaults.put("name", this.name.getContent()); + defaults.put("description", this.description.getContent()); + defaults.put("packageName", this.packageName.getContent()); return defaults; } @@ -281,7 +283,7 @@ public class InitializrMetadata { @Override public String getContent() { String value = super.getContent(); - return value == null ? nameCapability.getContent() : value; + return value == null ? this.nameCapability.getContent() : value; } } diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrMetadataBuilder.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrMetadataBuilder.java index ada0fc15..d7a1d487 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrMetadataBuilder.java +++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrMetadataBuilder.java @@ -101,7 +101,7 @@ public class InitializrMetadataBuilder { */ public InitializrMetadataBuilder withCustomizer( InitializrMetadataCustomizer customizer) { - customizers.add(customizer); + this.customizers.add(customizer); return this; } @@ -112,7 +112,7 @@ public class InitializrMetadataBuilder { InitializrConfiguration config = this.configuration != null ? this.configuration : new InitializrConfiguration(); InitializrMetadata metadata = createInstance(config); - for (InitializrMetadataCustomizer customizer : customizers) { + for (InitializrMetadataCustomizer customizer : this.customizers) { customizer.customize(metadata); } applyDefaults(metadata); @@ -156,18 +156,18 @@ public class InitializrMetadataBuilder { @Override public void customize(InitializrMetadata metadata) { - metadata.getDependencies().merge(properties.getDependencies()); - metadata.getTypes().merge(properties.getTypes()); - metadata.getBootVersions().merge(properties.getBootVersions()); - metadata.getPackagings().merge(properties.getPackagings()); - metadata.getJavaVersions().merge(properties.getJavaVersions()); - metadata.getLanguages().merge(properties.getLanguages()); - properties.getGroupId().apply(metadata.getGroupId()); - properties.getArtifactId().apply(metadata.getArtifactId()); - properties.getVersion().apply(metadata.getVersion()); - properties.getName().apply(metadata.getName()); - properties.getDescription().apply(metadata.getDescription()); - properties.getPackageName().apply(metadata.getPackageName()); + metadata.getDependencies().merge(this.properties.getDependencies()); + metadata.getTypes().merge(this.properties.getTypes()); + metadata.getBootVersions().merge(this.properties.getBootVersions()); + metadata.getPackagings().merge(this.properties.getPackagings()); + metadata.getJavaVersions().merge(this.properties.getJavaVersions()); + metadata.getLanguages().merge(this.properties.getLanguages()); + this.properties.getGroupId().apply(metadata.getGroupId()); + this.properties.getArtifactId().apply(metadata.getArtifactId()); + this.properties.getVersion().apply(metadata.getVersion()); + this.properties.getName().apply(metadata.getName()); + this.properties.getDescription().apply(metadata.getDescription()); + this.properties.getPackageName().apply(metadata.getPackageName()); } } @@ -188,9 +188,9 @@ public class InitializrMetadataBuilder { @Override public void customize(InitializrMetadata metadata) { - log.info("Loading initializr metadata from " + resource); + log.info("Loading initializr metadata from " + this.resource); try { - String content = StreamUtils.copyToString(resource.getInputStream(), + String content = StreamUtils.copyToString(this.resource.getInputStream(), UTF_8); ObjectMapper objectMapper = new ObjectMapper(); InitializrMetadata anotherMetadata = objectMapper.readValue(content, diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrProperties.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrProperties.java index 4fe837ed..8e3cb000 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrProperties.java +++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrProperties.java @@ -106,51 +106,51 @@ public class InitializrProperties extends InitializrConfiguration { private final SimpleElement packageName = new SimpleElement(null); public List getDependencies() { - return dependencies; + return this.dependencies; } public List getTypes() { - return types; + return this.types; } public List getPackagings() { - return packagings; + return this.packagings; } public List getJavaVersions() { - return javaVersions; + return this.javaVersions; } public List getLanguages() { - return languages; + return this.languages; } public List getBootVersions() { - return bootVersions; + return this.bootVersions; } public SimpleElement getGroupId() { - return groupId; + return this.groupId; } public SimpleElement getArtifactId() { - return artifactId; + return this.artifactId; } public SimpleElement getVersion() { - return version; + return this.version; } public SimpleElement getName() { - return name; + return this.name; } public SimpleElement getDescription() { - return description; + return this.description; } public SimpleElement getPackageName() { - return packageName; + return this.packageName; } public static class SimpleElement { @@ -175,7 +175,7 @@ public class InitializrProperties extends InitializrConfiguration { } public String getTitle() { - return title; + return this.title; } public void setTitle(String title) { @@ -183,7 +183,7 @@ public class InitializrProperties extends InitializrConfiguration { } public String getDescription() { - return description; + return this.description; } public void setDescription(String description) { @@ -191,7 +191,7 @@ public class InitializrProperties extends InitializrConfiguration { } public String getValue() { - return value; + return this.value; } public void setValue(String value) { @@ -199,14 +199,14 @@ public class InitializrProperties extends InitializrConfiguration { } public void apply(TextCapability capability) { - if (StringUtils.hasText(title)) { - capability.setTitle(title); + if (StringUtils.hasText(this.title)) { + capability.setTitle(this.title); } - if (StringUtils.hasText(description)) { - capability.setDescription(description); + if (StringUtils.hasText(this.description)) { + capability.setDescription(this.description); } - if (StringUtils.hasText(value)) { - capability.setContent(value); + if (StringUtils.hasText(this.value)) { + capability.setContent(this.value); } } diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/Link.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/Link.java index fe401a35..868a7065 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/metadata/Link.java +++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/Link.java @@ -88,7 +88,7 @@ public class Link { } public String getRel() { - return rel; + return this.rel; } public void setRel(String rel) { @@ -96,7 +96,7 @@ public class Link { } public boolean isTemplated() { - return templated; + return this.templated; } public void setTemplated(boolean templated) { @@ -104,7 +104,7 @@ public class Link { } public String getDescription() { - return description; + return this.description; } public void setDescription(String description) { @@ -112,11 +112,11 @@ public class Link { } public String getHref() { - return href; + return this.href; } public Set getTemplateVariables() { - return Collections.unmodifiableSet(templateVariables); + return Collections.unmodifiableSet(this.templateVariables); } public void setHref(String href) { @@ -124,15 +124,15 @@ public class Link { } public void resolve() { - if (rel == null) { + if (this.rel == null) { throw new InvalidInitializrMetadataException( "Invalid link " + this + ": rel attribute is mandatory"); } - if (href == null) { + if (this.href == null) { throw new InvalidInitializrMetadataException( "Invalid link " + this + ": href attribute is mandatory"); } - Matcher matcher = VARIABLE_REGEX.matcher(href); + Matcher matcher = VARIABLE_REGEX.matcher(this.href); while (matcher.find()) { String variable = matcher.group(1); this.templateVariables.add(variable); @@ -146,12 +146,12 @@ public class Link { * @return an URI where all variables have been expanded */ public URI expand(Map parameters) { - AtomicReference result = new AtomicReference<>(href); - templateVariables.forEach(var -> { + AtomicReference result = new AtomicReference<>(this.href); + this.templateVariables.forEach(var -> { Object value = parameters.get(var); if (value == null) { - throw new IllegalArgumentException( - "Could not expand " + href + ", missing value for '" + var + "'"); + throw new IllegalArgumentException("Could not expand " + this.href + + ", missing value for '" + var + "'"); } result.set(result.get().replace("{" + var + "}", value.toString())); }); diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/MetadataElement.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/MetadataElement.java index 5b124287..3a4c759d 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/metadata/MetadataElement.java +++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/MetadataElement.java @@ -46,11 +46,11 @@ public class MetadataElement { } public String getName() { - return name != null ? name : id; + return this.name != null ? this.name : this.id; } public String getId() { - return id; + return this.id; } public void setId(String id) { diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/Repository.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/Repository.java index 00fc63e4..d9886ac9 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/metadata/Repository.java +++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/Repository.java @@ -42,7 +42,7 @@ public class Repository { } public String getName() { - return name; + return this.name; } public void setName(String name) { @@ -50,7 +50,7 @@ public class Repository { } public URL getUrl() { - return url; + return this.url; } public void setUrl(URL url) { @@ -58,7 +58,7 @@ public class Repository { } public boolean isSnapshotsEnabled() { - return snapshotsEnabled; + return this.snapshotsEnabled; } public void setSnapshotsEnabled(boolean snapshotsEnabled) { @@ -67,44 +67,52 @@ public class Repository { @Override public String toString() { - return "Repository [" + (name != null ? "name=" + name + ", " : "") - + (url != null ? "url=" + url + ", " : "") + "snapshotsEnabled=" - + snapshotsEnabled + "]"; + return "Repository [" + (this.name != null ? "name=" + this.name + ", " : "") + + (this.url != null ? "url=" + this.url + ", " : "") + "snapshotsEnabled=" + + this.snapshotsEnabled + "]"; } @Override public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((name == null) ? 0 : name.hashCode()); - result = prime * result + (snapshotsEnabled ? 1231 : 1237); - result = prime * result + ((url == null) ? 0 : url.hashCode()); + result = prime * result + ((this.name == null) ? 0 : this.name.hashCode()); + result = prime * result + (this.snapshotsEnabled ? 1231 : 1237); + result = prime * result + ((this.url == null) ? 0 : this.url.hashCode()); return result; } @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } Repository other = (Repository) obj; - if (name == null) { - if (other.name != null) + if (this.name == null) { + if (other.name != null) { return false; + } } - else if (!name.equals(other.name)) + else if (!this.name.equals(other.name)) { return false; - if (snapshotsEnabled != other.snapshotsEnabled) + } + if (this.snapshotsEnabled != other.snapshotsEnabled) { return false; - if (url == null) { - if (other.url != null) + } + if (this.url == null) { + if (other.url != null) { return false; + } } - else if (!url.equals(other.url)) + else if (!this.url.equals(other.url)) { return false; + } return true; } diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/ServiceCapability.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/ServiceCapability.java index 8bd6fec6..4919f4b1 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/metadata/ServiceCapability.java +++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/ServiceCapability.java @@ -55,7 +55,7 @@ public abstract class ServiceCapability implements Cloneable { } public String getTitle() { - return title; + return this.title; } public void setTitle(String title) { @@ -63,7 +63,7 @@ public abstract class ServiceCapability implements Cloneable { } public String getDescription() { - return description; + return this.description; } public void setDescription(String description) { @@ -71,11 +71,11 @@ public abstract class ServiceCapability implements Cloneable { } public String getId() { - return id; + return this.id; } public ServiceCapabilityType getType() { - return type; + return this.type; } /** diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/ServiceCapabilityType.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/ServiceCapabilityType.java index cd9c6704..89c2784d 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/metadata/ServiceCapabilityType.java +++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/ServiceCapabilityType.java @@ -51,7 +51,7 @@ public enum ServiceCapabilityType { } public String getName() { - return name; + return this.name; } } diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/SingleSelectCapability.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/SingleSelectCapability.java index 942325ce..01079857 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/metadata/SingleSelectCapability.java +++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/SingleSelectCapability.java @@ -44,7 +44,7 @@ public class SingleSelectCapability @Override public List getContent() { - return content; + return this.content; } /** @@ -52,7 +52,7 @@ public class SingleSelectCapability */ @Override public DefaultMetadataElement getDefault() { - return content.stream().filter(DefaultMetadataElement::isDefault).findFirst() + return this.content.stream().filter(DefaultMetadataElement::isDefault).findFirst() .orElse(null); } @@ -60,7 +60,7 @@ public class SingleSelectCapability * Return the element with the specified id or {@code null} if no such element exists. */ public DefaultMetadataElement get(String id) { - return content.stream().filter(it -> id.equals(it.getId())).findFirst() + return this.content.stream().filter(it -> id.equals(it.getId())).findFirst() .orElse(null); } @@ -68,7 +68,7 @@ public class SingleSelectCapability public void merge(List otherContent) { otherContent.forEach(it -> { if (get(it.getId()) == null) { - content.add(it); + this.content.add(it); } }); } diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/TextCapability.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/TextCapability.java index 78e57ffe..d1a5dd3d 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/metadata/TextCapability.java +++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/TextCapability.java @@ -39,7 +39,7 @@ public class TextCapability extends ServiceCapability { @Override public String getContent() { - return content; + return this.content; } public void setContent(String content) { diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/Type.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/Type.java index ab67bb5a..f0694013 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/metadata/Type.java +++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/Type.java @@ -46,7 +46,7 @@ public class Type extends DefaultMetadataElement implements Describable { @Override public String getDescription() { - return description; + return this.description; } public void setDescription(String description) { @@ -55,7 +55,7 @@ public class Type extends DefaultMetadataElement implements Describable { @SuppressWarnings("deprecation") public String getStsId() { - return stsId; + return this.stsId; } @SuppressWarnings("deprecation") @@ -64,11 +64,11 @@ public class Type extends DefaultMetadataElement implements Describable { } public String getAction() { - return action; + return this.action; } public Map getTags() { - return tags; + return this.tags; } } diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/TypeCapability.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/TypeCapability.java index 53c3125d..e239c3ec 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/metadata/TypeCapability.java +++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/TypeCapability.java @@ -35,7 +35,7 @@ public class TypeCapability extends ServiceCapability> @Override public List getContent() { - return content; + return this.content; } /** @@ -43,7 +43,7 @@ public class TypeCapability extends ServiceCapability> * exists. */ public Type get(String id) { - return content.stream() + return this.content.stream() .filter(it -> id.equals(it.getId()) || id.equals(it.getStsId())) .findFirst().orElse(null); } @@ -53,7 +53,7 @@ public class TypeCapability extends ServiceCapability> */ @Override public Type getDefault() { - return content.stream().filter(DefaultMetadataElement::isDefault).findFirst() + return this.content.stream().filter(DefaultMetadataElement::isDefault).findFirst() .orElse(null); } @@ -61,7 +61,7 @@ public class TypeCapability extends ServiceCapability> public void merge(List otherContent) { otherContent.forEach(it -> { if (get(it.getId()) == null) { - content.add(it); + this.content.add(it); } }); } diff --git a/initializr-generator/src/main/java/io/spring/initializr/util/Agent.java b/initializr-generator/src/main/java/io/spring/initializr/util/Agent.java index f2d94a83..af2a007c 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/util/Agent.java +++ b/initializr-generator/src/main/java/io/spring/initializr/util/Agent.java @@ -42,11 +42,11 @@ public class Agent { } public AgentId getId() { - return id; + return this.id; } public String getVersion() { - return version; + return this.version; } /** @@ -86,11 +86,11 @@ public class Agent { final String name; public String getId() { - return id; + return this.id; } public String getName() { - return name; + return this.name; } AgentId(String id, String name) { diff --git a/initializr-generator/src/main/java/io/spring/initializr/util/TemplateRenderer.java b/initializr-generator/src/main/java/io/spring/initializr/util/TemplateRenderer.java index e5197a32..2c693967 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/util/TemplateRenderer.java +++ b/initializr-generator/src/main/java/io/spring/initializr/util/TemplateRenderer.java @@ -55,7 +55,7 @@ public class TemplateRenderer { } public boolean isCache() { - return cache; + return this.cache; } public void setCache(boolean cache) { @@ -74,7 +74,7 @@ public class TemplateRenderer { } public Template getTemplate(String name) { - if (cache) { + if (this.cache) { return this.templateCaches.computeIfAbsent(name, this::loadTemplate); } return loadTemplate(name); @@ -83,8 +83,8 @@ public class TemplateRenderer { protected Template loadTemplate(String name) { try { Reader template; - template = mustache.loader.getTemplate(name); - return mustache.compile(template); + template = this.mustache.loader.getTemplate(name); + return this.mustache.compile(template); } catch (Exception e) { throw new IllegalStateException("Cannot load template " + name, e); diff --git a/initializr-generator/src/main/java/io/spring/initializr/util/Version.java b/initializr-generator/src/main/java/io/spring/initializr/util/Version.java index d4f13076..8d60739b 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/util/Version.java +++ b/initializr-generator/src/main/java/io/spring/initializr/util/Version.java @@ -67,27 +67,26 @@ public final class Version implements Serializable, Comparable { } public Integer getMajor() { - return major; + return this.major; } public Integer getMinor() { - return minor; + return this.minor; } public Integer getPatch() { - return patch; + return this.patch; } public Qualifier getQualifier() { - return qualifier; + return this.qualifier; } @Override public String toString() { - return major + "." + minor + "." + patch - + (qualifier != null - ? "." + qualifier.qualifier - + (qualifier.version != null ? qualifier.version : "") + return this.major + "." + this.minor + "." + this.patch + + (this.qualifier != null ? "." + this.qualifier.qualifier + + (this.qualifier.version != null ? this.qualifier.version : "") : ""); } @@ -157,7 +156,7 @@ public final class Version implements Serializable, Comparable { private Integer version; public String getQualifier() { - return qualifier; + return this.qualifier; } public void setQualifier(String qualifier) { @@ -165,7 +164,7 @@ public final class Version implements Serializable, Comparable { } public Integer getVersion() { - return version; + return this.version; } public void setVersion(Integer version) { @@ -175,40 +174,49 @@ public final class Version implements Serializable, Comparable { @Override public String toString() { return "Qualifier [" - + (qualifier != null ? "qualifier=" + qualifier + ", " : "") - + (version != null ? "version=" + version : "") + "]"; + + (this.qualifier != null ? "qualifier=" + this.qualifier + ", " : "") + + (this.version != null ? "version=" + this.version : "") + "]"; } @Override public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qualifier == null) ? 0 : qualifier.hashCode()); - result = prime * result + ((version == null) ? 0 : version.hashCode()); + result = prime * result + + ((this.qualifier == null) ? 0 : this.qualifier.hashCode()); + result = prime * result + + ((this.version == null) ? 0 : this.version.hashCode()); return result; } @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } Qualifier other = (Qualifier) obj; - if (qualifier == null) { - if (other.qualifier != null) + if (this.qualifier == null) { + if (other.qualifier != null) { return false; + } } - else if (!qualifier.equals(other.qualifier)) + else if (!this.qualifier.equals(other.qualifier)) { return false; - if (version == null) { - if (other.version != null) + } + if (this.version == null) { + if (other.version != null) { return false; + } } - else if (!version.equals(other.version)) + else if (!this.version.equals(other.version)) { return false; + } return true; } @@ -218,46 +226,58 @@ public final class Version implements Serializable, Comparable { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((major == null) ? 0 : major.hashCode()); - result = prime * result + ((minor == null) ? 0 : minor.hashCode()); - result = prime * result + ((patch == null) ? 0 : patch.hashCode()); - result = prime * result + ((qualifier == null) ? 0 : qualifier.hashCode()); + result = prime * result + ((this.major == null) ? 0 : this.major.hashCode()); + result = prime * result + ((this.minor == null) ? 0 : this.minor.hashCode()); + result = prime * result + ((this.patch == null) ? 0 : this.patch.hashCode()); + result = prime * result + + ((this.qualifier == null) ? 0 : this.qualifier.hashCode()); return result; } @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } Version other = (Version) obj; - if (major == null) { - if (other.major != null) + if (this.major == null) { + if (other.major != null) { return false; + } } - else if (!major.equals(other.major)) + else if (!this.major.equals(other.major)) { return false; - if (minor == null) { - if (other.minor != null) + } + if (this.minor == null) { + if (other.minor != null) { return false; + } } - else if (!minor.equals(other.minor)) + else if (!this.minor.equals(other.minor)) { return false; - if (patch == null) { - if (other.patch != null) + } + if (this.patch == null) { + if (other.patch != null) { return false; + } } - else if (!patch.equals(other.patch)) + else if (!this.patch.equals(other.patch)) { return false; - if (qualifier == null) { - if (other.qualifier != null) + } + if (this.qualifier == null) { + if (other.qualifier != null) { return false; + } } - else if (!qualifier.equals(other.qualifier)) + else if (!this.qualifier.equals(other.qualifier)) { return false; + } return true; } diff --git a/initializr-generator/src/main/java/io/spring/initializr/util/VersionProperty.java b/initializr-generator/src/main/java/io/spring/initializr/util/VersionProperty.java index b32f9529..cecddaf8 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/util/VersionProperty.java +++ b/initializr-generator/src/main/java/io/spring/initializr/util/VersionProperty.java @@ -88,19 +88,21 @@ public class VersionProperty implements Serializable, Comparable())); - projectGenerator.setTmpdir(folder.newFolder().getAbsolutePath()); + this.projectGenerator.setTmpdir(this.folder.newFolder().getAbsolutePath()); } protected PomAssert generateMavenPom(ProjectRequest request) { request.setType("maven-build"); - String content = new String(projectGenerator.generateMavenPom(request)); + String content = new String(this.projectGenerator.generateMavenPom(request)); return new PomAssert(content).validateProjectRequest(request); } protected GradleBuildAssert generateGradleBuild(ProjectRequest request) { request.setType("gradle-build"); - String content = new String(projectGenerator.generateGradleBuild(request)); + String content = new String(this.projectGenerator.generateGradleBuild(request)); return new GradleBuildAssert(content).validateProjectRequest(request); } protected ProjectAssert generateProject(ProjectRequest request) { - File dir = projectGenerator.generateProjectStructure(request); + File dir = this.projectGenerator.generateProjectStructure(request); return new ProjectAssert(dir); } public ProjectRequest createProjectRequest(String... styles) { ProjectRequest request = new ProjectRequest(); - request.initialize(projectGenerator.getMetadataProvider().get()); + request.initialize(this.projectGenerator.getMetadataProvider().get()); request.getStyle().addAll(Arrays.asList(styles)); return request; } protected void applyMetadata(InitializrMetadata metadata) { - projectGenerator + this.projectGenerator .setMetadataProvider(new SimpleInitializrMetadataProvider(metadata)); } protected void verifyProjectSuccessfulEventFor(ProjectRequest request) { - verify(eventPublisher, times(1)) + verify(this.eventPublisher, times(1)) .publishEvent(argThat(new ProjectGeneratedEventMatcher(request))); } protected void verifyProjectFailedEventFor(ProjectRequest request, Exception ex) { - verify(eventPublisher, times(1)) + verify(this.eventPublisher, times(1)) .publishEvent(argThat(new ProjectFailedEventMatcher(request, ex))); } @@ -126,7 +126,7 @@ public abstract class AbstractProjectGeneratorTests { @Override public boolean matches(ProjectGeneratedEvent event) { - return request.equals(event.getProjectRequest()); + return this.request.equals(event.getProjectRequest()); } } @@ -145,8 +145,8 @@ public abstract class AbstractProjectGeneratorTests { @Override public boolean matches(ProjectFailedEvent event) { - return request.equals(event.getProjectRequest()) - && cause.equals(event.getCause()); + return this.request.equals(event.getProjectRequest()) + && this.cause.equals(event.getCause()); } } diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/CommandLineHelpGeneratorTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/CommandLineHelpGeneratorTests.java index 4ea1d391..2c7e8357 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/CommandLineHelpGeneratorTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/CommandLineHelpGeneratorTests.java @@ -37,7 +37,7 @@ public class CommandLineHelpGeneratorTests { @Before public void init() { - generator = new CommandLineHelpGenerator(new TemplateRenderer()); + this.generator = new CommandLineHelpGenerator(new TemplateRenderer()); } @Test @@ -46,7 +46,7 @@ public class CommandLineHelpGeneratorTests { .addDependencyGroup("test", createDependency("id-b", "depB"), createDependency("id-a", "depA", "and some description")) .build(); - String content = generator.generateGenericCapabilities(metadata, + String content = this.generator.generateGenericCapabilities(metadata, "https://fake-service"); assertCommandLineCapabilities(content); assertThat(content, containsString("id-a | and some description |")); @@ -64,7 +64,7 @@ public class CommandLineHelpGeneratorTests { type.setDescription("foo-desc"); InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults() .addType(type).build(); - String content = generator.generateGenericCapabilities(metadata, + String content = this.generator.generateGenericCapabilities(metadata, "https://fake-service"); assertCommandLineCapabilities(content); assertThat(content, containsString("| foo")); @@ -77,7 +77,7 @@ public class CommandLineHelpGeneratorTests { .addDependencyGroup("test", createDependency("id-b", "depB"), createDependency("id-a", "depA", "and some description")) .build(); - String content = generator.generateCurlCapabilities(metadata, + String content = this.generator.generateCurlCapabilities(metadata, "https://fake-service"); assertCommandLineCapabilities(content); assertThat(content, containsString("id-a | and some description |")); @@ -93,7 +93,7 @@ public class CommandLineHelpGeneratorTests { .addDependencyGroup("test", createDependency("id-b", "depB"), createDependency("id-a", "depA", "and some description")) .build(); - String content = generator.generateHttpieCapabilities(metadata, + String content = this.generator.generateHttpieCapabilities(metadata, "https://fake-service"); assertCommandLineCapabilities(content); assertThat(content, containsString("id-a | and some description |")); @@ -110,7 +110,7 @@ public class CommandLineHelpGeneratorTests { .addDependencyGroup("test", createDependency("id-b", "depB"), createDependency("id-a", "depA", "and some description")) .build(); - String content = generator.generateSpringBootCliCapabilities(metadata, + String content = this.generator.generateSpringBootCliCapabilities(metadata, "https://fake-service"); assertThat(content, containsString("| Id")); assertThat(content, containsString("| Tags")); @@ -135,7 +135,7 @@ public class CommandLineHelpGeneratorTests { second.setVersionRange(" [1.2.0.RELEASE,1.3.0.M1) "); InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults() .addDependencyGroup("test", first, second).build(); - String content = generator.generateSpringBootCliCapabilities(metadata, + String content = this.generator.generateSpringBootCliCapabilities(metadata, "https://fake-service"); assertThat(content, containsString( "| first | first desc | >=1.2.0.RELEASE |")); diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/CustomProjectGeneratorTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/CustomProjectGeneratorTests.java index 3e1a91f8..4d4abd9b 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/CustomProjectGeneratorTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/CustomProjectGeneratorTests.java @@ -69,11 +69,11 @@ public class CustomProjectGeneratorTests extends AbstractProjectGeneratorTests { generateProject(request); verifyProjectSuccessfulEventFor(request); - Runnable customFileGenerated = ((MyProjectGenerator) projectGenerator).customFileGenerated; - InOrder inOrder = Mockito.inOrder(eventPublisher, customFileGenerated); + Runnable customFileGenerated = ((MyProjectGenerator) this.projectGenerator).customFileGenerated; + InOrder inOrder = Mockito.inOrder(this.eventPublisher, customFileGenerated); inOrder.verify(customFileGenerated, times(1)).run(); - inOrder.verify(eventPublisher, times(1)) + inOrder.verify(this.eventPublisher, times(1)) .publishEvent(argThat(new ProjectGeneratedEventMatcher(request))); } @@ -88,7 +88,7 @@ public class CustomProjectGeneratorTests extends AbstractProjectGeneratorTests { File dir = super.generateProjectStructure(request, model); if ("maven".equals(request.getBuild())) { write(new File(dir, "custom.txt"), "custom.txt", model); - customFileGenerated.run(); + this.customFileGenerated.run(); } return dir; } diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorBuildTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorBuildTests.java index 0e571725..e0208ebd 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorBuildTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorBuildTests.java @@ -74,8 +74,8 @@ public class ProjectGeneratorBuildTests extends AbstractProjectGeneratorTests { ProjectRequest request = createProjectRequest(); request.setLanguage(language); ProjectAssert project = generateProject(request); - project.sourceCodeAssert(fileName).equalsTo(new ClassPathResource( - "project/" + language + "/standard/" + assertFileName)); + project.sourceCodeAssert(this.fileName).equalsTo(new ClassPathResource( + "project/" + language + "/standard/" + this.assertFileName)); } @Test @@ -98,8 +98,8 @@ public class ProjectGeneratorBuildTests extends AbstractProjectGeneratorTests { request.setPackaging("war"); request.setLanguage(language); ProjectAssert project = generateProject(request); - project.sourceCodeAssert(fileName).equalsTo( - new ClassPathResource("project/" + language + "/war/" + assertFileName)); + project.sourceCodeAssert(this.fileName).equalsTo(new ClassPathResource( + "project/" + language + "/war/" + this.assertFileName)); } @Test @@ -110,8 +110,8 @@ public class ProjectGeneratorBuildTests extends AbstractProjectGeneratorTests { request.getBuildProperties().getVersions() .put(new VersionProperty("spring-bar.version"), () -> "0.2.0.RELEASE"); ProjectAssert project = generateProject(request); - project.sourceCodeAssert(fileName).equalsTo(new ClassPathResource( - "project/" + build + "/version-override-" + assertFileName)); + project.sourceCodeAssert(this.fileName).equalsTo(new ClassPathResource( + "project/" + this.build + "/version-override-" + this.assertFileName)); } @Test @@ -125,8 +125,8 @@ public class ProjectGeneratorBuildTests extends AbstractProjectGeneratorTests { applyMetadata(metadata); ProjectRequest request = createProjectRequest("foo"); ProjectAssert project = generateProject(request); - project.sourceCodeAssert(fileName).equalsTo(new ClassPathResource( - "project/" + build + "/bom-property-" + assertFileName)); + project.sourceCodeAssert(this.fileName).equalsTo(new ClassPathResource( + "project/" + this.build + "/bom-property-" + this.assertFileName)); } @Test @@ -139,8 +139,8 @@ public class ProjectGeneratorBuildTests extends AbstractProjectGeneratorTests { applyMetadata(metadata); ProjectRequest request = createProjectRequest("foo", "web", "data-jpa"); ProjectAssert project = generateProject(request); - project.sourceCodeAssert(fileName).equalsTo(new ClassPathResource( - "project/" + build + "/compile-only-dependency-" + assertFileName)); + project.sourceCodeAssert(this.fileName).equalsTo(new ClassPathResource("project/" + + this.build + "/compile-only-dependency-" + this.assertFileName)); } @Test @@ -163,8 +163,8 @@ public class ProjectGeneratorBuildTests extends AbstractProjectGeneratorTests { applyMetadata(metadata); ProjectRequest request = createProjectRequest("foo"); ProjectAssert project = generateProject(request); - project.sourceCodeAssert(fileName).equalsTo(new ClassPathResource( - "project/" + build + "/bom-ordering-" + assertFileName)); + project.sourceCodeAssert(this.fileName).equalsTo(new ClassPathResource( + "project/" + this.build + "/bom-ordering-" + this.assertFileName)); } @Test @@ -173,8 +173,8 @@ public class ProjectGeneratorBuildTests extends AbstractProjectGeneratorTests { request.setLanguage("kotlin"); request.setJavaVersion("1.6"); ProjectAssert project = generateProject(request); - project.sourceCodeAssert(fileName).equalsTo(new ClassPathResource( - "project/" + build + "/kotlin-java6-" + assertFileName)); + project.sourceCodeAssert(this.fileName).equalsTo(new ClassPathResource( + "project/" + this.build + "/kotlin-java6-" + this.assertFileName)); } @Test @@ -183,8 +183,8 @@ public class ProjectGeneratorBuildTests extends AbstractProjectGeneratorTests { request.setLanguage("kotlin"); request.setJavaVersion("1.7"); ProjectAssert project = generateProject(request); - project.sourceCodeAssert(fileName).equalsTo(new ClassPathResource( - "project/" + build + "/kotlin-java7-" + assertFileName)); + project.sourceCodeAssert(this.fileName).equalsTo(new ClassPathResource( + "project/" + this.build + "/kotlin-java7-" + this.assertFileName)); } @Test @@ -196,8 +196,8 @@ public class ProjectGeneratorBuildTests extends AbstractProjectGeneratorTests { project.sourceCodeAssert("src/main/kotlin/com/example/demo/DemoApplication.kt") .equalsTo(new ClassPathResource( "project/kotlin/spring-boot-2.0/DemoApplicationLegacy.kt.gen")); - project.sourceCodeAssert(fileName).equalsTo(new ClassPathResource( - "project/" + build + "/kotlin-springboot2-legacy-" + assertFileName)); + project.sourceCodeAssert(this.fileName).equalsTo(new ClassPathResource("project/" + + this.build + "/kotlin-springboot2-legacy-" + this.assertFileName)); } @Test @@ -209,8 +209,8 @@ public class ProjectGeneratorBuildTests extends AbstractProjectGeneratorTests { project.sourceCodeAssert("src/main/kotlin/com/example/demo/DemoApplication.kt") .equalsTo(new ClassPathResource( "project/kotlin/spring-boot-2.0/DemoApplication.kt.gen")); - project.sourceCodeAssert(fileName).equalsTo(new ClassPathResource( - "project/" + build + "/kotlin-springboot2-" + assertFileName)); + project.sourceCodeAssert(this.fileName).equalsTo(new ClassPathResource( + "project/" + this.build + "/kotlin-springboot2-" + this.assertFileName)); } @Test @@ -220,14 +220,14 @@ public class ProjectGeneratorBuildTests extends AbstractProjectGeneratorTests { request.setBootVersion("2.0.0.M6"); request.setJavaVersion("9"); ProjectAssert project = generateProject(request); - project.sourceCodeAssert(fileName).equalsTo(new ClassPathResource( - "project/" + build + "/kotlin-java9-" + assertFileName)); + project.sourceCodeAssert(this.fileName).equalsTo(new ClassPathResource( + "project/" + this.build + "/kotlin-java9-" + this.assertFileName)); } @Override public ProjectRequest createProjectRequest(String... styles) { ProjectRequest request = super.createProjectRequest(styles); - request.setType(build + "-project"); + request.setType(this.build + "-project"); return request; } diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorLanguageTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorLanguageTests.java index 186175ef..4709cd6b 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorLanguageTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorLanguageTests.java @@ -57,54 +57,54 @@ public class ProjectGeneratorLanguageTests extends AbstractProjectGeneratorTests @Test public void standardJar() { ProjectRequest request = createProjectRequest(); - request.setLanguage(language); + request.setLanguage(this.language); generateProject(request).isGenericProject(DEFAULT_PACKAGE_NAME, - DEFAULT_APPLICATION_NAME, language, extension); + DEFAULT_APPLICATION_NAME, this.language, this.extension); } @Test public void standardWar() { ProjectRequest request = createProjectRequest("web"); - request.setLanguage(language); + request.setLanguage(this.language); request.setPackaging("war"); generateProject(request).isGenericWarProject(DEFAULT_PACKAGE_NAME, - DEFAULT_APPLICATION_NAME, language, extension); + DEFAULT_APPLICATION_NAME, this.language, this.extension); } @Test public void standardMainClass() { ProjectRequest request = createProjectRequest(); - request.setLanguage(language); + request.setLanguage(this.language); ProjectAssert project = generateProject(request); - project.sourceCodeAssert( - "src/main/" + language + "/com/example/demo/DemoApplication." + extension) - .equalsTo(new ClassPathResource("project/" + language - + "/standard/DemoApplication." + expectedExtension)); + project.sourceCodeAssert("src/main/" + this.language + + "/com/example/demo/DemoApplication." + this.extension) + .equalsTo(new ClassPathResource("project/" + this.language + + "/standard/DemoApplication." + this.expectedExtension)); } @Test public void standardTestClass() { ProjectRequest request = createProjectRequest(); - request.setLanguage(language); + request.setLanguage(this.language); ProjectAssert project = generateProject(request); - project.sourceCodeAssert("src/test/" + language - + "/com/example/demo/DemoApplicationTests." + extension) - .equalsTo(new ClassPathResource("project/" + language - + "/standard/DemoApplicationTests." + expectedExtension)); + project.sourceCodeAssert("src/test/" + this.language + + "/com/example/demo/DemoApplicationTests." + this.extension) + .equalsTo(new ClassPathResource("project/" + this.language + + "/standard/DemoApplicationTests." + this.expectedExtension)); } @Test public void standardTestClassWeb() { ProjectRequest request = createProjectRequest("web"); - request.setLanguage(language); + request.setLanguage(this.language); ProjectAssert project = generateProject(request); - project.sourceCodeAssert("src/test/" + language - + "/com/example/demo/DemoApplicationTests." + extension) - .equalsTo(new ClassPathResource("project/" + language - + "/standard/DemoApplicationTestsWeb." + expectedExtension)); + project.sourceCodeAssert("src/test/" + this.language + + "/com/example/demo/DemoApplicationTests." + this.extension) + .equalsTo(new ClassPathResource("project/" + this.language + + "/standard/DemoApplicationTestsWeb." + this.expectedExtension)); } @Test @@ -129,55 +129,58 @@ public class ProjectGeneratorLanguageTests extends AbstractProjectGeneratorTests private void testServletInitializr(String bootVersion, String expectedOutput) { ProjectRequest request = createProjectRequest(); - request.setLanguage(language); + request.setLanguage(this.language); request.setPackaging("war"); if (bootVersion != null) { request.setBootVersion(bootVersion); } ProjectAssert project = generateProject(request); - project.sourceCodeAssert("src/main/" + language - + "/com/example/demo/ServletInitializer." + extension) - .equalsTo(new ClassPathResource("project/" + language + "/" - + expectedOutput + "/ServletInitializer." + expectedExtension)); + project.sourceCodeAssert("src/main/" + this.language + + "/com/example/demo/ServletInitializer." + this.extension) + .equalsTo(new ClassPathResource( + "project/" + this.language + "/" + expectedOutput + + "/ServletInitializer." + this.expectedExtension)); } @Test public void springBoot14M1TestClass() { ProjectRequest request = createProjectRequest(); - request.setLanguage(language); + request.setLanguage(this.language); request.setBootVersion("1.4.0.M1"); ProjectAssert project = generateProject(request); - project.sourceCodeAssert("src/test/" + language - + "/com/example/demo/DemoApplicationTests." + extension) - .equalsTo(new ClassPathResource("project/" + language - + "/standard/DemoApplicationTests." + expectedExtension)); + project.sourceCodeAssert("src/test/" + this.language + + "/com/example/demo/DemoApplicationTests." + this.extension) + .equalsTo(new ClassPathResource("project/" + this.language + + "/standard/DemoApplicationTests." + this.expectedExtension)); } @Test public void springBoot14TestClass() { ProjectRequest request = createProjectRequest(); - request.setLanguage(language); + request.setLanguage(this.language); request.setBootVersion("1.4.0.M2"); ProjectAssert project = generateProject(request); - project.sourceCodeAssert("src/test/" + language - + "/com/example/demo/DemoApplicationTests." + extension) - .equalsTo(new ClassPathResource("project/" + language - + "/spring-boot-1.4/DemoApplicationTests." + expectedExtension)); + project.sourceCodeAssert("src/test/" + this.language + + "/com/example/demo/DemoApplicationTests." + this.extension) + .equalsTo(new ClassPathResource("project/" + this.language + + "/spring-boot-1.4/DemoApplicationTests." + + this.expectedExtension)); } @Test public void springBoot14TestClassWeb() { ProjectRequest request = createProjectRequest("web"); - request.setLanguage(language); + request.setLanguage(this.language); request.setBootVersion("1.4.0.M2"); ProjectAssert project = generateProject(request); - project.sourceCodeAssert("src/test/" + language - + "/com/example/demo/DemoApplicationTests." + extension) - .equalsTo(new ClassPathResource("project/" + language - + "/spring-boot-1.4/DemoApplicationTests." + expectedExtension)); + project.sourceCodeAssert("src/test/" + this.language + + "/com/example/demo/DemoApplicationTests." + this.extension) + .equalsTo(new ClassPathResource("project/" + this.language + + "/spring-boot-1.4/DemoApplicationTests." + + this.expectedExtension)); } } diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorTests.java index cd05b8b7..6eb6a1bf 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorTests.java @@ -802,7 +802,7 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests { .hasDependency(Dependency.withId("foo", "org.acme", "foo", "1.0.0")); // First after processor that flips Spring Boot version - projectGenerator.setRequestResolver(new ProjectRequestResolver( + this.projectGenerator.setRequestResolver(new ProjectRequestResolver( Collections.singletonList(new ProjectRequestPostProcessor() { @Override public void postProcessBeforeResolution(ProjectRequest r, @@ -853,7 +853,7 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests { request.setType("gradle-build"); this.thrown.expect(InvalidProjectRequestException.class); this.thrown.expectMessage("gradle-build"); - projectGenerator.generateMavenPom(request); + this.projectGenerator.generateMavenPom(request); } @Test @@ -862,7 +862,7 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests { request.setType("maven-build"); this.thrown.expect(InvalidProjectRequestException.class); this.thrown.expectMessage("maven-build"); - projectGenerator.generateGradleBuild(request); + this.projectGenerator.generateGradleBuild(request); } @Test diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectRequestResolverTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectRequestResolverTests.java index 494cf82e..8e270c8a 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectRequestResolverTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectRequestResolverTests.java @@ -48,13 +48,14 @@ public class ProjectRequestResolverTests { @Before public void setup() { - this.postProcessors.add(processor); + this.postProcessors.add(this.processor); } @Test public void beforeResolution() { - processor.before.put("javaVersion", "1.2"); - ProjectRequest request = resolve(createMavenProjectRequest(), postProcessors); + this.processor.before.put("javaVersion", "1.2"); + ProjectRequest request = resolve(createMavenProjectRequest(), + this.postProcessors); assertEquals("1.2", request.getJavaVersion()); assertEquals("1.2", request.getBuildProperties().getVersions() .get(new VersionProperty("java.version")).get()); @@ -62,7 +63,7 @@ public class ProjectRequestResolverTests { @Test public void afterResolution() { - postProcessors.add(new ProjectRequestPostProcessor() { + this.postProcessors.add(new ProjectRequestPostProcessor() { @Override public void postProcessAfterResolution(ProjectRequest request, InitializrMetadata metadata) { @@ -70,14 +71,15 @@ public class ProjectRequestResolverTests { request.getBuildProperties().getMaven().put("foo", () -> "bar"); } }); - ProjectRequest request = resolve(createMavenProjectRequest(), postProcessors); + ProjectRequest request = resolve(createMavenProjectRequest(), + this.postProcessors); assertEquals(1, request.getBuildProperties().getMaven().size()); assertEquals("bar", request.getBuildProperties().getMaven().get("foo").get()); } ProjectRequest resolve(ProjectRequest request, List processors) { - return new ProjectRequestResolver(processors).resolve(request, metadata); + return new ProjectRequestResolver(processors).resolve(request, this.metadata); } ProjectRequest createMavenProjectRequest(String... styles) { @@ -88,7 +90,7 @@ public class ProjectRequestResolverTests { ProjectRequest createProjectRequest(String... styles) { ProjectRequest request = new ProjectRequest(); - request.initialize(metadata); + request.initialize(this.metadata); request.getStyle().addAll(Arrays.asList(styles)); return request; } @@ -104,14 +106,14 @@ public class ProjectRequestResolverTests { public void postProcessBeforeResolution(ProjectRequest request, InitializrMetadata metadata) { BeanWrapperImpl wrapper = new BeanWrapperImpl(request); - before.forEach(wrapper::setPropertyValue); + this.before.forEach(wrapper::setPropertyValue); } @Override public void postProcessAfterResolution(ProjectRequest request, InitializrMetadata metadata) { BeanWrapperImpl wrapper = new BeanWrapperImpl(request); - after.forEach(wrapper::setPropertyValue); + this.after.forEach(wrapper::setPropertyValue); } } diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectRequestTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectRequestTests.java index 9e2a1049..0e9380a8 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectRequestTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectRequestTests.java @@ -45,9 +45,9 @@ public class ProjectRequestTests { @Test public void initializeGroupIdAndArtifactId() { - metadata = InitializrMetadataBuilder.create().build(); - metadata.getGroupId().setContent("org.acme"); - metadata.getArtifactId().setContent("my-project"); + this.metadata = InitializrMetadataBuilder.create().build(); + this.metadata.getGroupId().setContent("org.acme"); + this.metadata.getArtifactId().setContent("my-project"); ProjectRequest request = initProjectRequest(); assertEquals("org.acme", request.getGroupId()); assertEquals("my-project", request.getArtifactId()); @@ -56,26 +56,27 @@ public class ProjectRequestTests { @Test public void initializeSetsMetadataDefaults() { ProjectRequest request = initProjectRequest(); - assertEquals(metadata.getName().getContent(), request.getName()); - assertEquals(metadata.getTypes().getDefault().getId(), request.getType()); - assertEquals(metadata.getDescription().getContent(), request.getDescription()); - assertEquals(metadata.getGroupId().getContent(), request.getGroupId()); - assertEquals(metadata.getArtifactId().getContent(), request.getArtifactId()); - assertEquals(metadata.getVersion().getContent(), request.getVersion()); - assertEquals(metadata.getBootVersions().getDefault().getId(), + assertEquals(this.metadata.getName().getContent(), request.getName()); + assertEquals(this.metadata.getTypes().getDefault().getId(), request.getType()); + assertEquals(this.metadata.getDescription().getContent(), + request.getDescription()); + assertEquals(this.metadata.getGroupId().getContent(), request.getGroupId()); + assertEquals(this.metadata.getArtifactId().getContent(), request.getArtifactId()); + assertEquals(this.metadata.getVersion().getContent(), request.getVersion()); + assertEquals(this.metadata.getBootVersions().getDefault().getId(), request.getBootVersion()); - assertEquals(metadata.getPackagings().getDefault().getId(), + assertEquals(this.metadata.getPackagings().getDefault().getId(), request.getPackaging()); } @Test public void resolve() { - metadata = InitializrMetadataTestBuilder.withDefaults() + this.metadata = InitializrMetadataTestBuilder.withDefaults() .addDependencyGroup("code", "web", "security", "spring-data").build(); ProjectRequest request = initProjectRequest(); request.setType("maven-project"); request.getStyle().addAll(Arrays.asList("web", "spring-data")); - request.resolve(metadata); + request.resolve(this.metadata); assertEquals("Build type not detected", "maven", request.getBuild()); assertBootStarter(request.getResolvedDependencies().get(0), "web"); assertBootStarter(request.getResolvedDependencies().get(1), "spring-data"); @@ -83,12 +84,12 @@ public class ProjectRequestTests { @Test public void resolveWithDependencies() { - metadata = InitializrMetadataTestBuilder.withDefaults() + this.metadata = InitializrMetadataTestBuilder.withDefaults() .addDependencyGroup("code", "web", "security", "spring-data").build(); ProjectRequest request = initProjectRequest(); request.setType("maven-project"); request.getDependencies().addAll(Arrays.asList("web", "spring-data")); - request.resolve(metadata); + request.resolve(this.metadata); assertEquals("Build type not detected", "maven", request.getBuild()); assertBootStarter(request.getResolvedDependencies().get(0), "web"); assertBootStarter(request.getResolvedDependencies().get(1), "spring-data"); @@ -96,39 +97,39 @@ public class ProjectRequestTests { @Test public void resolveFullMetadata() { - metadata = InitializrMetadataTestBuilder.withDefaults() + this.metadata = InitializrMetadataTestBuilder.withDefaults() .addDependencyGroup("code", createDependency("org.foo", "acme", "1.2.0")) .build(); ProjectRequest request = initProjectRequest(); request.getStyle().add("org.foo:acme"); - request.resolve(metadata); + request.resolve(this.metadata); assertDependency(request.getResolvedDependencies().get(0), "org.foo", "acme", "1.2.0"); } @Test public void resolveUnknownSimpleId() { - metadata = InitializrMetadataTestBuilder.withDefaults() + this.metadata = InitializrMetadataTestBuilder.withDefaults() .addDependencyGroup("code", "org.foo:bar").build(); ProjectRequest request = initProjectRequest(); request.getStyle().addAll(Arrays.asList("org.foo:bar", "foo-bar")); - thrown.expect(InvalidProjectRequestException.class); - thrown.expectMessage("foo-bar"); - request.resolve(metadata); + this.thrown.expect(InvalidProjectRequestException.class); + this.thrown.expectMessage("foo-bar"); + request.resolve(this.metadata); assertEquals(1, request.getResolvedDependencies().size()); } @Test public void resolveUnknownDependency() { - metadata = InitializrMetadataTestBuilder.withDefaults() + this.metadata = InitializrMetadataTestBuilder.withDefaults() .addDependencyGroup("code", "org.foo:bar").build(); ProjectRequest request = initProjectRequest(); request.getStyle().add("org.foo:acme"); // does not exist - thrown.expect(InvalidProjectRequestException.class); - thrown.expectMessage("org.foo:acme"); - request.resolve(metadata); + this.thrown.expect(InvalidProjectRequestException.class); + this.thrown.expectMessage("org.foo:acme"); + request.resolve(this.metadata); assertEquals(1, request.getResolvedDependencies().size()); } @@ -154,9 +155,9 @@ public class ProjectRequestTests { request.getStyle().add("org.foo:bar"); request.setBootVersion("0.9.9.RELEASE"); - thrown.expect(InvalidProjectRequestException.class); - thrown.expectMessage("org.foo:bar"); - thrown.expectMessage("0.9.9.RELEASE"); + this.thrown.expect(InvalidProjectRequestException.class); + this.thrown.expectMessage("org.foo:bar"); + this.thrown.expectMessage("0.9.9.RELEASE"); request.resolve(metadata); } @@ -167,20 +168,20 @@ public class ProjectRequestTests { null, null, "0.1.0.RELEASE")); dependency.getMappings() .add(Mapping.create("1.1.0.RELEASE", null, null, "0.2.0.RELEASE")); - metadata = InitializrMetadataTestBuilder.withDefaults() + this.metadata = InitializrMetadataTestBuilder.withDefaults() .addDependencyGroup("code", dependency).build(); ProjectRequest request = initProjectRequest(); request.setBootVersion("1.0.5.RELEASE"); request.getStyle().add("org.foo:bar"); - request.resolve(metadata); + request.resolve(this.metadata); assertDependency(request.getResolvedDependencies().get(0), "org.foo", "bar", "0.1.0.RELEASE"); ProjectRequest anotherRequest = new ProjectRequest(); anotherRequest.setBootVersion("1.1.0.RELEASE"); anotherRequest.getStyle().add("org.foo:bar"); - anotherRequest.resolve(metadata); + anotherRequest.resolve(this.metadata); assertDependency(anotherRequest.getResolvedDependencies().get(0), "org.foo", "bar", "0.2.0.RELEASE"); } @@ -189,17 +190,17 @@ public class ProjectRequestTests { public void resolveBuild() { ProjectRequest request = initProjectRequest(); request.setType("gradle-project"); - request.resolve(metadata); + request.resolve(this.metadata); assertEquals("gradle", request.getBuild()); } @Test public void resolveBuildNoTag() { - metadata = InitializrMetadataTestBuilder.withDefaults() + this.metadata = InitializrMetadataTestBuilder.withDefaults() .addType("foo", false, "/foo.zip", null, null).build(); ProjectRequest request = initProjectRequest(); request.setType("foo"); - request.resolve(metadata); + request.resolve(this.metadata); assertNull(request.getBuild()); } @@ -208,17 +209,18 @@ public class ProjectRequestTests { ProjectRequest request = initProjectRequest(); request.setType("foo-project"); - thrown.expect(InvalidProjectRequestException.class); - thrown.expectMessage("foo-project"); - request.resolve(metadata); + this.thrown.expect(InvalidProjectRequestException.class); + this.thrown.expectMessage("foo-project"); + request.resolve(this.metadata); } @Test public void resolveApplicationNameWithNoName() { ProjectRequest request = initProjectRequest(); request.setName(null); - request.resolve(metadata); - assertEquals(metadata.getConfiguration().getEnv().getFallbackApplicationName(), + request.resolve(this.metadata); + assertEquals( + this.metadata.getConfiguration().getEnv().getFallbackApplicationName(), request.getApplicationName()); } @@ -226,7 +228,7 @@ public class ProjectRequestTests { public void resolveApplicationName() { ProjectRequest request = initProjectRequest(); request.setName("Foo2"); - request.resolve(metadata); + request.resolve(this.metadata); assertEquals("Foo2Application", request.getApplicationName()); } @@ -236,7 +238,7 @@ public class ProjectRequestTests { request.setName("Foo2"); request.setApplicationName("MyApplicationName"); - request.resolve(metadata); + request.resolve(this.metadata); assertEquals("MyApplicationName", request.getApplicationName()); } @@ -245,7 +247,7 @@ public class ProjectRequestTests { ProjectRequest request = initProjectRequest(); request.setGroupId("org.acme"); request.setArtifactId("foo"); - request.resolve(metadata); + request.resolve(this.metadata); assertThat(request.getPackageName()).isEqualTo("org.acme.foo"); } @@ -254,7 +256,7 @@ public class ProjectRequestTests { ProjectRequest request = initProjectRequest(); request.setGroupId("org.acme"); request.setArtifactId("foo-bar"); - request.resolve(metadata); + request.resolve(this.metadata); assertThat(request.getPackageName()).isEqualTo("org.acme.foobar"); } @@ -263,7 +265,7 @@ public class ProjectRequestTests { ProjectRequest request = initProjectRequest(); request.setGroupId(null); request.setArtifactId("foo"); - request.resolve(metadata); + request.resolve(this.metadata); assertThat(request.getPackageName()).isEqualTo("com.example.demo"); } @@ -272,7 +274,7 @@ public class ProjectRequestTests { ProjectRequest request = initProjectRequest(); request.setGroupId("org.acme"); request.setArtifactId(null); - request.resolve(metadata); + request.resolve(this.metadata); assertThat(request.getPackageName()).isEqualTo("com.example.demo"); } @@ -290,15 +292,16 @@ public class ProjectRequestTests { @Test public void cleanPackageNameWithNoName() { ProjectRequest request = initProjectRequest(); - request.resolve(metadata); - assertEquals(metadata.getPackageName().getContent(), request.getPackageName()); + request.resolve(this.metadata); + assertEquals(this.metadata.getPackageName().getContent(), + request.getPackageName()); } @Test public void cleanPackageName() { ProjectRequest request = initProjectRequest(); request.setPackageName("com:foo bar"); - request.resolve(metadata); + request.resolve(this.metadata); assertEquals("com.foo.bar", request.getPackageName()); } @@ -310,12 +313,12 @@ public class ProjectRequestTests { bom.getAdditionalBoms().add("bar-bom"); BillOfMaterials additionalBom = BillOfMaterials.create("com.example", "bar-bom", "1.1.0"); - metadata = InitializrMetadataTestBuilder.withDefaults().addBom("foo-bom", bom) - .addBom("bar-bom", additionalBom).addDependencyGroup("test", dependency) - .build(); + this.metadata = InitializrMetadataTestBuilder.withDefaults() + .addBom("foo-bom", bom).addBom("bar-bom", additionalBom) + .addDependencyGroup("test", dependency).build(); ProjectRequest request = initProjectRequest(); request.getStyle().add("foo"); - request.resolve(metadata); + request.resolve(this.metadata); assertEquals(1, (request.getResolvedDependencies().size())); assertEquals(2, request.getBoms().size()); assertEquals(bom, request.getBoms().get("foo-bom")); @@ -332,12 +335,12 @@ public class ProjectRequestTests { bom.getAdditionalBoms().add("bar-bom"); BillOfMaterials additionalBom = BillOfMaterials.create("com.example", "bar-bom", "1.1.0"); - metadata = InitializrMetadataTestBuilder.withDefaults().addBom("foo-bom", bom) - .addBom("bar-bom", additionalBom) + this.metadata = InitializrMetadataTestBuilder.withDefaults() + .addBom("foo-bom", bom).addBom("bar-bom", additionalBom) .addDependencyGroup("test", dependency, anotherDependency).build(); ProjectRequest request = initProjectRequest(); request.getStyle().addAll(Arrays.asList("foo", "bar")); - request.resolve(metadata); + request.resolve(this.metadata); assertEquals(2, request.getResolvedDependencies().size()); assertEquals(2, request.getBoms().size()); assertEquals(bom, request.getBoms().get("foo-bom")); @@ -351,22 +354,21 @@ public class ProjectRequestTests { dependency.setRepository("foo-repo"); BillOfMaterials bom = BillOfMaterials.create("com.example", "foo-bom", "1.0.0"); bom.getRepositories().add("bar-repo"); - metadata = InitializrMetadataTestBuilder.withDefaults().addBom("foo-bom", bom) + this.metadata = InitializrMetadataTestBuilder.withDefaults() + .addBom("foo-bom", bom) .addRepository("foo-repo", "foo-repo", "http://example.com/foo", false) .addRepository("bar-repo", "bar-repo", "http://example.com/bar", false) .addDependencyGroup("test", dependency).build(); ProjectRequest request = initProjectRequest(); request.getStyle().add("foo"); - request.resolve(metadata); + request.resolve(this.metadata); assertEquals(1, request.getResolvedDependencies().size()); assertEquals(1, request.getBoms().size()); assertEquals(2, request.getRepositories().size()); - assertEquals( - metadata.getConfiguration().getEnv().getRepositories().get("foo-repo"), - request.getRepositories().get("foo-repo")); - assertEquals( - metadata.getConfiguration().getEnv().getRepositories().get("bar-repo"), - request.getRepositories().get("bar-repo")); + assertEquals(this.metadata.getConfiguration().getEnv().getRepositories() + .get("foo-repo"), request.getRepositories().get("foo-repo")); + assertEquals(this.metadata.getConfiguration().getEnv().getRepositories() + .get("bar-repo"), request.getRepositories().get("bar-repo")); } @Test @@ -378,22 +380,21 @@ public class ProjectRequestTests { bom.getRepositories().add("bar-repo"); Dependency anotherDependency = Dependency.withId("bar"); anotherDependency.setRepository("bar-repo"); - metadata = InitializrMetadataTestBuilder.withDefaults().addBom("foo-bom", bom) + this.metadata = InitializrMetadataTestBuilder.withDefaults() + .addBom("foo-bom", bom) .addRepository("foo-repo", "foo-repo", "http://example.com/foo", false) .addRepository("bar-repo", "bar-repo", "http://example.com/bar", false) .addDependencyGroup("test", dependency, anotherDependency).build(); ProjectRequest request = initProjectRequest(); request.getStyle().addAll(Arrays.asList("foo", "bar")); - request.resolve(metadata); + request.resolve(this.metadata); assertEquals(2, request.getResolvedDependencies().size()); assertEquals(1, request.getBoms().size()); assertEquals(2, request.getRepositories().size()); - assertEquals( - metadata.getConfiguration().getEnv().getRepositories().get("foo-repo"), - request.getRepositories().get("foo-repo")); - assertEquals( - metadata.getConfiguration().getEnv().getRepositories().get("bar-repo"), - request.getRepositories().get("bar-repo")); + assertEquals(this.metadata.getConfiguration().getEnv().getRepositories() + .get("foo-repo"), request.getRepositories().get("foo-repo")); + assertEquals(this.metadata.getConfiguration().getEnv().getRepositories() + .get("bar-repo"), request.getRepositories().get("bar-repo")); } private ProjectRequest initProjectRequest() { diff --git a/initializr-generator/src/test/java/io/spring/initializr/metadata/BillOfMaterialsTests.java b/initializr-generator/src/test/java/io/spring/initializr/metadata/BillOfMaterialsTests.java index 63921de0..df7f69df 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/metadata/BillOfMaterialsTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/metadata/BillOfMaterialsTests.java @@ -112,8 +112,8 @@ public class BillOfMaterialsTests { .add(BillOfMaterials.Mapping.create("[1.3.0.M1, 1.4.0.M1)", "1.2.0")); bom.validate(); - thrown.expect(IllegalStateException.class); - thrown.expectMessage("1.4.1.RELEASE"); + this.thrown.expect(IllegalStateException.class); + this.thrown.expectMessage("1.4.1.RELEASE"); bom.resolve(Version.parse("1.4.1.RELEASE")); } diff --git a/initializr-generator/src/test/java/io/spring/initializr/metadata/DependenciesCapabilityTests.java b/initializr-generator/src/test/java/io/spring/initializr/metadata/DependenciesCapabilityTests.java index 6fa331cb..b3f364a1 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/metadata/DependenciesCapabilityTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/metadata/DependenciesCapabilityTests.java @@ -55,8 +55,8 @@ public class DependenciesCapabilityTests { DependenciesCapability capability = createDependenciesCapability("foo", dependency, dependency2); - thrown.expect(IllegalArgumentException.class); - thrown.expectMessage("conflict"); + this.thrown.expect(IllegalArgumentException.class); + this.thrown.expectMessage("conflict"); capability.validate(); } @@ -85,8 +85,8 @@ public class DependenciesCapabilityTests { capability.getContent().add(createDependencyGroup("foo", dependency)); capability.getContent().add(createDependencyGroup("bar", dependency2)); - thrown.expect(IllegalArgumentException.class); - thrown.expectMessage("alias2"); + this.thrown.expect(IllegalArgumentException.class); + this.thrown.expectMessage("alias2"); capability.validate(); } diff --git a/initializr-generator/src/test/java/io/spring/initializr/metadata/DependencyTests.java b/initializr-generator/src/test/java/io/spring/initializr/metadata/DependencyTests.java index ca13c2dd..ee413d8e 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/metadata/DependencyTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/metadata/DependencyTests.java @@ -97,7 +97,7 @@ public class DependencyTests { @Test public void invalidDependency() { - thrown.expect(InvalidInitializrMetadataException.class); + this.thrown.expect(InvalidInitializrMetadataException.class); new Dependency().resolve(); } @@ -105,7 +105,7 @@ public class DependencyTests { public void invalidDependencyScope() { Dependency dependency = Dependency.withId("web"); - thrown.expect(InvalidInitializrMetadataException.class); + this.thrown.expect(InvalidInitializrMetadataException.class); dependency.setScope("whatever"); } @@ -114,8 +114,8 @@ public class DependencyTests { Dependency dependency = Dependency.withId("web"); dependency.setVersionRange("A.B.C"); - thrown.expect(InvalidInitializrMetadataException.class); - thrown.expectMessage("A.B.C"); + this.thrown.expect(InvalidInitializrMetadataException.class); + this.thrown.expectMessage("A.B.C"); dependency.resolve(); } @@ -123,7 +123,7 @@ public class DependencyTests { public void invalidIdFormatTooManyColons() { Dependency dependency = Dependency.withId("org.foo:bar:1.0:test:external"); - thrown.expect(InvalidInitializrMetadataException.class); + this.thrown.expect(InvalidInitializrMetadataException.class); dependency.resolve(); } @@ -132,7 +132,7 @@ public class DependencyTests { Dependency dependency = Dependency.withId("foo"); dependency.getLinks().add(Link.create(null, "https://example.com")); - thrown.expect(InvalidInitializrMetadataException.class); + this.thrown.expect(InvalidInitializrMetadataException.class); dependency.resolve(); } @@ -140,7 +140,7 @@ public class DependencyTests { public void generateIdWithNoGroupId() { Dependency dependency = new Dependency(); dependency.setArtifactId("bar"); - thrown.expect(IllegalArgumentException.class); + this.thrown.expect(IllegalArgumentException.class); dependency.generateId(); } @@ -148,7 +148,7 @@ public class DependencyTests { public void generateIdWithNoArtifactId() { Dependency dependency = new Dependency(); dependency.setGroupId("foo"); - thrown.expect(IllegalArgumentException.class); + this.thrown.expect(IllegalArgumentException.class); dependency.generateId(); } @@ -164,8 +164,8 @@ public class DependencyTests { Dependency dependency = Dependency.withId("web"); dependency.getMappings() .add(Dependency.Mapping.create("foo-bar", null, null, "0.1.0.RELEASE")); - thrown.expect(InvalidInitializrMetadataException.class); - thrown.expectMessage("foo-bar"); + this.thrown.expect(InvalidInitializrMetadataException.class); + this.thrown.expectMessage("foo-bar"); dependency.resolve(); } diff --git a/initializr-generator/src/test/java/io/spring/initializr/metadata/InitializrMetadataBuilderTests.java b/initializr-generator/src/test/java/io/spring/initializr/metadata/InitializrMetadataBuilderTests.java index 84264eb7..5ac2e6eb 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/metadata/InitializrMetadataBuilderTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/metadata/InitializrMetadataBuilderTests.java @@ -34,7 +34,7 @@ import static org.junit.Assert.assertNotNull; /** * Tests for {@link InitializrMetadataBuilder}. - * + * * @author Stephane Nicoll */ public class InitializrMetadataBuilderTests { diff --git a/initializr-generator/src/test/java/io/spring/initializr/metadata/InitializrMetadataTests.java b/initializr-generator/src/test/java/io/spring/initializr/metadata/InitializrMetadataTests.java index 23f50425..39a898c6 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/metadata/InitializrMetadataTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/metadata/InitializrMetadataTests.java @@ -45,9 +45,9 @@ public class InitializrMetadataTests { .withDefaults().addBom("my-bom", "org.acme", "foo", "1.2.3") .addDependencyGroup("test", foo); - thrown.expect(InvalidInitializrMetadataException.class); - thrown.expectMessage("foo-bom"); - thrown.expectMessage("my-bom"); + this.thrown.expect(InvalidInitializrMetadataException.class); + this.thrown.expectMessage("foo-bom"); + this.thrown.expectMessage("my-bom"); builder.build(); } @@ -60,9 +60,9 @@ public class InitializrMetadataTests { .addRepository("my-repo", "repo", "http://example.com/repo", true) .addDependencyGroup("test", foo); - thrown.expect(InvalidInitializrMetadataException.class); - thrown.expectMessage("foo-repo"); - thrown.expectMessage("my-repo"); + this.thrown.expect(InvalidInitializrMetadataException.class); + this.thrown.expectMessage("foo-repo"); + this.thrown.expectMessage("my-repo"); builder.build(); } @@ -73,9 +73,9 @@ public class InitializrMetadataTests { InitializrMetadataTestBuilder builder = InitializrMetadataTestBuilder .withDefaults().addBom("foo-bom", bom); - thrown.expect(InvalidInitializrMetadataException.class); - thrown.expectMessage("No version"); - thrown.expectMessage("foo-bom"); + this.thrown.expect(InvalidInitializrMetadataException.class); + this.thrown.expectMessage("No version"); + this.thrown.expectMessage("foo-bom"); builder.build(); } @@ -88,9 +88,9 @@ public class InitializrMetadataTests { InitializrMetadataTestBuilder builder = InitializrMetadataTestBuilder .withDefaults().addBom("foo-bom", bom); - thrown.expect(InvalidInitializrMetadataException.class); - thrown.expectMessage("invalid repository id foo-repo"); - thrown.expectMessage("foo-bom"); + this.thrown.expect(InvalidInitializrMetadataException.class); + this.thrown.expectMessage("invalid repository id foo-repo"); + this.thrown.expectMessage("foo-bom"); builder.build(); } @@ -105,9 +105,9 @@ public class InitializrMetadataTests { InitializrMetadataTestBuilder builder = InitializrMetadataTestBuilder .withDefaults().addBom("foo-bom", bom).addBom("bar-bom", barBom); - thrown.expect(InvalidInitializrMetadataException.class); - thrown.expectMessage("invalid additional bom"); - thrown.expectMessage("biz-bom"); + this.thrown.expect(InvalidInitializrMetadataException.class); + this.thrown.expectMessage("invalid additional bom"); + this.thrown.expectMessage("biz-bom"); builder.build(); } @@ -120,9 +120,9 @@ public class InitializrMetadataTests { InitializrMetadataTestBuilder builder = InitializrMetadataTestBuilder .withDefaults().addBom("foo-bom", bom); - thrown.expect(InvalidInitializrMetadataException.class); - thrown.expectMessage("FOO_BAR"); - thrown.expectMessage("foo-bom"); + this.thrown.expect(InvalidInitializrMetadataException.class); + this.thrown.expectMessage("FOO_BAR"); + this.thrown.expectMessage("foo-bom"); builder.build(); } @@ -137,10 +137,10 @@ public class InitializrMetadataTests { InitializrMetadataTestBuilder builder = InitializrMetadataTestBuilder .withDefaults().addBom("foo-bom", bom); - thrown.expect(InvalidInitializrMetadataException.class); - thrown.expectMessage("invalid repository id foo-repo"); - thrown.expectMessage("1.3.0.M2"); - thrown.expectMessage("foo-bom"); + this.thrown.expect(InvalidInitializrMetadataException.class); + this.thrown.expectMessage("invalid repository id foo-repo"); + this.thrown.expectMessage("1.3.0.M2"); + this.thrown.expectMessage("foo-bom"); builder.build(); } @@ -155,10 +155,10 @@ public class InitializrMetadataTests { InitializrMetadataTestBuilder builder = InitializrMetadataTestBuilder .withDefaults().addBom("foo-bom", bom); - thrown.expect(InvalidInitializrMetadataException.class); - thrown.expectMessage("invalid additional bom"); - thrown.expectMessage("1.3.0.M2"); - thrown.expectMessage("bar-bom"); + this.thrown.expect(InvalidInitializrMetadataException.class); + this.thrown.expectMessage("invalid additional bom"); + this.thrown.expectMessage("1.3.0.M2"); + this.thrown.expectMessage("bar-bom"); builder.build(); } @@ -206,8 +206,9 @@ public class InitializrMetadataTests { InitializrMetadataTestBuilder builder = InitializrMetadataTestBuilder .withDefaults().setMavenParent("org.foo", "foo-parent", null, false); - thrown.expect(InvalidInitializrMetadataException.class); - thrown.expectMessage("Custom maven pom requires groupId, artifactId and version"); + this.thrown.expect(InvalidInitializrMetadataException.class); + this.thrown.expectMessage( + "Custom maven pom requires groupId, artifactId and version"); builder.build(); } diff --git a/initializr-generator/src/test/java/io/spring/initializr/metadata/LinkTests.java b/initializr-generator/src/test/java/io/spring/initializr/metadata/LinkTests.java index 2cbcae63..fa8b20a5 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/metadata/LinkTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/metadata/LinkTests.java @@ -43,14 +43,14 @@ public class LinkTests { public void resolveInvalidLinkNoRel() { Link link = new Link(); link.setHref("https://example.com"); - thrown.expect(InvalidInitializrMetadataException.class); + this.thrown.expect(InvalidInitializrMetadataException.class); link.resolve(); } @Test public void resolveInvalidLinkNoHref() { Link link = Link.create("reference", null, "foo doc"); - thrown.expect(InvalidInitializrMetadataException.class); + this.thrown.expect(InvalidInitializrMetadataException.class); link.resolve(); } @@ -97,8 +97,8 @@ public class LinkTests { Link link = Link.create("reference", "https://example.com/{a}/2/{b}"); link.resolve(); - thrown.expect(IllegalArgumentException.class); - thrown.expectMessage("missing value for 'b'"); + this.thrown.expect(IllegalArgumentException.class); + this.thrown.expectMessage("missing value for 'b'"); link.expand(Collections.singletonMap("a", "test")); } diff --git a/initializr-generator/src/test/java/io/spring/initializr/test/generator/PomAssert.java b/initializr-generator/src/test/java/io/spring/initializr/test/generator/PomAssert.java index 125eb41e..261fe7f3 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/test/generator/PomAssert.java +++ b/initializr-generator/src/test/java/io/spring/initializr/test/generator/PomAssert.java @@ -61,13 +61,13 @@ public class PomAssert { private final Map repositories = new LinkedHashMap<>(); public PomAssert(String content) { - eng = XMLUnit.newXpathEngine(); + this.eng = XMLUnit.newXpathEngine(); Map context = new LinkedHashMap<>(); context.put("pom", "http://maven.apache.org/POM/4.0.0"); SimpleNamespaceContext namespaceContext = new SimpleNamespaceContext(context); - eng.setNamespaceContext(namespaceContext); + this.eng.setNamespaceContext(namespaceContext); try { - doc = XMLUnit.buildControlDocument(content); + this.doc = XMLUnit.buildControlDocument(content); } catch (Exception e) { throw new IllegalArgumentException("Cannot parse XML", e); @@ -91,7 +91,7 @@ public class PomAssert { public PomAssert hasGroupId(String groupId) { try { - assertThat(eng.evaluate(createRootNodeXPath("groupId"), doc)) + assertThat(this.eng.evaluate(createRootNodeXPath("groupId"), this.doc)) .isEqualTo(groupId); } catch (XpathException e) { @@ -102,7 +102,7 @@ public class PomAssert { public PomAssert hasArtifactId(String artifactId) { try { - assertThat(eng.evaluate(createRootNodeXPath("artifactId"), doc)) + assertThat(this.eng.evaluate(createRootNodeXPath("artifactId"), this.doc)) .isEqualTo(artifactId); } catch (XpathException e) { @@ -113,7 +113,7 @@ public class PomAssert { public PomAssert hasVersion(String version) { try { - assertThat(eng.evaluate(createRootNodeXPath("version"), doc)) + assertThat(this.eng.evaluate(createRootNodeXPath("version"), this.doc)) .isEqualTo(version); } catch (XpathException e) { @@ -124,7 +124,7 @@ public class PomAssert { public PomAssert hasPackaging(String packaging) { try { - assertThat(eng.evaluate(createRootNodeXPath("packaging"), doc)) + assertThat(this.eng.evaluate(createRootNodeXPath("packaging"), this.doc)) .isEqualTo(packaging); } catch (XpathException e) { @@ -135,7 +135,8 @@ public class PomAssert { public PomAssert hasName(String name) { try { - assertThat(eng.evaluate(createRootNodeXPath("name"), doc)).isEqualTo(name); + assertThat(this.eng.evaluate(createRootNodeXPath("name"), this.doc)) + .isEqualTo(name); } catch (XpathException e) { throw new IllegalStateException("Cannot find path", e); @@ -145,7 +146,7 @@ public class PomAssert { public PomAssert hasDescription(String description) { try { - assertThat(eng.evaluate(createRootNodeXPath("description"), doc)) + assertThat(this.eng.evaluate(createRootNodeXPath("description"), this.doc)) .isEqualTo(description); } catch (XpathException e) { @@ -156,8 +157,9 @@ public class PomAssert { public PomAssert hasJavaVersion(String javaVersion) { try { - assertThat(eng.evaluate(createPropertyNodeXpath("java.version"), doc)) - .isEqualTo(javaVersion); + assertThat( + this.eng.evaluate(createPropertyNodeXpath("java.version"), this.doc)) + .isEqualTo(javaVersion); } catch (XpathException e) { throw new IllegalStateException("Cannot find path", e); @@ -223,7 +225,7 @@ public class PomAssert { public PomAssert hasDependency(Dependency expected) { String id = generateDependencyId(expected.getGroupId(), expected.getArtifactId()); assertThat(this.dependencies).containsKey(id); - Dependency dependency = dependencies.get(id); + Dependency dependency = this.dependencies.get(id); if (expected.getVersion() != null) { assertThat(dependency.getVersion()).isEqualTo(expected.getVersion()); } @@ -239,7 +241,7 @@ public class PomAssert { public PomAssert hasBom(String groupId, String artifactId, String version) { String id = generateBomId(groupId, artifactId); assertThat(this.boms).containsKey(id); - BillOfMaterials bom = boms.get(id); + BillOfMaterials bom = this.boms.get(id); assertThat(bom.getVersion()).isEqualTo(version); return this; } @@ -251,9 +253,9 @@ public class PomAssert { public PomAssert hasNoRepository() { try { - Assert.assertEquals(0, - eng.getMatchingNodes(createRootNodeXPath("repositories"), doc) - .getLength()); + Assert.assertEquals(0, this.eng + .getMatchingNodes(createRootNodeXPath("repositories"), this.doc) + .getLength()); } catch (XpathException e) { throw new IllegalStateException("Cannot find path", e); @@ -271,7 +273,7 @@ public class PomAssert { public PomAssert hasRepository(String id, String name, String url, Boolean snapshotsEnabled) { assertThat(this.repositories).containsKeys(id); - Repository repository = repositories.get(id); + Repository repository = this.repositories.get(id); if (name != null) { assertThat(repository.getName()).isEqualTo(name); } @@ -297,9 +299,9 @@ public class PomAssert { private PomAssert hasPluginRepository(String name) { NodeList nodes; try { - nodes = eng.getMatchingNodes( + nodes = this.eng.getMatchingNodes( createRootNodeXPath("pluginRepositories/pom:pluginRepository/pom:id"), - doc); + this.doc); } catch (XpathException e) { throw new IllegalStateException("Cannot find path", e); @@ -323,12 +325,12 @@ public class PomAssert { private ParentPom parseParent() { ParentPom parent = new ParentPom(); try { - parent.setGroupId( - eng.evaluate(createRootNodeXPath("parent/pom:groupId"), doc)); - parent.setArtifactId( - eng.evaluate(createRootNodeXPath("parent/pom:artifactId"), doc)); - parent.setVersion( - eng.evaluate(createRootNodeXPath("parent/pom:version"), doc)); + parent.setGroupId(this.eng.evaluate(createRootNodeXPath("parent/pom:groupId"), + this.doc)); + parent.setArtifactId(this.eng + .evaluate(createRootNodeXPath("parent/pom:artifactId"), this.doc)); + parent.setVersion(this.eng.evaluate(createRootNodeXPath("parent/pom:version"), + this.doc)); return parent; } catch (XpathException e) { @@ -339,7 +341,8 @@ public class PomAssert { private void parseProperties() { NodeList nodes; try { - nodes = eng.getMatchingNodes(createRootNodeXPath("properties/*"), doc); + nodes = this.eng.getMatchingNodes(createRootNodeXPath("properties/*"), + this.doc); } catch (XpathException e) { throw new IllegalStateException("Cannot find path", e); @@ -348,7 +351,7 @@ public class PomAssert { Node item = nodes.item(i); if (item instanceof Element) { Element element = (Element) item; - properties.put(element.getTagName(), element.getTextContent()); + this.properties.put(element.getTagName(), element.getTextContent()); } } } @@ -356,8 +359,8 @@ public class PomAssert { private void parseDependencies() { NodeList nodes; try { - nodes = eng.getMatchingNodes( - createRootNodeXPath("dependencies/pom:dependency"), doc); + nodes = this.eng.getMatchingNodes( + createRootNodeXPath("dependencies/pom:dependency"), this.doc); } catch (XpathException e) { throw new IllegalStateException("Cannot find path", e); @@ -388,8 +391,8 @@ public class PomAssert { dependency.setType(type.item(0).getTextContent()); } String id = dependency.generateId(); - assertThat(dependencies).doesNotContainKeys(id); - dependencies.put(id, dependency); + assertThat(this.dependencies).doesNotContainKeys(id); + this.dependencies.put(id, dependency); } } } @@ -397,8 +400,10 @@ public class PomAssert { private void parseBoms() { NodeList nodes; try { - nodes = eng.getMatchingNodes(createRootNodeXPath( - "dependencyManagement/pom:dependencies/pom:dependency"), doc); + nodes = this.eng.getMatchingNodes( + createRootNodeXPath( + "dependencyManagement/pom:dependencies/pom:dependency"), + this.doc); } catch (XpathException e) { throw new IllegalStateException("Cannot find path", e); @@ -425,7 +430,7 @@ public class PomAssert { } String id = generateBomId(bom.getGroupId(), bom.getArtifactId()); assertThat(this.boms).doesNotContainKeys(id); - boms.put(id, bom); + this.boms.put(id, bom); } } } @@ -434,8 +439,8 @@ public class PomAssert { private void parseRepositories() { NodeList nodes; try { - nodes = eng.getMatchingNodes( - createRootNodeXPath("repositories/pom:repository"), doc); + nodes = this.eng.getMatchingNodes( + createRootNodeXPath("repositories/pom:repository"), this.doc); } catch (XpathException e) { throw new IllegalStateException("Cannot find path", e); @@ -472,7 +477,7 @@ public class PomAssert { } } assertThat(this.repositories).doesNotContainKeys(id); - repositories.put(id, repository); + this.repositories.put(id, repository); } } } diff --git a/initializr-generator/src/test/java/io/spring/initializr/test/generator/ProjectAssert.java b/initializr-generator/src/test/java/io/spring/initializr/test/generator/ProjectAssert.java index 395731ca..971a38c0 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/test/generator/ProjectAssert.java +++ b/initializr-generator/src/test/java/io/spring/initializr/test/generator/ProjectAssert.java @@ -45,11 +45,11 @@ public class ProjectAssert { private Boolean mavenProject; public File getDir() { - return dir; + return this.dir; } public Boolean getMavenProject() { - return mavenProject; + return this.mavenProject; } /** @@ -71,9 +71,8 @@ public class ProjectAssert { */ public ProjectAssert hasBaseDir(String name) { File projectDir = file(name); - assertThat(projectDir) - .describedAs("No directory %s found in %s", name, dir.getAbsolutePath()) - .exists(); + assertThat(projectDir).describedAs("No directory %s found in %s", name, + this.dir.getAbsolutePath()).exists(); assertThat(projectDir).isDirectory(); // Replacing the root dir so that other assertions match the root return new ProjectAssert(projectDir); @@ -138,7 +137,7 @@ public class ProjectAssert { hasFile("pom.xml").hasNoFile("build.gradle"); hasFile("mvnw", "mvnw.cmd", ".mvn/wrapper/maven-wrapper.properties", ".mvn/wrapper/maven-wrapper.jar"); - mavenProject = true; + this.mavenProject = true; return this; } @@ -146,7 +145,7 @@ public class ProjectAssert { hasFile("build.gradle").hasNoFile("pom.xml"); hasFile("gradlew", "gradlew.bat", "gradle/wrapper/gradle-wrapper.properties", "gradle/wrapper/gradle-wrapper.jar"); - mavenProject = false; + this.mavenProject = false; if (StringUtils.hasText(version)) { Properties properties = properties( "gradle/wrapper/gradle-wrapper.properties"); @@ -254,7 +253,7 @@ public class ProjectAssert { } private File file(String localPath) { - return new File(dir, localPath); + return new File(this.dir, localPath); } private Properties properties(String localPath) { diff --git a/initializr-generator/src/test/java/io/spring/initializr/test/generator/SourceCodeAssert.java b/initializr-generator/src/test/java/io/spring/initializr/test/generator/SourceCodeAssert.java index ab5f3c5a..4db882b0 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/test/generator/SourceCodeAssert.java +++ b/initializr-generator/src/test/java/io/spring/initializr/test/generator/SourceCodeAssert.java @@ -45,7 +45,7 @@ public class SourceCodeAssert { try (InputStream stream = expected.getInputStream()) { String expectedContent = StreamUtils.copyToString(stream, Charset.forName("UTF-8")); - assertThat(content).describedAs("Content for %s", this.name) + assertThat(this.content).describedAs("Content for %s", this.name) .isEqualTo(expectedContent.replaceAll("\r\n", "\n")); } catch (IOException e) { diff --git a/initializr-generator/src/test/java/io/spring/initializr/test/metadata/InitializrMetadataTestBuilder.java b/initializr-generator/src/test/java/io/spring/initializr/test/metadata/InitializrMetadataTestBuilder.java index 33278df2..050a8438 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/test/metadata/InitializrMetadataTestBuilder.java +++ b/initializr-generator/src/test/java/io/spring/initializr/test/metadata/InitializrMetadataTestBuilder.java @@ -47,11 +47,11 @@ public class InitializrMetadataTestBuilder { } public InitializrMetadata build() { - return builder.build(); + return this.builder.build(); } public InitializrMetadataTestBuilder addDependencyGroup(String name, String... ids) { - builder.withCustomizer(it -> { + this.builder.withCustomizer(it -> { DependencyGroup group = new DependencyGroup(); group.setName(name); for (String id : ids) { @@ -66,7 +66,7 @@ public class InitializrMetadataTestBuilder { public InitializrMetadataTestBuilder addDependencyGroup(String name, Dependency... dependencies) { - builder.withCustomizer(it -> { + this.builder.withCustomizer(it -> { DependencyGroup group = new DependencyGroup(); group.setName(name); group.getContent().addAll(Arrays.asList(dependencies)); @@ -105,7 +105,7 @@ public class InitializrMetadataTestBuilder { } public InitializrMetadataTestBuilder addType(Type type) { - builder.withCustomizer(it -> it.getTypes().getContent().add(type)); + this.builder.withCustomizer(it -> it.getTypes().getContent().add(type)); return this; } @@ -114,7 +114,7 @@ public class InitializrMetadataTestBuilder { } public InitializrMetadataTestBuilder addPackaging(String id, boolean defaultValue) { - builder.withCustomizer(it -> { + this.builder.withCustomizer(it -> { DefaultMetadataElement packaging = new DefaultMetadataElement(); packaging.setId(id); packaging.setName(id); @@ -131,7 +131,7 @@ public class InitializrMetadataTestBuilder { public InitializrMetadataTestBuilder addJavaVersion(String version, boolean defaultValue) { - builder.withCustomizer(it -> { + this.builder.withCustomizer(it -> { DefaultMetadataElement element = new DefaultMetadataElement(); element.setId(version); element.setName(version); @@ -147,7 +147,7 @@ public class InitializrMetadataTestBuilder { } public InitializrMetadataTestBuilder addLanguage(String id, boolean defaultValue) { - builder.withCustomizer(it -> { + this.builder.withCustomizer(it -> { DefaultMetadataElement element = new DefaultMetadataElement(); element.setId(id); element.setName(id); @@ -164,7 +164,7 @@ public class InitializrMetadataTestBuilder { } public InitializrMetadataTestBuilder addBootVersion(String id, boolean defaultValue) { - builder.withCustomizer(it -> { + this.builder.withCustomizer(it -> { DefaultMetadataElement element = new DefaultMetadataElement(); element.setId(id); element.setName(id); @@ -181,21 +181,21 @@ public class InitializrMetadataTestBuilder { } public InitializrMetadataTestBuilder addBom(String id, BillOfMaterials bom) { - builder.withCustomizer( + this.builder.withCustomizer( it -> it.getConfiguration().getEnv().getBoms().put(id, bom)); return this; } public InitializrMetadataTestBuilder setGradleEnv( String dependencyManagementPluginVersion) { - builder.withCustomizer(it -> it.getConfiguration().getEnv().getGradle() + this.builder.withCustomizer(it -> it.getConfiguration().getEnv().getGradle() .setDependencyManagementPluginVersion(dependencyManagementPluginVersion)); return this; } public InitializrMetadataTestBuilder setKotlinEnv(String defaultKotlinVersion, Kotlin.Mapping... mappings) { - builder.withCustomizer(it -> { + this.builder.withCustomizer(it -> { it.getConfiguration().getEnv().getKotlin() .setDefaultVersion(defaultKotlinVersion); for (Kotlin.Mapping mapping : mappings) { @@ -207,7 +207,7 @@ public class InitializrMetadataTestBuilder { public InitializrMetadataTestBuilder setMavenParent(String groupId, String artifactId, String version, boolean includeSpringBootBom) { - builder.withCustomizer(it -> { + this.builder.withCustomizer(it -> { ParentPom parent = it.getConfiguration().getEnv().getMaven().getParent(); parent.setGroupId(groupId); parent.setArtifactId(artifactId); @@ -219,7 +219,7 @@ public class InitializrMetadataTestBuilder { public InitializrMetadataTestBuilder addRepository(String id, String name, String url, boolean snapshotsEnabled) { - builder.withCustomizer(it -> { + this.builder.withCustomizer(it -> { Repository repo = new Repository(); repo.setName(name); try { diff --git a/initializr-generator/src/test/java/io/spring/initializr/util/VersionParserTests.java b/initializr-generator/src/test/java/io/spring/initializr/util/VersionParserTests.java index 558b61d7..dc62a440 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/util/VersionParserTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/util/VersionParserTests.java @@ -43,94 +43,96 @@ public class VersionParserTests { @Test public void noQualifierString() { - Version version = parser.parse("1.2.0"); + Version version = this.parser.parse("1.2.0"); assertThat(version.toString(), equalTo("1.2.0")); } @Test public void withQualifierString() { - Version version = parser.parse("1.2.0.RELEASE"); + Version version = this.parser.parse("1.2.0.RELEASE"); assertThat(version.toString(), equalTo("1.2.0.RELEASE")); } @Test public void withQualifierAndVersionString() { - Version version = parser.parse("1.2.0.RC2"); + Version version = this.parser.parse("1.2.0.RC2"); assertThat(version.toString(), equalTo("1.2.0.RC2")); } @Test public void parseInvalidVersion() { - thrown.expect(InvalidVersionException.class); - parser.parse("foo"); + this.thrown.expect(InvalidVersionException.class); + this.parser.parse("foo"); } @Test public void safeParseInvalidVersion() { - assertNull(parser.safeParse("foo")); + assertNull(this.parser.safeParse("foo")); } @Test public void parseVersionWithSpaces() { - assertThat(parser.parse(" 1.2.0.RC3 "), - lessThan(parser.parse("1.3.0.RELEASE"))); + assertThat(this.parser.parse(" 1.2.0.RC3 "), + lessThan(this.parser.parse("1.3.0.RELEASE"))); } @Test public void parseVariableVersionMatch() { - List currentVersions = Arrays.asList(parser.parse("1.3.8.RELEASE"), - parser.parse("1.3.9.BUILD-SNAPSHOT")); - parser = new VersionParser(currentVersions); - assertThat(parser.parse("1.3.x.BUILD-SNAPSHOT").toString(), + List currentVersions = Arrays.asList(this.parser.parse("1.3.8.RELEASE"), + this.parser.parse("1.3.9.BUILD-SNAPSHOT")); + this.parser = new VersionParser(currentVersions); + assertThat(this.parser.parse("1.3.x.BUILD-SNAPSHOT").toString(), equalTo("1.3.9.BUILD-SNAPSHOT")); } @Test public void parseVariableVersionNoPatchMatch() { - List currentVersions = Arrays.asList(parser.parse("1.3.8.RELEASE"), - parser.parse("1.3.9.BUILD-SNAPSHOT")); - parser = new VersionParser(currentVersions); - assertThat(parser.parse("1.x.x.RELEASE").toString(), equalTo("1.3.8.RELEASE")); + List currentVersions = Arrays.asList(this.parser.parse("1.3.8.RELEASE"), + this.parser.parse("1.3.9.BUILD-SNAPSHOT")); + this.parser = new VersionParser(currentVersions); + assertThat(this.parser.parse("1.x.x.RELEASE").toString(), + equalTo("1.3.8.RELEASE")); } @Test public void parseVariableVersionNoQualifierMatch() { - List currentVersions = Arrays.asList(parser.parse("1.3.8.RELEASE"), - parser.parse("1.4.0.BUILD-SNAPSHOT")); - parser = new VersionParser(currentVersions); - assertThat(parser.parse("1.4.x").toString(), equalTo("1.4.0.BUILD-SNAPSHOT")); + List currentVersions = Arrays.asList(this.parser.parse("1.3.8.RELEASE"), + this.parser.parse("1.4.0.BUILD-SNAPSHOT")); + this.parser = new VersionParser(currentVersions); + assertThat(this.parser.parse("1.4.x").toString(), + equalTo("1.4.0.BUILD-SNAPSHOT")); } @Test public void parseVariableVersionNoMatch() { - List currentVersions = Arrays.asList(parser.parse("1.3.8.RELEASE"), - parser.parse("1.3.9.BUILD-SNAPSHOT")); - parser = new VersionParser(currentVersions); - assertThat(parser.parse("1.4.x.BUILD-SNAPSHOT").toString(), + List currentVersions = Arrays.asList(this.parser.parse("1.3.8.RELEASE"), + this.parser.parse("1.3.9.BUILD-SNAPSHOT")); + this.parser = new VersionParser(currentVersions); + assertThat(this.parser.parse("1.4.x.BUILD-SNAPSHOT").toString(), equalTo("1.4.999.BUILD-SNAPSHOT")); } @Test public void parseVariableVersionNoPatchNoMatch() { - List currentVersions = Arrays.asList(parser.parse("1.3.8.RELEASE"), - parser.parse("1.3.9.BUILD-SNAPSHOT")); - parser = new VersionParser(currentVersions); - assertThat(parser.parse("2.x.x.RELEASE").toString(), + List currentVersions = Arrays.asList(this.parser.parse("1.3.8.RELEASE"), + this.parser.parse("1.3.9.BUILD-SNAPSHOT")); + this.parser = new VersionParser(currentVersions); + assertThat(this.parser.parse("2.x.x.RELEASE").toString(), equalTo("2.999.999.RELEASE")); } @Test public void parseVariableVersionNoQualifierNoMatch() { - List currentVersions = Arrays.asList(parser.parse("1.3.8.RELEASE"), - parser.parse("1.4.0.BUILD-SNAPSHOT")); - parser = new VersionParser(currentVersions); - assertThat(parser.parse("1.2.x").toString(), equalTo("1.2.999")); + List currentVersions = Arrays.asList(this.parser.parse("1.3.8.RELEASE"), + this.parser.parse("1.4.0.BUILD-SNAPSHOT")); + this.parser = new VersionParser(currentVersions); + assertThat(this.parser.parse("1.2.x").toString(), equalTo("1.2.999")); } @Test public void invalidRange() { - thrown.expect(InvalidVersionException.class); - parser.parseRange("foo-bar"); + this.thrown.expect(InvalidVersionException.class); + this.parser.parseRange("foo-bar"); } } diff --git a/initializr-generator/src/test/java/io/spring/initializr/util/VersionPropertyTests.java b/initializr-generator/src/test/java/io/spring/initializr/util/VersionPropertyTests.java index b6b1d91e..fdebf085 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/util/VersionPropertyTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/util/VersionPropertyTests.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link VersionProperty}. - * + * * @author Stephane Nicoll */ public class VersionPropertyTests { diff --git a/initializr-generator/src/test/java/io/spring/initializr/util/VersionRangeTests.java b/initializr-generator/src/test/java/io/spring/initializr/util/VersionRangeTests.java index aa2ac5f1..0b98cb9c 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/util/VersionRangeTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/util/VersionRangeTests.java @@ -159,7 +159,7 @@ public class VersionRangeTests { @Override public void describeTo(Description description) { - description.appendText(range.toString()); + description.appendText(this.range.toString()); } } diff --git a/initializr-service/src/main/java/io/spring/initializr/service/InitializrService.java b/initializr-service/src/main/java/io/spring/initializr/service/InitializrService.java index dc57ce57..f7125410 100644 --- a/initializr-service/src/main/java/io/spring/initializr/service/InitializrService.java +++ b/initializr-service/src/main/java/io/spring/initializr/service/InitializrService.java @@ -32,8 +32,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.web.servlet.resource.ResourceUrlProvider; /** - * Initializr service application. Enables legacy STS support for older - * clients. + * Initializr service application. Enables legacy STS support for older clients. * * @author Stephane Nicoll */ @@ -47,7 +46,8 @@ public class InitializrService { @Bean @SuppressWarnings("deprecation") - public LegacyStsController legacyStsController(InitializrMetadataProvider metadataProvider, + public LegacyStsController legacyStsController( + InitializrMetadataProvider metadataProvider, ResourceUrlProvider resourceUrlProvider) { return new LegacyStsController(metadataProvider, resourceUrlProvider); } diff --git a/initializr-service/src/main/java/io/spring/initializr/service/extension/Java9RequestPostProcessor.java b/initializr-service/src/main/java/io/spring/initializr/service/extension/Java9RequestPostProcessor.java index 084c32fb..b771840f 100644 --- a/initializr-service/src/main/java/io/spring/initializr/service/extension/Java9RequestPostProcessor.java +++ b/initializr-service/src/main/java/io/spring/initializr/service/extension/Java9RequestPostProcessor.java @@ -36,10 +36,12 @@ class Java9RequestPostProcessor implements ProjectRequestPostProcessor { private static final Version VERSION_2_0_0_M1 = Version.parse("2.0.0.M1"); - private static final List UNSUPPORTED_LANGUAGES = Arrays.asList("groovy", "kotlin"); + private static final List UNSUPPORTED_LANGUAGES = Arrays.asList("groovy", + "kotlin"); @Override - public void postProcessAfterResolution(ProjectRequest request, InitializrMetadata metadata) { + public void postProcessAfterResolution(ProjectRequest request, + InitializrMetadata metadata) { Version requestVersion = Version.safeParse(request.getBootVersion()); if (!"9".equals(request.getJavaVersion())) { return; diff --git a/initializr-service/src/main/java/io/spring/initializr/service/extension/ReactorTestRequestPostProcessor.java b/initializr-service/src/main/java/io/spring/initializr/service/extension/ReactorTestRequestPostProcessor.java index 12701ad5..fa757bda 100644 --- a/initializr-service/src/main/java/io/spring/initializr/service/extension/ReactorTestRequestPostProcessor.java +++ b/initializr-service/src/main/java/io/spring/initializr/service/extension/ReactorTestRequestPostProcessor.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Component; /** * A {@link ProjectRequestPostProcessor} that automatically adds "reactor-test" when * webflux is selected. - * + * * @author Stephane Nicoll */ @Component @@ -35,11 +35,12 @@ class ReactorTestRequestPostProcessor extends AbstractProjectRequestPostProcesso private static final Version VERSION_2_0_0_M2 = Version.parse("2.0.0.M2"); - static final Dependency REACTOR_TEST = Dependency.withId("reactor-test", + static final Dependency REACTOR_TEST = Dependency.withId("reactor-test", "io.projectreactor", "reactor-test", null, Dependency.SCOPE_TEST); @Override - public void postProcessAfterResolution(ProjectRequest request, InitializrMetadata metadata) { + public void postProcessAfterResolution(ProjectRequest request, + InitializrMetadata metadata) { if (hasDependency(request, "webflux") && isSpringBootVersionAtLeastAfter(request, VERSION_2_0_0_M2)) { request.getResolvedDependencies().add(REACTOR_TEST); diff --git a/initializr-service/src/main/java/io/spring/initializr/service/extension/SpringBatchTestRequestPostProcessor.java b/initializr-service/src/main/java/io/spring/initializr/service/extension/SpringBatchTestRequestPostProcessor.java index b1546a85..ca4e69a9 100644 --- a/initializr-service/src/main/java/io/spring/initializr/service/extension/SpringBatchTestRequestPostProcessor.java +++ b/initializr-service/src/main/java/io/spring/initializr/service/extension/SpringBatchTestRequestPostProcessor.java @@ -25,8 +25,8 @@ import io.spring.initializr.util.Version; import org.springframework.stereotype.Component; /** - * A {@link ProjectRequestPostProcessor} that automatically adds - * {@code spring-batch-test} when Spring Batch is selected. + * A {@link ProjectRequestPostProcessor} that automatically adds {@code spring-batch-test} + * when Spring Batch is selected. * * @author Tim Riemer */ @@ -36,7 +36,8 @@ class SpringBatchTestRequestPostProcessor extends AbstractProjectRequestPostProc private static final Version VERSION_1_3_0 = Version.parse("1.3.0.RELEASE"); static final Dependency SPRING_BATCH_TEST = Dependency.withId("spring-batch-test", - "org.springframework.batch", "spring-batch-test", null, Dependency.SCOPE_TEST); + "org.springframework.batch", "spring-batch-test", null, + Dependency.SCOPE_TEST); @Override public void postProcessAfterResolution(ProjectRequest request, diff --git a/initializr-service/src/main/java/io/spring/initializr/service/extension/SpringBoot2RequestPostProcessor.java b/initializr-service/src/main/java/io/spring/initializr/service/extension/SpringBoot2RequestPostProcessor.java index 36e1ff3a..6e0156d5 100644 --- a/initializr-service/src/main/java/io/spring/initializr/service/extension/SpringBoot2RequestPostProcessor.java +++ b/initializr-service/src/main/java/io/spring/initializr/service/extension/SpringBoot2RequestPostProcessor.java @@ -26,8 +26,8 @@ import io.spring.initializr.util.Version; import org.springframework.stereotype.Component; /** - * As of Spring Boot 2.0, Java8 is mandatory so this extension makes sure that the - * java version is forced. + * As of Spring Boot 2.0, Java8 is mandatory so this extension makes sure that the java + * version is forced. * * @author Stephane Nicoll */ diff --git a/initializr-service/src/main/java/io/spring/initializr/service/extension/SpringCloudStreamRequestPostProcessor.java b/initializr-service/src/main/java/io/spring/initializr/service/extension/SpringCloudStreamRequestPostProcessor.java index 8e515dc0..19abd02a 100644 --- a/initializr-service/src/main/java/io/spring/initializr/service/extension/SpringCloudStreamRequestPostProcessor.java +++ b/initializr-service/src/main/java/io/spring/initializr/service/extension/SpringCloudStreamRequestPostProcessor.java @@ -23,8 +23,8 @@ import io.spring.initializr.metadata.InitializrMetadata; import org.springframework.stereotype.Component; /** - * Determine the appropriate Spring Cloud stream dependency to use based on the - * selected integration technology. + * Determine the appropriate Spring Cloud stream dependency to use based on the selected + * integration technology. *

* Does not replace the integration technology jar by the relevant binder. If more than * one tech is selected, it is far more easier to remove the unnecessary binder jar than @@ -33,8 +33,7 @@ import org.springframework.stereotype.Component; * @author Stephane Nicoll */ @Component -class SpringCloudStreamRequestPostProcessor - extends AbstractProjectRequestPostProcessor { +class SpringCloudStreamRequestPostProcessor extends AbstractProjectRequestPostProcessor { static final Dependency KAFKA_BINDER = Dependency.withId("cloud-stream-binder-kafka", "org.springframework.cloud", "spring-cloud-stream-binder-kafka"); @@ -79,4 +78,3 @@ class SpringCloudStreamRequestPostProcessor } } - diff --git a/initializr-service/src/main/java/io/spring/initializr/service/extension/SpringSecurityTestRequestPostProcessor.java b/initializr-service/src/main/java/io/spring/initializr/service/extension/SpringSecurityTestRequestPostProcessor.java index 3e36366a..b1c1622f 100644 --- a/initializr-service/src/main/java/io/spring/initializr/service/extension/SpringSecurityTestRequestPostProcessor.java +++ b/initializr-service/src/main/java/io/spring/initializr/service/extension/SpringSecurityTestRequestPostProcessor.java @@ -35,9 +35,9 @@ class SpringSecurityTestRequestPostProcessor extends AbstractProjectRequestPostP private static final Version VERSION_1_3_0 = Version.parse("1.3.0.RELEASE"); - static final Dependency SPRING_SECURITY_TEST = Dependency.withId( - "security-test", "org.springframework.security", - "spring-security-test", null, Dependency.SCOPE_TEST); + static final Dependency SPRING_SECURITY_TEST = Dependency.withId("security-test", + "org.springframework.security", "spring-security-test", null, + Dependency.SCOPE_TEST); @Override public void postProcessAfterResolution(ProjectRequest request, diff --git a/initializr-service/src/main/java/io/spring/initializr/service/extension/SpringSessionRequestPostProcessor.java b/initializr-service/src/main/java/io/spring/initializr/service/extension/SpringSessionRequestPostProcessor.java index 91dabccc..be5a5699 100644 --- a/initializr-service/src/main/java/io/spring/initializr/service/extension/SpringSessionRequestPostProcessor.java +++ b/initializr-service/src/main/java/io/spring/initializr/service/extension/SpringSessionRequestPostProcessor.java @@ -34,8 +34,7 @@ import org.springframework.stereotype.Component; * @author Stephane Nicoll */ @Component -class SpringSessionRequestPostProcessor - extends AbstractProjectRequestPostProcessor { +class SpringSessionRequestPostProcessor extends AbstractProjectRequestPostProcessor { private static final Version VERSION_2_0_0_M3 = Version.parse("2.0.0.M3"); @@ -45,7 +44,6 @@ class SpringSessionRequestPostProcessor static final Dependency JDBC = Dependency.withId("session-jdbc", "org.springframework.session", "spring-session-jdbc"); - @Override public void postProcessAfterResolution(ProjectRequest request, InitializrMetadata metadata) { diff --git a/initializr-service/src/test/java/io/spring/initializr/service/InitializrServiceSmokeTests.java b/initializr-service/src/test/java/io/spring/initializr/service/InitializrServiceSmokeTests.java index f7183b06..3d594031 100644 --- a/initializr-service/src/test/java/io/spring/initializr/service/InitializrServiceSmokeTests.java +++ b/initializr-service/src/test/java/io/spring/initializr/service/InitializrServiceSmokeTests.java @@ -60,7 +60,8 @@ public class InitializrServiceSmokeTests { RequestEntity request = RequestEntity.get(new URI("/")) .accept(MediaType.parseMediaType("application/vnd.initializr.v2.1+json")) .build(); - ResponseEntity response = this.restTemplate.exchange(request, String.class); + ResponseEntity response = this.restTemplate.exchange(request, + String.class); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); new ObjectMapper().readTree(response.getBody()); } @@ -68,16 +69,16 @@ public class InitializrServiceSmokeTests { @Test public void configurationCanBeSerialized() throws URISyntaxException { RequestEntity request = RequestEntity.get(new URI("/metadata/config")) - .accept(MediaType.APPLICATION_JSON) - .build(); - ResponseEntity response = this.restTemplate.exchange(request, String.class); + .accept(MediaType.APPLICATION_JSON).build(); + ResponseEntity response = this.restTemplate.exchange(request, + String.class); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); InitializrMetadata actual = InitializrMetadataBuilder.create() - .withInitializrMetadata(new ByteArrayResource( - response.getBody().getBytes())) + .withInitializrMetadata( + new ByteArrayResource(response.getBody().getBytes())) .build(); assertThat(actual).isNotNull(); - InitializrMetadata expected = metadataProvider.get(); + InitializrMetadata expected = this.metadataProvider.get(); assertThat(actual.getDependencies().getAll().size()) .isEqualTo(expected.getDependencies().getAll().size()); assertThat(actual.getConfiguration().getEnv().getBoms().size()) diff --git a/initializr-service/src/test/java/io/spring/initializr/service/extension/AbstractRequestPostProcessorTests.java b/initializr-service/src/test/java/io/spring/initializr/service/extension/AbstractRequestPostProcessorTests.java index fe192603..75b2f904 100644 --- a/initializr-service/src/test/java/io/spring/initializr/service/extension/AbstractRequestPostProcessorTests.java +++ b/initializr-service/src/test/java/io/spring/initializr/service/extension/AbstractRequestPostProcessorTests.java @@ -52,19 +52,19 @@ public abstract class AbstractRequestPostProcessorTests { protected PomAssert generateMavenPom(ProjectRequest request) { request.setType("maven-build"); - String content = new String(projectGenerator.generateMavenPom(request)); + String content = new String(this.projectGenerator.generateMavenPom(request)); return new PomAssert(content); } protected GradleBuildAssert generateGradleBuild(ProjectRequest request) { request.setType("gradle-build"); - String content = new String(projectGenerator.generateGradleBuild(request)); + String content = new String(this.projectGenerator.generateGradleBuild(request)); return new GradleBuildAssert(content); } protected ProjectRequest createProjectRequest(String... styles) { ProjectRequest request = new ProjectRequest(); - request.initialize(metadataProvider.get()); + request.initialize(this.metadataProvider.get()); request.getStyle().addAll(Arrays.asList(styles)); return request; } diff --git a/initializr-service/src/test/java/io/spring/initializr/service/extension/JacksonKotlinRequestPostProcessorTests.java b/initializr-service/src/test/java/io/spring/initializr/service/extension/JacksonKotlinRequestPostProcessorTests.java index 4cbb846f..156d0010 100644 --- a/initializr-service/src/test/java/io/spring/initializr/service/extension/JacksonKotlinRequestPostProcessorTests.java +++ b/initializr-service/src/test/java/io/spring/initializr/service/extension/JacksonKotlinRequestPostProcessorTests.java @@ -36,10 +36,8 @@ public class JacksonKotlinRequestPostProcessorTests ProjectRequest request = createProjectRequest("webflux"); request.setBootVersion("2.0.0.M2"); request.setLanguage("kotlin"); - generateMavenPom(request) - .hasSpringBootStarterDependency("webflux") - .hasDependency(JACKSON_KOTLIN) - .hasSpringBootStarterTest() + generateMavenPom(request).hasSpringBootStarterDependency("webflux") + .hasDependency(JACKSON_KOTLIN).hasSpringBootStarterTest() .hasDependency(REACTOR_TEST) .hasDependency("org.jetbrains.kotlin", "kotlin-reflect") .hasDependency("org.jetbrains.kotlin", "kotlin-stdlib-jdk8") @@ -50,10 +48,8 @@ public class JacksonKotlinRequestPostProcessorTests public void jacksonModuleKotlinIsNotAddedWithoutKotlin() { ProjectRequest request = createProjectRequest("webflux"); request.setBootVersion("2.0.0.M2"); - generateMavenPom(request) - .hasSpringBootStarterDependency("webflux") - .hasSpringBootStarterTest() - .hasDependency(REACTOR_TEST) + generateMavenPom(request).hasSpringBootStarterDependency("webflux") + .hasSpringBootStarterTest().hasDependency(REACTOR_TEST) .hasDependenciesCount(3); } @@ -62,8 +58,7 @@ public class JacksonKotlinRequestPostProcessorTests ProjectRequest request = createProjectRequest("actuator"); request.setBootVersion("2.0.0.M2"); request.setLanguage("kotlin"); - generateMavenPom(request) - .hasSpringBootStarterDependency("actuator") + generateMavenPom(request).hasSpringBootStarterDependency("actuator") .hasSpringBootStarterTest() .hasDependency("org.jetbrains.kotlin", "kotlin-reflect") .hasDependency("org.jetbrains.kotlin", "kotlin-stdlib-jdk8") diff --git a/initializr-service/src/test/java/io/spring/initializr/service/extension/Java9RequestPostProcessorTests.java b/initializr-service/src/test/java/io/spring/initializr/service/extension/Java9RequestPostProcessorTests.java index 15b20fc7..94884a08 100644 --- a/initializr-service/src/test/java/io/spring/initializr/service/extension/Java9RequestPostProcessorTests.java +++ b/initializr-service/src/test/java/io/spring/initializr/service/extension/Java9RequestPostProcessorTests.java @@ -24,8 +24,7 @@ import org.junit.Test; * * @author Stephane Nicoll */ -public class Java9RequestPostProcessorTests - extends AbstractRequestPostProcessorTests { +public class Java9RequestPostProcessorTests extends AbstractRequestPostProcessorTests { @Test public void java9CannotBeUsedWithSpringBoot1Maven() { diff --git a/initializr-service/src/test/java/io/spring/initializr/service/extension/ReactorTestRequestPostProcessorTests.java b/initializr-service/src/test/java/io/spring/initializr/service/extension/ReactorTestRequestPostProcessorTests.java index c8cc746f..fdc1183f 100644 --- a/initializr-service/src/test/java/io/spring/initializr/service/extension/ReactorTestRequestPostProcessorTests.java +++ b/initializr-service/src/test/java/io/spring/initializr/service/extension/ReactorTestRequestPostProcessorTests.java @@ -32,13 +32,11 @@ public class ReactorTestRequestPostProcessorTests public void reactorTestIsAdded() { ProjectRequest request = createProjectRequest("webflux"); request.setBootVersion("2.0.0.M2"); - Dependency reactorTest = Dependency.withId( - "reactor-test", "io.projectreactor", "reactor-test"); + Dependency reactorTest = Dependency.withId("reactor-test", "io.projectreactor", + "reactor-test"); reactorTest.setScope(Dependency.SCOPE_TEST); - generateMavenPom(request) - .hasSpringBootStarterDependency("webflux") - .hasSpringBootStarterTest() - .hasDependency(reactorTest) + generateMavenPom(request).hasSpringBootStarterDependency("webflux") + .hasSpringBootStarterTest().hasDependency(reactorTest) .hasDependenciesCount(3); } @@ -46,20 +44,16 @@ public class ReactorTestRequestPostProcessorTests public void reactorTestIsNotAddedWithEarlierVersions() { ProjectRequest request = createProjectRequest("webflux"); request.setBootVersion("2.0.0.M1"); - generateMavenPom(request) - .hasSpringBootStarterDependency("webflux") - .hasSpringBootStarterTest() - .hasDependenciesCount(2); + generateMavenPom(request).hasSpringBootStarterDependency("webflux") + .hasSpringBootStarterTest().hasDependenciesCount(2); } @Test public void reactorTestIsNotAddedWithoutWebFlux() { ProjectRequest request = createProjectRequest("web"); request.setBootVersion("2.0.0.M2"); - generateMavenPom(request) - .hasSpringBootStarterDependency("web") - .hasSpringBootStarterTest() - .hasDependenciesCount(2); + generateMavenPom(request).hasSpringBootStarterDependency("web") + .hasSpringBootStarterTest().hasDependenciesCount(2); } } \ No newline at end of file diff --git a/initializr-service/src/test/java/io/spring/initializr/service/extension/SpringBatchTestRequestPostProcessorTests.java b/initializr-service/src/test/java/io/spring/initializr/service/extension/SpringBatchTestRequestPostProcessorTests.java index af9be36e..8e50f1fa 100644 --- a/initializr-service/src/test/java/io/spring/initializr/service/extension/SpringBatchTestRequestPostProcessorTests.java +++ b/initializr-service/src/test/java/io/spring/initializr/service/extension/SpringBatchTestRequestPostProcessorTests.java @@ -31,10 +31,8 @@ public class SpringBatchTestRequestPostProcessorTests @Test public void batchTestIsAddedWithBatch() { ProjectRequest request = createProjectRequest("batch"); - generateMavenPom(request) - .hasSpringBootStarterDependency("batch") - .hasSpringBootStarterTest() - .hasDependency(springBatchTest()) + generateMavenPom(request).hasSpringBootStarterDependency("batch") + .hasSpringBootStarterTest().hasDependency(springBatchTest()) .hasDependenciesCount(3); } @@ -42,19 +40,15 @@ public class SpringBatchTestRequestPostProcessorTests public void batchTestIsNotAddedBefore13() { ProjectRequest request = createProjectRequest("batch"); request.setBootVersion("1.2.7.RELEASE"); - generateMavenPom(request) - .hasSpringBootStarterDependency("batch") - .hasSpringBootStarterTest() - .hasDependenciesCount(2); + generateMavenPom(request).hasSpringBootStarterDependency("batch") + .hasSpringBootStarterTest().hasDependenciesCount(2); } @Test public void batchTestIsNotAddedWithoutSpringBatch() { ProjectRequest request = createProjectRequest("web"); - generateMavenPom(request) - .hasSpringBootStarterDependency("web") - .hasSpringBootStarterTest() - .hasDependenciesCount(2); + generateMavenPom(request).hasSpringBootStarterDependency("web") + .hasSpringBootStarterTest().hasDependenciesCount(2); } private static Dependency springBatchTest() { diff --git a/initializr-service/src/test/java/io/spring/initializr/service/extension/SpringCloudStreamRequestPostProcessorTests.java b/initializr-service/src/test/java/io/spring/initializr/service/extension/SpringCloudStreamRequestPostProcessorTests.java index 6cc29817..31bdf3da 100644 --- a/initializr-service/src/test/java/io/spring/initializr/service/extension/SpringCloudStreamRequestPostProcessorTests.java +++ b/initializr-service/src/test/java/io/spring/initializr/service/extension/SpringCloudStreamRequestPostProcessorTests.java @@ -35,24 +35,18 @@ public class SpringCloudStreamRequestPostProcessorTests @Test public void springCloudStreamWithRabbit() { ProjectRequest request = createProjectRequest("cloud-stream", "amqp"); - generateMavenPom(request) - .hasDependency(getDependency("cloud-stream")) - .hasDependency(getDependency("amqp")) - .hasDependency(RABBIT_BINDER) - .hasSpringBootStarterTest() - .hasDependency(SCS_TEST) + generateMavenPom(request).hasDependency(getDependency("cloud-stream")) + .hasDependency(getDependency("amqp")).hasDependency(RABBIT_BINDER) + .hasSpringBootStarterTest().hasDependency(SCS_TEST) .hasDependenciesCount(5); } @Test public void springCloudStreamWithKafka() { ProjectRequest request = createProjectRequest("cloud-stream", "kafka"); - generateMavenPom(request) - .hasDependency(getDependency("cloud-stream")) - .hasDependency(getDependency("kafka")) - .hasDependency(KAFKA_BINDER) - .hasSpringBootStarterTest() - .hasDependency(SCS_TEST) + generateMavenPom(request).hasDependency(getDependency("cloud-stream")) + .hasDependency(getDependency("kafka")).hasDependency(KAFKA_BINDER) + .hasSpringBootStarterTest().hasDependency(SCS_TEST) .hasDependenciesCount(5); } @@ -60,42 +54,32 @@ public class SpringCloudStreamRequestPostProcessorTests public void springCloudStreamWithKafkaStreams() { ProjectRequest request = createProjectRequest("cloud-stream", "kafka-streams"); request.setBootVersion("2.0.0.RELEASE"); - generateMavenPom(request) - .hasDependency(getDependency("cloud-stream")) + generateMavenPom(request).hasDependency(getDependency("cloud-stream")) .hasDependency(getDependency("kafka-streams")) - .hasDependency(KAFKA_STREAMS_BINDER) - .hasSpringBootStarterTest() - .hasDependency(SCS_TEST) - .hasDependenciesCount(5); + .hasDependency(KAFKA_STREAMS_BINDER).hasSpringBootStarterTest() + .hasDependency(SCS_TEST).hasDependenciesCount(5); } @Test public void springCloudStreamWithAllBinders() { - ProjectRequest request = createProjectRequest( - "cloud-stream", "amqp", "kafka", "kafka-streams"); - generateMavenPom(request) - .hasDependency(getDependency("cloud-stream")) + ProjectRequest request = createProjectRequest("cloud-stream", "amqp", "kafka", + "kafka-streams"); + generateMavenPom(request).hasDependency(getDependency("cloud-stream")) .hasDependency(getDependency("amqp")) .hasDependency(getDependency("kafka")) .hasDependency(getDependency("kafka-streams")) - .hasDependency(RABBIT_BINDER) - .hasDependency(KAFKA_BINDER) - .hasDependency(KAFKA_STREAMS_BINDER) - .hasSpringBootStarterTest() - .hasDependency(SCS_TEST) - .hasDependenciesCount(9); + .hasDependency(RABBIT_BINDER).hasDependency(KAFKA_BINDER) + .hasDependency(KAFKA_STREAMS_BINDER).hasSpringBootStarterTest() + .hasDependency(SCS_TEST).hasDependenciesCount(9); } @Test public void reactiveSpringCloudStreamWithRabbit() { ProjectRequest request = createProjectRequest("reactive-cloud-stream", "amqp"); request.setBootVersion("2.0.0.RELEASE"); - generateMavenPom(request) - .hasDependency(getDependency("reactive-cloud-stream")) - .hasDependency(getDependency("amqp")) - .hasDependency(RABBIT_BINDER) - .hasSpringBootStarterTest() - .hasDependency(SCS_TEST) + generateMavenPom(request).hasDependency(getDependency("reactive-cloud-stream")) + .hasDependency(getDependency("amqp")).hasDependency(RABBIT_BINDER) + .hasSpringBootStarterTest().hasDependency(SCS_TEST) .hasDependenciesCount(5); } @@ -103,122 +87,94 @@ public class SpringCloudStreamRequestPostProcessorTests public void reactiveSpringCloudStreamWithKafka() { ProjectRequest request = createProjectRequest("reactive-cloud-stream", "kafka"); request.setBootVersion("2.0.0.RELEASE"); - generateMavenPom(request) - .hasDependency(getDependency("reactive-cloud-stream")) - .hasDependency(getDependency("kafka")) - .hasDependency(KAFKA_BINDER) - .hasSpringBootStarterTest() - .hasDependency(SCS_TEST) + generateMavenPom(request).hasDependency(getDependency("reactive-cloud-stream")) + .hasDependency(getDependency("kafka")).hasDependency(KAFKA_BINDER) + .hasSpringBootStarterTest().hasDependency(SCS_TEST) .hasDependenciesCount(5); } @Test public void reactiveSpringCloudStreamWithKafkaStreams() { - ProjectRequest request = createProjectRequest( - "reactive-cloud-stream", "kafka-streams"); + ProjectRequest request = createProjectRequest("reactive-cloud-stream", + "kafka-streams"); request.setBootVersion("2.0.0.RELEASE"); - generateMavenPom(request) - .hasDependency(getDependency("reactive-cloud-stream")) + generateMavenPom(request).hasDependency(getDependency("reactive-cloud-stream")) .hasDependency(getDependency("kafka-streams")) - .hasDependency(KAFKA_STREAMS_BINDER) - .hasSpringBootStarterTest() - .hasDependency(SCS_TEST) - .hasDependenciesCount(5); + .hasDependency(KAFKA_STREAMS_BINDER).hasSpringBootStarterTest() + .hasDependency(SCS_TEST).hasDependenciesCount(5); } @Test public void reactiveSpringCloudStreamWithAllBinders() { - ProjectRequest request = createProjectRequest( - "reactive-cloud-stream", "amqp", "kafka","kafka-streams"); + ProjectRequest request = createProjectRequest("reactive-cloud-stream", "amqp", + "kafka", "kafka-streams"); request.setBootVersion("2.0.0.RELEASE"); - generateMavenPom(request) - .hasDependency(getDependency("reactive-cloud-stream")) + generateMavenPom(request).hasDependency(getDependency("reactive-cloud-stream")) .hasDependency(getDependency("amqp")) .hasDependency(getDependency("kafka")) .hasDependency(getDependency("kafka-streams")) - .hasDependency(RABBIT_BINDER) - .hasDependency(KAFKA_BINDER) - .hasDependency(KAFKA_STREAMS_BINDER) - .hasSpringBootStarterTest() - .hasDependency(SCS_TEST) - .hasDependenciesCount(9); + .hasDependency(RABBIT_BINDER).hasDependency(KAFKA_BINDER) + .hasDependency(KAFKA_STREAMS_BINDER).hasSpringBootStarterTest() + .hasDependency(SCS_TEST).hasDependenciesCount(9); } @Test public void springCloudBusWithRabbit() { ProjectRequest request = createProjectRequest("cloud-bus", "amqp"); - generateMavenPom(request) - .hasDependency(getDependency("cloud-bus")) - .hasDependency(getDependency("amqp")) - .hasDependency(RABBIT_BINDER) - .hasSpringBootStarterTest() - .hasDependenciesCount(4); + generateMavenPom(request).hasDependency(getDependency("cloud-bus")) + .hasDependency(getDependency("amqp")).hasDependency(RABBIT_BINDER) + .hasSpringBootStarterTest().hasDependenciesCount(4); } @Test public void springCloudBusWithKafka() { ProjectRequest request = createProjectRequest("cloud-bus", "amqp"); - generateMavenPom(request) - .hasDependency(getDependency("cloud-bus")) - .hasDependency(getDependency("amqp")) - .hasDependency(RABBIT_BINDER) - .hasSpringBootStarterTest() - .hasDependenciesCount(4); + generateMavenPom(request).hasDependency(getDependency("cloud-bus")) + .hasDependency(getDependency("amqp")).hasDependency(RABBIT_BINDER) + .hasSpringBootStarterTest().hasDependenciesCount(4); } @Test public void springCloudBusWithAllBinders() { - ProjectRequest request = createProjectRequest( - "cloud-bus", "amqp", "kafka", "kafka-streams"); - generateMavenPom(request) - .hasDependency(getDependency("cloud-bus")) + ProjectRequest request = createProjectRequest("cloud-bus", "amqp", "kafka", + "kafka-streams"); + generateMavenPom(request).hasDependency(getDependency("cloud-bus")) .hasDependency(getDependency("amqp")) .hasDependency(getDependency("kafka")) .hasDependency(getDependency("kafka-streams")) - .hasDependency(RABBIT_BINDER) - .hasDependency(KAFKA_BINDER) - .hasSpringBootStarterTest() - .hasDependenciesCount(7); + .hasDependency(RABBIT_BINDER).hasDependency(KAFKA_BINDER) + .hasSpringBootStarterTest().hasDependenciesCount(7); } @Test public void springCloudTurbineStreamWithRabbit() { ProjectRequest request = createProjectRequest("cloud-turbine-stream", "amqp"); request.setBootVersion("2.0.0.RELEASE"); - generateMavenPom(request) - .hasDependency(getDependency("cloud-turbine-stream")) - .hasDependency(getDependency("amqp")) - .hasDependency(RABBIT_BINDER) - .hasSpringBootStarterTest() - .hasDependenciesCount(4); + generateMavenPom(request).hasDependency(getDependency("cloud-turbine-stream")) + .hasDependency(getDependency("amqp")).hasDependency(RABBIT_BINDER) + .hasSpringBootStarterTest().hasDependenciesCount(4); } @Test public void springCloudTurbineStreamWithKafka() { ProjectRequest request = createProjectRequest("cloud-turbine-stream", "kafka"); request.setBootVersion("2.0.0.RELEASE"); - generateMavenPom(request) - .hasDependency(getDependency("cloud-turbine-stream")) - .hasDependency(getDependency("kafka")) - .hasDependency(KAFKA_BINDER) - .hasSpringBootStarterTest() - .hasDependenciesCount(4); + generateMavenPom(request).hasDependency(getDependency("cloud-turbine-stream")) + .hasDependency(getDependency("kafka")).hasDependency(KAFKA_BINDER) + .hasSpringBootStarterTest().hasDependenciesCount(4); } @Test public void springCloudTurbineStreamWithAllBinders() { - ProjectRequest request = createProjectRequest( - "cloud-turbine-stream", "amqp", "kafka", "kafka-streams"); + ProjectRequest request = createProjectRequest("cloud-turbine-stream", "amqp", + "kafka", "kafka-streams"); request.setBootVersion("2.0.0.RELEASE"); - generateMavenPom(request) - .hasDependency(getDependency("cloud-turbine-stream")) + generateMavenPom(request).hasDependency(getDependency("cloud-turbine-stream")) .hasDependency(getDependency("amqp")) .hasDependency(getDependency("kafka")) .hasDependency(getDependency("kafka-streams")) - .hasDependency(RABBIT_BINDER) - .hasDependency(KAFKA_BINDER) - .hasSpringBootStarterTest() - .hasDependenciesCount(7); + .hasDependency(RABBIT_BINDER).hasDependency(KAFKA_BINDER) + .hasSpringBootStarterTest().hasDependenciesCount(7); } } diff --git a/initializr-service/src/test/java/io/spring/initializr/service/extension/SpringSecurityTestRequestPostProcessorTests.java b/initializr-service/src/test/java/io/spring/initializr/service/extension/SpringSecurityTestRequestPostProcessorTests.java index 4b1ffbfd..d5a3eea4 100644 --- a/initializr-service/src/test/java/io/spring/initializr/service/extension/SpringSecurityTestRequestPostProcessorTests.java +++ b/initializr-service/src/test/java/io/spring/initializr/service/extension/SpringSecurityTestRequestPostProcessorTests.java @@ -31,10 +31,8 @@ public class SpringSecurityTestRequestPostProcessorTests @Test public void securityTestIsAddedWithSecurity() { ProjectRequest request = createProjectRequest("security"); - generateMavenPom(request) - .hasSpringBootStarterDependency("security") - .hasSpringBootStarterTest() - .hasDependency(springSecurityTest()) + generateMavenPom(request).hasSpringBootStarterDependency("security") + .hasSpringBootStarterTest().hasDependency(springSecurityTest()) .hasDependenciesCount(3); } @@ -42,22 +40,17 @@ public class SpringSecurityTestRequestPostProcessorTests public void securityTestIsNotAddedBefore13() { ProjectRequest request = createProjectRequest("security"); request.setBootVersion("1.2.7.RELEASE"); - generateMavenPom(request) - .hasSpringBootStarterDependency("security") - .hasSpringBootStarterTest() - .hasDependenciesCount(2); + generateMavenPom(request).hasSpringBootStarterDependency("security") + .hasSpringBootStarterTest().hasDependenciesCount(2); } @Test public void securityTestIsNotAddedWithoutSpringSecurity() { ProjectRequest request = createProjectRequest("web"); - generateMavenPom(request) - .hasSpringBootStarterDependency("web") - .hasSpringBootStarterTest() - .hasDependenciesCount(2); + generateMavenPom(request).hasSpringBootStarterDependency("web") + .hasSpringBootStarterTest().hasDependenciesCount(2); } - private static Dependency springSecurityTest() { Dependency dependency = Dependency.withId("spring-security-test", "org.springframework.security", "spring-security-test"); diff --git a/initializr-service/src/test/java/io/spring/initializr/service/extension/SpringSessionRequestPostProcessorTests.java b/initializr-service/src/test/java/io/spring/initializr/service/extension/SpringSessionRequestPostProcessorTests.java index 6463cfeb..61a866a8 100644 --- a/initializr-service/src/test/java/io/spring/initializr/service/extension/SpringSessionRequestPostProcessorTests.java +++ b/initializr-service/src/test/java/io/spring/initializr/service/extension/SpringSessionRequestPostProcessorTests.java @@ -36,8 +36,7 @@ public class SpringSessionRequestPostProcessorTests request.setBootVersion("1.5.4.RELEASE"); generateMavenPom(request) .hasDependency("org.springframework.session", "spring-session") - .hasSpringBootStarterRootDependency() - .hasSpringBootStarterTest() + .hasSpringBootStarterRootDependency().hasSpringBootStarterTest() .hasDependenciesCount(3); } @@ -47,8 +46,7 @@ public class SpringSessionRequestPostProcessorTests request.setBootVersion("1.5.4.RELEASE"); generateMavenPom(request) .hasDependency("org.springframework.session", "spring-session") - .hasSpringBootStarterDependency("data-redis") - .hasSpringBootStarterTest() + .hasSpringBootStarterDependency("data-redis").hasSpringBootStarterTest() .hasDependenciesCount(3); } @@ -58,8 +56,7 @@ public class SpringSessionRequestPostProcessorTests request.setBootVersion("1.5.4.RELEASE"); generateMavenPom(request) .hasDependency("org.springframework.session", "spring-session") - .hasSpringBootStarterDependency("jdbc") - .hasSpringBootStarterTest() + .hasSpringBootStarterDependency("jdbc").hasSpringBootStarterTest() .hasDependenciesCount(3); } @@ -69,19 +66,16 @@ public class SpringSessionRequestPostProcessorTests request.setBootVersion("2.0.0.M2"); generateMavenPom(request) .hasDependency("org.springframework.session", "spring-session") - .hasSpringBootStarterRootDependency() - .hasSpringBootStarterTest() + .hasSpringBootStarterRootDependency().hasSpringBootStarterTest() .hasDependenciesCount(3); } - + @Test public void noSessionWithRedis() { ProjectRequest request = createProjectRequest("data-redis"); request.setBootVersion("2.0.0.M3"); - generateMavenPom(request) - .hasSpringBootStarterDependency("data-redis") - .hasSpringBootStarterTest() - .hasDependenciesCount(2); + generateMavenPom(request).hasSpringBootStarterDependency("data-redis") + .hasSpringBootStarterTest().hasDependenciesCount(2); } @Test @@ -90,8 +84,7 @@ public class SpringSessionRequestPostProcessorTests request.setBootVersion("2.0.0.M3"); generateMavenPom(request) .hasDependency("org.springframework.session", "spring-session-core") - .hasSpringBootStarterDependency("data-jpa") - .hasSpringBootStarterTest() + .hasSpringBootStarterDependency("data-jpa").hasSpringBootStarterTest() .hasDependenciesCount(3); } @@ -99,46 +92,33 @@ public class SpringSessionRequestPostProcessorTests public void sessionWithRedis() { ProjectRequest request = createProjectRequest("session", "data-redis"); request.setBootVersion("2.0.0.M3"); - generateMavenPom(request) - .hasSpringBootStarterDependency("data-redis") - .hasSpringBootStarterTest() - .hasDependency(REDIS) - .hasDependenciesCount(3); + generateMavenPom(request).hasSpringBootStarterDependency("data-redis") + .hasSpringBootStarterTest().hasDependency(REDIS).hasDependenciesCount(3); } @Test public void sessionWithRedisReactive() { ProjectRequest request = createProjectRequest("session", "data-redis-reactive"); request.setBootVersion("2.0.0.M7"); - generateMavenPom(request) - .hasSpringBootStarterDependency("data-redis-reactive") - .hasSpringBootStarterTest() - .hasDependency(REDIS) - .hasDependenciesCount(3); + generateMavenPom(request).hasSpringBootStarterDependency("data-redis-reactive") + .hasSpringBootStarterTest().hasDependency(REDIS).hasDependenciesCount(3); } @Test public void sessionWithJdbc() { ProjectRequest request = createProjectRequest("session", "jdbc"); request.setBootVersion("2.0.0.M3"); - generateMavenPom(request) - .hasSpringBootStarterDependency("jdbc") - .hasSpringBootStarterTest() - .hasDependency(JDBC) - .hasDependenciesCount(3); + generateMavenPom(request).hasSpringBootStarterDependency("jdbc") + .hasSpringBootStarterTest().hasDependency(JDBC).hasDependenciesCount(3); } @Test public void sessionWithRedisAndJdbc() { ProjectRequest request = createProjectRequest("session", "data-redis", "jdbc"); request.setBootVersion("2.0.0.M3"); - generateMavenPom(request) - .hasSpringBootStarterDependency("data-redis") - .hasSpringBootStarterDependency("jdbc") - .hasSpringBootStarterTest() - .hasDependency(REDIS) - .hasDependency(JDBC) - .hasDependenciesCount(5); + generateMavenPom(request).hasSpringBootStarterDependency("data-redis") + .hasSpringBootStarterDependency("jdbc").hasSpringBootStarterTest() + .hasDependency(REDIS).hasDependency(JDBC).hasDependenciesCount(5); } } diff --git a/initializr-service/src/test/java/io/spring/initializr/service/info/CloudFoundryInfoContributorTests.java b/initializr-service/src/test/java/io/spring/initializr/service/info/CloudFoundryInfoContributorTests.java index c62c78fc..ca5e1b65 100644 --- a/initializr-service/src/test/java/io/spring/initializr/service/info/CloudFoundryInfoContributorTests.java +++ b/initializr-service/src/test/java/io/spring/initializr/service/info/CloudFoundryInfoContributorTests.java @@ -48,8 +48,8 @@ public class CloudFoundryInfoContributorTests { assertThat(info.getDetails()).containsOnlyKeys("app"); Object appDetails = info.getDetails().get("app"); assertThat(appDetails).isInstanceOf(Map.class); - assertThat((Map) appDetails).containsOnly( - entry("name", "foo-bar")); + assertThat((Map) appDetails) + .containsOnly(entry("name", "foo-bar")); } private static Info getInfo(Environment env) { diff --git a/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfiguration.java b/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfiguration.java index dc93c0ed..d2dea65b 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfiguration.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfiguration.java @@ -99,7 +99,7 @@ public class InitializrAutoConfiguration { @Bean @ConditionalOnMissingBean public ProjectRequestResolver projectRequestResolver() { - return new ProjectRequestResolver(postProcessors); + return new ProjectRequestResolver(this.postProcessors); } @Bean diff --git a/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrWebConfig.java b/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrWebConfig.java index 57a78d2f..868b2042 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrWebConfig.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrWebConfig.java @@ -65,7 +65,7 @@ public class InitializrWebConfig implements WebMvcConfigurer { @Override public List resolveMediaTypes(NativeWebRequest request) throws HttpMediaTypeNotAcceptableException { - String path = urlPathHelper.getPathWithinApplication( + String path = this.urlPathHelper.getPathWithinApplication( request.getNativeRequest(HttpServletRequest.class)); if (!StringUtils.hasText(path) || !path.equals("/")) { // Only care about "/" return MEDIA_TYPE_ALL_LIST; diff --git a/initializr-web/src/main/java/io/spring/initializr/web/mapper/InitializrMetadataVersion.java b/initializr-web/src/main/java/io/spring/initializr/web/mapper/InitializrMetadataVersion.java index 48d2b468..0894d876 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/mapper/InitializrMetadataVersion.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/mapper/InitializrMetadataVersion.java @@ -44,7 +44,7 @@ public enum InitializrMetadataVersion { } public MediaType getMediaType() { - return mediaType; + return this.mediaType; } } \ No newline at end of file diff --git a/initializr-web/src/main/java/io/spring/initializr/web/project/AbstractInitializrController.java b/initializr-web/src/main/java/io/spring/initializr/web/project/AbstractInitializrController.java index d4cd08d4..72a26280 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/project/AbstractInitializrController.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/project/AbstractInitializrController.java @@ -58,7 +58,7 @@ public abstract class AbstractInitializrController { public boolean isForceSsl() { if (this.forceSsl == null) { - this.forceSsl = metadataProvider.get().getConfiguration().getEnv() + this.forceSsl = this.metadataProvider.get().getConfiguration().getEnv() .isForceSsl(); } return this.forceSsl; @@ -75,7 +75,7 @@ public abstract class AbstractInitializrController { * Render the home page with the specified template. */ protected void renderHome(Map model) { - InitializrMetadata metadata = metadataProvider.get(); + InitializrMetadata metadata = this.metadataProvider.get(); model.put("serviceUrl", generateAppUrl()); BeanWrapperImpl wrapper = new BeanWrapperImpl(metadata); @@ -96,7 +96,7 @@ public abstract class AbstractInitializrController { } public Function getLinkTo() { - return linkTo; + return this.linkTo; } private TypeCapability removeTypes(TypeCapability types) { diff --git a/initializr-web/src/main/java/io/spring/initializr/web/project/MainController.java b/initializr-web/src/main/java/io/spring/initializr/web/project/MainController.java index 885b4e77..84dc7d52 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/project/MainController.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/project/MainController.java @@ -105,14 +105,14 @@ public class MainController extends AbstractInitializrController { @RequestHeader Map headers) { ProjectRequest request = new ProjectRequest(); request.getParameters().putAll(headers); - request.initialize(metadataProvider.get()); + request.initialize(this.metadataProvider.get()); return request; } @RequestMapping(path = "/metadata/config", produces = "application/json") @ResponseBody public InitializrMetadata config() { - return metadataProvider.get(); + return this.metadataProvider.get(); } @RequestMapping("/metadata/client") @@ -124,31 +124,31 @@ public class MainController extends AbstractInitializrController { public ResponseEntity serviceCapabilitiesText( @RequestHeader(value = HttpHeaders.USER_AGENT, required = false) String userAgent) { String appUrl = generateAppUrl(); - InitializrMetadata metadata = metadataProvider.get(); + InitializrMetadata metadata = this.metadataProvider.get(); BodyBuilder builder = ResponseEntity.ok().contentType(MediaType.TEXT_PLAIN); if (userAgent != null) { Agent agent = Agent.fromUserAgent(userAgent); if (agent != null) { if (CURL.equals(agent.getId())) { - String content = commandLineHelpGenerator + String content = this.commandLineHelpGenerator .generateCurlCapabilities(metadata, appUrl); return builder.eTag(createUniqueId(content)).body(content); } if (HTTPIE.equals(agent.getId())) { - String content = commandLineHelpGenerator + String content = this.commandLineHelpGenerator .generateHttpieCapabilities(metadata, appUrl); return builder.eTag(createUniqueId(content)).body(content); } if (SPRING_BOOT_CLI.equals(agent.getId())) { - String content = commandLineHelpGenerator + String content = this.commandLineHelpGenerator .generateSpringBootCliCapabilities(metadata, appUrl); return builder.eTag(createUniqueId(content)).body(content); } } } - String content = commandLineHelpGenerator.generateGenericCapabilities(metadata, - appUrl); + String content = this.commandLineHelpGenerator + .generateGenericCapabilities(metadata, appUrl); return builder.eTag(createUniqueId(content)).body(content); } @@ -177,7 +177,8 @@ public class MainController extends AbstractInitializrController { private ResponseEntity serviceCapabilitiesFor( InitializrMetadataVersion version, MediaType contentType) { String appUrl = generateAppUrl(); - String content = getJsonMapper(version).write(metadataProvider.get(), appUrl); + String content = getJsonMapper(version).write(this.metadataProvider.get(), + appUrl); return ResponseEntity.ok().contentType(contentType).eTag(createUniqueId(content)) .cacheControl(CacheControl.maxAge(7, TimeUnit.DAYS)).body(content); } @@ -201,11 +202,11 @@ public class MainController extends AbstractInitializrController { private ResponseEntity dependenciesFor(InitializrMetadataVersion version, String bootVersion) { - InitializrMetadata metadata = metadataProvider.get(); + InitializrMetadata metadata = this.metadataProvider.get(); Version v = bootVersion != null ? Version.parse(bootVersion) : Version.parse(metadata.getBootVersions().getDefault().getId()); - DependencyMetadata dependencyMetadata = dependencyMetadataProvider.get(metadata, - v); + DependencyMetadata dependencyMetadata = this.dependencyMetadataProvider + .get(metadata, v); String content = new DependencyMetadataV21JsonMapper().write(dependencyMetadata); return ResponseEntity.ok().contentType(version.getMediaType()) .eTag(createUniqueId(content)) @@ -225,13 +226,13 @@ public class MainController extends AbstractInitializrController { @RequestMapping(path = { "/spring", "/spring.zip" }) public String spring() { - String url = metadataProvider.get().createCliDistributionURl("zip"); + String url = this.metadataProvider.get().createCliDistributionURl("zip"); return "redirect:" + url; } @RequestMapping(path = { "/spring.tar.gz", "spring.tgz" }) public String springTgz() { - String url = metadataProvider.get().createCliDistributionURl("tar.gz"); + String url = this.metadataProvider.get().createCliDistributionURl("tar.gz"); return "redirect:" + url; } @@ -239,7 +240,8 @@ public class MainController extends AbstractInitializrController { @ResponseBody public ResponseEntity pom(BasicProjectRequest request) { request.setType("maven-build"); - byte[] mavenPom = projectGenerator.generateMavenPom((ProjectRequest) request); + byte[] mavenPom = this.projectGenerator + .generateMavenPom((ProjectRequest) request); return createResponseEntity(mavenPom, "application/octet-stream", "pom.xml"); } @@ -247,7 +249,7 @@ public class MainController extends AbstractInitializrController { @ResponseBody public ResponseEntity gradle(BasicProjectRequest request) { request.setType("gradle-build"); - byte[] gradleBuild = projectGenerator + byte[] gradleBuild = this.projectGenerator .generateGradleBuild((ProjectRequest) request); return createResponseEntity(gradleBuild, "application/octet-stream", "build.gradle"); @@ -258,9 +260,9 @@ public class MainController extends AbstractInitializrController { public ResponseEntity springZip(BasicProjectRequest basicRequest) throws IOException { ProjectRequest request = (ProjectRequest) basicRequest; - File dir = projectGenerator.generateProjectStructure(request); + File dir = this.projectGenerator.generateProjectStructure(request); - File download = projectGenerator.createDistributionFile(dir, ".zip"); + File download = this.projectGenerator.createDistributionFile(dir, ".zip"); String wrapperScript = getWrapperScript(request); new File(dir, wrapperScript).setExecutable(true); @@ -289,9 +291,9 @@ public class MainController extends AbstractInitializrController { public ResponseEntity springTgz(BasicProjectRequest basicRequest) throws IOException { ProjectRequest request = (ProjectRequest) basicRequest; - File dir = projectGenerator.generateProjectStructure(request); + File dir = this.projectGenerator.generateProjectStructure(request); - File download = projectGenerator.createDistributionFile(dir, ".tar.gz"); + File download = this.projectGenerator.createDistributionFile(dir, ".tar.gz"); String wrapperScript = getWrapperScript(request); new File(dir, wrapperScript).setExecutable(true); @@ -339,7 +341,7 @@ public class MainController extends AbstractInitializrController { log.info("Uploading: {} ({} bytes)", download, bytes.length); ResponseEntity result = createResponseEntity(bytes, contentType, fileName); - projectGenerator.cleanTempFiles(dir); + this.projectGenerator.cleanTempFiles(dir); return result; } diff --git a/initializr-web/src/main/java/io/spring/initializr/web/support/DefaultInitializrMetadataProvider.java b/initializr-web/src/main/java/io/spring/initializr/web/support/DefaultInitializrMetadataProvider.java index 737bd069..e9fa353f 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/support/DefaultInitializrMetadataProvider.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/support/DefaultInitializrMetadataProvider.java @@ -56,8 +56,8 @@ public class DefaultInitializrMetadataProvider implements InitializrMetadataProv @Override @Cacheable(value = "initializr.metadata", key = "'metadata'") public InitializrMetadata get() { - updateInitializrMetadata(metadata); - return metadata; + updateInitializrMetadata(this.metadata); + return this.metadata; } protected void updateInitializrMetadata(InitializrMetadata metadata) { @@ -72,12 +72,12 @@ public class DefaultInitializrMetadataProvider implements InitializrMetadataProv } protected List fetchBootVersions() { - String url = metadata.getConfiguration().getEnv().getSpringBootMetadataUrl(); + String url = this.metadata.getConfiguration().getEnv().getSpringBootMetadataUrl(); if (StringUtils.hasText(url)) { try { log.info("Fetching boot metadata from {}", url); - return new SpringBootMetadataReader(objectMapper, restTemplate, url) - .getBootVersions(); + return new SpringBootMetadataReader(this.objectMapper, this.restTemplate, + url).getBootVersions(); } catch (Exception e) { log.warn("Failed to fetch spring boot metadata", e); diff --git a/initializr-web/src/main/java/io/spring/initializr/web/support/SpringBootMetadataReader.java b/initializr-web/src/main/java/io/spring/initializr/web/support/SpringBootMetadataReader.java index 68d27e0f..cef9fcda 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/support/SpringBootMetadataReader.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/support/SpringBootMetadataReader.java @@ -50,7 +50,7 @@ public class SpringBootMetadataReader { * Return the boot versions parsed by this instance. */ public List getBootVersions() { - ArrayNode array = (ArrayNode) content.get("projectReleases"); + ArrayNode array = (ArrayNode) this.content.get("projectReleases"); List list = new ArrayList<>(); for (JsonNode it : array) { DefaultMetadataElement version = new DefaultMetadataElement(); diff --git a/initializr-web/src/main/java/io/spring/initializr/web/ui/UiController.java b/initializr-web/src/main/java/io/spring/initializr/web/ui/UiController.java index cc155d5a..cdb3dc4c 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/ui/UiController.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/ui/UiController.java @@ -54,8 +54,8 @@ public class UiController { @GetMapping(path = "/ui/dependencies", produces = "application/json") public ResponseEntity dependencies( @RequestParam(required = false) String version) { - List dependencyGroups = metadataProvider.get().getDependencies() - .getContent(); + List dependencyGroups = this.metadataProvider.get() + .getDependencies().getContent(); List content = new ArrayList<>(); Version v = StringUtils.isEmpty(version) ? null : Version.parse(version); dependencyGroups.forEach(g -> g.getContent().forEach(d -> { diff --git a/initializr-web/src/test/java/io/spring/initializr/web/AbstractFullStackInitializrIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/AbstractFullStackInitializrIntegrationTests.java index 5765aa40..7ab1b9df 100644 --- a/initializr-web/src/test/java/io/spring/initializr/web/AbstractFullStackInitializrIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/AbstractFullStackInitializrIntegrationTests.java @@ -41,7 +41,7 @@ public abstract class AbstractFullStackInitializrIntegrationTests @Override protected String createUrl(String context) { - return "http://" + host + ":" + port + return "http://" + this.host + ":" + this.port + (context.startsWith("/") ? context : "/" + context); } diff --git a/initializr-web/src/test/java/io/spring/initializr/web/AbstractInitializrControllerIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/AbstractInitializrControllerIntegrationTests.java index f78b0040..31e19e89 100644 --- a/initializr-web/src/test/java/io/spring/initializr/web/AbstractInitializrControllerIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/AbstractInitializrControllerIntegrationTests.java @@ -52,7 +52,7 @@ public abstract class AbstractInitializrControllerIntegrationTests } public MockMvcClientHttpRequestFactory getRequests() { - return requests; + return this.requests; } @Configuration diff --git a/initializr-web/src/test/java/io/spring/initializr/web/AbstractInitializrIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/AbstractInitializrIntegrationTests.java index ea2aab35..ec7bda62 100644 --- a/initializr-web/src/test/java/io/spring/initializr/web/AbstractInitializrIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/AbstractInitializrIntegrationTests.java @@ -86,7 +86,7 @@ public abstract class AbstractInitializrIntegrationTests { @Before public void before() { - restTemplate = restTemplateBuilder.build(); + this.restTemplate = this.restTemplateBuilder.build(); } protected abstract String createUrl(String context); @@ -94,7 +94,7 @@ public abstract class AbstractInitializrIntegrationTests { protected String htmlHome() { HttpHeaders headers = new HttpHeaders(); headers.setAccept(Collections.singletonList(MediaType.TEXT_HTML)); - return restTemplate.exchange(createUrl("/"), HttpMethod.GET, + return this.restTemplate.exchange(createUrl("/"), HttpMethod.GET, new HttpEntity(headers), String.class).getBody(); } @@ -175,7 +175,7 @@ public abstract class AbstractInitializrIntegrationTests { } protected byte[] downloadArchive(String context) { - return restTemplate.getForObject(createUrl(context), byte[].class); + return this.restTemplate.getForObject(createUrl(context), byte[].class); } protected ResponseEntity invokeHome(String userAgentHeader, @@ -199,7 +199,7 @@ public abstract class AbstractInitializrIntegrationTests { else { headers.setAccept(Collections.emptyList()); } - return restTemplate.exchange(createUrl(contextPath), HttpMethod.GET, + return this.restTemplate.exchange(createUrl(contextPath), HttpMethod.GET, new HttpEntity(headers), responseType); } @@ -207,7 +207,7 @@ public abstract class AbstractInitializrIntegrationTests { try { File archiveFile = writeArchive(content); - File project = folder.newFolder(); + File project = this.folder.newFolder(); switch (archiveType) { case ZIP: unzip(archiveFile, project); @@ -243,7 +243,7 @@ public abstract class AbstractInitializrIntegrationTests { } protected File writeArchive(byte[] body) throws IOException { - File archiveFile = folder.newFile(); + File archiveFile = this.folder.newFile(); try (FileOutputStream stream = new FileOutputStream(archiveFile)) { stream.write(body); } @@ -275,7 +275,7 @@ public abstract class AbstractInitializrIntegrationTests { } public RestTemplate getRestTemplate() { - return restTemplate; + return this.restTemplate; } private enum ArchiveType { diff --git a/initializr-web/src/test/java/io/spring/initializr/web/autoconfigure/CloudfoundryEnvironmentPostProcessorTests.java b/initializr-web/src/test/java/io/spring/initializr/web/autoconfigure/CloudfoundryEnvironmentPostProcessorTests.java index 458f4fb0..6a0c5074 100644 --- a/initializr-web/src/test/java/io/spring/initializr/web/autoconfigure/CloudfoundryEnvironmentPostProcessorTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/autoconfigure/CloudfoundryEnvironmentPostProcessorTests.java @@ -36,37 +36,41 @@ public class CloudfoundryEnvironmentPostProcessorTests { @Test public void parseCredentials() { - environment.setProperty("vcap.services.stats-index.credentials.uri", + this.environment.setProperty("vcap.services.stats-index.credentials.uri", "http://user:pass@example.com/bar/biz?param=one"); - postProcessor.postProcessEnvironment(environment, application); + this.postProcessor.postProcessEnvironment(this.environment, this.application); - assertThat(environment.getProperty("initializr.stats.elastic.uri")) + assertThat(this.environment.getProperty("initializr.stats.elastic.uri")) .isEqualTo("http://example.com/bar/biz?param=one"); - assertThat(environment.getProperty("initializr.stats.elastic.username")) + assertThat(this.environment.getProperty("initializr.stats.elastic.username")) .isEqualTo("user"); - assertThat(environment.getProperty("initializr.stats.elastic.password")) + assertThat(this.environment.getProperty("initializr.stats.elastic.password")) .isEqualTo("pass"); } @Test public void parseNoCredentials() { - environment.setProperty("vcap.services.stats-index.credentials.uri", + this.environment.setProperty("vcap.services.stats-index.credentials.uri", "http://example.com/bar/biz?param=one"); - postProcessor.postProcessEnvironment(environment, application); + this.postProcessor.postProcessEnvironment(this.environment, this.application); - assertThat(environment.getProperty("initializr.stats.elastic.uri")) + assertThat(this.environment.getProperty("initializr.stats.elastic.uri")) .isEqualTo("http://example.com/bar/biz?param=one"); - assertThat(environment.getProperty("initializr.stats.elastic.username")).isNull(); - assertThat(environment.getProperty("initializr.stats.elastic.password")).isNull(); + assertThat(this.environment.getProperty("initializr.stats.elastic.username")) + .isNull(); + assertThat(this.environment.getProperty("initializr.stats.elastic.password")) + .isNull(); } @Test public void parseNoVcapUri() { - postProcessor.postProcessEnvironment(environment, application); + this.postProcessor.postProcessEnvironment(this.environment, this.application); - assertThat(environment.getProperty("initializr.stats.elastic.uri")).isNull(); - assertThat(environment.getProperty("initializr.stats.elastic.username")).isNull(); - assertThat(environment.getProperty("initializr.stats.elastic.password")).isNull(); + assertThat(this.environment.getProperty("initializr.stats.elastic.uri")).isNull(); + assertThat(this.environment.getProperty("initializr.stats.elastic.username")) + .isNull(); + assertThat(this.environment.getProperty("initializr.stats.elastic.password")) + .isNull(); } } diff --git a/initializr-web/src/test/java/io/spring/initializr/web/mapper/DependencyMetadataJsonMapperTests.java b/initializr-web/src/test/java/io/spring/initializr/web/mapper/DependencyMetadataJsonMapperTests.java index 271593f3..8a1573d4 100644 --- a/initializr-web/src/test/java/io/spring/initializr/web/mapper/DependencyMetadataJsonMapperTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/mapper/DependencyMetadataJsonMapperTests.java @@ -50,7 +50,7 @@ public class DependencyMetadataJsonMapperTests { Version.parse("1.2.0.RELEASE"), Collections.singletonMap(d.getId(), d), Collections.singletonMap("repo-id", repository), Collections.singletonMap("bom-id", bom)); - JSONObject content = new JSONObject(mapper.write(metadata)); + JSONObject content = new JSONObject(this.mapper.write(metadata)); assertEquals("my-bom", content.getJSONObject("dependencies").getJSONObject("foo") .getString("bom")); assertEquals("my-repo", content.getJSONObject("dependencies").getJSONObject("foo") diff --git a/initializr-web/src/test/java/io/spring/initializr/web/mapper/InitializrMetadataJsonMapperTests.java b/initializr-web/src/test/java/io/spring/initializr/web/mapper/InitializrMetadataJsonMapperTests.java index de760018..8e19c256 100644 --- a/initializr-web/src/test/java/io/spring/initializr/web/mapper/InitializrMetadataJsonMapperTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/mapper/InitializrMetadataJsonMapperTests.java @@ -43,7 +43,7 @@ public class InitializrMetadataJsonMapperTests { InitializrMetadata metadata = new InitializrMetadataTestBuilder() .addType("foo", true, "/foo.zip", "none", "test") .addDependencyGroup("foo", "one", "two").build(); - String json = jsonMapper.write(metadata, null); + String json = this.jsonMapper.write(metadata, null); JsonNode result = objectMapper.readTree(json); assertEquals( "/foo.zip?type=foo{&dependencies,packaging,javaVersion,language,bootVersion," @@ -56,7 +56,7 @@ public class InitializrMetadataJsonMapperTests { InitializrMetadata metadata = new InitializrMetadataTestBuilder() .addType("foo", true, "/foo.zip", "none", "test") .addDependencyGroup("foo", "one", "two").build(); - String json = jsonMapper.write(metadata, "http://server:8080/my-app"); + String json = this.jsonMapper.write(metadata, "http://server:8080/my-app"); JsonNode result = objectMapper.readTree(json); assertEquals( "http://server:8080/my-app/foo.zip?type=foo{&dependencies,packaging,javaVersion," @@ -71,7 +71,7 @@ public class InitializrMetadataJsonMapperTests { dependency.getLinks().add(Link.create("reference", "https://example.com/doc")); InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults() .addDependencyGroup("test", dependency).build(); - String json = jsonMapper.write(metadata, null); + String json = this.jsonMapper.write(metadata, null); int first = json.indexOf("https://example.com/how-to"); int second = json.indexOf("https://example.com/doc"); // JSON objects are not ordered diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/HomePage.java b/initializr-web/src/test/java/io/spring/initializr/web/project/HomePage.java index 9e555bdb..70fb0cf1 100644 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/HomePage.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/HomePage.java @@ -45,7 +45,7 @@ class HomePage { } public Object value(String id) { - return getInputValue(form.findElement(By.id(id))); + return getInputValue(this.form.findElement(By.id(id))); } private Object getInputValue(WebElement input) { @@ -82,7 +82,7 @@ class HomePage { } public WebElement dependency(String value) { - for (WebElement element : form.findElements(By.name("style"))) { + for (WebElement element : this.form.findElements(By.name("style"))) { if (value.equals(element.getAttribute("value"))) { return element; } @@ -91,64 +91,64 @@ class HomePage { } public void advanced() { - form.findElement(By.cssSelector(".tofullversion")).findElement(By.tagName("a")) - .click(); + this.form.findElement(By.cssSelector(".tofullversion")) + .findElement(By.tagName("a")).click(); } public void simple() { - form.findElement(By.cssSelector(".tosimpleversion")).click(); + this.form.findElement(By.cssSelector(".tosimpleversion")).click(); } public void artifactId(String text) { - form.findElement(By.id("artifactId")).clear(); - form.findElement(By.id("artifactId")).sendKeys(text); + this.form.findElement(By.id("artifactId")).clear(); + this.form.findElement(By.id("artifactId")).sendKeys(text); } public void autocomplete(String text) { - form.findElement(By.id("autocomplete")).sendKeys(text); + this.form.findElement(By.id("autocomplete")).sendKeys(text); } public void bootVersion(String text) { - form.findElement(By.id("bootVersion")).sendKeys(text); - form.click(); + this.form.findElement(By.id("bootVersion")).sendKeys(text); + this.form.click(); } public void description(String text) { - form.findElement(By.id("description")).clear(); - form.findElement(By.id("description")).sendKeys(text); + this.form.findElement(By.id("description")).clear(); + this.form.findElement(By.id("description")).sendKeys(text); } public void groupId(String text) { - form.findElement(By.id("groupId")).clear(); - form.findElement(By.id("groupId")).sendKeys(text); + this.form.findElement(By.id("groupId")).clear(); + this.form.findElement(By.id("groupId")).sendKeys(text); } public void language(String text) { - form.findElement(By.id("language")).sendKeys(text); + this.form.findElement(By.id("language")).sendKeys(text); } public void name(String text) { - form.findElement(By.id("name")).clear(); - form.findElement(By.id("name")).sendKeys(text); + this.form.findElement(By.id("name")).clear(); + this.form.findElement(By.id("name")).sendKeys(text); } public void packaging(String text) { - form.findElement(By.id("packaging")).sendKeys(text); + this.form.findElement(By.id("packaging")).sendKeys(text); } public void packageName(String text) { - form.findElement(By.id("packageName")).clear(); - form.findElement(By.id("packageName")).sendKeys(text); + this.form.findElement(By.id("packageName")).clear(); + this.form.findElement(By.id("packageName")).sendKeys(text); } public void type(String text) { - form.findElement(By.id("type")).sendKeys(text); + this.form.findElement(By.id("type")).sendKeys(text); } public HomePage submit() { - String url = driver.getCurrentUrl(); - form.findElement(By.name("generate-project")).click(); - assertThat(driver.getCurrentUrl()).isEqualTo(url); + String url = this.driver.getCurrentUrl(); + this.form.findElement(By.name("generate-project")).click(); + assertThat(this.driver.getCurrentUrl()).isEqualTo(url); return this; } diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerIntegrationTests.java index 508b5b28..70d4a433 100644 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerIntegrationTests.java @@ -21,6 +21,7 @@ import java.net.URISyntaxException; import io.spring.initializr.metadata.Dependency; import io.spring.initializr.web.AbstractInitializrControllerIntegrationTests; +import io.spring.initializr.web.AbstractInitializrIntegrationTests; import io.spring.initializr.web.mapper.InitializrMetadataVersion; import org.json.JSONException; import org.json.JSONObject; @@ -171,8 +172,8 @@ public class MainControllerIntegrationTests public void currentMetadataCompatibleWithV2() { ResponseEntity response = invokeHome(null, "*/*"); validateMetadata(response, - AbstractInitializrControllerIntegrationTests.CURRENT_METADATA_MEDIA_TYPE, - "2.0.0", JSONCompareMode.LENIENT); + AbstractInitializrIntegrationTests.CURRENT_METADATA_MEDIA_TYPE, "2.0.0", + JSONCompareMode.LENIENT); } @Test @@ -192,7 +193,7 @@ public class MainControllerIntegrationTests "application/vnd.initializr.v2.1+json"); assertThat(response.getHeaders().getFirst(HttpHeaders.ETAG), not(nullValue())); validateContentType(response, - AbstractInitializrControllerIntegrationTests.CURRENT_METADATA_MEDIA_TYPE); + AbstractInitializrIntegrationTests.CURRENT_METADATA_MEDIA_TYPE); validateCurrentMetadata(response.getBody()); } @@ -202,7 +203,7 @@ public class MainControllerIntegrationTests "application/vnd.initializr.v2.1+json", "application/vnd.initializr.v2+json"); validateContentType(response, - AbstractInitializrControllerIntegrationTests.CURRENT_METADATA_MEDIA_TYPE); + AbstractInitializrIntegrationTests.CURRENT_METADATA_MEDIA_TYPE); validateCurrentMetadata(response.getBody()); } @@ -249,7 +250,7 @@ public class MainControllerIntegrationTests public void curlWithAcceptHeaderJson() { ResponseEntity response = invokeHome("curl/1.2.4", "application/json"); validateContentType(response, - AbstractInitializrControllerIntegrationTests.CURRENT_METADATA_MEDIA_TYPE); + AbstractInitializrIntegrationTests.CURRENT_METADATA_MEDIA_TYPE); validateCurrentMetadata(response.getBody()); } @@ -276,7 +277,7 @@ public class MainControllerIntegrationTests public void httpieWithAcceptHeaderJson() { ResponseEntity response = invokeHome("HTTPie/0.8.0", "application/json"); validateContentType(response, - AbstractInitializrControllerIntegrationTests.CURRENT_METADATA_MEDIA_TYPE); + AbstractInitializrIntegrationTests.CURRENT_METADATA_MEDIA_TYPE); validateCurrentMetadata(response.getBody()); } @@ -296,7 +297,7 @@ public class MainControllerIntegrationTests public void springBootCliReceivesJsonByDefault() { ResponseEntity response = invokeHome("SpringBootCli/1.2.0", "*/*"); validateContentType(response, - AbstractInitializrControllerIntegrationTests.CURRENT_METADATA_MEDIA_TYPE); + AbstractInitializrIntegrationTests.CURRENT_METADATA_MEDIA_TYPE); validateCurrentMetadata(response.getBody()); } diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerServiceMetadataIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerServiceMetadataIntegrationTests.java index 6789b031..d2eaff79 100644 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerServiceMetadataIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerServiceMetadataIntegrationTests.java @@ -48,7 +48,7 @@ public class MainControllerServiceMetadataIntegrationTests @Test public void initializeRemoteConfig() throws Exception { - InitializrMetadata localMetadata = metadataProvider.get(); + InitializrMetadata localMetadata = this.metadataProvider.get(); InitializrMetadata metadata = InitializrMetadataBuilder.create() .withInitializrMetadata(new UrlResource(createUrl("/metadata/config"))) .build(); diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationSmokeTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationSmokeTests.java index 538d4924..5f6abc2f 100644 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationSmokeTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationSmokeTests.java @@ -60,25 +60,26 @@ public class ProjectGenerationSmokeTests public void setup() throws IOException { Assume.assumeTrue("Smoke tests disabled (set System property 'smoke.test')", Boolean.getBoolean("smoke.test")); - downloadDir = folder.newFolder(); + this.downloadDir = this.folder.newFolder(); FirefoxProfile fxProfile = new FirefoxProfile(); fxProfile.setPreference("browser.download.folderList", 2); fxProfile.setPreference("browser.download.manager.showWhenStarting", false); - fxProfile.setPreference("browser.download.dir", downloadDir.getAbsolutePath()); + fxProfile.setPreference("browser.download.dir", + this.downloadDir.getAbsolutePath()); fxProfile.setPreference("browser.helperApps.neverAsk.saveToDisk", "application/zip,application/x-compress,application/octet-stream"); FirefoxOptions options = new FirefoxOptions().setProfile(fxProfile); - driver = new FirefoxDriver(options); - ((JavascriptExecutor) driver).executeScript("window.focus();"); + this.driver = new FirefoxDriver(options); + ((JavascriptExecutor) this.driver).executeScript("window.focus();"); - Actions actions = new Actions(driver); - enterAction = actions.sendKeys(Keys.ENTER).build(); + Actions actions = new Actions(this.driver); + this.enterAction = actions.sendKeys(Keys.ENTER).build(); } @After public void destroy() { - if (driver != null) { - driver.close(); + if (this.driver != null) { + this.driver.close(); } } @@ -355,8 +356,8 @@ public class ProjectGenerationSmokeTests } private HomePage toHome(String path) { - driver.get("http://localhost:" + port + path); - return new HomePage(driver); + this.driver.get("http://localhost:" + this.port + path); + return new HomePage(this.driver); } private ProjectAssert assertSimpleProject() throws Exception { @@ -366,7 +367,7 @@ public class ProjectGenerationSmokeTests private void selectDependency(HomePage page, String text) { page.autocomplete(text); - enterAction.perform(); + this.enterAction.perform(); } private byte[] from(String fileName) throws Exception { @@ -374,7 +375,7 @@ public class ProjectGenerationSmokeTests } private File getArchive(String fileName) { - File archive = new File(downloadDir, fileName); + File archive = new File(this.downloadDir, fileName); assertTrue("Expected content with name " + fileName, archive.exists()); return archive; } diff --git a/initializr-web/src/test/java/io/spring/initializr/web/support/DefaultDependencyMetadataProviderTests.java b/initializr-web/src/test/java/io/spring/initializr/web/support/DefaultDependencyMetadataProviderTests.java index 88321dbc..99072d73 100644 --- a/initializr-web/src/test/java/io/spring/initializr/web/support/DefaultDependencyMetadataProviderTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/support/DefaultDependencyMetadataProviderTests.java @@ -44,7 +44,7 @@ public class DefaultDependencyMetadataProviderTests { third.setVersionRange("1.1.8.RELEASE"); InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults() .addDependencyGroup("test", first, second, third).build(); - DependencyMetadata dependencyMetadata = provider.get(metadata, + DependencyMetadata dependencyMetadata = this.provider.get(metadata, Version.parse("1.1.5.RELEASE")); assertEquals(2, dependencyMetadata.getDependencies().size()); assertEquals(0, dependencyMetadata.getRepositories().size()); @@ -64,7 +64,7 @@ public class DefaultDependencyMetadataProviderTests { InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults() .addDependencyGroup("test", first, second).build(); - DependencyMetadata dependencyMetadata = provider.get(metadata, + DependencyMetadata dependencyMetadata = this.provider.get(metadata, Version.parse("1.0.5.RELEASE")); assertEquals(2, dependencyMetadata.getDependencies().size()); assertEquals("org.bar", @@ -74,7 +74,7 @@ public class DefaultDependencyMetadataProviderTests { assertEquals("0.1.0.RELEASE", dependencyMetadata.getDependencies().get("first").getVersion()); - DependencyMetadata anotherDependencyMetadata = provider.get(metadata, + DependencyMetadata anotherDependencyMetadata = this.provider.get(metadata, Version.parse("1.1.0.RELEASE")); assertEquals(2, anotherDependencyMetadata.getDependencies().size()); assertEquals("org.biz", @@ -95,7 +95,7 @@ public class DefaultDependencyMetadataProviderTests { InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults() .addRepository("repo-foo", "my-repo", "http://localhost", false) .addDependencyGroup("test", first, second, third).build(); - DependencyMetadata dependencyMetadata = provider.get(metadata, + DependencyMetadata dependencyMetadata = this.provider.get(metadata, Version.parse("1.1.5.RELEASE")); assertEquals(3, dependencyMetadata.getDependencies().size()); assertEquals(1, dependencyMetadata.getRepositories().size()); @@ -120,7 +120,7 @@ public class DefaultDependencyMetadataProviderTests { InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults() .addBom("bom-foo", bom).addDependencyGroup("test", first, second, third) .build(); - DependencyMetadata dependencyMetadata = provider.get(metadata, + DependencyMetadata dependencyMetadata = this.provider.get(metadata, Version.parse("1.1.5.RELEASE")); assertEquals(3, dependencyMetadata.getDependencies().size()); assertEquals(0, dependencyMetadata.getRepositories().size()); @@ -186,7 +186,7 @@ public class DefaultDependencyMetadataProviderTests { .addRepository("repo-bar", "bar", "http://localhost", false) .addRepository("repo-biz", "biz", "http://localhost", false) .addDependencyGroup("test", first, second, third).build(); - return provider.get(metadata, Version.parse(bootVersion)); + return this.provider.get(metadata, Version.parse(bootVersion)); } } diff --git a/initializr-web/src/test/java/io/spring/initializr/web/support/DefaultInitializrMetadataProviderTests.java b/initializr-web/src/test/java/io/spring/initializr/web/support/DefaultInitializrMetadataProviderTests.java index a1164ca2..000021b1 100644 --- a/initializr-web/src/test/java/io/spring/initializr/web/support/DefaultInitializrMetadataProviderTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/support/DefaultInitializrMetadataProviderTests.java @@ -52,8 +52,8 @@ public class DefaultInitializrMetadataProviderTests { @Before public void setUp() { - restTemplate = new RestTemplate(); - mockServer = MockRestServiceServer.createServer(restTemplate); + this.restTemplate = new RestTemplate(); + this.mockServer = MockRestServiceServer.createServer(this.restTemplate); } @Test @@ -63,7 +63,7 @@ public class DefaultInitializrMetadataProviderTests { .addBootVersion("0.0.8.RELEASE", false).build(); assertEquals("0.0.9.RELEASE", metadata.getBootVersions().getDefault().getId()); DefaultInitializrMetadataProvider provider = new DefaultInitializrMetadataProvider( - metadata, objectMapper, restTemplate); + metadata, objectMapper, this.restTemplate); expectJson(metadata.getConfiguration().getEnv().getSpringBootMetadataUrl(), "metadata/sagan/spring-boot.json"); @@ -85,7 +85,7 @@ public class DefaultInitializrMetadataProviderTests { .addBootVersion("0.0.8.RELEASE", false).build(); assertEquals("0.0.9.RELEASE", metadata.getBootVersions().getDefault().getId()); DefaultInitializrMetadataProvider provider = new DefaultInitializrMetadataProvider( - metadata, objectMapper, restTemplate); + metadata, objectMapper, this.restTemplate); expectJson(metadata.getConfiguration().getEnv().getSpringBootMetadataUrl(), "metadata/sagan/spring-boot-no-default.json"); diff --git a/initializr-web/src/test/java/io/spring/initializr/web/support/SpringBootMetadataReaderTests.java b/initializr-web/src/test/java/io/spring/initializr/web/support/SpringBootMetadataReaderTests.java index 4890d918..59cedaee 100644 --- a/initializr-web/src/test/java/io/spring/initializr/web/support/SpringBootMetadataReaderTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/support/SpringBootMetadataReaderTests.java @@ -50,17 +50,17 @@ public class SpringBootMetadataReaderTests { private final RestTemplate restTemplate = new RestTemplate(); private final MockRestServiceServer server = MockRestServiceServer - .bindTo(restTemplate).build(); + .bindTo(this.restTemplate).build(); @Test public void readAvailableVersions() throws IOException { - server.expect(requestTo("https://spring.io/project_metadata/spring-boot")) + this.server.expect(requestTo("https://spring.io/project_metadata/spring-boot")) .andRespond(withSuccess( new ClassPathResource("metadata/sagan/spring-boot.json"), MediaType.APPLICATION_JSON)); - List versions = new SpringBootMetadataReader(objectMapper, - restTemplate, - metadata.getConfiguration().getEnv().getSpringBootMetadataUrl()) + List versions = new SpringBootMetadataReader( + this.objectMapper, this.restTemplate, + this.metadata.getConfiguration().getEnv().getSpringBootMetadataUrl()) .getBootVersions(); assertNotNull("spring boot versions should not be null", versions); AtomicBoolean defaultFound = new AtomicBoolean(false); @@ -74,7 +74,7 @@ public class SpringBootMetadataReaderTests { defaultFound.set(true); } }); - server.verify(); + this.server.verify(); } } diff --git a/initializr-web/src/test/java/io/spring/initializr/web/test/MockMvcClientHttpRequestFactory.java b/initializr-web/src/test/java/io/spring/initializr/web/test/MockMvcClientHttpRequestFactory.java index ed527d7f..d12a5d21 100644 --- a/initializr-web/src/test/java/io/spring/initializr/web/test/MockMvcClientHttpRequestFactory.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/test/MockMvcClientHttpRequestFactory.java @@ -112,7 +112,7 @@ public class MockMvcClientHttpRequestFactory implements ClientHttpRequestFactory for (String field : this.fields) { snippets.add(new ResponseFieldSnippet(field)); } - actions.andDo(document(label, preprocessResponse(prettyPrint()), + actions.andDo(document(this.label, preprocessResponse(prettyPrint()), snippets.toArray(new Snippet[0]))); this.fields = new ArrayList<>(); return actions; diff --git a/initializr-web/src/test/java/io/spring/initializr/web/test/MockMvcClientHttpRequestFactoryTestExecutionListener.java b/initializr-web/src/test/java/io/spring/initializr/web/test/MockMvcClientHttpRequestFactoryTestExecutionListener.java index 7911597e..a708b28d 100644 --- a/initializr-web/src/test/java/io/spring/initializr/web/test/MockMvcClientHttpRequestFactoryTestExecutionListener.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/test/MockMvcClientHttpRequestFactoryTestExecutionListener.java @@ -34,20 +34,20 @@ public final class MockMvcClientHttpRequestFactoryTestExecutionListener ConfigurableBeanFactory beanFactory = (ConfigurableBeanFactory) testContext .getApplicationContext().getAutowireCapableBeanFactory(); if (!beanFactory.containsBean("mockMvcClientHttpRequestFactory")) { - factory = new MockMvcClientHttpRequestFactory( + this.factory = new MockMvcClientHttpRequestFactory( beanFactory.getBean(MockMvc.class)); beanFactory.registerSingleton("mockMvcClientHttpRequestFactory", this.factory); } else { - factory = beanFactory.getBean("mockMvcClientHttpRequestFactory", + this.factory = beanFactory.getBean("mockMvcClientHttpRequestFactory", MockMvcClientHttpRequestFactory.class); } } @Override public void beforeTestMethod(TestContext testContext) throws Exception { - if (factory != null) { + if (this.factory != null) { this.factory.setTest(testContext.getTestClass(), testContext.getTestMethod()); } } diff --git a/initializr-web/src/test/java/io/spring/initializr/web/test/ResponseFieldSnippet.java b/initializr-web/src/test/java/io/spring/initializr/web/test/ResponseFieldSnippet.java index ae81ff80..c669766f 100644 --- a/initializr-web/src/test/java/io/spring/initializr/web/test/ResponseFieldSnippet.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/test/ResponseFieldSnippet.java @@ -71,7 +71,7 @@ public class ResponseFieldSnippet extends TemplatedSnippet { } this.file = file; this.path = path; - objectMapper.configure(SerializationFeature.INDENT_OUTPUT, true); + this.objectMapper.configure(SerializationFeature.INDENT_OUTPUT, true); } /* @@ -84,8 +84,8 @@ public class ResponseFieldSnippet extends TemplatedSnippet { .getAttributes().get(RestDocumentationContext.class.getName()); WriterResolver writerResolver = (WriterResolver) operation.getAttributes() .get(WriterResolver.class.getName()); - try (Writer writer = writerResolver - .resolve(operation.getName() + "/" + getSnippetName(), file, context)) { + try (Writer writer = writerResolver.resolve( + operation.getName() + "/" + getSnippetName(), this.file, context)) { Map model = createModel(operation); model.putAll(getAttributes()); TemplateEngine templateEngine = (TemplateEngine) operation.getAttributes() @@ -97,14 +97,15 @@ public class ResponseFieldSnippet extends TemplatedSnippet { @Override protected Map createModel(Operation operation) { try { - Object object = objectMapper.readValue( + Object object = this.objectMapper.readValue( operation.getResponse().getContentAsString(), Object.class); - Object field = fieldProcessor.extract(JsonFieldPath.compile(path), object); - if (field instanceof List && index != null) { - field = ((List) field).get(index); + Object field = this.fieldProcessor.extract(JsonFieldPath.compile(this.path), + object); + if (field instanceof List && this.index != null) { + field = ((List) field).get(this.index); } return Collections.singletonMap("value", - objectMapper.writeValueAsString(field)); + this.objectMapper.writeValueAsString(field)); } catch (Exception ex) { throw new IllegalStateException(ex);