Merge pull request #298 from m-reza-rahman/master

Fix caching bug
eclipse-ee4j · Jun 9, 2024 · c79187a · c79187a
2 parents a4a6137 + 3ab47ce
commit c79187a
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/ui/src/main/java/org/eclipse/starter/ui/Project.java b/ui/src/main/java/org/eclipse/starter/ui/Project.java
@@ -34,9 +34,7 @@ public class Project implements Serializable {
 	private static final Map<String, String> RUNTIMES = Map.ofEntries(entry("glassfish", "GlassFish"),
 			entry("open-liberty", "Open Liberty"), entry("payara", "Payara"), entry("tomee", "TomEE"),
 			entry("wildfly", "WildFly"));
-
-	private static final String DEFAULT_GROUPID = "org.eclipse";;
-
+	private static final String DEFAULT_GROUPID = "org.eclipse";
 	private static final String DEFAULT_ARTIFACTID = "jakartaee-hello-world";
 
 	private static Map<String, String> cache = new ConcurrentHashMap<>();
@@ -402,7 +400,7 @@ public void generate() {
 				LOGGER.info("Downloading zip file.");
 				downloadZip(new File(workingDirectory, artifactId + ".zip"));
 
-				// caching makes only sense if defaults weren't changed since otherwise it's unlikely to hit cache
+				// Caching makes only sense if defaults weren't changed since otherwise it's unlikely to hit cache.
 				if (groupId.equals(DEFAULT_GROUPID) && artifactId.equals(DEFAULT_ARTIFACTID)) {
 					LOGGER.info("Caching output.");
 					cache.put(getCacheKey(), workingDirectory.getAbsolutePath());
@@ -422,7 +420,7 @@ public void generate() {
 	}
 
 	private String getCacheKey() {
-		return jakartaVersion + ":" + profile + ":" + javaVersion + ":" + docker + ":" + runtime;
+		return jakartaVersion + ":" + profile + ":" + javaVersion + ":" + docker + ":" + runtime + ":" + groupId + ":" + artifactId;
 	}
 
 	private void downloadZip(File zip) {