Handling Unicode in Project Generation stripAccents

Fix for Bug : spring-io#1328
nirbhay24 · Nov 20, 2022 · ec4bdbe · ec4bdbe
1 parent 6b84396
commit ec4bdbe
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
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
@@ -66,7 +66,7 @@ public void setDependencies(List<String> dependencies) {
 	}
 
 	public String getName() {
-		return this.name;
+		return cleanInputValue(this.name);
 	}
 
 	public void setName(String name) {
@@ -90,15 +90,15 @@ public void setDescription(String description) {
 	}
 
 	public String getGroupId() {
-		return this.groupId;
+		return cleanInputValue(this.groupId);
 	}
 
 	public void setGroupId(String groupId) {
 		this.groupId = groupId;
 	}
 
 	public String getArtifactId() {
-		return this.artifactId;
+		return cleanInputValue(this.artifactId);
 	}
 
 	public void setArtifactId(String artifactId) {
@@ -147,7 +147,7 @@ public void setLanguage(String language) {
 
 	public String getPackageName() {
 		if (StringUtils.hasText(this.packageName)) {
-			return this.packageName;
+			return cleanInputValue(this.packageName);
 		}
 		if (StringUtils.hasText(this.groupId) && StringUtils.hasText(this.artifactId)) {
 			return getGroupId() + "." + getArtifactId();
@@ -175,4 +175,11 @@ public void setBaseDir(String baseDir) {
 		this.baseDir = baseDir;
 	}
 
+	private String cleanInputValue(String inputString) {
+		if (StringUtils.hasText(inputString)) {
+			return org.apache.commons.lang3.StringUtils.stripAccents(inputString);
+		}
+		return inputString;
+	}
+
 }
diff --git a/.../spring/initializr/web/controller/ProjectGenerationControllerArchiveIntegrationTests.java b/.../spring/initializr/web/controller/ProjectGenerationControllerArchiveIntegrationTests.java
@@ -36,4 +36,10 @@ void baseDirectorySeparatedBySpace() {
 		assertDefaultProject(project.resolveModule("demo trial"));
 	}
 
+	@Test
+	void projectNameWithAccentRemoved() {
+		ProjectStructure project = downloadZip("/starter.zip?artifactId=demo&baseDir=demo trial&name=Demö");
+		assertDefaultProject(project.resolveModule("demo trial"));
+	}
+
 }