Merge pull request #17071 from igfoo/igfoo/dep_env

Java/Kotlin: Remove support for deprecated SOURCE_ARCHIVE and TRAP_FOLDER
github · Jul 29, 2024 · 1530037 · 1530037
2 parents 58689c9 + 225d291
commit 1530037
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/java/kotlin-extractor/src/main/java/com/semmle/extractor/java/OdasaOutput.java b/java/kotlin-extractor/src/main/java/com/semmle/extractor/java/OdasaOutput.java
@@ -78,13 +78,11 @@ public class OdasaOutput {
 	}
 
 	public OdasaOutput(boolean trackClassOrigins, Compression compression, Logger log) {
-		String trapFolderVar = Env.systemEnv().getFirstNonEmpty("CODEQL_EXTRACTOR_JAVA_TRAP_DIR",
-				Var.TRAP_FOLDER.name());
+		String trapFolderVar = Env.systemEnv().get("CODEQL_EXTRACTOR_JAVA_TRAP_DIR");
 		if (trapFolderVar == null) {
 			throw new ResourceError("CODEQL_EXTRACTOR_JAVA_TRAP_DIR was not set");
 		}
-		String sourceArchiveVar = Env.systemEnv().getFirstNonEmpty("CODEQL_EXTRACTOR_JAVA_SOURCE_ARCHIVE_DIR",
-				Var.SOURCE_ARCHIVE.name());
+		String sourceArchiveVar = Env.systemEnv().get("CODEQL_EXTRACTOR_JAVA_SOURCE_ARCHIVE_DIR");
 		if (sourceArchiveVar == null) {
 			throw new ResourceError("CODEQL_EXTRACTOR_JAVA_SOURCE_ARCHIVE_DIR was not set");
 		}

diff --git a/java/kotlin-extractor/src/main/java/com/semmle/util/process/Env.java b/java/kotlin-extractor/src/main/java/com/semmle/util/process/Env.java
@@ -256,8 +256,6 @@ public enum Var {
 		 */
 		ODASA_SRC,
 		ODASA_DB,
-		TRAP_FOLDER,
-		SOURCE_ARCHIVE,
 		ODASA_OUTPUT,
 		ODASA_SUBPROJECT_THREADS,
 

diff --git a/java/ql/lib/change-notes/2024-07-25-env-vars.md b/java/ql/lib/change-notes/2024-07-25-env-vars.md
@@ -0,0 +1,4 @@
+---
+category: breaking
+---
+* The Java and Kotlin extractors no longer support the `SOURCE_ARCHIVE` and `TRAP_FOLDER` legacy environment variable.