From c98f59e8f2f3e18069c4603fdfd661924b059766 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 11 Feb 2019 12:46:00 +0100 Subject: [PATCH] Remove deprecated `stsId` Closes gh-820 --- .../src/test/resources/application-test-default.yml | 4 ---- .../main/java/io/spring/initializr/metadata/Type.java | 11 ----------- .../io/spring/initializr/metadata/TypeCapability.java | 5 ++--- .../src/test/resources/application-test-default.yml | 4 ---- .../src/test/resources/metadata/config/test-min.json | 1 - .../web/project/MainControllerIntegrationTests.java | 5 +++-- .../test/resources/metadata/config/test-default.json | 4 ---- 7 files changed, 5 insertions(+), 29 deletions(-) diff --git a/initializr-generator/src/test/resources/application-test-default.yml b/initializr-generator/src/test/resources/application-test-default.yml index a3daf6ea..6e573506 100644 --- a/initializr-generator/src/test/resources/application-test-default.yml +++ b/initializr-generator/src/test/resources/application-test-default.yml @@ -100,7 +100,6 @@ initializr: types: - name: Maven POM id: maven-build - sts-id: pom.xml tags: build: maven format: build @@ -108,7 +107,6 @@ initializr: action: /pom.xml - name: Maven Project id: maven-project - sts-id: starter.zip tags: build: maven format: project @@ -116,7 +114,6 @@ initializr: action: /starter.zip - name: Gradle Config id: gradle-build - sts-id: build.gradle tags: build: gradle format: build @@ -124,7 +121,6 @@ initializr: action: /build.gradle - name: Gradle Project id: gradle-project - sts-id: gradle.zip tags: build: gradle format: project diff --git a/initializr-metadata/src/main/java/io/spring/initializr/metadata/Type.java b/initializr-metadata/src/main/java/io/spring/initializr/metadata/Type.java index 455630e4..55453653 100644 --- a/initializr-metadata/src/main/java/io/spring/initializr/metadata/Type.java +++ b/initializr-metadata/src/main/java/io/spring/initializr/metadata/Type.java @@ -29,9 +29,6 @@ public class Type extends DefaultMetadataElement implements Describable { private String description; - @Deprecated - private String stsId; - private String action; private final Map tags = new LinkedHashMap<>(); @@ -53,14 +50,6 @@ public class Type extends DefaultMetadataElement implements Describable { this.description = description; } - public String getStsId() { - return this.stsId; - } - - public void setStsId(String stsId) { - this.stsId = stsId; - } - public String getAction() { return this.action; } diff --git a/initializr-metadata/src/main/java/io/spring/initializr/metadata/TypeCapability.java b/initializr-metadata/src/main/java/io/spring/initializr/metadata/TypeCapability.java index 21558001..cdbf92b4 100644 --- a/initializr-metadata/src/main/java/io/spring/initializr/metadata/TypeCapability.java +++ b/initializr-metadata/src/main/java/io/spring/initializr/metadata/TypeCapability.java @@ -45,9 +45,8 @@ public class TypeCapability extends ServiceCapability> * @return the Type or {@code null} */ public Type get(String id) { - return this.content.stream() - .filter((it) -> id.equals(it.getId()) || id.equals(it.getStsId())) - .findFirst().orElse(null); + return this.content.stream().filter((it) -> id.equals(it.getId())).findFirst() + .orElse(null); } /** diff --git a/initializr-metadata/src/test/resources/application-test-default.yml b/initializr-metadata/src/test/resources/application-test-default.yml index a3daf6ea..6e573506 100644 --- a/initializr-metadata/src/test/resources/application-test-default.yml +++ b/initializr-metadata/src/test/resources/application-test-default.yml @@ -100,7 +100,6 @@ initializr: types: - name: Maven POM id: maven-build - sts-id: pom.xml tags: build: maven format: build @@ -108,7 +107,6 @@ initializr: action: /pom.xml - name: Maven Project id: maven-project - sts-id: starter.zip tags: build: maven format: project @@ -116,7 +114,6 @@ initializr: action: /starter.zip - name: Gradle Config id: gradle-build - sts-id: build.gradle tags: build: gradle format: build @@ -124,7 +121,6 @@ initializr: action: /build.gradle - name: Gradle Project id: gradle-project - sts-id: gradle.zip tags: build: gradle format: project diff --git a/initializr-metadata/src/test/resources/metadata/config/test-min.json b/initializr-metadata/src/test/resources/metadata/config/test-min.json index 0b6e2d1e..03e98f56 100644 --- a/initializr-metadata/src/test/resources/metadata/config/test-min.json +++ b/initializr-metadata/src/test/resources/metadata/config/test-min.json @@ -31,7 +31,6 @@ "name": "Maven POM", "id": "maven-build", "description": null, - "stsId": "pom.xml", "action": "/pom.xml", "tags": { "build": "maven", 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 1f2fcfde..75315104 100755 --- 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 @@ -118,8 +118,9 @@ class MainControllerIntegrationTests @Test void gradleWarProject() { - downloadZip("/starter.zip?style=web&style=security&packaging=war&type=gradle.zip") - .isJavaWarProject().isGradleProject(); + downloadZip( + "/starter.zip?style=web&style=security&packaging=war&type=gradle-project") + .isJavaWarProject().isGradleProject(); } @Test diff --git a/initializr-web/src/test/resources/metadata/config/test-default.json b/initializr-web/src/test/resources/metadata/config/test-default.json index 48d1d921..1a6a0b4f 100644 --- a/initializr-web/src/test/resources/metadata/config/test-default.json +++ b/initializr-web/src/test/resources/metadata/config/test-default.json @@ -349,7 +349,6 @@ "description": null, "id": "maven-build", "name": "Maven POM", - "stsId": "pom.xml", "tags": { "build": "maven", "format": "build" @@ -361,7 +360,6 @@ "description": null, "id": "maven-project", "name": "Maven Project", - "stsId": "starter.zip", "tags": { "build": "maven", "format": "project" @@ -373,7 +371,6 @@ "description": null, "id": "gradle-build", "name": "Gradle Config", - "stsId": "build.gradle", "tags": { "build": "gradle", "format": "build" @@ -385,7 +382,6 @@ "description": null, "id": "gradle-project", "name": "Gradle Project", - "stsId": "gradle.zip", "tags": { "build": "gradle", "format": "project"