diff --git a/initializr-actuator/pom.xml b/initializr-actuator/pom.xml index 69f7062e..8dd96137 100644 --- a/initializr-actuator/pom.xml +++ b/initializr-actuator/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 io.spring.initializr diff --git a/initializr-actuator/src/main/java/io/spring/initializr/actuate/autoconfigure/InitializrActuatorEndpointsAutoConfiguration.java b/initializr-actuator/src/main/java/io/spring/initializr/actuate/autoconfigure/InitializrActuatorEndpointsAutoConfiguration.java index f189f4b2..b8db0704 100644 --- a/initializr-actuator/src/main/java/io/spring/initializr/actuate/autoconfigure/InitializrActuatorEndpointsAutoConfiguration.java +++ b/initializr-actuator/src/main/java/io/spring/initializr/actuate/autoconfigure/InitializrActuatorEndpointsAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,12 @@ package io.spring.initializr.actuate.autoconfigure; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - import io.spring.initializr.actuate.info.BomRangesInfoContributor; import io.spring.initializr.metadata.InitializrMetadataProvider; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + /** * {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration * Auto-configuration} to improve actuator endpoints with initializr specific information. diff --git a/initializr-actuator/src/main/java/io/spring/initializr/actuate/autoconfigure/InitializrMetricsConfiguration.java b/initializr-actuator/src/main/java/io/spring/initializr/actuate/autoconfigure/InitializrMetricsConfiguration.java index e9d60afc..e2eeaca3 100644 --- a/initializr-actuator/src/main/java/io/spring/initializr/actuate/autoconfigure/InitializrMetricsConfiguration.java +++ b/initializr-actuator/src/main/java/io/spring/initializr/actuate/autoconfigure/InitializrMetricsConfiguration.java @@ -16,7 +16,8 @@ package io.spring.initializr.actuate.autoconfigure; -import org.springframework.beans.factory.annotation.Autowired; +import io.spring.initializr.actuate.metric.ProjectGenerationMetricsListener; + import org.springframework.boot.actuate.autoconfigure.ExportMetricWriter; import org.springframework.boot.actuate.autoconfigure.MetricExportAutoConfiguration; import org.springframework.boot.actuate.metrics.CounterService; @@ -34,8 +35,6 @@ import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.util.ObjectUtils; -import io.spring.initializr.actuate.metric.ProjectGenerationMetricsListener; - /** * {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration * Auto-configuration} to handle the metrics of an initializr instance. 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 28879853..7f73f1cc 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 @@ -18,6 +18,11 @@ package io.spring.initializr.actuate.autoconfigure; import java.util.Collections; +import io.spring.initializr.actuate.stat.ProjectGenerationStatPublisher; +import io.spring.initializr.actuate.stat.ProjectRequestDocumentFactory; +import io.spring.initializr.actuate.stat.StatsProperties; +import io.spring.initializr.metadata.InitializrMetadataProvider; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -28,11 +33,6 @@ import org.springframework.retry.backoff.ExponentialBackOffPolicy; import org.springframework.retry.policy.SimpleRetryPolicy; import org.springframework.retry.support.RetryTemplate; -import io.spring.initializr.actuate.stat.ProjectGenerationStatPublisher; -import io.spring.initializr.actuate.stat.ProjectRequestDocumentFactory; -import io.spring.initializr.actuate.stat.StatsProperties; -import io.spring.initializr.metadata.InitializrMetadataProvider; - /** * {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration * Auto-configuration} to publish statistics of each generated project. @@ -63,8 +63,8 @@ class InitializrStatsAutoConfiguration { backOffPolicy.setInitialInterval(3000L); backOffPolicy.setMultiplier(3); SimpleRetryPolicy retryPolicy = new SimpleRetryPolicy( - statsProperties.getElastic().getMaxAttempts(), Collections - ., Boolean> singletonMap(Exception.class, true)); + statsProperties.getElastic().getMaxAttempts(), + Collections.singletonMap(Exception.class, true)); retryTemplate.setBackOffPolicy(backOffPolicy); retryTemplate.setRetryPolicy(retryPolicy); return retryTemplate; 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 f5797388..95371400 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,11 +19,11 @@ package io.spring.initializr.actuate.info; import java.util.LinkedHashMap; import java.util.Map; +import io.spring.initializr.metadata.InitializrMetadataProvider; + import org.springframework.boot.actuate.info.Info; import org.springframework.boot.actuate.info.InfoContributor; -import io.spring.initializr.metadata.InitializrMetadataProvider; - /** * An {@link InfoContributor} that exposes the actual ranges used by each bom * defined in the project. @@ -41,8 +41,8 @@ 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()) { + 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(); 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 0ff029d7..2cd85974 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 @@ -16,14 +16,14 @@ package io.spring.initializr.actuate.metric; +import java.util.List; + import io.spring.initializr.generator.ProjectFailedEvent; import io.spring.initializr.generator.ProjectGeneratedEvent; import io.spring.initializr.generator.ProjectRequest; import io.spring.initializr.metadata.Dependency; import io.spring.initializr.util.Agent; -import java.util.List; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.metrics.CounterService; import org.springframework.context.event.EventListener; 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 45eae5b6..c46ef520 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 @@ -16,8 +16,13 @@ package io.spring.initializr.actuate.stat; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import io.spring.initializr.generator.ProjectRequestEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.context.event.EventListener; import org.springframework.http.MediaType; @@ -28,12 +33,6 @@ import org.springframework.retry.support.RetryTemplate; import org.springframework.scheduling.annotation.Async; import org.springframework.web.client.RestTemplate; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import io.spring.initializr.generator.ProjectRequestEvent; - /** * Publish stats for each project generated to an Elastic index. * 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 66c6e8a0..4d18494a 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 @@ -21,8 +21,6 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.springframework.util.StringUtils; - import io.spring.initializr.generator.ProjectFailedEvent; import io.spring.initializr.generator.ProjectRequest; import io.spring.initializr.generator.ProjectRequestEvent; @@ -30,6 +28,8 @@ import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.metadata.InitializrMetadataProvider; import io.spring.initializr.util.Agent; +import org.springframework.util.StringUtils; + /** * Create {@link ProjectRequestDocument} instances. * @@ -54,13 +54,13 @@ public class ProjectRequestDocumentFactory { handleCloudFlareHeaders(request, document); String candidate = (String) request.getParameters().get("x-forwarded-for"); - if (!StringUtils.hasText(document.getRequestIp()) && candidate!=null) { + if (!StringUtils.hasText(document.getRequestIp()) && candidate != null) { document.setRequestIp(candidate); document.setRequestIpv4(extractIpv4(candidate)); } Agent agent = extractAgentInformation(request); - if (agent!=null) { + if (agent != null) { document.setClientId(agent.getId().getId()); document.setClientVersion(agent.getVersion()); } @@ -71,25 +71,25 @@ public class ProjectRequestDocumentFactory { document.setBootVersion(request.getBootVersion()); document.setJavaVersion(request.getJavaVersion()); - if (StringUtils.hasText(request.getJavaVersion()) && metadata.getJavaVersions().get(request.getJavaVersion())==null) { + if (StringUtils.hasText(request.getJavaVersion()) && metadata.getJavaVersions().get(request.getJavaVersion()) == null) { document.setInvalid(true); document.setInvalidJavaVersion(true); } document.setLanguage(request.getLanguage()); - if (StringUtils.hasText(request.getLanguage()) && metadata.getLanguages().get(request.getLanguage())==null) { + if (StringUtils.hasText(request.getLanguage()) && metadata.getLanguages().get(request.getLanguage()) == null) { document.setInvalid(true); document.setInvalidLanguage(true); } document.setPackaging(request.getPackaging()); - if (StringUtils.hasText(request.getPackaging()) && metadata.getPackagings().get(request.getPackaging())==null) { + if (StringUtils.hasText(request.getPackaging()) && metadata.getPackagings().get(request.getPackaging()) == null) { document.setInvalid(true); document.setInvalidPackaging(true); } document.setType(request.getType()); - if (StringUtils.hasText(request.getType()) && metadata.getTypes().get(request.getType())==null) { + if (StringUtils.hasText(request.getType()) && metadata.getTypes().get(request.getType()) == null) { document.setInvalid(true); document.setInvalidType(true); } @@ -98,10 +98,11 @@ public class ProjectRequestDocumentFactory { List dependencies = new ArrayList<>(); dependencies.addAll(request.getStyle()); dependencies.addAll(request.getDependencies()); - dependencies.forEach( id -> { - if (metadata.getDependencies().get(id)!=null) { + dependencies.forEach(id -> { + if (metadata.getDependencies().get(id) != null) { document.getDependencies().add(id); - } else { + } + else { document.setInvalid(true); document.getInvalidDependencies().add(id); } @@ -111,7 +112,7 @@ public class ProjectRequestDocumentFactory { if (event instanceof ProjectFailedEvent) { ProjectFailedEvent failed = (ProjectFailedEvent) event; document.setInvalid(true); - if (failed.getCause()!=null) { + if (failed.getCause() != null) { document.setErrorMessage(failed.getCause().getMessage()); } } 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 e2fe60c1..8022ab82 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,14 @@ package io.spring.initializr.actuate; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - +import io.spring.initializr.web.AbstractFullStackInitializrIntegrationTests; import org.json.JSONObject; import org.junit.Test; + import org.springframework.test.context.ActiveProfiles; -import io.spring.initializr.web.AbstractFullStackInitializrIntegrationTests; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * Tests for actuator specific features. diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/info/BomRangesInfoContributorTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/info/BomRangesInfoContributorTests.java index 632abefb..8236018d 100644 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/info/BomRangesInfoContributorTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/info/BomRangesInfoContributorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,18 +16,18 @@ package io.spring.initializr.actuate.info; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.entry; - import java.util.Map; -import org.junit.Test; -import org.springframework.boot.actuate.info.Info; - import io.spring.initializr.metadata.BillOfMaterials; import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.metadata.SimpleInitializrMetadataProvider; import io.spring.initializr.test.metadata.InitializrMetadataTestBuilder; +import org.junit.Test; + +import org.springframework.boot.actuate.info.Info; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.entry; /** * Tests for {@link BomRangesInfoContributor} diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/metric/MetricsExportTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/metric/MetricsExportTests.java index e4989f4b..d3a32774 100644 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/metric/MetricsExportTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/metric/MetricsExportTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,20 @@ package io.spring.initializr.actuate.metric; -import static org.junit.Assert.assertTrue; - +import io.spring.initializr.actuate.metric.MetricsExportTests.Config; +import io.spring.initializr.actuate.test.RedisRunning; +import io.spring.initializr.generator.ProjectGeneratedEvent; +import io.spring.initializr.generator.ProjectRequest; +import io.spring.initializr.metadata.InitializrMetadata; +import io.spring.initializr.metadata.InitializrMetadataBuilder; +import io.spring.initializr.metadata.InitializrMetadataProvider; +import io.spring.initializr.metadata.InitializrProperties; +import io.spring.initializr.metadata.SimpleInitializrMetadataProvider; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.actuate.metrics.repository.redis.RedisMetricRepository; @@ -33,15 +41,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.junit4.SpringRunner; -import io.spring.initializr.actuate.metric.MetricsExportTests.Config; -import io.spring.initializr.actuate.test.RedisRunning; -import io.spring.initializr.generator.ProjectGeneratedEvent; -import io.spring.initializr.generator.ProjectRequest; -import io.spring.initializr.metadata.InitializrMetadata; -import io.spring.initializr.metadata.InitializrMetadataBuilder; -import io.spring.initializr.metadata.InitializrMetadataProvider; -import io.spring.initializr.metadata.InitializrProperties; -import io.spring.initializr.metadata.SimpleInitializrMetadataProvider; +import static org.junit.Assert.assertTrue; /** * @author Dave Syer 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 6164e690..a06f32e9 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,9 +18,6 @@ package io.spring.initializr.actuate.metric; import java.util.Arrays; -import org.junit.Before; -import org.junit.Test; - import io.spring.initializr.actuate.test.MetricsAssert; import io.spring.initializr.actuate.test.TestCounterService; import io.spring.initializr.generator.ProjectFailedEvent; @@ -29,6 +26,8 @@ import io.spring.initializr.generator.ProjectRequest; import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.test.metadata.InitializrMetadataTestBuilder; +import org.junit.Before; +import org.junit.Test; /** * @author Stephane Nicoll @@ -237,7 +236,7 @@ public class ProjectGenerationMetricsListenerTests { @Test public void incrementMetrics() { ProjectRequest request = initialize(); - request.getStyle().addAll(Arrays.asList("security","spring-data")); + request.getStyle().addAll(Arrays.asList("security", "spring-data")); request.resolve(metadata); fireProjectGeneratedEvent(request); metricsAssert.hasValue(1, "initializr.requests", 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 503245cc..c4de7c47 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,20 +16,17 @@ package io.spring.initializr.actuate.stat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.net.URI; import java.util.ArrayList; import java.util.List; +import io.spring.initializr.actuate.stat.MainControllerStatsIntegrationTests.StatsMockController; +import io.spring.initializr.web.AbstractFullStackInitializrIntegrationTests; import org.json.JSONArray; import org.json.JSONObject; import org.junit.Before; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Import; import org.springframework.http.HttpHeaders; @@ -42,9 +39,11 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.HttpClientErrorException; -import io.spring.initializr.actuate.stat.MainControllerStatsIntegrationTests.StatsMockController; -import io.spring.initializr.actuate.stat.MainControllerStatsIntegrationTests.StatsMockController.Content; -import io.spring.initializr.web.AbstractFullStackInitializrIntegrationTests; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * Integration tests for stats processing. @@ -66,14 +65,14 @@ 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:" + 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()); - Content content = statsMockController.stats.get(0); + StatsMockController.Content content = statsMockController.stats.get(0); JSONObject json = new JSONObject(content.json); assertEquals("com.foo", json.get("groupId")); @@ -87,7 +86,7 @@ public class MainControllerStatsIntegrationTests public void authorizationHeaderIsSet() { downloadArchive("/starter.zip"); assertEquals("No stat got generated", 1, statsMockController.stats.size()); - Content content = statsMockController.stats.get(0); + StatsMockController.Content content = statsMockController.stats.get(0); String authorization = content.authorization; assertNotNull("Authorization header must be set", authorization); @@ -102,7 +101,7 @@ public class MainControllerStatsIntegrationTests public void requestIpNotSetByDefault() { downloadArchive("/starter.zip?groupId=com.foo&artifactId=bar&dependencies=web"); assertEquals("No stat got generated", 1, statsMockController.stats.size()); - Content content = statsMockController.stats.get(0); + StatsMockController.Content content = statsMockController.stats.get(0); JSONObject json = new JSONObject(content.json); assertFalse("requestIp property should not be set", json.has("requestIp")); @@ -114,7 +113,7 @@ public class MainControllerStatsIntegrationTests .header("X-FORWARDED-FOR", "10.0.0.123").build(); getRestTemplate().exchange(request, String.class); assertEquals("No stat got generated", 1, statsMockController.stats.size()); - Content content = statsMockController.stats.get(0); + StatsMockController.Content content = statsMockController.stats.get(0); JSONObject json = new JSONObject(content.json); assertEquals("Wrong requestIp", "10.0.0.123", json.get("requestIp")); @@ -126,7 +125,7 @@ public class MainControllerStatsIntegrationTests .header("x-forwarded-for", "foo-bar").build(); getRestTemplate().exchange(request, String.class); assertEquals("No stat got generated", 1, statsMockController.stats.size()); - Content content = statsMockController.stats.get(0); + StatsMockController.Content content = statsMockController.stats.get(0); JSONObject json = new JSONObject(content.json); assertFalse("requestIpv4 property should not be set if value is not a valid IPv4", @@ -139,7 +138,7 @@ public class MainControllerStatsIntegrationTests .header("cf-ipcountry", "XX").build(); getRestTemplate().exchange(request, String.class); assertEquals("No stat got generated", 1, statsMockController.stats.size()); - Content content = statsMockController.stats.get(0); + StatsMockController.Content content = statsMockController.stats.get(0); JSONObject json = new JSONObject(content.json); assertFalse("requestCountry property should not be set if value is set to xx", @@ -151,11 +150,12 @@ public class MainControllerStatsIntegrationTests try { downloadArchive("/starter.zip?type=invalid-type"); fail("Should have failed to generate project with invalid type"); - } catch (HttpClientErrorException ex) { + } + catch (HttpClientErrorException ex) { assertEquals(HttpStatus.BAD_REQUEST, ex.getStatusCode()); } assertEquals("No stat got generated", 1, statsMockController.stats.size()); - Content content = statsMockController.stats.get(0); + StatsMockController.Content content = statsMockController.stats.get(0); JSONObject json = new JSONObject(content.json); assertEquals("com.example", json.get("groupId")); 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 45178287..01acb53d 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 @@ -1,14 +1,14 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -16,16 +16,15 @@ package io.spring.initializr.actuate.stat; -import static org.springframework.test.web.client.match.MockRestRequestMatchers.jsonPath; -import static org.springframework.test.web.client.match.MockRestRequestMatchers.method; -import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo; -import static org.springframework.test.web.client.response.MockRestResponseCreators.withStatus; - import java.util.Collections; import java.util.UUID; +import io.spring.initializr.actuate.stat.StatsProperties.Elastic; +import io.spring.initializr.generator.ProjectGeneratedEvent; +import io.spring.initializr.generator.ProjectRequest; import org.junit.Before; import org.junit.Test; + import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -33,9 +32,10 @@ import org.springframework.retry.policy.SimpleRetryPolicy; import org.springframework.retry.support.RetryTemplate; import org.springframework.test.web.client.MockRestServiceServer; -import io.spring.initializr.actuate.stat.StatsProperties.Elastic; -import io.spring.initializr.generator.ProjectGeneratedEvent; -import io.spring.initializr.generator.ProjectRequest; +import static org.springframework.test.web.client.match.MockRestRequestMatchers.jsonPath; +import static org.springframework.test.web.client.match.MockRestRequestMatchers.method; +import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo; +import static org.springframework.test.web.client.response.MockRestResponseCreators.withStatus; /** * @author Stephane Nicoll @@ -69,9 +69,8 @@ public class ProjectGenerationStatPublisherTests extends AbstractInitializrStatT .andExpect(jsonPath("$.groupId").value("com.example.foo")) .andExpect(jsonPath("$.artifactId").value("my-project")) .andRespond(withStatus(HttpStatus.CREATED) - .body(mockResponse(UUID.randomUUID().toString(), true)) - .contentType(MediaType.APPLICATION_JSON) - ); + .body(mockResponse(UUID.randomUUID().toString(), true)) + .contentType(MediaType.APPLICATION_JSON)); this.statPublisher.handleEvent(new ProjectGeneratedEvent(request)); mockServer.verify(); @@ -92,8 +91,8 @@ public class ProjectGenerationStatPublisherTests extends AbstractInitializrStatT 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)); + .body(mockResponse(UUID.randomUUID().toString(), true)) + .contentType(MediaType.APPLICATION_JSON)); this.statPublisher.handleEvent(new ProjectGeneratedEvent(request)); mockServer.verify(); @@ -103,7 +102,7 @@ public class ProjectGenerationStatPublisherTests extends AbstractInitializrStatT public void fatalErrorOnlyLogs() { ProjectRequest request = createProjectRequest(); this.retryTemplate.setRetryPolicy(new SimpleRetryPolicy(2, - Collections., Boolean> singletonMap(Exception.class, true))); + Collections.singletonMap(Exception.class, true))); mockServer.expect(requestTo("http://example.com/elastic/initializr/request")) .andExpect(method(HttpMethod.POST)) 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 c8ab97ee..85501b18 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,18 +16,17 @@ package io.spring.initializr.actuate.stat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import java.util.Arrays; -import org.junit.Test; - import io.spring.initializr.generator.ProjectFailedEvent; import io.spring.initializr.generator.ProjectGeneratedEvent; import io.spring.initializr.generator.ProjectRequest; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; /** * @@ -60,7 +59,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe @Test public void createDocumentWithRequestIp() { ProjectRequest request = createProjectRequest(); - request.getParameters().put("x-forwarded-for","10.0.0.123"); + request.getParameters().put("x-forwarded-for", "10.0.0.123"); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request); ProjectRequestDocument document = factory.createDocument(event); assertEquals("10.0.0.123", document.getRequestIp()); @@ -83,7 +82,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe public void createDocumentWithCloudFlareHeaders() { ProjectRequest request = createProjectRequest(); request.getParameters().put("cf-connecting-ip", "10.0.0.123"); - request.getParameters().put("cf-ipcountry","BE"); + request.getParameters().put("cf-ipcountry", "BE"); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request); ProjectRequestDocument document = factory.createDocument(event); assertEquals("10.0.0.123", document.getRequestIp()); @@ -126,7 +125,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe @Test public void createDocumentWithUserAgent() { ProjectRequest request = createProjectRequest(); - request.getParameters().put("user-agent","HTTPie/0.8.0"); + request.getParameters().put("user-agent", "HTTPie/0.8.0"); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request); ProjectRequestDocument document = factory.createDocument(event); assertEquals("httpie", document.getClientId()); @@ -136,7 +135,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe @Test public void createDocumentWithUserAgentNoVersion() { ProjectRequest request = createProjectRequest(); - request.getParameters().put("user-agent","IntelliJ IDEA"); + request.getParameters().put("user-agent", "IntelliJ IDEA"); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request); ProjectRequestDocument document = factory.createDocument(event); assertEquals("intellijidea", document.getClientId()); 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 8b5b82ab..d4d6ba98 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,10 @@ package io.spring.initializr.actuate.stat; -import io.spring.initializr.actuate.stat.StatsProperties; import org.junit.Test; -import static org.junit.Assert.assertThat; import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; /** * @author Stephane Nicoll 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 0a9bf742..c20ba62f 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,11 @@ package io.spring.initializr.actuate.test; +import java.util.Arrays; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import java.util.Arrays; - /** * Metrics assertion based on {@link TestCounterService}. * diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/test/RedisRunning.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/test/RedisRunning.java index 526e446b..ac1e2a11 100644 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/test/RedisRunning.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/test/RedisRunning.java @@ -20,6 +20,7 @@ import org.junit.Assume; import org.junit.rules.TestWatcher; import org.junit.runner.Description; import org.junit.runners.model.Statement; + import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; /** @@ -39,7 +40,8 @@ public class RedisRunning extends TestWatcher { } try { connectionFactory.getConnection(); - } catch (Exception e) { + } + catch (Exception e) { Assume.assumeNoException("Cannot connect to Redis (so skipping tests)", e); } return super.apply(base, description); diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/test/TestCounterService.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/test/TestCounterService.java index eea61b14..fed98410 100644 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/test/TestCounterService.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/test/TestCounterService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,14 +33,14 @@ public class TestCounterService implements CounterService { @Override public void increment(String metricName) { Long value = getValues().get(metricName); - Long valueToSet = value!=null ? ++value : 1; + Long valueToSet = value != null ? ++value : 1; getValues().put(metricName, valueToSet); } @Override public void decrement(String metricName) { Long value = getValues().get(metricName); - Long valueToSet = value!=null ? +--value : -1; + Long valueToSet = value != null ? +--value : -1; getValues().put(metricName, valueToSet); } diff --git a/initializr-generator/pom.xml b/initializr-generator/pom.xml index 721849fd..cdc4afb3 100644 --- a/initializr-generator/pom.xml +++ b/initializr-generator/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 io.spring.initializr 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 4df14f7f..791b3bcf 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 @@ -21,13 +21,13 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.stream.Collectors; -import org.springframework.beans.BeanWrapperImpl; - import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.metadata.Type; import io.spring.initializr.util.TemplateRenderer; +import org.springframework.beans.BeanWrapperImpl; + /** * Generate help pages for command-line clients. * 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 1cd2a050..19e09598 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 @@ -28,16 +28,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.BeanWrapperImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.ApplicationEventPublisher; -import org.springframework.util.Assert; -import org.springframework.util.FileSystemUtils; -import org.springframework.util.StreamUtils; - import io.spring.initializr.InitializrException; import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrConfiguration.Env.Maven.ParentPom; @@ -45,6 +35,16 @@ import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.metadata.InitializrMetadataProvider; import io.spring.initializr.util.TemplateRenderer; import io.spring.initializr.util.Version; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.springframework.beans.BeanWrapperImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.ApplicationEventPublisher; +import org.springframework.util.Assert; +import org.springframework.util.FileSystemUtils; +import org.springframework.util.StreamUtils; /** * Generate a project based on the configured metadata. @@ -384,17 +384,17 @@ public class ProjectGenerator { Map versions = new LinkedHashMap(); model.put("buildPropertiesVersions", versions.entrySet()); - request.getBuildProperties().getVersions().forEach((k,v) -> { + request.getBuildProperties().getVersions().forEach((k, v) -> { versions.put(k, v.get()); }); Map gradle = new LinkedHashMap(); model.put("buildPropertiesGradle", gradle.entrySet()); - request.getBuildProperties().getGradle().forEach((k,v) -> { + request.getBuildProperties().getGradle().forEach((k, v) -> { gradle.put(k, v.get()); }); Map maven = new LinkedHashMap(); model.put("buildPropertiesMaven", maven.entrySet()); - request.getBuildProperties().getMaven().forEach((k,v) -> { + request.getBuildProperties().getMaven().forEach((k, v) -> { maven.put(k, v.get()); }); @@ -404,7 +404,7 @@ public class ProjectGenerator { model.put("kotlinVersion", metadata.getConfiguration().getEnv().getKotlin().getVersion()); if ("kotlin".equals(request.getLanguage())) { - model.put("kotlin", true); + model.put("kotlin", true); } if ("groovy".equals(request.getLanguage())) { model.put("groovy", true); @@ -423,7 +423,7 @@ public class ProjectGenerator { model.put("springBootPluginName", (VERSION_1_4_2_M1 .compareTo(Version.safeParse(request.getBootVersion())) <= 0 - ? "org.springframework.boot" : "spring-boot")); + ? "org.springframework.boot" : "spring-boot")); // New testing stuff model.put("newTestInfrastructure", isNewTestInfrastructureAvailable(request)); 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 3b94b924..e543bedb 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 @@ -22,9 +22,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.springframework.beans.BeanWrapperImpl; -import org.springframework.util.StringUtils; - import io.spring.initializr.metadata.BillOfMaterials; import io.spring.initializr.metadata.DefaultMetadataElement; import io.spring.initializr.metadata.Dependency; @@ -33,6 +30,9 @@ import io.spring.initializr.metadata.Repository; import io.spring.initializr.metadata.Type; import io.spring.initializr.util.Version; +import org.springframework.beans.BeanWrapperImpl; +import org.springframework.util.StringUtils; + /** * A request to generate a project. * 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 9e71cb51..776621ef 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 @@ -1,12 +1,28 @@ +/* + * Copyright 2012-2017 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package io.spring.initializr.generator; import java.util.ArrayList; import java.util.List; -import org.springframework.util.Assert; - import io.spring.initializr.metadata.InitializrMetadata; +import org.springframework.util.Assert; + /** * Resolve {@link ProjectRequest} instances, honouring callback hook points. * 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 74e2b480..060caaa1 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 @@ -22,7 +22,6 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; - import io.spring.initializr.util.InvalidVersionException; import io.spring.initializr.util.Version; import io.spring.initializr.util.VersionParser; diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/DefaultMetadataElement.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/DefaultMetadataElement.java index d74d3b17..55a12cf1 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/metadata/DefaultMetadataElement.java +++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/DefaultMetadataElement.java @@ -45,7 +45,7 @@ public class DefaultMetadataElement extends MetadataElement { public boolean isDefault() { return this.defaultValue; } - + public static DefaultMetadataElement create(String id, boolean defaultValue) { return new DefaultMetadataElement(id, defaultValue); } 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 665a1105..f64dde3a 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 @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import com.fasterxml.jackson.annotation.JsonIgnore; - import io.spring.initializr.util.VersionParser; /** diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/Dependency.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/Dependency.java index 30d841c0..9c2ca65a 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/metadata/Dependency.java +++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/Dependency.java @@ -21,16 +21,15 @@ import java.util.Arrays; import java.util.List; import java.util.StringTokenizer; -import org.springframework.util.StringUtils; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; - import io.spring.initializr.util.InvalidVersionException; import io.spring.initializr.util.Version; import io.spring.initializr.util.VersionParser; import io.spring.initializr.util.VersionRange; +import org.springframework.util.StringUtils; + /** * Meta-data for a dependency. Each dependency has a primary identifier and an arbitrary * number of {@code aliases}. @@ -38,7 +37,6 @@ import io.spring.initializr.util.VersionRange; * @author Stephane Nicoll */ @JsonInclude(JsonInclude.Include.NON_EMPTY) -// @AutoClone(style = AutoCloneStyle.COPY_CONSTRUCTOR) public class Dependency extends MetadataElement implements Describable { public static final String SCOPE_COMPILE = "compile"; @@ -249,7 +247,7 @@ 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) { + if (range != null) { return range.match(version); } return true; 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 4747d252..86cc3a21 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 @@ -55,7 +55,7 @@ public class DependencyGroup { private String repository; final List content = new ArrayList<>(); - + public String getName() { return name; } @@ -96,6 +96,6 @@ public class DependencyGroup { DependencyGroup group = new DependencyGroup(); group.setName(name); return group; - } + } } 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 dd31417a..5a386f9f 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 @@ -40,7 +40,7 @@ public class DependencyMetadata { } public DependencyMetadata(Version bootVersion, Map dependencies, - Map repositories, Map boms) { + Map repositories, Map boms) { this.bootVersion = bootVersion; this.dependencies = dependencies; this.repositories = repositories; 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 5ac56725..4262dd2d 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 @@ -462,8 +462,8 @@ public class InitializrConfiguration { && !StringUtils.hasText(artifactId) && !StringUtils.hasText(version)) || (StringUtils.hasText(groupId) - && StringUtils.hasText(artifactId) - && StringUtils.hasText(version)))) { + && StringUtils.hasText(artifactId) + && StringUtils.hasText(version)))) { throw new InvalidInitializrMetadataException("Custom maven pom " + "requires groupId, artifactId and version"); } 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 ae90eca9..25780a7e 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 @@ -20,14 +20,14 @@ import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; +import com.fasterxml.jackson.databind.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.core.io.Resource; import org.springframework.util.StreamUtils; import org.springframework.util.StringUtils; -import com.fasterxml.jackson.databind.ObjectMapper; - /** * Builder for {@link InitializrMetadata}. Allows to read metadata from any arbitrary * resource, including remote URLs. 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 d058e639..34f50bb8 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 @@ -19,11 +19,11 @@ package io.spring.initializr.metadata; import java.util.ArrayList; import java.util.List; +import com.fasterxml.jackson.annotation.JsonIgnore; + import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.util.StringUtils; -import com.fasterxml.jackson.annotation.JsonIgnore; - /** * Configuration of the initializr service. * 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 c8749c22..f5496ea3 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 @@ -68,14 +68,14 @@ public class Link { */ @JsonInclude(JsonInclude.Include.NON_NULL) private String description; - + public Link() { } private Link(String rel, String href) { - this(rel, href, (String)null); + this(rel, href, null); } - + private Link(String rel, String href, String description) { this.rel = rel; this.href = href; @@ -124,11 +124,11 @@ public class Link { } public void resolve() { - if (rel==null) { + if (rel == null) { throw new InvalidInitializrMetadataException( "Invalid link " + this + ": rel attribute is mandatory"); } - if (href==null) { + if (href == null) { throw new InvalidInitializrMetadataException( "Invalid link " + this + ": href attribute is mandatory"); } @@ -147,13 +147,13 @@ public class Link { */ public URI expand(Map parameters) { AtomicReference result = new AtomicReference(href); - templateVariables.forEach( var -> { + templateVariables.forEach(var -> { Object value = parameters.get(var); - if (value==null) { + if (value == null) { throw new IllegalArgumentException( "Could not expand " + href + ", missing value for '" + var + "'"); } - result.set(result.get().replace("{" + var+"}", value.toString())); + result.set(result.get().replace("{" + var + "}", value.toString())); }); try { return new URI(result.get()); 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 234d8a3a..8b042687 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 @@ -33,7 +33,7 @@ public class MetadataElement { * The unique id of this element for a given capability. */ private String id; - + public MetadataElement() { } @@ -47,7 +47,7 @@ public class MetadataElement { } public String getName() { - return name!=null ? name: id; + return name != null ? name : id; } public String getId() { 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 03341958..b186c4e1 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 @@ -16,12 +16,12 @@ package io.spring.initializr.metadata; -import org.springframework.util.Assert; -import org.springframework.util.StringUtils; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import org.springframework.util.Assert; +import org.springframework.util.StringUtils; + /** * Defines a capability of the initializr service. Each capability is defined by a id and * a {@link ServiceCapabilityType type}. 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 bf1e2d6c..b8df5ddc 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 @@ -56,7 +56,7 @@ public class TypeCapability extends ServiceCapability> implements Def @Override public void merge(List otherContent) { otherContent.forEach(it -> { - if (get(it.getId())==null) { + if (get(it.getId()) == null) { content.add(it); } }); 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 1bd9e1bc..1a20a6c0 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 @@ -22,16 +22,16 @@ import java.nio.charset.Charset; import java.util.Map; import java.util.concurrent.ConcurrentMap; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.core.io.DefaultResourceLoader; -import org.springframework.core.io.ResourceLoader; -import org.springframework.util.ConcurrentReferenceHashMap; - import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Mustache.Compiler; import com.samskivert.mustache.Mustache.TemplateLoader; import com.samskivert.mustache.Template; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.springframework.core.io.DefaultResourceLoader; +import org.springframework.core.io.ResourceLoader; +import org.springframework.util.ConcurrentReferenceHashMap; /** * @author Dave Syer 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 3dfb8f58..9e749118 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 @@ -81,9 +81,9 @@ public final class Version implements Serializable, Comparable { @Override public String toString() { - return major + "." + minor + "." + patch + - (qualifier!=null ? "." + qualifier.qualifier + - (qualifier.version!=null ? qualifier.version : "") : ""); + return major + "." + minor + "." + patch + + (qualifier != null ? "." + qualifier.qualifier + + (qualifier.version != null ? qualifier.version : "") : ""); } /** @@ -109,7 +109,8 @@ public final class Version implements Serializable, Comparable { public static Version safeParse(String text) { try { return parse(text); - } catch (InvalidVersionException e) { + } + catch (InvalidVersionException e) { return null; } } @@ -135,37 +136,45 @@ public final class Version implements Serializable, Comparable { } private static int safeCompare(Integer first, Integer second) { - Integer firstIndex = first !=null ? first : 0; - Integer secondIndex = second !=null ? second : 0; + Integer firstIndex = first != null ? first : 0; + Integer secondIndex = second != null ? second : 0; return firstIndex.compareTo(secondIndex); } public static class Qualifier { public Qualifier() { } + public Qualifier(String qualifier) { this.qualifier = qualifier; } + String qualifier; Integer version; + public String getQualifier() { return qualifier; } + public void setQualifier(String qualifier) { this.qualifier = qualifier; } + public Integer getVersion() { return version; } + public void setVersion(Integer version) { this.version = version; } + @Override public String toString() { return "Qualifier [" + (qualifier != null ? "qualifier=" + qualifier + ", " : "") + (version != null ? "version=" + version : "") + "]"; } + @Override public int hashCode() { final int prime = 31; @@ -174,6 +183,7 @@ public final class Version implements Serializable, Comparable { result = prime * result + ((version == null) ? 0 : version.hashCode()); return result; } + @Override public boolean equals(Object obj) { if (this == obj) @@ -258,16 +268,16 @@ public final class Version implements Serializable, Comparable { @Override public int compare(Qualifier o1, Qualifier o2) { - Qualifier first = o1!=null ? o1 : new Qualifier(RELEASE); - Qualifier second = o2!=null ? o2 : new Qualifier(RELEASE); + Qualifier first = o1 != null ? o1 : new Qualifier(RELEASE); + Qualifier second = o2 != null ? o2 : new Qualifier(RELEASE); int qualifier = compareQualifier(first, second); - return qualifier!=0 ? qualifier : compareQualifierVersion(first, second); + return qualifier != 0 ? qualifier : compareQualifierVersion(first, second); } private static int compareQualifierVersion(Qualifier first, Qualifier second) { - Integer firstVersion = first.getVersion()!=null ? first.getVersion() : 0; - Integer secondVersion = second.getVersion()!=null ? second.getVersion(): 0; + Integer firstVersion = first.getVersion() != null ? first.getVersion() : 0; + Integer secondVersion = second.getVersion() != null ? second.getVersion() : 0; return firstVersion.compareTo(secondVersion); } @@ -277,13 +287,15 @@ public final class Version implements Serializable, Comparable { if (firstIndex == -1 && secondIndex == -1) { // Unknown qualifier, alphabetic ordering return first.qualifier.compareTo(second.qualifier); - } else { + } + else { return firstIndex.compareTo(secondIndex); } } private static int getQualifierIndex(String qualifier) { - return StringUtils.hasText(qualifier) ? KNOWN_QUALIFIERS.indexOf(qualifier) : 0; + return StringUtils.hasText(qualifier) ? KNOWN_QUALIFIERS.indexOf(qualifier) + : 0; } } diff --git a/initializr-generator/src/main/java/io/spring/initializr/util/VersionParser.java b/initializr-generator/src/main/java/io/spring/initializr/util/VersionParser.java index a224de3c..ec088ac3 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/util/VersionParser.java +++ b/initializr-generator/src/main/java/io/spring/initializr/util/VersionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,11 +22,11 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; +import io.spring.initializr.util.Version.Qualifier; + import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import io.spring.initializr.util.Version.Qualifier; - /** * Parser for {@link Version} and {@link VersionRange} that allows to resolve the minor * and patch value against a configurable list of "latest versions". @@ -84,12 +84,14 @@ public class VersionParser { if ("x".equals(minor) || "x".equals(patch)) { Integer minorInt = "x".equals(minor) ? null : Integer.parseInt(minor); Version latest = findLatestVersion(major, minorInt, qualifier); - if (latest==null) { - return new Version(major, ("x".equals(minor) ? 999 : Integer.parseInt(minor)), + if (latest == null) { + return new Version(major, ("x".equals(minor) ? 999 + : Integer.parseInt(minor)), ("x".equals(patch) ? 999 : Integer.parseInt(patch)), qualifier); } return new Version(major, latest.getMinor(), latest.getPatch(), latest.getQualifier()); - } else { + } + else { return new Version(major, Integer.parseInt(minor), Integer.parseInt(patch), qualifier); } } @@ -105,7 +107,8 @@ public class VersionParser { public Version safeParse(String text) { try { return parse(text); - } catch (InvalidVersionException ex) { + } + catch (InvalidVersionException ex) { return null; } } @@ -133,15 +136,15 @@ public class VersionParser { } private Version findLatestVersion(Integer major, Integer minor, - Version.Qualifier qualifier) { + Version.Qualifier qualifier) { List matches = this.latestVersions.stream().filter(it -> { - if (major!=null && !major.equals(it.getMajor())) { + if (major != null && !major.equals(it.getMajor())) { return false; } - if (minor!=null && !minor.equals(it.getMinor())) { + if (minor != null && !minor.equals(it.getMinor())) { return false; } - if (qualifier!=null && !qualifier.equals(it.getQualifier())) { + if (qualifier != null && !qualifier.equals(it.getQualifier())) { return false; } return true; diff --git a/initializr-generator/src/main/java/io/spring/initializr/util/VersionRange.java b/initializr-generator/src/main/java/io/spring/initializr/util/VersionRange.java index bd3cf36c..f25cbac4 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/util/VersionRange.java +++ b/initializr-generator/src/main/java/io/spring/initializr/util/VersionRange.java @@ -40,7 +40,7 @@ public class VersionRange { final boolean lowerInclusive; final Version higherVersion; final boolean higherInclusive; - + // For Jackson @SuppressWarnings("unused") private VersionRange() { @@ -48,7 +48,7 @@ public class VersionRange { } protected VersionRange(Version lowerVersion, boolean lowerInclusive, - Version higherVersion, boolean higherInclusive) { + Version higherVersion, boolean higherInclusive) { this.lowerVersion = lowerVersion; this.lowerInclusive = lowerInclusive; this.higherVersion = higherVersion; @@ -64,14 +64,16 @@ public class VersionRange { int lower = lowerVersion.compareTo(version); if (lower > 0) { return false; - } else if (!lowerInclusive && lower == 0) { + } + else if (!lowerInclusive && lower == 0) { return false; } - if (higherVersion!=null) { + if (higherVersion != null) { int higher = higherVersion.compareTo(version); if (higher < 0) { return false; - } else if (!higherInclusive && higher == 0) { + } + else if (!higherInclusive && higher == 0) { return false; } } @@ -95,13 +97,12 @@ public class VersionRange { } @Override - public - String toString() { + public String toString() { StringBuffer sb = new StringBuffer(); - if (lowerVersion!=null) { + if (lowerVersion != null) { sb.append((lowerInclusive ? ">=" : ">") + lowerVersion); } - if (higherVersion!=null) { + if (higherVersion != null) { sb.append(" and " + (higherInclusive ? "<=" : "<") + higherVersion); } return sb.toString(); diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/AbstractProjectGeneratorTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/AbstractProjectGeneratorTests.java index 6707b378..1e5560c6 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/AbstractProjectGeneratorTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/AbstractProjectGeneratorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,22 +16,11 @@ package io.spring.initializr.generator; -import static org.mockito.Matchers.argThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; -import org.junit.Before; -import org.junit.Rule; -import org.junit.rules.TemporaryFolder; -import org.mockito.ArgumentMatcher; -import org.springframework.context.ApplicationEventPublisher; - import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.metadata.SimpleInitializrMetadataProvider; @@ -39,6 +28,17 @@ import io.spring.initializr.test.generator.GradleBuildAssert; import io.spring.initializr.test.generator.PomAssert; import io.spring.initializr.test.generator.ProjectAssert; import io.spring.initializr.test.metadata.InitializrMetadataTestBuilder; +import org.junit.Before; +import org.junit.Rule; +import org.junit.rules.TemporaryFolder; +import org.mockito.ArgumentMatcher; + +import org.springframework.context.ApplicationEventPublisher; + +import static org.mockito.Matchers.argThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; /** * @@ -97,8 +97,7 @@ public abstract class AbstractProjectGeneratorTests { projectGenerator.setMetadataProvider(new SimpleInitializrMetadataProvider(metadata)); } - protected void verifyProjectSuccessfulEventFor(ProjectRequest request) - { + protected void verifyProjectSuccessfulEventFor(ProjectRequest request) { verify(eventPublisher, times(1)).publishEvent(argThat(new ProjectGeneratedEventMatcher(request))); } 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 0d3d432e..508abc6a 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,18 +16,17 @@ package io.spring.initializr.generator; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.core.IsNot.not; -import static org.junit.Assert.assertThat; - -import org.junit.Before; -import org.junit.Test; - import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.metadata.Type; import io.spring.initializr.test.metadata.InitializrMetadataTestBuilder; import io.spring.initializr.util.TemplateRenderer; +import org.junit.Before; +import org.junit.Test; + +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.core.IsNot.not; +import static org.junit.Assert.assertThat; /** * @author Stephane Nicoll @@ -35,7 +34,7 @@ import io.spring.initializr.util.TemplateRenderer; public class CommandLineHelpGeneratorTests { private CommandLineHelpGenerator generator; - + @Before public void init() { generator = new CommandLineHelpGenerator(new TemplateRenderer()); @@ -111,7 +110,7 @@ public class CommandLineHelpGeneratorTests { createDependency("id-b", "depB"), createDependency("id-a", "depA", "and some description")).build(); String content = generator.generateSpringBootCliCapabilities(metadata, "https://fake-service"); - assertThat(content, containsString("| Id")); + assertThat(content, containsString("| Id")); assertThat(content, containsString("| Tags")); assertThat(content, containsString("id-a | and some description |")); assertThat(content, containsString("id-b | depB")); 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 fca4fb5e..5711ca0b 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 @@ -16,16 +16,16 @@ package io.spring.initializr.generator; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.springframework.core.io.ClassPathResource; - import io.spring.initializr.metadata.BillOfMaterials; import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.test.generator.ProjectAssert; import io.spring.initializr.test.metadata.InitializrMetadataTestBuilder; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import org.springframework.core.io.ClassPathResource; /** * Project generator tests for supported build systems. 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 1ebef325..e1048f86 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,15 +16,15 @@ package io.spring.initializr.generator; -import static io.spring.initializr.test.generator.ProjectAssert.DEFAULT_APPLICATION_NAME; -import static io.spring.initializr.test.generator.ProjectAssert.DEFAULT_PACKAGE_NAME; - +import io.spring.initializr.test.generator.ProjectAssert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; + import org.springframework.core.io.ClassPathResource; -import io.spring.initializr.test.generator.ProjectAssert; +import static io.spring.initializr.test.generator.ProjectAssert.DEFAULT_APPLICATION_NAME; +import static io.spring.initializr.test.generator.ProjectAssert.DEFAULT_PACKAGE_NAME; /** * Project generator tests for supported languages. @@ -121,7 +121,7 @@ public class ProjectGeneratorLanguageTests extends AbstractProjectGeneratorTests ProjectRequest request = createProjectRequest(); request.setLanguage(language); request.setPackaging("war"); - if (bootVersion!=null) { + if (bootVersion != null) { request.setBootVersion(bootVersion); } ProjectAssert project = generateProject(request); 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 08118895..f0c95b1c 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 @@ -16,26 +16,26 @@ package io.spring.initializr.generator; -import static org.hamcrest.CoreMatchers.containsString; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; - import java.util.Collections; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.io.ClassPathResource; - import io.spring.initializr.metadata.BillOfMaterials; import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.test.generator.ProjectAssert; import io.spring.initializr.test.metadata.InitializrMetadataTestBuilder; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.io.ClassPathResource; + +import static org.hamcrest.CoreMatchers.containsString; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; /** * Tests for {@link ProjectGenerator} @@ -186,10 +186,8 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests { generateGradleBuild(request) .contains( "compile('org.springframework.boot:spring-boot-starter-data-jpa')") - .contains("compile('org.springframework.boot:spring-boot-starter-web')") // Added - // by - // war - // packaging + // Added by warpackaging + .contains("compile('org.springframework.boot:spring-boot-starter-web')") .contains( "testCompile('org.springframework.boot:spring-boot-starter-test')") .contains("configurations {") // declare providedRuntime config @@ -464,9 +462,8 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests { .contains("compile('org.springframework.boot:spring-boot-starter-web')") .contains( "compile('org.springframework.boot:spring-boot-starter-data-jpa')") - .contains("runtime('org.h2:h2')").contains("configurations {") // declare - // providedRuntime - // config + // declare providedRuntime config + .contains("runtime('org.h2:h2')").contains("configurations {") .contains("providedRuntime") .contains("providedRuntime('javax.servlet:servlet-api')") .contains("testCompile('org.hamcrest:hamcrest')"); 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 98f8de84..3ccbe8a3 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 @@ -1,6 +1,20 @@ -package io.spring.initializr.generator; +/* + * Copyright 2012-2017 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ -import static org.junit.Assert.*; +package io.spring.initializr.generator; import java.util.ArrayList; import java.util.Arrays; @@ -8,12 +22,14 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.junit.Before; -import org.junit.Test; -import org.springframework.beans.BeanWrapperImpl; - import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.test.metadata.InitializrMetadataTestBuilder; +import org.junit.Before; +import org.junit.Test; + +import org.springframework.beans.BeanWrapperImpl; + +import static org.junit.Assert.assertEquals; /** * Tests for {@link ProjectRequestResolver}. 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 5f88dfe1..a6fec0f4 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,20 +16,19 @@ package io.spring.initializr.generator; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - import java.util.Arrays; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; - import io.spring.initializr.metadata.BillOfMaterials; import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.metadata.InitializrMetadataBuilder; import io.spring.initializr.test.metadata.InitializrMetadataTestBuilder; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; /** * @author Stephane Nicoll 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 2d2e2026..d4a18d1e 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,20 +16,19 @@ package io.spring.initializr.metadata; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.hamcrest.CoreMatchers.sameInstance; -import static org.junit.Assert.assertThat; - import java.util.Arrays; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; - import io.spring.initializr.metadata.BillOfMaterials.Mapping; import io.spring.initializr.util.Version; import io.spring.initializr.util.VersionParser; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.CoreMatchers.sameInstance; +import static org.junit.Assert.assertThat; /** * @author Stephane Nicoll 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 f90272a7..88cb2dcf 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 @@ -16,18 +16,17 @@ package io.spring.initializr.metadata; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; - import java.util.Arrays; +import io.spring.initializr.util.Version; +import io.spring.initializr.util.VersionParser; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import io.spring.initializr.util.Version; -import io.spring.initializr.util.VersionParser; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; /** * @author Stephane Nicoll 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 d3013a37..56c87691 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 @@ -16,14 +16,12 @@ package io.spring.initializr.metadata; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - import java.net.URL; import java.util.Map; import java.util.Properties; import org.junit.Test; + import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; import org.springframework.boot.bind.PropertiesConfigurationFactory; import org.springframework.core.env.MutablePropertySources; @@ -31,6 +29,9 @@ import org.springframework.core.env.PropertiesPropertySource; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + /** * @author Stephane Nicoll */ 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 3faf93dc..215be805 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,18 +16,17 @@ package io.spring.initializr.metadata; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.List; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; - import io.spring.initializr.metadata.BillOfMaterials.Mapping; import io.spring.initializr.test.metadata.InitializrMetadataTestBuilder; import io.spring.initializr.util.Version; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + +import static org.assertj.core.api.Assertions.assertThat; /** * @author Stephane Nicoll 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 d2b9452c..2cbcae63 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 @@ -16,10 +16,6 @@ package io.spring.initializr.metadata; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import java.net.URI; import java.util.Collections; import java.util.LinkedHashMap; @@ -29,6 +25,10 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + /** * Tests for {@link Link}. * diff --git a/initializr-generator/src/test/java/io/spring/initializr/metadata/SingleSelectCapabilityTests.java b/initializr-generator/src/test/java/io/spring/initializr/metadata/SingleSelectCapabilityTests.java index 65945dee..639dcd43 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/metadata/SingleSelectCapabilityTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/metadata/SingleSelectCapabilityTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ public class SingleSelectCapabilityTests { public void defaultNoDefault() { SingleSelectCapability capability = new SingleSelectCapability("test"); capability.getContent().add(DefaultMetadataElement.create("foo", false)); - capability.getContent().add(DefaultMetadataElement.create("bar",false)); + capability.getContent().add(DefaultMetadataElement.create("bar", false)); assertNull(capability.getDefault()); } @@ -44,7 +44,7 @@ public class SingleSelectCapabilityTests { public void defaultType() { SingleSelectCapability capability = new SingleSelectCapability("test"); capability.getContent().add(DefaultMetadataElement.create("foo", false)); - DefaultMetadataElement second = DefaultMetadataElement.create("bar",true); + DefaultMetadataElement second = DefaultMetadataElement.create("bar", true); capability.getContent().add(second); assertEquals(second, capability.getDefault()); } @@ -56,7 +56,7 @@ public class SingleSelectCapabilityTests { capability.getContent().add(foo); SingleSelectCapability anotherCapability = new SingleSelectCapability("test"); - DefaultMetadataElement bar =DefaultMetadataElement.create("bar", false); + DefaultMetadataElement bar = DefaultMetadataElement.create("bar", false); anotherCapability.getContent().add(bar); capability.merge(anotherCapability); diff --git a/initializr-generator/src/test/java/io/spring/initializr/metadata/TextCapabilityTests.java b/initializr-generator/src/test/java/io/spring/initializr/metadata/TextCapabilityTests.java index b1f99e57..d03ffee5 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/metadata/TextCapabilityTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/metadata/TextCapabilityTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,10 @@ package io.spring.initializr.metadata; -import static org.junit.Assert.assertEquals; - import org.junit.Test; +import static org.junit.Assert.assertEquals; + /** * @author Stephane Nicoll */ diff --git a/initializr-generator/src/test/java/io/spring/initializr/metadata/TypeCapabilityTests.java b/initializr-generator/src/test/java/io/spring/initializr/metadata/TypeCapabilityTests.java index c885e03e..916fbdf0 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/metadata/TypeCapabilityTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/metadata/TypeCapabilityTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,11 @@ package io.spring.initializr.metadata; +import org.junit.Test; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import org.junit.Test; - /** * @author Stephane Nicoll */ @@ -63,20 +63,20 @@ public class TypeCapabilityTests { @Test public void mergeAddEntry() { TypeCapability capability = new TypeCapability(); - Type first = new Type(); - first.setId("foo"); - first.setDefault(false); - capability.getContent().add(first); + Type first = new Type(); + first.setId("foo"); + first.setDefault(false); + capability.getContent().add(first); TypeCapability anotherCapability = new TypeCapability(); - Type another = new Type(); - another.setId("foo"); - another.setDefault(false); - Type second = new Type(); - second.setId("bar"); - second.setDefault(true); - anotherCapability.getContent().add(another); - anotherCapability.getContent().add(second); + Type another = new Type(); + another.setId("foo"); + another.setDefault(false); + Type second = new Type(); + second.setId("bar"); + second.setDefault(true); + anotherCapability.getContent().add(another); + anotherCapability.getContent().add(second); capability.merge(anotherCapability); assertEquals(2, capability.getContent().size()); diff --git a/initializr-generator/src/test/java/io/spring/initializr/test/generator/GradleBuildAssert.java b/initializr-generator/src/test/java/io/spring/initializr/test/generator/GradleBuildAssert.java index 85622804..0ac61ff7 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/test/generator/GradleBuildAssert.java +++ b/initializr-generator/src/test/java/io/spring/initializr/test/generator/GradleBuildAssert.java @@ -44,7 +44,7 @@ public class GradleBuildAssert { } public GradleBuildAssert hasArtifactId(String artifactId) { - return contains("baseName = '"+ artifactId+"'"); + return contains("baseName = '" + artifactId + "'"); } public GradleBuildAssert hasVersion(String version) { 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 66c4c1f4..4040f0b5 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 @@ -16,16 +16,16 @@ package io.spring.initializr.test.generator; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.net.MalformedURLException; import java.net.URL; import java.util.LinkedHashMap; import java.util.Map; +import io.spring.initializr.generator.ProjectRequest; +import io.spring.initializr.metadata.BillOfMaterials; +import io.spring.initializr.metadata.Dependency; +import io.spring.initializr.metadata.InitializrConfiguration.Env.Maven.ParentPom; +import io.spring.initializr.metadata.Repository; import org.custommonkey.xmlunit.SimpleNamespaceContext; import org.custommonkey.xmlunit.XMLUnit; import org.custommonkey.xmlunit.XpathEngine; @@ -37,11 +37,10 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import io.spring.initializr.generator.ProjectRequest; -import io.spring.initializr.metadata.BillOfMaterials; -import io.spring.initializr.metadata.Dependency; -import io.spring.initializr.metadata.InitializrConfiguration.Env.Maven.ParentPom; -import io.spring.initializr.metadata.Repository; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * XPath assertions that are specific to a standard Maven POM. @@ -231,7 +230,7 @@ public class PomAssert { dependency.getScope()); } if (expected.getType() != null) { - assertEquals("Wrong type for "+ dependency, expected.getType(), + assertEquals("Wrong type for " + dependency, expected.getType(), dependency.getType()); } return this; 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 5c4e3e6e..92f511f0 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 @@ -16,9 +16,6 @@ package io.spring.initializr.test.generator; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -30,6 +27,9 @@ import org.springframework.core.io.support.PropertiesLoaderUtils; import org.springframework.util.StreamUtils; import org.springframework.util.StringUtils; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + /** * Various project based assertions. * @@ -74,8 +74,8 @@ public class ProjectAssert { assertTrue("No directory " + name + " found in " + dir.getAbsolutePath(), projectDir.exists()); assertTrue(name + " is not a directory", projectDir.isDirectory()); - return new ProjectAssert(projectDir); // Replacing the root dir so that other - // assertions match the root + // Replacing the root dir so that other assertions match the root + return new ProjectAssert(projectDir); } /** @@ -201,8 +201,8 @@ public class ProjectAssert { String packageName = expectedPackageName.replace(".", "/"); return isGenericProject(expectedPackageName, expectedApplicationName, codeLocation, extension).hasStaticAndTemplatesResources(true) - .hasFile("src/main/" + codeLocation + "/" + packageName - + "/ServletInitializer." + extension); + .hasFile("src/main/" + codeLocation + "/" + packageName + + "/ServletInitializer." + extension); } public ProjectAssert hasStaticAndTemplatesResources(boolean web) { 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 cce06be7..605624ee 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 @@ -20,8 +20,6 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Arrays; -import org.springframework.util.StringUtils; - import io.spring.initializr.metadata.BillOfMaterials; import io.spring.initializr.metadata.DefaultMetadataElement; import io.spring.initializr.metadata.Dependency; @@ -32,6 +30,8 @@ import io.spring.initializr.metadata.InitializrMetadataBuilder; import io.spring.initializr.metadata.Repository; import io.spring.initializr.metadata.Type; +import org.springframework.util.StringUtils; + /** * Easily create a {@link InitializrMetadata} instance for testing purposes. * @@ -111,7 +111,7 @@ public class InitializrMetadataTestBuilder { } public InitializrMetadataTestBuilder addPackaging(String id, boolean defaultValue) { - builder.withCustomizer(it -> { + builder.withCustomizer(it -> { DefaultMetadataElement packaging = new DefaultMetadataElement(); packaging.setId(id); packaging.setName(id); @@ -126,7 +126,7 @@ public class InitializrMetadataTestBuilder { } public InitializrMetadataTestBuilder addJavaVersion(String version, boolean defaultValue) { - builder.withCustomizer(it -> { + builder.withCustomizer(it -> { DefaultMetadataElement element = new DefaultMetadataElement(); element.setId(version); element.setName(version); @@ -141,7 +141,7 @@ public class InitializrMetadataTestBuilder { } public InitializrMetadataTestBuilder addLanguage(String id, boolean defaultValue) { - builder.withCustomizer(it -> { + builder.withCustomizer(it -> { DefaultMetadataElement element = new DefaultMetadataElement(); element.setId(id); element.setName(id); @@ -157,7 +157,7 @@ public class InitializrMetadataTestBuilder { } public InitializrMetadataTestBuilder addBootVersion(String id, boolean defaultValue) { - builder.withCustomizer(it -> { + builder.withCustomizer(it -> { DefaultMetadataElement element = new DefaultMetadataElement(); element.setId(id); element.setName(id); @@ -173,29 +173,29 @@ public class InitializrMetadataTestBuilder { } public InitializrMetadataTestBuilder addBom(String id, BillOfMaterials bom) { - builder.withCustomizer( it -> { + builder.withCustomizer(it -> { it.getConfiguration().getEnv().getBoms().put(id, bom); }); return this; } public InitializrMetadataTestBuilder setGradleEnv(String dependencyManagementPluginVersion) { - builder.withCustomizer( it-> { + builder.withCustomizer(it -> { it.getConfiguration().getEnv().getGradle().setDependencyManagementPluginVersion(dependencyManagementPluginVersion); }); return this; } public InitializrMetadataTestBuilder setKotlinEnv(String kotlinVersion) { - builder.withCustomizer( it-> { + builder.withCustomizer(it -> { it.getConfiguration().getEnv().getKotlin().setVersion(kotlinVersion); }); return this; } public InitializrMetadataTestBuilder setMavenParent(String groupId, String artifactId, - String version, boolean includeSpringBootBom) { - builder.withCustomizer( it-> { + String version, boolean includeSpringBootBom) { + builder.withCustomizer(it -> { ParentPom parent = it.getConfiguration().getEnv().getMaven().getParent(); parent.setGroupId(groupId); parent.setArtifactId(artifactId); @@ -206,7 +206,7 @@ public class InitializrMetadataTestBuilder { } public InitializrMetadataTestBuilder addRepository(String id, String name, String url, boolean snapshotsEnabled) { - builder.withCustomizer( it-> { + builder.withCustomizer(it -> { Repository repo = new Repository(); repo.setName(name); try { diff --git a/initializr-generator/src/test/java/io/spring/initializr/util/AgentTests.java b/initializr-generator/src/test/java/io/spring/initializr/util/AgentTests.java index a59f4679..b841aadf 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/util/AgentTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/util/AgentTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ package io.spring.initializr.util; +import org.junit.Test; + import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; import static org.junit.Assert.assertThat; -import org.junit.Test; - /** * Tests for {@link Agent}. * 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 eb87e6ce..d391846e 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,6 @@ package io.spring.initializr.util; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.lessThan; -import static org.junit.Assert.assertNull; - import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -29,6 +24,11 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.lessThan; +import static org.junit.Assert.assertNull; + /** * Tests for {@link VersionParser}. * 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 a36c1f18..aa30d9fe 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package io.spring.initializr.util; -import static org.hamcrest.core.IsNot.not; -import static org.junit.Assert.assertThat; - import java.util.Arrays; import java.util.Collections; @@ -28,6 +25,9 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import static org.hamcrest.core.IsNot.not; +import static org.junit.Assert.assertThat; + /** * @author Stephane Nicoll */ diff --git a/initializr-generator/src/test/java/io/spring/initializr/util/VersionTests.java b/initializr-generator/src/test/java/io/spring/initializr/util/VersionTests.java index aab52804..467c8fbe 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/util/VersionTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/util/VersionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,16 +16,16 @@ package io.spring.initializr.util; +import java.util.Collections; + +import org.junit.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.comparesEqualTo; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.lessThan; -import java.util.Collections; - -import org.junit.Test; - /** * @author Stephane Nicoll */ diff --git a/initializr-service/pom.xml b/initializr-service/pom.xml index a668b2bb..d1e9e384 100644 --- a/initializr-service/pom.xml +++ b/initializr-service/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 @@ -66,7 +67,9 @@ ${project.basedir}/../.git yyyy-MM-dd'T'HH:mm:ssZ true - ${project.build.outputDirectory}/git.properties + + ${project.build.outputDirectory}/git.properties + @@ -89,7 +92,8 @@ - ${spring.boot.version} + ${spring.boot.version} + diff --git a/initializr-web/pom.xml b/initializr-web/pom.xml index b0f45212..8a36e50b 100644 --- a/initializr-web/pom.xml +++ b/initializr-web/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 io.spring.initializr @@ -120,7 +121,8 @@ true - ${basedir}/src/assembly/snippets.xml + ${basedir}/src/assembly/snippets.xml + ${basedir}/src/assembly/stub.xml diff --git a/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/CloudfoundryEnvironmentPostProcessor.java b/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/CloudfoundryEnvironmentPostProcessor.java index 5a3b430a..24667074 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/CloudfoundryEnvironmentPostProcessor.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/CloudfoundryEnvironmentPostProcessor.java @@ -46,9 +46,9 @@ public class CloudfoundryEnvironmentPostProcessor @Override public void postProcessEnvironment(ConfigurableEnvironment environment, - SpringApplication springApplication) { + SpringApplication springApplication) { - Map map = new LinkedHashMap<>(); + Map map = new LinkedHashMap<>(); String uri = environment.getProperty("vcap.services.stats-index.credentials.uri"); if (StringUtils.hasText(uri)) { UriComponents uriComponents = UriComponentsBuilder.fromUriString(uri).build(); @@ -71,7 +71,7 @@ public class CloudfoundryEnvironmentPostProcessor } private static void addOrReplace(MutablePropertySources propertySources, - Map map) { + Map map) { MapPropertySource target = null; if (propertySources.contains(PROPERTY_SOURCE_NAME)) { PropertySource source = propertySources.get(PROPERTY_SOURCE_NAME); 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 5a79675b..a25fa9ce 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 @@ -21,6 +21,22 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; +import com.github.benmanes.caffeine.cache.Caffeine; +import io.spring.initializr.generator.ProjectGenerator; +import io.spring.initializr.generator.ProjectRequestPostProcessor; +import io.spring.initializr.generator.ProjectRequestResolver; +import io.spring.initializr.generator.ProjectResourceLocator; +import io.spring.initializr.metadata.DependencyMetadataProvider; +import io.spring.initializr.metadata.InitializrMetadata; +import io.spring.initializr.metadata.InitializrMetadataBuilder; +import io.spring.initializr.metadata.InitializrMetadataProvider; +import io.spring.initializr.metadata.InitializrProperties; +import io.spring.initializr.util.TemplateRenderer; +import io.spring.initializr.web.project.MainController; +import io.spring.initializr.web.support.DefaultDependencyMetadataProvider; +import io.spring.initializr.web.support.DefaultInitializrMetadataProvider; +import io.spring.initializr.web.ui.UiController; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.bind.RelaxedPropertyResolver; @@ -37,23 +53,6 @@ import org.springframework.core.env.Environment; import org.springframework.web.client.RestTemplate; import org.springframework.web.servlet.resource.ResourceUrlProvider; -import com.github.benmanes.caffeine.cache.Caffeine; - -import io.spring.initializr.generator.ProjectGenerator; -import io.spring.initializr.generator.ProjectRequestPostProcessor; -import io.spring.initializr.generator.ProjectRequestResolver; -import io.spring.initializr.generator.ProjectResourceLocator; -import io.spring.initializr.metadata.DependencyMetadataProvider; -import io.spring.initializr.metadata.InitializrMetadata; -import io.spring.initializr.metadata.InitializrMetadataBuilder; -import io.spring.initializr.metadata.InitializrMetadataProvider; -import io.spring.initializr.metadata.InitializrProperties; -import io.spring.initializr.util.TemplateRenderer; -import io.spring.initializr.web.project.MainController; -import io.spring.initializr.web.support.DefaultDependencyMetadataProvider; -import io.spring.initializr.web.support.DefaultInitializrMetadataProvider; -import io.spring.initializr.web.ui.UiController; - /** * {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration * Auto-configuration} to configure Spring initializr. In a web environment, @@ -81,10 +80,10 @@ public class InitializrAutoConfiguration { @Bean @ConditionalOnMissingBean public MainController initializrMainController(InitializrMetadataProvider metadataProvider, - TemplateRenderer templateRenderer, - ResourceUrlProvider resourceUrlProvider, - ProjectGenerator projectGenerator, - DependencyMetadataProvider dependencyMetadataProvider) { + TemplateRenderer templateRenderer, + ResourceUrlProvider resourceUrlProvider, + ProjectGenerator projectGenerator, + DependencyMetadataProvider dependencyMetadataProvider) { return new MainController(metadataProvider, templateRenderer, resourceUrlProvider , projectGenerator, dependencyMetadataProvider); } diff --git a/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/WebConfig.java b/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/WebConfig.java index d96714e8..7204c770 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/WebConfig.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/WebConfig.java @@ -21,6 +21,9 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; +import io.spring.initializr.util.Agent; +import io.spring.initializr.util.Agent.AgentId; + import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.util.StringUtils; @@ -31,9 +34,6 @@ import org.springframework.web.servlet.config.annotation.ContentNegotiationConfi import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; import org.springframework.web.util.UrlPathHelper; -import io.spring.initializr.util.Agent; -import io.spring.initializr.util.Agent.AgentId; - /** * Spring Initializr web configuration. * @@ -62,12 +62,12 @@ public class WebConfig extends WebMvcConfigurerAdapter { return Collections.emptyList(); } String userAgent = request.getHeader(HttpHeaders.USER_AGENT); - if (userAgent!=null) { + if (userAgent != null) { Agent agent = Agent.fromUserAgent(userAgent); - if (agent!=null) { - if (AgentId.CURL.equals(agent.getId()) || AgentId.HTTPIE.equals(agent.getId())) { - return Collections.singletonList(MediaType.TEXT_PLAIN); - } + if (agent != null) { + if (AgentId.CURL.equals(agent.getId()) || AgentId.HTTPIE.equals(agent.getId())) { + return Collections.singletonList(MediaType.TEXT_PLAIN); + } } } return Collections.singletonList(MediaType.APPLICATION_JSON); diff --git a/initializr-web/src/main/java/io/spring/initializr/web/mapper/DependencyMetadataV21JsonMapper.java b/initializr-web/src/main/java/io/spring/initializr/web/mapper/DependencyMetadataV21JsonMapper.java index f76c2925..88eb45a9 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/mapper/DependencyMetadataV21JsonMapper.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/mapper/DependencyMetadataV21JsonMapper.java @@ -20,12 +20,11 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.stream.Collectors; -import org.json.JSONObject; - import io.spring.initializr.metadata.BillOfMaterials; import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.DependencyMetadata; import io.spring.initializr.metadata.Repository; +import org.json.JSONObject; /** * A {@link DependencyMetadataJsonMapper} handling the metadata format for v2.1. diff --git a/initializr-web/src/main/java/io/spring/initializr/web/mapper/InitializrMetadataV21JsonMapper.java b/initializr-web/src/main/java/io/spring/initializr/web/mapper/InitializrMetadataV21JsonMapper.java index 88bc9a2b..f8e9d1e8 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/mapper/InitializrMetadataV21JsonMapper.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/mapper/InitializrMetadataV21JsonMapper.java @@ -20,14 +20,14 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import io.spring.initializr.metadata.Dependency; +import io.spring.initializr.metadata.Type; import org.json.JSONObject; + import org.springframework.hateoas.TemplateVariable; import org.springframework.hateoas.TemplateVariables; import org.springframework.hateoas.UriTemplate; -import io.spring.initializr.metadata.Dependency; -import io.spring.initializr.metadata.Type; - /** * A {@link InitializrMetadataJsonMapper} handling the metadata format for v2.1 *

