LPD-29388 com.liferay.ide.upgrade.commands.ui: updates usages

liferay · Aug 2, 2024 · cebeee4 · cebeee4
1 parent 5a5a8b0
commit cebeee4
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 49 deletions.
diff --git a/tools/plugins/com.liferay.ide.upgrade.commands.ui/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.upgrade.commands.ui/META-INF/MANIFEST.MF
@@ -15,6 +15,7 @@ Require-Bundle: com.liferay.ide.core,
  com.liferay.ide.ui,
  com.liferay.ide.upgrade.commands.core,
  com.liferay.ide.upgrade.plan.core,
+ com.liferay.release.util,
  org.apache.commons.io,
  org.apache.commons.lang,
  org.eclipse.compare,

diff --git a/.../liferay/ide/upgrade/commands/ui/internal/code/ConfigureTargetPlatformVersionCommand.java b/.../liferay/ide/upgrade/commands/ui/internal/code/ConfigureTargetPlatformVersionCommand.java
@@ -15,8 +15,8 @@
 package com.liferay.ide.upgrade.commands.ui.internal.code;
 
 import com.liferay.ide.core.util.FileUtil;
+import com.liferay.ide.core.util.ReleaseUtil;
 import com.liferay.ide.core.workspace.WorkspaceConstants;
-import com.liferay.ide.project.core.util.ProjectUtil;
 import com.liferay.ide.ui.util.UIUtil;
 import com.liferay.ide.upgrade.commands.core.code.ConfigureTargetPlatformVersionCommandKeys;
 import com.liferay.ide.upgrade.plan.core.ResourceSelection;
@@ -26,16 +26,12 @@
 import com.liferay.ide.upgrade.plan.core.UpgradePlan;
 import com.liferay.ide.upgrade.plan.core.UpgradePlanner;
 import com.liferay.ide.upgrade.plan.core.UpgradePreview;
+import com.liferay.release.util.ReleaseEntry;
 
 import java.io.File;
 
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Consumer;
 
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
@@ -112,49 +108,26 @@ private File _getGradlePropertiesFile() {
 	}
 
 	private IStatus _updateTargetPlatformValue(File gradeProperties) {
-		CompletableFuture<Map<String, String[]>> future = CompletableFuture.supplyAsync(
-			() -> {
-				try {
-					return ProjectUtil.initMavenTargetPlatform();
-				}
-				catch (Exception exception) {
-					return new HashMap<>();
-				}
-			});
-
-		future.thenAccept(
-			new Consumer<Map<String, String[]>>() {
-
-				@Override
-				public void accept(Map<String, String[]> mavenTargetPlatform) {
-					UpgradePlan upgradePlan = _upgradePlanner.getCurrentUpgradePlan();
-
-					String targetPlatformVersion = mavenTargetPlatform.get("7.1")[0];
-
-					String targetVersion = upgradePlan.getTargetVersion();
-
-					if (Objects.equals(targetVersion, "7.0")) {
-						targetPlatformVersion = mavenTargetPlatform.get("7.0")[0];
-					}
-					else if (Objects.equals(targetVersion, "7.1")) {
-						targetPlatformVersion = mavenTargetPlatform.get("7.1")[0];
-					}
-					else if (Objects.equals(targetVersion, "7.2")) {
-						targetPlatformVersion = mavenTargetPlatform.get("7.2")[0];
-					}
-
-					try {
-						PropertiesConfiguration config = new PropertiesConfiguration(gradeProperties);
-
-						config.setProperty(WorkspaceConstants.TARGET_PLATFORM_VERSION_PROPERTY, targetPlatformVersion);
-
-						config.save();
-					}
-					catch (ConfigurationException ce) {
-					}
-				}
-
-			});
+		UpgradePlan upgradePlan = _upgradePlanner.getCurrentUpgradePlan();
+
+		String upgradePlanTargetVersion = upgradePlan.getTargetVersion();
+
+		ReleaseEntry releaseEntry = ReleaseUtil.getReleaseEntry(upgradePlanTargetVersion);
+
+		if (releaseEntry == null) {
+			releaseEntry = ReleaseUtil.getReleaseEntry("7.1");
+		}
+
+		try {
+			PropertiesConfiguration config = new PropertiesConfiguration(gradeProperties);
+
+			config.setProperty(
+				WorkspaceConstants.TARGET_PLATFORM_VERSION_PROPERTY, releaseEntry.getTargetPlatformVersion());
+
+			config.save();
+		}
+		catch (ConfigurationException ce) {
+		}
 
 		return Status.OK_STATUS;
 	}