Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
3872005
feat(jdtls): add `PomPath` to metadata
FluoriteCafe-work Sep 10, 2025
5574787
feat: MetadataManager
FluoriteCafe-work Sep 10, 2025
3988de5
feat: add command `triggerJavaUpgradeTool`
FluoriteCafe-work Sep 10, 2025
bf7eb04
feat: NotificationManager
FluoriteCafe-work Sep 10, 2025
18be55e
feat: IssueManager
FluoriteCafe-work Sep 10, 2025
560048c
feat(upgradeManager): collect issues on load and workspace folder update
FluoriteCafe-work Sep 10, 2025
0503046
feat: integrate the flow
FluoriteCafe-work Sep 10, 2025
b2406d9
feat: add context menu to open modernization tool
FluoriteCafe-work Sep 10, 2025
fa488ef
fix: only show modernization menu when related extension is installed
FluoriteCafe-work Sep 10, 2025
9fbc1c2
fix: typo
FluoriteCafe-work Sep 10, 2025
c3ee610
chore: fmt
FluoriteCafe-work Sep 10, 2025
0e998ba
feat: control reminder display by settings
FluoriteCafe-work Sep 10, 2025
3b62771
feat: don't scan when upgrade extension does not exist
FluoriteCafe-work Sep 10, 2025
9043db4
chore: make class methods static as there are no states here
FluoriteCafe-work Sep 10, 2025
06c14d9
fix: typo
FluoriteCafe-work Sep 10, 2025
1fac1f0
chore: add copyright headers
FluoriteCafe-work Sep 10, 2025
97a044a
chore: skip package dependency check when JRE version issue is found
FluoriteCafe-work Sep 11, 2025
a554cca
chore: check Settings first as it's cheaper (?)
FluoriteCafe-work Sep 11, 2025
67fba26
chore: revise fix prompts
FluoriteCafe-work Sep 11, 2025
c667fa2
chore: call `javaupgrade.gotoAgentMode` to trigger prompts
FluoriteCafe-work Sep 11, 2025
cda24ca
feat: revise notification message
FluoriteCafe-work Sep 11, 2025
5817721
fix: only trigger notification on the first issue found
FluoriteCafe-work Sep 11, 2025
f6db20c
feat: allow "Not Now" or "Don't Show Again" for notifications
FluoriteCafe-work Sep 11, 2025
4bc2e93
fix(upgradeManager): command calling
FluoriteCafe-work Sep 11, 2025
b93017d
chore: Java uses the word `runtime` instead of `engine`
FluoriteCafe-work Sep 11, 2025
2da82b0
chore: remove debug strings
FluoriteCafe-work Sep 11, 2025
802f9de
feat: support deprecated dependencies (and add Java EE as an example)
FluoriteCafe-work Sep 11, 2025
82aaf05
fix: use 21 when showing latest version
FluoriteCafe-work Sep 11, 2025
887261c
chore: string polishment
FluoriteCafe-work Sep 11, 2025
535e190
fix: fix prompt version insertion issues
FluoriteCafe-work Sep 11, 2025
6655cd8
chore: centralize JRE metadata together
FluoriteCafe-work Sep 12, 2025
cabb469
chore: rename settings `java.dependency.showUpgradeReminder` -> `java…
FluoriteCafe-work Sep 12, 2025
7c606cb
fix: only show Modernize Java Project under Java project environment
FluoriteCafe-work Sep 12, 2025
4bdc6d6
chore: `java.view.modernizeJavaProject` -> `_java.view.modernizeJavaP…
FluoriteCafe-work Sep 12, 2025
81b9905
chore: `java.view.triggerJavaUpgradeTool` -> `_java.upgrade.triggerUp…
FluoriteCafe-work Sep 12, 2025
76a8261
chore: change JRE package ID to `java:*`
FluoriteCafe-work Sep 12, 2025
56084e6
chore: centralize `LATEST_JAVA_LTS_VESRION` and `SESSION_COUNT_BEFORE…
FluoriteCafe-work Sep 12, 2025
28d2ee4
chore: `_java.upgrade.triggerUpgrade` -> `_java.upgradeWithCopilot`
FluoriteCafe-work Sep 12, 2025
2789537
chore: no need for `PomPath`
FluoriteCafe-work Sep 12, 2025
1f0a36f
fix(notificationManager): use settings to control whether to send not…
FluoriteCafe-work Sep 12, 2025
fbe2d5f
chore: split assessment part to `assessmentManager`
FluoriteCafe-work Sep 12, 2025
790a5ea
feat: use `DisplayInterface` to organize user faced presentations
FluoriteCafe-work Sep 12, 2025
1872705
chore: string improvements
FluoriteCafe-work Sep 12, 2025
e9b6917
chore: get all issues for notification
FluoriteCafe-work Sep 12, 2025
e25d0b6
feat: add telemetry
FluoriteCafe-work Sep 12, 2025
46f78a8
fix: add current version to telemetry
FluoriteCafe-work Sep 12, 2025
c2c4cf6
chore: restore formatting
FluoriteCafe-work Sep 12, 2025
1c1fef6
fix: pass `suggestedVersion` to `UpgradeIssue`
FluoriteCafe-work Sep 12, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,16 @@
"command": "java.view.package.renameFile",
"title": "%contributes.commands.java.view.package.renameFile%",
"category": "Java"
},
{
"command": "_java.view.modernizeJavaProject",
"title": "%contributes.commands.java.view.modernizeJavaProject%",
"category": "Java"
},
{
"command": "_java.upgradeWithCopilot",
"title": "%contributes.commands.java.upgradeWithCopilot%",
"category": "Java"
}
],
"configuration": {
Expand Down Expand Up @@ -323,6 +333,11 @@
"description": "%configuration.java.dependency.packagePresentation%",
"default": "flat"
},
"java.dependency.enableDependencyDiagnostics": {
"type": "boolean",
"description": "%configuration.java.dependency.enableDependencyDiagnostics%",
"default": true
},
"java.project.exportJar.targetPath": {
"type": "string",
"anyOf": [
Expand Down Expand Up @@ -568,6 +583,11 @@
"when": "explorerResourceIsFolder",
"group": "1_javaactions@30"
},
{
"command": "_java.view.modernizeJavaProject",
"when": "explorerResourceIsFolder && java:serverMode && isModernizationExtensionInstalled",
"group": "1_javaactions@40"
},
{
"command": "java.view.package.revealInProjectExplorer",
"when": "resourceFilename =~ /(.*\\.gradle)|(.*\\.gradle\\.kts)|(pom\\.xml)$/ && java:serverMode == Standard",
Expand Down Expand Up @@ -1092,4 +1112,4 @@
"vscode-extension-telemetry-wrapper": "^0.14.0",
"vscode-tas-client": "^0.1.75"
}
}
}
3 changes: 3 additions & 0 deletions package.nls.json
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please only make necessary changes to reduce the size of of the PR. In this file, the only change is the inserted line of:

  "contributes.commands.java.view.triggerJavaUpgradeTool": "Upgrade dependencies",

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Formatting are restored in c2c4cf6.

Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"contributes.commands.java.view.package.copyRelativeFilePath": "Copy Relative Path",
"contributes.commands.java.view.package.new": "New...",
"contributes.commands.java.view.package.newJavaClass": "Class...",
"contributes.commands.java.view.modernizeJavaProject": "Modernize Java project",
"contributes.commands.java.view.package.newJavaInterface": "Interface...",
"contributes.commands.java.view.package.newJavaEnum": "Enum...",
"contributes.commands.java.view.package.newJavaRecord": "Record...",
Expand All @@ -38,11 +39,13 @@
"contributes.commands.java.view.fileExplorer.newPackage": "New Java Package...",
"contributes.submenus.javaProject.new": "New",
"contributes.commands.java.view.menus.file.newJavaClass": "New Java File",
"contributes.commands.java.upgradeWithCopilot": "Upgrade dependencies",
"configuration.java.dependency.showMembers": "Show the members in the explorer",
"configuration.java.dependency.syncWithFolderExplorer": "Link Java Projects Explorer with the active editor",
"configuration.java.dependency.autoRefresh": "Synchronize Java Projects explorer with changes",
"configuration.java.dependency.refreshDelay": "The delay time (ms) the auto refresh is invoked when changes are detected",
"configuration.java.dependency.packagePresentation": "Package presentation mode: flat or hierarchical",
"configuration.java.dependency.enableDependencyDiagnostics": "Show reminders when your Java runtimes or dependencies need an upgrade.",
"configuration.java.project.explorer.showNonJavaResources": "When enabled, the explorer shows non-Java resources.",
"configuration.java.project.exportJar.targetPath.customization": "The output path of the exported jar. Leave it empty if you want to manually pick the output location.",
"configuration.java.project.exportJar.targetPath.workspaceFolder": "Export the jar file into the workspace folder. Its name is the same as the folder's.",
Expand Down
9 changes: 9 additions & 0 deletions src/commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ export namespace Commands {

export const VIEW_PACKAGE_NEW_JAVA_CLASS = "java.view.package.newJavaClass";

export const VIEW_MODERNIZE_JAVA_PROJECT = "_java.view.modernizeJavaProject";

export const VIEW_PACKAGE_NEW_JAVA_INTERFACE = "java.view.package.newJavaInterface";

export const VIEW_PACKAGE_NEW_JAVA_ENUM = "java.view.package.newJavaEnum";
Expand Down Expand Up @@ -132,6 +134,8 @@ export namespace Commands {

export const JAVA_PROJECT_CHECK_IMPORT_STATUS = "java.project.checkImportStatus";

export const JAVA_UPGRADE_WITH_COPILOT = "_java.upgradeWithCopilot";

/**
* Commands from Visual Studio Code
*/
Expand All @@ -156,6 +160,11 @@ export namespace Commands {

export const BUILD_PROJECT = "java.project.build";

/**
* Commands from Java Upgrade Tool
*/
export const GOTO_AGENT_MODE = "javaupgrade.gotoAgentMode";

/**
* Get the project settings
*/
Expand Down
6 changes: 6 additions & 0 deletions src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ export namespace Explorer {

export namespace ExtensionName {
export const JAVA_LANGUAGE_SUPPORT: string = "redhat.java";
export const APP_MODERNIZATION_FOR_JAVA = "vscjava.migrate-java-to-azure";
export const APP_MODERNIZATION_UPGRADE_FOR_JAVA = "vscjava.vscode-java-upgrade";
}

export namespace Upgrade {
export const PACKAGE_ID_FOR_JAVA_RUNTIME = "java:*";
}

/**
Expand Down
2 changes: 2 additions & 0 deletions src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ import { DiagnosticProvider } from "./tasks/buildArtifact/migration/DiagnosticPr
import { setContextForDeprecatedTasks, updateExportTaskType } from "./tasks/buildArtifact/migration/utils";
import { CodeActionProvider } from "./tasks/buildArtifact/migration/CodeActionProvider";
import { newJavaFile } from "./explorerCommands/new";
import upgradeManager from "./upgrade/upgradeManager";

export async function activate(context: ExtensionContext): Promise<void> {
contextManager.initialize(context);
upgradeManager.initialize(context);
await initializeFromJsonFile(context.asAbsolutePath("./package.json"));
await initExpService(context);
await instrumentOperation("activation", activateExtension)(context);
Expand Down
8 changes: 8 additions & 0 deletions src/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ export class Settings {
workspace.getConfiguration("java.dependency").update("packagePresentation", PackagePresentation.Hierarchical, false);
}

public static disableWorkspaceDependencyDiagnostics() {
return workspace.getConfiguration("java.dependency").update("enableDependencyDiagnostics", false, ConfigurationTarget.Workspace);
}

public static switchNonJavaResourceFilter(enabled: boolean): void {
workspace.getConfiguration("java.project.explorer").update(
"showNonJavaResources",
Expand Down Expand Up @@ -108,6 +112,10 @@ export class Settings {
return workspace.getConfiguration("java.dependency").get("refreshDelay", 2000);
}

public static getEnableDependencyDiagnostics() {
return workspace.getConfiguration("java.dependency").get("enableDependencyDiagnostics", true);
}

public static getExportJarTargetPath(): string {
// tslint:disable-next-line: no-invalid-template-strings
return workspace.getConfiguration("java.project.exportJar").get<string>("targetPath", "${workspaceFolder}/${workspaceFolderBasename}.jar");
Expand Down
2 changes: 2 additions & 0 deletions src/syncHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { DataNode } from "./views/dataNode";
import { ExplorerNode } from "./views/explorerNode";
import { explorerNodeCache } from "./views/nodeCache/explorerNodeCache";
import { Jdtls } from "./java/jdtls";
import upgradeManager from "./upgrade/upgradeManager";

const ENABLE_AUTO_REFRESH: string = "java.view.package.enableAutoRefresh";
const DISABLE_AUTO_REFRESH: string = "java.view.package.disableAutoRefresh";
Expand Down Expand Up @@ -46,6 +47,7 @@ class SyncHandler implements Disposable {

this.disposables.push(workspace.onDidChangeWorkspaceFolders(() => {
this.refresh();
upgradeManager.scan();
}));

try {
Expand Down
104 changes: 104 additions & 0 deletions src/upgrade/assessmentManager.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license.

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 { DEPENDENCY_JAVA_RUNTIME } from "./dependency.data";
import { Upgrade } from '../constants';
import { buildPackageId } from './utility';
import metadataManager from './metadataManager';

function getJavaIssues(data: INodeData): UpgradeIssue[] {
const javaVersion = data.metaData?.MaxSourceVersion as number | undefined;
const { name, reason, supportedVersion, suggestedVersion } = DEPENDENCY_JAVA_RUNTIME;
if (!javaVersion) {
return [];
}
const currentSemVer = semver.coerce(javaVersion);
if (currentSemVer && !semver.satisfies(currentSemVer, supportedVersion)) {
return [{
packageId: Upgrade.PACKAGE_ID_FOR_JAVA_RUNTIME,
packageDisplayName: name,
currentVersion: String(javaVersion),
reason,
suggestedVersion,
}];
}

return [];
}

function getUpgrade(versionString: string, supportedVersionDefinition: DependencyCheckItem): Omit<UpgradeIssue, "packageId"> | null {
const { reason } = supportedVersionDefinition;
switch (reason) {
case UpgradeReason.DEPRECATED: {
const { alternative } = supportedVersionDefinition;
return {
packageDisplayName: supportedVersionDefinition.name,
reason,
currentVersion: versionString,
suggestedVersion: alternative,
}
}
case UpgradeReason.END_OF_LIFE: {
const currentSemVer = semver.coerce(versionString);
if (currentSemVer && !semver.satisfies(currentSemVer, supportedVersionDefinition.supportedVersion)) {
return {
packageDisplayName: supportedVersionDefinition.name,
reason,
currentVersion: versionString,
suggestedVersion: supportedVersionDefinition.suggestedVersion,
}
}
}

}

return null;
}

function getDependencyIssues(data: INodeData): UpgradeIssue[] {
const versionString = data.metaData?.["maven.version"];
const groupId = data.metaData?.["maven.groupId"];
const artifactId = data.metaData?.["maven.artifactId"];
const packageId = buildPackageId(groupId, artifactId);
const supportedVersionDefinition = metadataManager.getMetadataById(packageId);
if (!versionString || !groupId || !supportedVersionDefinition) {
return [];
}

const upgrade = getUpgrade(versionString, supportedVersionDefinition);
if (upgrade) {
return [{ ...upgrade, packageId }];
}
return [];
}

async function getProjectIssues(projectNode: INodeData): Promise<UpgradeIssue[]> {
const issues: UpgradeIssue[] = [];
issues.push(...getJavaIssues(projectNode));
const packageData = await Jdtls.getPackageData({ kind: NodeKind.Project, projectUri: projectNode.uri });
await Promise.allSettled(
packageData
.filter(x => x.kind === NodeKind.Container)
.map(async (packageContainer) => {
const packages = await Jdtls.getPackageData({
kind: NodeKind.Container,
projectUri: projectNode.uri,
path: packageContainer.path,
});
packages.forEach(
(pkg) => {
issues.push(...getDependencyIssues(pkg))
}
);
})
);
return issues;
}

export default {
getProjectIssues
};
42 changes: 42 additions & 0 deletions src/upgrade/dependency.data.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license.

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": `>=${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,
"name": "Java EE",
"alternative": "Jakarta EE 10",
},
"javax:javaee-web-api": {
"reason": UpgradeReason.DEPRECATED,
"name": "Java EE",
"alternative": "Jakarta EE 10",
},
[Upgrade.PACKAGE_ID_FOR_JAVA_RUNTIME]: DEPENDENCY_JAVA_RUNTIME,
};

export default DEPENDENCIES_TO_SCAN;
Loading