chore: centralize LATEST_JAVA_LTS_VESRION and SESSION_COUNT_BEFORE_NOTIFICATION_RESHOW to individual files

Author: FluoriteCafe-work

src/constants.ts

@@ -39,8 +39,6 @@ export namespace ExtensionName {
 
 export namespace Upgrade {
     export const PACKAGE_ID_FOR_JAVA_RUNTIME = "java:*";
-    export const LATEST_JAVA_LTS_VESRION = 21;
-    export const SESSION_COUNT_BEFORE_NOTIFICATION_RESHOW = 3;
 }
 
 /**

src/upgrade/dependency.data.ts

@@ -4,22 +4,27 @@
 import { Upgrade } from "../constants";
 import { UpgradeReason, type DependencyCheckMetadata } from "./type";
 
+const LATEST_JAVA_LTS_VESRION = 21;
+
 export const DEPENDENCY_JAVA_RUNTIME = {
     "name": "Java Runtime",
     "reason": UpgradeReason.JRE_TOO_OLD,
-    "supportedVersion": `>=${Upgrade.LATEST_JAVA_LTS_VESRION}`,
+    "supportedVersion": `>=${LATEST_JAVA_LTS_VESRION}`,
+    "suggestedVersion": String(LATEST_JAVA_LTS_VESRION),
 } as const;
 
 const DEPENDENCIES_TO_SCAN: DependencyCheckMetadata = {
     "org.springframework.boot:*": {
         "reason": UpgradeReason.END_OF_LIFE,
         "name": "Spring Boot",
         "supportedVersion": "2.7.x || >=3.2.x",
+        "suggestedVersion": "6.2",
     },
     "org.springframework:*": {
         "reason": UpgradeReason.END_OF_LIFE,
         "name": "Spring Framework",
         "supportedVersion": "5.3.x || >=6.2.x",
+        "suggestedVersion": "3.5"
     },
     "javax:javaee-api": {
         "reason": UpgradeReason.DEPRECATED,

src/upgrade/display/notificationManager.ts

@@ -5,7 +5,6 @@ import { commands, ExtensionContext, window } from "vscode";
 import type { UpgradeIssue } from "../type";
 import { buildFixPrompt, buildNotificationMessage } from "../utility";
 import { Commands } from "../../commands";
-import { Upgrade } from "../../constants";
 
 const KEY_PREFIX = 'javaupgrade.notificationManager';
 const IS_CANDIDATE_KEY = `${KEY_PREFIX}.isCandidate`;
@@ -15,6 +14,8 @@ const BUTTON_TEXT_UPGRADE = "Upgrade Now";
 const BUTTON_TEXT_NOT_NOW = "Not Now";
 const BUTTON_TEXT_DONT_SHOW_AGAIN = "Don't Show Again";
 
+const SESSION_COUNT_BEFORE_NOTIFICATION_RESHOW = 3;
+
 class NotificationManager {
     private hasShown = false;
     private context?: ExtensionContext;
@@ -49,7 +50,7 @@ class NotificationManager {
                 break;
             }
             case BUTTON_TEXT_NOT_NOW: {
-                this.setSessionCount(-1 * Upgrade.SESSION_COUNT_BEFORE_NOTIFICATION_RESHOW);
+                this.setSessionCount(-1 * SESSION_COUNT_BEFORE_NOTIFICATION_RESHOW);
                 break;
             }
             case BUTTON_TEXT_DONT_SHOW_AGAIN: {

src/upgrade/type.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 export type DependencyCheckItemBase = { name: string, reason: UpgradeReason };
-export type DependencyCheckItemEol = DependencyCheckItemBase & { reason: UpgradeReason.END_OF_LIFE | UpgradeReason.JRE_TOO_OLD, supportedVersion: string };
+export type DependencyCheckItemEol = DependencyCheckItemBase & { reason: UpgradeReason.END_OF_LIFE | UpgradeReason.JRE_TOO_OLD, supportedVersion: string, suggestedVersion: string };
 export type DependencyCheckItemDeprecated = DependencyCheckItemBase & { reason: UpgradeReason.DEPRECATED, alternative: string };
 export type DependencyCheckItem = (DependencyCheckItemEol | DependencyCheckItemDeprecated);
 export type DependencyCheckMetadata = Record<string, DependencyCheckItem>;

src/upgrade/upgradeManager.ts

@@ -20,17 +20,18 @@ const DEFAULT_UPGRADE_PROMPT = "Upgrade Java project dependency to latest versio
 
 function getJavaIssues(data: INodeData): UpgradeIssue[] {
     const javaVersion = data.metaData?.MaxSourceVersion as number | undefined;
-    const javaSupportedVersionDefinition = DEPENDENCY_JAVA_RUNTIME;
+    const { name, reason, supportedVersion, suggestedVersion } = DEPENDENCY_JAVA_RUNTIME;
     if (!javaVersion) {
         return [];
     }
-    if (javaVersion < Upgrade.LATEST_JAVA_LTS_VESRION) {
+    const currentSemVer = semver.coerce(javaVersion);
+    if (currentSemVer && !semver.satisfies(currentSemVer, supportedVersion)) {
         return [{
             packageId: Upgrade.PACKAGE_ID_FOR_JAVA_RUNTIME,
-            packageDisplayName: javaSupportedVersionDefinition.name,
-            reason: javaSupportedVersionDefinition.reason,
+            packageDisplayName: name,
             currentVersion: String(javaVersion),
-            suggestedVersion: String(Upgrade.LATEST_JAVA_LTS_VESRION),
+            reason,
+            suggestedVersion,
         }];
     }