rm contextValue migration

Author: dshimo

src/definitions/constants.ts

@@ -37,45 +37,12 @@ export function isAggregator(contextValue: string): boolean {
     return /^libertyProject.*:aggregator/.test(contextValue);
 }
 
-// ---------------------------------------------------------------------------
-// Deprecated — kept temporarily for persisted storage migration only.
-// These are the old contextValue strings that may exist in workspaceState for
-// users upgrading. createLibertyProject maps these to new values on load.
-// Remove after one release cycle.
-// ---------------------------------------------------------------------------
-/** @deprecated Use LIBERTY_PROJECT_MAVEN */
-export const LIBERTY_MAVEN_PROJECT = "libertyMavenProject";
-/** @deprecated Use LIBERTY_PROJECT_GRADLE */
-export const LIBERTY_GRADLE_PROJECT = "libertyGradleProject";
-/** @deprecated Use LIBERTY_PROJECT_MAVEN_CONTAINER */
-export const LIBERTY_MAVEN_PROJECT_CONTAINER = "libertyMavenProjectContainer";
-/** @deprecated Use LIBERTY_PROJECT_GRADLE_CONTAINER */
-export const LIBERTY_GRADLE_PROJECT_CONTAINER = "libertyGradleProjectContainer";
-
 export const TEST_REPORT_STRING = "Test Summary";
 export const LIBERTY_DASHBOARD_WORKSPACE_STORAGE_KEY = "liberty.dashboard.data";
 export const LIBERTY_MAVEN_PLUGIN_CONTAINER_VERSION = "3.3.0";
 export const LIBERTY_GRADLE_PLUGIN_CONTAINER_VERSION = "3.1.0";
 export const LIBERTY_SERVER_ENV_PORT_REGEX = /^WLP_DEBUG_ADDRESS=([\d]+)$/;
 
-// ---------------------------------------------------------------------------
-// Deprecated — COMMAND_AND_PROJECT_TYPE_MAP replaced by regex helpers above.
-// filterProjects in helperUtil.ts now uses isMaven/isGradle/isContainer.
-// Remove after migration is complete.
-// ---------------------------------------------------------------------------
-/** @deprecated Use isMaven/isGradle/isContainer helpers in filterProjects */
-export const COMMAND_AND_PROJECT_TYPE_MAP: { [command: string]: string[] } = {
-    "liberty.dev.start": [LIBERTY_MAVEN_PROJECT, LIBERTY_GRADLE_PROJECT, LIBERTY_MAVEN_PROJECT_CONTAINER, LIBERTY_GRADLE_PROJECT_CONTAINER],
-    "liberty.dev.stop":[LIBERTY_MAVEN_PROJECT, LIBERTY_GRADLE_PROJECT, LIBERTY_MAVEN_PROJECT_CONTAINER, LIBERTY_GRADLE_PROJECT_CONTAINER],
-    "liberty.dev.custom":[LIBERTY_MAVEN_PROJECT, LIBERTY_GRADLE_PROJECT, LIBERTY_MAVEN_PROJECT_CONTAINER, LIBERTY_GRADLE_PROJECT_CONTAINER],
-    "liberty.dev.start.container":[ LIBERTY_MAVEN_PROJECT_CONTAINER, LIBERTY_GRADLE_PROJECT_CONTAINER],
-    "liberty.dev.run.tests":[LIBERTY_MAVEN_PROJECT, LIBERTY_GRADLE_PROJECT, LIBERTY_MAVEN_PROJECT_CONTAINER, LIBERTY_GRADLE_PROJECT_CONTAINER],
-    "failsafe":[LIBERTY_MAVEN_PROJECT , LIBERTY_MAVEN_PROJECT_CONTAINER],
-    "surefire":[LIBERTY_MAVEN_PROJECT, LIBERTY_MAVEN_PROJECT_CONTAINER],
-    "gradle":[ LIBERTY_GRADLE_PROJECT, LIBERTY_GRADLE_PROJECT_CONTAINER],
-    "liberty.dev.debug": [LIBERTY_MAVEN_PROJECT, LIBERTY_GRADLE_PROJECT, LIBERTY_MAVEN_PROJECT_CONTAINER, LIBERTY_GRADLE_PROJECT_CONTAINER],
-};
-
 export const EXCLUDED_DIR_PATTERN = "**/{bin,classes,target,build}/**";
 export const COMMAND_TITLES = new Map();
 export const UNTITLED_WORKSPACE="Untitled (Workspace)";

