Kotlin: Fix recommended variable names in error messages

igfoo · igfoo · commit 712561ffa25a · 2023-05-11T13:02:35.000+01:00
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
@@ -75,11 +75,11 @@ public class OdasaOutput {
 	public OdasaOutput(boolean trackClassOrigins, Logger log) {
 		String trapFolderVar = Env.systemEnv().getFirstNonEmpty("CODEQL_EXTRACTOR_JAVA_TRAP_DIR", Var.TRAP_FOLDER.name());
 		if (trapFolderVar == null) {
-			throw new ResourceError(Var.ODASA_JAVA_LAYOUT + " was not set");
+			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());
 		if (sourceArchiveVar == null) {
-			throw new ResourceError(Var.SOURCE_ARCHIVE + " was not set");
+			throw new ResourceError("CODEQL_EXTRACTOR_JAVA_SOURCE_ARCHIVE_DIR was not set");
     }
 		this.trapFolder = new File(trapFolderVar);
 		this.sourceArchiveFolder = new File(sourceArchiveVar);

Original file line number	Diff line number	Diff line change
`@@ -75,11 +75,11 @@ public class OdasaOutput {`
`75`	`75`	`public OdasaOutput(boolean trackClassOrigins, Logger log) {`
`76`	`76`	`String trapFolderVar = Env.systemEnv().getFirstNonEmpty("CODEQL_EXTRACTOR_JAVA_TRAP_DIR", Var.TRAP_FOLDER.name());`
`77`	`77`	`if (trapFolderVar == null) {`
`78`		`- throw new ResourceError(Var.ODASA_JAVA_LAYOUT + " was not set");`
	`78`	`+ throw new ResourceError("CODEQL_EXTRACTOR_JAVA_TRAP_DIR was not set");`
`79`	`79`	`}`
`80`	`80`	`String sourceArchiveVar = Env.systemEnv().getFirstNonEmpty("CODEQL_EXTRACTOR_JAVA_SOURCE_ARCHIVE_DIR", Var.SOURCE_ARCHIVE.name());`
`81`	`81`	`if (sourceArchiveVar == null) {`
`82`		`- throw new ResourceError(Var.SOURCE_ARCHIVE + " was not set");`
	`82`	`+ throw new ResourceError("CODEQL_EXTRACTOR_JAVA_SOURCE_ARCHIVE_DIR was not set");`
`83`	`83`	`}`
`84`	`84`	`this.trapFolder = new File(trapFolderVar);`
`85`	`85`	`this.sourceArchiveFolder = new File(sourceArchiveVar);`