Remove deprecated stsId

Closes gh-820

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

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<String, String> 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;
 	}

initializr-metadata/src/main/java/io/spring/initializr/metadata/TypeCapability.java

@@ -45,9 +45,8 @@ public class TypeCapability extends ServiceCapability<List<Type>>
 	 * @return the Type or {@code null}
 	 */
 	public Type get(String id) {
-		return this.content.stream()
+		return this.content.stream().filter((it) -> id.equals(it.getId())).findFirst()
-				.filter((it) -> id.equals(it.getId()) || id.equals(it.getStsId()))
+				.orElse(null);
-				.findFirst().orElse(null);
 	}
 
 	/**

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

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",

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")
+		downloadZip(
-				.isJavaWarProject().isGradleProject();
+				"/starter.zip?style=web&style=security&packaging=war&type=gradle-project")
+						.isJavaWarProject().isGradleProject();
 	}
 
 	@Test

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"