src/liberty/projectDiscovery.ts

@@ -14,8 +14,6 @@ import {
 	LIBERTY_PROJECT_MAVEN_CONTAINER, LIBERTY_PROJECT_GRADLE_CONTAINER,
 	LIBERTY_PROJECT_MAVEN_AGGREGATOR, LIBERTY_PROJECT_GRADLE_AGGREGATOR,
 	isMaven, isGradle,
-	LIBERTY_MAVEN_PROJECT, LIBERTY_GRADLE_PROJECT,
-	LIBERTY_MAVEN_PROJECT_CONTAINER, LIBERTY_GRADLE_PROJECT_CONTAINER,
 } from "../definitions/constants";
 import { BuildFileImpl, GradleBuildFile } from "../util/buildFile";
 import { BaseLibertyProject } from "./baseLibertyProject";
@@ -40,21 +38,6 @@ export interface DiscoveryResult {
 	rootProjects: LibertyProject[];
 }
 
-/**
- * Migration shim: map old persisted contextValue strings to new scheme.
- * Users upgrading from previous versions may have old strings in workspaceState.
- * Remove this shim after one release cycle.
- */
-export function migrateContextValue(cv: string): string {
-	const map: Record<string, string> = {
-		[LIBERTY_MAVEN_PROJECT]: LIBERTY_PROJECT_MAVEN,
-		[LIBERTY_GRADLE_PROJECT]: LIBERTY_PROJECT_GRADLE,
-		[LIBERTY_MAVEN_PROJECT_CONTAINER]: LIBERTY_PROJECT_MAVEN_CONTAINER,
-		[LIBERTY_GRADLE_PROJECT_CONTAINER]: LIBERTY_PROJECT_GRADLE_CONTAINER,
-	};
-	return map[cv] ?? cv;
-}
-
 /**
  * Create a LibertyProject from a folder path (no known type) or a build file path + type.
  */
@@ -67,12 +50,11 @@ export async function createLibertyProjectFromPath(
 	let project: LibertyProject | undefined;
 
 	if (type !== undefined) {
-		const migratedType = migrateContextValue(type);
-		if (fse.existsSync(path) && isMaven(migratedType)) {
+		if (fse.existsSync(path) && isMaven(type)) {
 			const xmlString = await fse.readFile(path, "utf8");
-			project = await createProject(context, path, migratedType, xmlString);
-		} else if (fse.existsSync(path) && isGradle(migratedType)) {
-			project = await createProject(context, path, migratedType);
+			project = await createProject(context, path, type, xmlString);
+		} else if (fse.existsSync(path) && isGradle(type)) {
+			project = await createProject(context, path, type);
 		}
 	} else {
 		const pomFile = vscodePath.resolve(path, "pom.xml");

src/util/helperUtil.ts

@@ -56,7 +56,6 @@ export function devModeRequirement(command: string): boolean | undefined {
  * @returns a list of projects that the given command can be excuted on.
  */
 export function filterProjects(projects: LibertyProject[], command: string): LibertyProject[] {
-	// Replaced COMMAND_AND_PROJECT_TYPE_MAP array lookups with regex helpers.
 	// Aggregators are intentionally excluded — command palette picks leaf projects only;
 	// aggregator delegation is handled by pickProject in libertyProject.ts.
 	const req = devModeRequirement(command);