Calculate package version range for upgrade

src/upgrade/assessmentManager.ts

@@ -4,13 +4,21 @@
 import * as semver from 'semver';
 import { Jdtls } from "../java/jdtls";
 import { NodeKind, type INodeData } from "../java/nodeData";
-import { type DependencyCheckItem, UpgradeReason, type UpgradeIssue } from "./type";
+import { type DependencyCheckItem, UpgradeReason, type UpgradeIssue, type VersionSet } from "./type";
 import { DEPENDENCY_JAVA_RUNTIME } from "./dependency.metadata";
 import { Upgrade } from '../constants';
 import { buildPackageId } from './utility';
 import metadataManager from './metadataManager';
 import { sendInfo } from 'vscode-extension-telemetry-wrapper';
 
+function getVersionRange(versions: Set<string>) : string {
+    const versionList = [...versions].sort((a, b) => semver.compare(a, b));
+    if (versionList.length === 1) {
+        return versionList[0];
+    }
+    return `${versionList[0]}|${versionList[versionList.length - 1]}`;
+}
+
 function getJavaIssues(data: INodeData): UpgradeIssue[] {
     const javaVersion = data.metaData?.MaxSourceVersion as number | undefined;
     const { name, supportedVersion } = DEPENDENCY_JAVA_RUNTIME;
@@ -59,7 +67,7 @@ function getUpgradeForDependency(versionString: string, supportedVersionDefiniti
     return null;
 }
 
-function getDependencyIssue(data: INodeData): UpgradeIssue | null {
+function getDependencyIssue(data: INodeData, versionSet: VersionSet): UpgradeIssue | null {
     const versionString = data.metaData?.["maven.version"];
     const groupId = data.metaData?.["maven.groupId"];
     const artifactId = data.metaData?.["maven.artifactId"];
@@ -69,6 +77,11 @@ function getDependencyIssue(data: INodeData): UpgradeIssue | null {
         return null;
     }
 
+    if (!versionSet[groupId]) {
+        versionSet[groupId] = new Set();
+    }
+    versionSet[groupId].add(versionString);
+
     return getUpgradeForDependency(versionString, supportedVersionDefinition, packageId);
 }
 
@@ -84,7 +97,20 @@ async function getDependencyIssues(projectNode: INodeData): Promise<UpgradeIssue
                     path: packageContainer.path,
                 });
 
-                return packages.map(getDependencyIssue).filter((x): x is UpgradeIssue => Boolean(x));
+                const versionsByGroupId: VersionSet = {};
+                const issues = packages.map(pkg => getDependencyIssue(pkg, versionsByGroupId)).filter((x): x is UpgradeIssue => Boolean(x));
+                if (Object.entries(versionsByGroupId).length > 0) {
+                    sendInfo("", {
+                        operationName: "java.dependency.assessmentManager.getDependencyIssues",
+                        versionRangeByGroupId: JSON.stringify(
+                            Object.fromEntries(
+                                Object.entries(versionsByGroupId).map(([groupId, versions]) => [groupId, getVersionRange(versions)]),
+                            ),
+                        ),
+                    });
+                }
+
+                return issues;
             })
     );
 
@@ -113,10 +139,6 @@ async function getWorkspaceIssues(workspaceFolderUri: string): Promise<UpgradeIs
     const projects = await Jdtls.getProjects(workspaceFolderUri);
     const projectsIssues = await Promise.allSettled(projects.map(async (projectNode) => {
         const issues = await getProjectIssues(projectNode);
-        sendInfo("", {
-            operationName: "java.dependency.assessmentManager.getWorkspaceIssues",
-            issuesFoundForPackageId: JSON.stringify(issues.map(x => `${x.packageId}:${x.currentVersion}`)),
-        });
         return issues;
     }));
 

src/upgrade/display/notificationManager.ts

@@ -53,6 +53,10 @@ class NotificationManager implements IUpgradeIssuesRenderer {
                 const prompt = buildFixPrompt(issue);
                 const notificationMessage = buildNotificationMessage(issue, hasExtension);
                 const upgradeButtonText = hasExtension ? BUTTON_TEXT_UPGRADE : BUTTON_TEXT_INSTALL_AND_UPGRADE;
+
+                sendInfo(operationId, {
+                    operationName: "java.dependency.upgradeNotification.runUpgradeNotification",
+                });
                 const selection = await window.showInformationMessage(
                     notificationMessage,
                     upgradeButtonText,

src/upgrade/type.ts

@@ -28,4 +28,6 @@ export type UpgradeIssue = {
 
 export interface IUpgradeIssuesRenderer {
     render(issues: UpgradeIssue[]): void;
-}
+}
+
+export type VersionSet = Record<string, Set<string>>;