From 74e460a3a1ce84d2127ae224a46f2a03695ad8f9 Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Tue, 16 Jul 2019 15:44:52 -0700 Subject: [PATCH] Remove support for style See gh-959 --- .../stat/ProjectRequestDocumentFactory.java | 1 - ...ultProjectRequestToDescriptionConverter.java | 4 ++-- .../initializr/web/project/ProjectRequest.java | 10 ---------- ...ontrollerCustomDefaultsIntegrationTests.java | 2 +- ...tionControllerCustomEnvIntegrationTests.java | 2 +- ...ectGenerationControllerIntegrationTests.java | 17 +++++++++-------- 6 files changed, 13 insertions(+), 23 deletions(-) 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 b28eccf1..17ca46b3 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 @@ -77,7 +77,6 @@ public class ProjectRequestDocumentFactory { // Let's not rely on the resolved dependencies here List dependencies = new ArrayList<>(); - dependencies.addAll(request.getStyle()); dependencies.addAll(request.getDependencies()); List validDependencies = dependencies.stream() .filter((id) -> metadata.getDependencies().get(id) != null).collect(Collectors.toList()); diff --git a/initializr-web/src/main/java/io/spring/initializr/web/project/DefaultProjectRequestToDescriptionConverter.java b/initializr-web/src/main/java/io/spring/initializr/web/project/DefaultProjectRequestToDescriptionConverter.java index c9b3ac05..82d57e2a 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/project/DefaultProjectRequestToDescriptionConverter.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/project/DefaultProjectRequestToDescriptionConverter.java @@ -200,7 +200,7 @@ public class DefaultProjectRequestToDescriptionConverter } private void validateDependencies(ProjectRequest request, InitializrMetadata metadata) { - List dependencies = (!request.getStyle().isEmpty() ? request.getStyle() : request.getDependencies()); + List dependencies = request.getDependencies(); dependencies.forEach((dep) -> { Dependency dependency = metadata.getDependencies().get(dep); if (dependency == null) { @@ -242,7 +242,7 @@ public class DefaultProjectRequestToDescriptionConverter private List getResolvedDependencies(ProjectRequest request, String springBootVersion, InitializrMetadata metadata) { - List depIds = (!request.getStyle().isEmpty() ? request.getStyle() : request.getDependencies()); + List depIds = request.getDependencies(); Version requestedVersion = Version.parse(springBootVersion); return depIds.stream().map((it) -> { Dependency dependency = metadata.getDependencies().get(it); diff --git a/initializr-web/src/main/java/io/spring/initializr/web/project/ProjectRequest.java b/initializr-web/src/main/java/io/spring/initializr/web/project/ProjectRequest.java index 89701472..a8a94dd3 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/project/ProjectRequest.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/project/ProjectRequest.java @@ -28,8 +28,6 @@ import org.springframework.util.StringUtils; */ public class ProjectRequest { - private List style = new ArrayList<>(); - private List dependencies = new ArrayList<>(); private String name; @@ -59,14 +57,6 @@ public class ProjectRequest { // The base directory to create in the archive - no baseDir by default private String baseDir; - public List getStyle() { - return this.style; - } - - public void setStyle(List style) { - this.style = style; - } - public List getDependencies() { return this.dependencies; } diff --git a/initializr-web/src/test/java/io/spring/initializr/web/controller/ProjectGenerationControllerCustomDefaultsIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/controller/ProjectGenerationControllerCustomDefaultsIntegrationTests.java index 4746fc6d..260d011f 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/controller/ProjectGenerationControllerCustomDefaultsIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/controller/ProjectGenerationControllerCustomDefaultsIntegrationTests.java @@ -34,7 +34,7 @@ class ProjectGenerationControllerCustomDefaultsIntegrationTests extends Abstract @Test void generateDefaultPom() { - String content = getRestTemplate().getForObject(createUrl("/pom.xml?style=web"), String.class); + String content = getRestTemplate().getForObject(createUrl("/pom.xml?dependencies=web"), String.class); MavenBuildAssert pomAssert = new MavenBuildAssert(content); pomAssert.hasGroupId("org.foo").hasArtifactId("foo-bar").hasVersion("1.2.4-SNAPSHOT") .doesNotHaveNode("/project/packaging").hasName("FooBar").hasDescription("FooBar Project"); diff --git a/initializr-web/src/test/java/io/spring/initializr/web/controller/ProjectGenerationControllerCustomEnvIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/controller/ProjectGenerationControllerCustomEnvIntegrationTests.java index a9c87234..d8375f8b 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/controller/ProjectGenerationControllerCustomEnvIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/controller/ProjectGenerationControllerCustomEnvIntegrationTests.java @@ -35,7 +35,7 @@ class ProjectGenerationControllerCustomEnvIntegrationTests extends AbstractIniti @Test void generateProjectWithInvalidName() { - ProjectStructure project = downloadZip("/starter.zip?style=data-jpa&name=Invalid"); + ProjectStructure project = downloadZip("/starter.zip?dependencies=data-jpa&name=Invalid"); assertThat(project).containsFiles("src/main/java/com/example/demo/FooBarApplication.java", "src/test/java/com/example/demo/FooBarApplicationTests.java"); assertThat(project).doesNotContainFiles("src/main/java/com/example/demo/DemoApplication.java", diff --git a/initializr-web/src/test/java/io/spring/initializr/web/controller/ProjectGenerationControllerIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/controller/ProjectGenerationControllerIntegrationTests.java index 2451f566..cab52866 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/controller/ProjectGenerationControllerIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/controller/ProjectGenerationControllerIntegrationTests.java @@ -42,7 +42,7 @@ class ProjectGenerationControllerIntegrationTests extends AbstractInitializrCont @Test void simpleZipProject() { - ResponseEntity entity = downloadArchive("/starter.zip?style=web&style=jpa"); + ResponseEntity entity = downloadArchive("/starter.zip?dependencies=web&dependencies=jpa"); assertArchiveResponseHeaders(entity, MediaType.valueOf("application/zip"), "demo.zip"); ProjectStructure project = projectFromArchive(entity.getBody()); assertDefaultProject(project); @@ -56,7 +56,7 @@ class ProjectGenerationControllerIntegrationTests extends AbstractInitializrCont @Test void simpleTgzProject() { - ResponseEntity entity = downloadArchive("/starter.tgz?style=org.acme:foo"); + ResponseEntity entity = downloadArchive("/starter.tgz?dependencies=org.acme:foo"); assertArchiveResponseHeaders(entity, MediaType.valueOf("application/x-compress"), "demo.tar.gz"); ProjectStructure project = tgzProjectAssert(entity.getBody()); assertDefaultProject(project); @@ -74,7 +74,7 @@ class ProjectGenerationControllerIntegrationTests extends AbstractInitializrCont @Test void dependencyInRange() { Dependency biz = Dependency.create("org.acme", "biz", "1.3.5", "runtime"); - ProjectStructure project = downloadTgz("/starter.tgz?style=org.acme:biz&bootVersion=2.2.1.RELEASE"); + ProjectStructure project = downloadTgz("/starter.tgz?dependencies=org.acme:biz&bootVersion=2.2.1.RELEASE"); assertDefaultProject(project); assertDoesNotHaveWebResources(project); assertThat(project).mavenBuild().hasDependenciesSize(3).hasDependency(biz); @@ -83,7 +83,7 @@ class ProjectGenerationControllerIntegrationTests extends AbstractInitializrCont @Test void dependencyNotInRange() { try { - execute("/starter.tgz?style=org.acme:bur", byte[].class, null, (String[]) null); + execute("/starter.tgz?dependencies=org.acme:bur", byte[].class, null, (String[]) null); } catch (HttpClientErrorException ex) { assertThat(ex.getStatusCode()).isEqualTo(HttpStatus.NOT_ACCEPTABLE); @@ -125,7 +125,8 @@ class ProjectGenerationControllerIntegrationTests extends AbstractInitializrCont @Test void kotlinRange() { - ProjectStructure project = downloadZip("/starter.zip?style=web&language=kotlin&bootVersion=2.0.1.RELEASE"); + ProjectStructure project = downloadZip( + "/starter.zip?dependencies=web&language=kotlin&bootVersion=2.0.1.RELEASE"); assertThat(project).containsFiles("src/main/kotlin/com/example/demo/DemoApplication.kt", "src/test/kotlin/com/example/demo/DemoApplicationTests.kt", "src/main/resources/application.properties"); @@ -135,7 +136,7 @@ class ProjectGenerationControllerIntegrationTests extends AbstractInitializrCont @Test void gradleWarProject() { ProjectStructure project = downloadZip( - "/starter.zip?style=web&style=security&packaging=war&type=gradle-project"); + "/starter.zip?dependencies=web&dependencies=security&packaging=war&type=gradle-project"); assertThat(project).hasGroovyDslGradleBuild().hasGradleWrapper(); assertThat(project).containsFiles("src/main/java/com/example/demo/DemoApplication.java", "src/main/java/com/example/demo/ServletInitializer.java", @@ -147,7 +148,7 @@ class ProjectGenerationControllerIntegrationTests extends AbstractInitializrCont @Test void missingDependencyProperException() { try { - downloadArchive("/starter.zip?style=foo:bar"); + downloadArchive("/starter.zip?dependencies=foo:bar"); fail("Should have failed"); } catch (HttpClientErrorException ex) { @@ -160,7 +161,7 @@ class ProjectGenerationControllerIntegrationTests extends AbstractInitializrCont @Test void invalidDependencyProperException() { try { - downloadArchive("/starter.zip?style=foo"); + downloadArchive("/starter.zip?dependencies=foo"); fail("Should have failed"); } catch (HttpClientErrorException ex) {