@@ -50,7 +50,7 @@ public class InitializrMetadataV21JsonMapper extends InitializrMetadataV2JsonMap @Override protected Map links(JSONObject parent, List types, String appUrl) { Map links = super.links(parent, types, appUrl); - links.put("dependencies", dependenciesLink(appUrl)); + links.put("dependencies", dependenciesLink(appUrl)); parent.put("_links", links); return links; } @@ -58,10 +58,10 @@ public class InitializrMetadataV21JsonMapper extends InitializrMetadataV2JsonMap @Override protected Map mapDependency(Dependency dependency) { Map content = mapValue(dependency); - if (dependency.getVersionRange()!=null) { + if (dependency.getVersionRange() != null) { content.put("versionRange", dependency.getVersionRange()); } - if (dependency.getLinks()!=null && !dependency.getLinks().isEmpty()) { + if (dependency.getLinks() != null && !dependency.getLinks().isEmpty()) { content.put("_links", LinkMapper.mapLinks(dependency.getLinks())); } return content; diff --git a/initializr-web/src/main/java/io/spring/initializr/web/mapper/InitializrMetadataV2JsonMapper.java b/initializr-web/src/main/java/io/spring/initializr/web/mapper/InitializrMetadataV2JsonMapper.java index 0f4a1071..5d4f3afd 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/mapper/InitializrMetadataV2JsonMapper.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/mapper/InitializrMetadataV2JsonMapper.java @@ -22,12 +22,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.json.JSONObject; -import org.springframework.hateoas.TemplateVariable; -import org.springframework.hateoas.TemplateVariables; -import org.springframework.hateoas.UriTemplate; -import org.springframework.util.StringUtils; - import io.spring.initializr.metadata.DefaultMetadataElement; import io.spring.initializr.metadata.DependenciesCapability; import io.spring.initializr.metadata.Dependency; @@ -39,6 +33,12 @@ import io.spring.initializr.metadata.SingleSelectCapability; import io.spring.initializr.metadata.TextCapability; import io.spring.initializr.metadata.Type; import io.spring.initializr.metadata.TypeCapability; +import org.json.JSONObject; + +import org.springframework.hateoas.TemplateVariable; +import org.springframework.hateoas.TemplateVariables; +import org.springframework.hateoas.UriTemplate; +import org.springframework.util.StringUtils; /** * A {@link InitializrMetadataJsonMapper} handling the metadata format for v2. @@ -176,7 +176,7 @@ public class InitializrMetadataV2JsonMapper implements InitializrMetadataJsonMap } protected Map mapDependency(Dependency dependency) { - if (dependency.getVersionRange() == null) { + if (dependency.getVersionRange() == null) { // only map the dependency if no versionRange is set return mapValue(dependency); } 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 6667e704..e137e207 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 @@ -23,17 +23,17 @@ import java.util.function.Function; import javax.servlet.http.HttpServletResponse; +import io.spring.initializr.generator.InvalidProjectRequestException; +import io.spring.initializr.metadata.InitializrMetadata; +import io.spring.initializr.metadata.InitializrMetadataProvider; +import io.spring.initializr.metadata.TypeCapability; + import org.springframework.beans.BeanWrapperImpl; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.servlet.resource.ResourceUrlProvider; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; -import io.spring.initializr.generator.InvalidProjectRequestException; -import io.spring.initializr.metadata.InitializrMetadata; -import io.spring.initializr.metadata.InitializrMetadataProvider; -import io.spring.initializr.metadata.TypeCapability; - /** * A base controller that uses a {@link InitializrMetadataProvider} * @@ -72,7 +72,7 @@ public abstract class AbstractInitializrController { /** * Render the home page with the specified template. */ - protected void renderHome(Map model) throws Exception { + protected void renderHome(Map model) throws Exception { InitializrMetadata metadata = metadataProvider.get(); model.put("serviceUrl", generateAppUrl()); @@ -80,7 +80,8 @@ public abstract class AbstractInitializrController { for (PropertyDescriptor descriptor : wrapper.getPropertyDescriptors()) { if ("types".equals(descriptor.getName())) { model.put("types", removeTypes(metadata.getTypes())); - } else { + } + else { model.put(descriptor.getName(), wrapper.getPropertyValue(descriptor.getName())); } } @@ -101,7 +102,7 @@ public abstract class AbstractInitializrController { result.setTitle(types.getTitle()); result.getContent().addAll(types.getContent()); // Only keep project type - result.getContent().removeIf(t -> !"project".equals(t.getTags().get("format")) ); + result.getContent().removeIf(t -> !"project".equals(t.getTags().get("format"))); return result; } diff --git a/initializr-web/src/main/java/io/spring/initializr/web/project/LegacyStsController.java b/initializr-web/src/main/java/io/spring/initializr/web/project/LegacyStsController.java index 367869d1..04a87fc3 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/project/LegacyStsController.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/project/LegacyStsController.java @@ -18,12 +18,12 @@ package io.spring.initializr.web.project; import java.util.Map; +import io.spring.initializr.metadata.InitializrMetadataProvider; + import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.resource.ResourceUrlProvider; -import io.spring.initializr.metadata.InitializrMetadataProvider; - /** * A controller used to serve the legacy home page used by STS. * @@ -35,7 +35,7 @@ public class LegacyStsController extends AbstractInitializrController { public LegacyStsController(InitializrMetadataProvider metadataProvider, ResourceUrlProvider resourceUrlProvider) { super(metadataProvider, resourceUrlProvider); } - + @RequestMapping(value = "/sts", produces = "text/html") public String stsHome(Map model) throws Exception { renderHome(model); 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 16ad187e..52893648 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 @@ -16,10 +16,6 @@ package io.spring.initializr.web.project; -import static io.spring.initializr.util.Agent.AgentId.CURL; -import static io.spring.initializr.util.Agent.AgentId.HTTPIE; -import static io.spring.initializr.util.Agent.AgentId.SPRING_BOOT_CLI; - import java.io.File; import java.io.FileInputStream; import java.io.UnsupportedEncodingException; @@ -28,26 +24,7 @@ import java.nio.charset.StandardCharsets; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.rauschig.jarchivelib.ArchiverFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.http.CacheControl; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.http.ResponseEntity.BodyBuilder; -import org.springframework.stereotype.Controller; -import org.springframework.util.DigestUtils; -import org.springframework.util.StreamUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.servlet.resource.ResourceUrlProvider; - import com.samskivert.mustache.Mustache; - import io.spring.initializr.generator.BasicProjectRequest; import io.spring.initializr.generator.CommandLineHelpGenerator; import io.spring.initializr.generator.ProjectGenerator; @@ -64,6 +41,28 @@ import io.spring.initializr.web.mapper.InitializrMetadataJsonMapper; import io.spring.initializr.web.mapper.InitializrMetadataV21JsonMapper; import io.spring.initializr.web.mapper.InitializrMetadataV2JsonMapper; import io.spring.initializr.web.mapper.InitializrMetadataVersion; +import org.rauschig.jarchivelib.ArchiverFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.springframework.http.CacheControl; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.http.ResponseEntity.BodyBuilder; +import org.springframework.stereotype.Controller; +import org.springframework.util.DigestUtils; +import org.springframework.util.StreamUtils; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.resource.ResourceUrlProvider; + +import static io.spring.initializr.util.Agent.AgentId.CURL; +import static io.spring.initializr.util.Agent.AgentId.HTTPIE; +import static io.spring.initializr.util.Agent.AgentId.SPRING_BOOT_CLI; /** * The main initializr controller provides access to the configured metadata and serves as @@ -179,10 +178,10 @@ public class MainController extends AbstractInitializrController { private static InitializrMetadataJsonMapper getJsonMapper( InitializrMetadataVersion version) { switch (version) { - case V2: - return new InitializrMetadataV2JsonMapper(); - default: - return new InitializrMetadataV21JsonMapper(); + case V2: + return new InitializrMetadataV2JsonMapper(); + default: + return new InitializrMetadataV21JsonMapper(); } } diff --git a/initializr-web/src/main/java/io/spring/initializr/web/support/DefaultDependencyMetadataProvider.java b/initializr-web/src/main/java/io/spring/initializr/web/support/DefaultDependencyMetadataProvider.java index 061d5d90..ef127fa3 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/support/DefaultDependencyMetadataProvider.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/support/DefaultDependencyMetadataProvider.java @@ -19,8 +19,6 @@ package io.spring.initializr.web.support; import java.util.LinkedHashMap; import java.util.Map; -import org.springframework.cache.annotation.Cacheable; - import io.spring.initializr.metadata.BillOfMaterials; import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.DependencyMetadata; @@ -29,6 +27,8 @@ import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.metadata.Repository; import io.spring.initializr.util.Version; +import org.springframework.cache.annotation.Cacheable; + /** * A default {@link DependencyMetadataProvider} implementation. * @@ -48,14 +48,14 @@ public class DefaultDependencyMetadataProvider implements DependencyMetadataProv Map repositories = new LinkedHashMap<>(); for (Dependency d : dependencies.values()) { - if (d.getRepository()!=null) { + if (d.getRepository() != null) { repositories.put(d.getRepository(), metadata.getConfiguration().getEnv().getRepositories().get(d.getRepository())); } } Map boms = new LinkedHashMap<>(); for (Dependency d : dependencies.values()) { - if (d.getBom()!=null) { + if (d.getBom() != null) { boms.put(d.getBom(), metadata.getConfiguration().getEnv().getBoms().get(d.getBom()).resolve(bootVersion)); } } 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 41edfbdb..8b514007 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 @@ -18,15 +18,15 @@ package io.spring.initializr.web.support; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.util.StringUtils; -import org.springframework.web.client.RestTemplate; - import io.spring.initializr.metadata.DefaultMetadataElement; import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.metadata.InitializrMetadataProvider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.springframework.cache.annotation.Cacheable; +import org.springframework.util.StringUtils; +import org.springframework.web.client.RestTemplate; /** * A default {@link InitializrMetadataProvider} that is able to refresh @@ -35,7 +35,7 @@ import io.spring.initializr.metadata.InitializrMetadataProvider; * @author Stephane Nicoll */ public class DefaultInitializrMetadataProvider implements InitializrMetadataProvider { - + private static final Logger log = LoggerFactory .getLogger(DefaultInitializrMetadataProvider.class); @@ -56,7 +56,7 @@ public class DefaultInitializrMetadataProvider implements InitializrMetadataProv protected void updateInitializrMetadata(InitializrMetadata metadata) { List bootVersions = fetchBootVersions(); - if (bootVersions!=null && !bootVersions.isEmpty()) { + if (bootVersions != null && !bootVersions.isEmpty()) { if (bootVersions.stream().noneMatch(it -> it.isDefault())) { // No default specified bootVersions.get(0).setDefault(true); } @@ -70,7 +70,8 @@ public class DefaultInitializrMetadataProvider implements InitializrMetadataProv try { log.info("Fetching boot metadata from {}", url); return new SpringBootMetadataReader(restTemplate, url).getBootVersions(); - } catch (Exception e) { + } + 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 9236e3de..bd089348 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 @@ -19,12 +19,11 @@ package io.spring.initializr.web.support; import java.util.ArrayList; import java.util.List; +import io.spring.initializr.metadata.DefaultMetadataElement; import org.json.JSONArray; import org.json.JSONObject; -import org.springframework.util.StringUtils; -import org.springframework.web.client.RestTemplate; -import io.spring.initializr.metadata.DefaultMetadataElement; +import org.springframework.web.client.RestTemplate; /** * Reads metadata from the main spring.io website. This is a stateful @@ -50,7 +49,7 @@ public class SpringBootMetadataReader { public List getBootVersions() { JSONArray array = content.getJSONArray("projectReleases"); List list = new ArrayList<>(); - for (int i=0; i { g.getContent().forEach(d -> { - if (v!=null && d.getVersionRange()!=null) { + if (v != null && d.getVersionRange() != null) { if (d.match(v)) { content.add(new DependencyItem(g.getName(), d)); } - } else { + } + else { content.add(new DependencyItem(g.getName(), d)); } }); @@ -84,10 +85,10 @@ public class UiController { result.put("id", d.getId()); result.put("name", d.getName()); result.put("group", item.group); - if (d.getDescription()!=null) { + if (d.getDescription() != null) { result.put("description", d.getDescription()); } - if (d.getWeight()>0) { + if (d.getWeight() > 0) { result.put("weight", d.getWeight()); } if (!CollectionUtils.isEmpty(d.getKeywords()) || !CollectionUtils.isEmpty(d.getAliases())) { 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 d3572d75..01df7e36 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,15 @@ package io.spring.initializr.web; -import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; import io.spring.initializr.web.AbstractInitializrIntegrationTests.Config; - import org.junit.runner.RunWith; + import org.springframework.boot.context.embedded.LocalServerPort; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; + /** * @author Stephane Nicoll * @author Dave Syer 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 d9cf4e15..448f76fb 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 @@ -16,6 +16,10 @@ package io.spring.initializr.web; +import io.spring.initializr.web.AbstractInitializrControllerIntegrationTests.RestTemplateConfig; +import io.spring.initializr.web.test.MockMvcClientHttpRequestFactory; +import io.spring.initializr.web.test.MockMvcClientHttpRequestFactoryTestExecutionListener; + import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs; @@ -27,10 +31,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.TestExecutionListeners.MergeMode; -import io.spring.initializr.web.AbstractInitializrControllerIntegrationTests.RestTemplateConfig; -import io.spring.initializr.web.test.MockMvcClientHttpRequestFactory; -import io.spring.initializr.web.test.MockMvcClientHttpRequestFactoryTestExecutionListener; - /** * @author Stephane Nicoll */ 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 2a0d172d..5c3cb122 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package io.spring.initializr.web; -import static org.junit.Assert.assertTrue; - import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -28,6 +26,14 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import io.spring.initializr.metadata.InitializrMetadata; +import io.spring.initializr.metadata.InitializrMetadataBuilder; +import io.spring.initializr.metadata.InitializrMetadataProvider; +import io.spring.initializr.metadata.InitializrProperties; +import io.spring.initializr.test.generator.ProjectAssert; +import io.spring.initializr.web.AbstractInitializrIntegrationTests.Config; +import io.spring.initializr.web.mapper.InitializrMetadataVersion; +import io.spring.initializr.web.support.DefaultInitializrMetadataProvider; import org.json.JSONObject; import org.junit.Before; import org.junit.Rule; @@ -36,6 +42,7 @@ import org.junit.runner.RunWith; import org.rauschig.jarchivelib.ArchiverFactory; import org.skyscreamer.jsonassert.JSONAssert; import org.skyscreamer.jsonassert.JSONCompareMode; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; @@ -51,14 +58,7 @@ import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.StreamUtils; import org.springframework.web.client.RestTemplate; -import io.spring.initializr.metadata.InitializrMetadata; -import io.spring.initializr.metadata.InitializrMetadataBuilder; -import io.spring.initializr.metadata.InitializrMetadataProvider; -import io.spring.initializr.metadata.InitializrProperties; -import io.spring.initializr.test.generator.ProjectAssert; -import io.spring.initializr.web.AbstractInitializrIntegrationTests.Config; -import io.spring.initializr.web.mapper.InitializrMetadataVersion; -import io.spring.initializr.web.support.DefaultInitializrMetadataProvider; +import static org.junit.Assert.assertTrue; /** * @author Stephane Nicoll @@ -183,12 +183,12 @@ public abstract class AbstractInitializrIntegrationTests { File project = folder.newFolder(); switch (archiveType) { - case ZIP: - ArchiverFactory.createArchiver("zip").extract(archiveFile, project); - break; - case TGZ: - ArchiverFactory.createArchiver("tar", "gz").extract(archiveFile, project); - break; + case ZIP: + ArchiverFactory.createArchiver("zip").extract(archiveFile, project); + break; + case TGZ: + ArchiverFactory.createArchiver("tar", "gz").extract(archiveFile, project); + break; } return new ProjectAssert(project); } 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 d4e059db..a6e7c3df 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,15 @@ package io.spring.initializr.web.autoconfigure; +import org.junit.Test; + +import org.springframework.boot.SpringApplication; +import org.springframework.mock.env.MockEnvironment; + import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; import static org.junit.Assert.assertThat; -import org.junit.Test; -import org.springframework.boot.SpringApplication; -import org.springframework.mock.env.MockEnvironment; - /** * @author Stephane Nicoll */ 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 7406919e..271593f3 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,19 +16,18 @@ package io.spring.initializr.web.mapper; -import static org.junit.Assert.assertEquals; - import java.net.URL; import java.util.Collections; -import org.json.JSONObject; -import org.junit.Test; - import io.spring.initializr.metadata.BillOfMaterials; import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.DependencyMetadata; import io.spring.initializr.metadata.Repository; import io.spring.initializr.util.Version; +import org.json.JSONObject; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; /** * @author Stephane Nicoll 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 73e269db..72039321 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 @@ -16,16 +16,15 @@ package io.spring.initializr.web.mapper; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import org.json.JSONObject; -import org.junit.Test; - import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.metadata.Link; import io.spring.initializr.test.metadata.InitializrMetadataTestBuilder; +import org.json.JSONObject; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * @author Stephane Nicoll @@ -51,12 +50,12 @@ public class InitializrMetadataJsonMapperTests { String json = jsonMapper.write(metadata, "http://server:8080/my-app"); JSONObject result = new JSONObject(json); assertEquals("http://server:8080/my-app/foo.zip?type=foo{&dependencies,packaging,javaVersion," + - "language,bootVersion,groupId,artifactId,version,name,description,packageName}", + "language,bootVersion,groupId,artifactId,version,name,description,packageName}", get(result, "_links.foo.href")); } @Test - public void linksRendered() { + public void linksRendered() { Dependency dependency = Dependency.withId("foo", "com.example", "foo"); dependency.getLinks().add(Link.create("guide", "https://example.com/how-to")); dependency.getLinks().add(Link.create("reference", "https://example.com/doc")); @@ -66,17 +65,17 @@ public class InitializrMetadataJsonMapperTests { int first = json.indexOf("https://example.com/how-to"); int second = json.indexOf("https://example.com/doc"); // JSON objects are not ordered - assertTrue(first>0); - assertTrue(second>0); + assertTrue(first > 0); + assertTrue(second > 0); } private Object get(JSONObject result, String path) { String[] nodes = path.split("\\."); - for (int i = 0; i < nodes.length-1; i++) { + for (int i = 0; i < nodes.length - 1; i++) { String node = nodes[i]; result = result.getJSONObject(node); } - return result.getString(nodes[nodes.length-1]); + return result.getString(nodes[nodes.length - 1]); } } diff --git a/initializr-web/src/test/java/io/spring/initializr/web/mapper/LinkMapperTests.java b/initializr-web/src/test/java/io/spring/initializr/web/mapper/LinkMapperTests.java index 99526a2a..76f9722a 100644 --- a/initializr-web/src/test/java/io/spring/initializr/web/mapper/LinkMapperTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/mapper/LinkMapperTests.java @@ -16,16 +16,15 @@ package io.spring.initializr.web.mapper; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.List; import java.util.Map; +import io.spring.initializr.metadata.Link; import org.junit.Test; -import io.spring.initializr.metadata.Link; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * Tests for {@link LinkMapper}. diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/CommandLineExampleIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/CommandLineExampleIntegrationTests.java index b1a78cf8..ef5c3312 100644 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/CommandLineExampleIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/CommandLineExampleIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,12 @@ package io.spring.initializr.web.project; -import org.junit.Test; -import org.springframework.http.ResponseEntity; -import org.springframework.test.context.ActiveProfiles; - import io.spring.initializr.test.generator.PomAssert; import io.spring.initializr.web.AbstractInitializrControllerIntegrationTests; +import org.junit.Test; + +import org.springframework.http.ResponseEntity; +import org.springframework.test.context.ActiveProfiles; /** * Validate that the "raw" HTTP commands that are described in the diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/LegacyStsControllerIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/LegacyStsControllerIntegrationTests.java index 802903d9..fe47dea8 100644 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/LegacyStsControllerIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/LegacyStsControllerIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,13 @@ package io.spring.initializr.web.project; -import static org.junit.Assert.assertTrue; - import java.util.Arrays; +import io.spring.initializr.metadata.InitializrMetadataProvider; +import io.spring.initializr.web.AbstractInitializrControllerIntegrationTests; +import io.spring.initializr.web.project.LegacyStsControllerIntegrationTests.LegacyConfig; import org.junit.Test; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpEntity; @@ -31,9 +33,7 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ContextConfiguration; import org.springframework.web.servlet.resource.ResourceUrlProvider; -import io.spring.initializr.metadata.InitializrMetadataProvider; -import io.spring.initializr.web.AbstractInitializrControllerIntegrationTests; -import io.spring.initializr.web.project.LegacyStsControllerIntegrationTests.LegacyConfig; +import static org.junit.Assert.assertTrue; /** * @author Stephane Nicoll @@ -49,8 +49,8 @@ public class LegacyStsControllerIntegrationTests assertTrue("groupId not found", body.contains("com.example")); assertTrue("artifactId not found", body.contains("demo")); assertTrue("custom description not found", body.contains("Demo project for Spring Boot")); - assertTrue ("Wrong body:\n" + body, body.contains("")); - assertTrue ("Wrong body:\n" + body, body.contains("")); + assertTrue("Wrong body:\n" + body, body.contains("")); + assertTrue("Wrong body:\n" + body, body.contains("")); } protected String htmlHome() { diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerDefaultsIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerDefaultsIntegrationTests.java index 807bdfd3..a1bd01f2 100644 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerDefaultsIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerDefaultsIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,18 +16,18 @@ package io.spring.initializr.web.project; -import static org.junit.Assert.assertTrue; - -import org.junit.Test; -import org.springframework.test.context.ActiveProfiles; - import io.spring.initializr.test.generator.PomAssert; import io.spring.initializr.web.AbstractInitializrControllerIntegrationTests; +import org.junit.Test; + +import org.springframework.test.context.ActiveProfiles; + +import static org.junit.Assert.assertTrue; /** * @author Stephane Nicoll */ -@ActiveProfiles({"test-default", "test-custom-defaults"}) +@ActiveProfiles({ "test-default", "test-custom-defaults" }) public class MainControllerDefaultsIntegrationTests extends AbstractInitializrControllerIntegrationTests { // see defaults customization diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerEnvIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerEnvIntegrationTests.java index 130160a6..e1cda133 100644 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerEnvIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerEnvIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,24 +16,24 @@ package io.spring.initializr.web.project; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import java.net.URI; +import io.spring.initializr.test.generator.ProjectAssert; +import io.spring.initializr.web.AbstractInitializrControllerIntegrationTests; import org.junit.Test; + import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.test.context.ActiveProfiles; -import io.spring.initializr.test.generator.ProjectAssert; -import io.spring.initializr.web.AbstractInitializrControllerIntegrationTests; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * @author Stephane Nicoll */ -@ActiveProfiles({"test-default", "test-custom-env"}) +@ActiveProfiles({ "test-default", "test-custom-env" }) public class MainControllerEnvIntegrationTests extends AbstractInitializrControllerIntegrationTests { @Test 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 eff87f13..b765ff35 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,24 @@ package io.spring.initializr.web.project; +import java.net.URI; +import java.net.URISyntaxException; + +import io.spring.initializr.metadata.Dependency; +import io.spring.initializr.web.AbstractInitializrControllerIntegrationTests; +import io.spring.initializr.web.mapper.InitializrMetadataVersion; +import org.json.JSONObject; +import org.junit.Ignore; +import org.junit.Test; +import org.skyscreamer.jsonassert.JSONCompareMode; + +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.web.client.HttpClientErrorException; + import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.nullValue; @@ -27,24 +45,6 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.net.URI; -import java.net.URISyntaxException; - -import org.json.JSONObject; -import org.junit.Ignore; -import org.junit.Test; -import org.skyscreamer.jsonassert.JSONCompareMode; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.test.context.ActiveProfiles; -import org.springframework.web.client.HttpClientErrorException; - -import io.spring.initializr.metadata.Dependency; -import io.spring.initializr.web.AbstractInitializrControllerIntegrationTests; -import io.spring.initializr.web.mapper.InitializrMetadataVersion; - /** * @author Stephane Nicoll */ @@ -81,7 +81,7 @@ public class MainControllerIntegrationTests @Test public void dependencyNotInRange() { try { - execute("/starter.tgz?style=org.acme:bur", byte[].class, null, (String[])null); + execute("/starter.tgz?style=org.acme:bur", byte[].class, null, (String[]) null); } catch (HttpClientErrorException ex) { assertEquals(HttpStatus.NOT_ACCEPTABLE, ex.getStatusCode()); @@ -92,8 +92,8 @@ public class MainControllerIntegrationTests public void noDependencyProject() { downloadZip("/starter.zip").isJavaProject().isMavenProject() .hasStaticAndTemplatesResources(false).pomAssert().hasDependenciesCount(2) - .hasSpringBootStarterRootDependency() // the root dep is added if none is - // specified + // the root dep is added if none is specified + .hasSpringBootStarterRootDependency() .hasSpringBootStarterTest(); } @@ -349,7 +349,8 @@ public class MainControllerIntegrationTests try { downloadArchive("/starter.zip?style=foo:bar"); fail("Should have failed"); - } catch (HttpClientErrorException ex) { + } + catch (HttpClientErrorException ex) { assertEquals(HttpStatus.BAD_REQUEST, ex.getStatusCode()); assertStandardErrorBody(ex.getResponseBodyAsString(), "Unknown dependency 'foo:bar' check project metadata"); @@ -361,7 +362,8 @@ public class MainControllerIntegrationTests try { downloadArchive("/starter.zip?style=foo"); fail("Should have failed"); - } catch (HttpClientErrorException ex) { + } + catch (HttpClientErrorException ex) { assertEquals(HttpStatus.BAD_REQUEST, ex.getStatusCode()); assertStandardErrorBody(ex.getResponseBodyAsString(), "Unknown dependency 'foo' check project metadata"); @@ -371,18 +373,18 @@ public class MainControllerIntegrationTests @Test public void homeIsForm() { String body = htmlHome(); - assertTrue ("Wrong body:\n" + body, body.contains("action=\"/starter.zip\"")); - assertTrue ("Wrong body:\n" + body, body.contains("Web dependency description")); - assertFalse ("Wrong body:\n" + body, body.contains("${")); - assertFalse ("Wrong body:\n" + body, body.contains("{{")); - assertFalse ("Wrong body:\n" + body, body.contains("}}")); - assertTrue ("Wrong body:\n" + body, body.contains("