From 05ab8e566461f37a57cbd453029b56b665d7c199 Mon Sep 17 00:00:00 2001
From: Drew Brokke <drew.brokke@liferay.com>
Date: Fri, 1 Nov 2024 16:32:29 -0500
Subject: [PATCH] LPD-38770 com.liferay.ide.upgrade.commands.ui: tries to
 automatically determine the new product key

---
 .../CreateNewLiferayWorkspaceCommand.java     | 41 +++++++++++--------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/tools/plugins/com.liferay.ide.upgrade.commands.ui/src/com/liferay/ide/upgrade/commands/ui/internal/CreateNewLiferayWorkspaceCommand.java b/tools/plugins/com.liferay.ide.upgrade.commands.ui/src/com/liferay/ide/upgrade/commands/ui/internal/CreateNewLiferayWorkspaceCommand.java
index 52d9fecd59..5a59ab0406 100644
--- a/tools/plugins/com.liferay.ide.upgrade.commands.ui/src/com/liferay/ide/upgrade/commands/ui/internal/CreateNewLiferayWorkspaceCommand.java
+++ b/tools/plugins/com.liferay.ide.upgrade.commands.ui/src/com/liferay/ide/upgrade/commands/ui/internal/CreateNewLiferayWorkspaceCommand.java
@@ -15,6 +15,7 @@
 package com.liferay.ide.upgrade.commands.ui.internal;
 
 import com.liferay.ide.core.util.CoreUtil;
+import com.liferay.ide.core.util.ReleaseUtil;
 import com.liferay.ide.core.util.SapphireContentAccessor;
 import com.liferay.ide.project.core.workspace.NewLiferayWorkspaceOp;
 import com.liferay.ide.ui.util.UIUtil;
@@ -23,6 +24,7 @@
 import com.liferay.ide.upgrade.plan.core.UpgradeCommandPerformedEvent;
 import com.liferay.ide.upgrade.plan.core.UpgradePlan;
 import com.liferay.ide.upgrade.plan.core.UpgradePlanner;
+import com.liferay.release.util.ReleaseEntry;
 
 import java.nio.file.Paths;
 
@@ -74,27 +76,34 @@ public IStatus perform(IProgressMonitor progressMonitor) {
 
 		NewLiferayWorkspaceOp newLiferayWorkspaceOp = NewLiferayWorkspaceOp.TYPE.instantiate();
 
-		switch (upgradePlan.getTargetVersion()) {
-			case "7.0":
-				newLiferayWorkspaceOp.setProductVersion("portal-7.0-ga7");
+		ReleaseEntry releaseEntry = ReleaseUtil.getReleaseEntry("portal", upgradePlan.getTargetVersion());
 
-				break;
-			case "7.1":
-				newLiferayWorkspaceOp.setProductVersion("portal-7.1-ga4");
+		if (releaseEntry != null) {
+			newLiferayWorkspaceOp.setProductVersion(releaseEntry.getReleaseKey());
+		}
+		else {
+			switch (upgradePlan.getTargetVersion()) {
+				case "7.0":
+					newLiferayWorkspaceOp.setProductVersion("portal-7.0-ga7");
+
+					break;
+				case "7.1":
+					newLiferayWorkspaceOp.setProductVersion("portal-7.1-ga4");
 
-				break;
-			case "7.2":
-				newLiferayWorkspaceOp.setProductVersion("portal-7.2-ga2");
+					break;
+				case "7.2":
+					newLiferayWorkspaceOp.setProductVersion("portal-7.2-ga2");
 
-				break;
-			case "7.3":
-				newLiferayWorkspaceOp.setProductVersion("portal-7.3-ga8");
+					break;
+				case "7.3":
+					newLiferayWorkspaceOp.setProductVersion("portal-7.3-ga8");
 
-				break;
-			case "7.4":
-				newLiferayWorkspaceOp.setProductVersion("portal-7.4-ga4");
+					break;
+				case "7.4":
+					newLiferayWorkspaceOp.setProductVersion("portal-7.4-ga4");
 
-				break;
+					break;
+			}
 		}
 
 		newLiferayWorkspaceOp.setLiferayVersion(upgradePlan.getTargetVersion());