Skip to content

Commit b88ead0

Browse files
committed
Fix codeanalyzer.jar not being a PosixPath
Signed-off-by: Rahul Krishna <[email protected]>
1 parent e567b5c commit b88ead0

File tree

6 files changed

+81
-110
lines changed

6 files changed

+81
-110
lines changed

cldk/analysis/java/codeanalyzer/codeanalyzer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,13 @@ def _get_codeanalyzer_exec(self) -> List[str]:
130130
if self.analysis_backend_path:
131131
analysis_backend_path = Path(self.analysis_backend_path)
132132
logger.info(f"Using codeanalyzer.jar from {analysis_backend_path}")
133-
codeanalyzer_jar_file = next(analysis_backend_path.glob("*.jar"), None)
133+
codeanalyzer_jar_file = next(analysis_backend_path.rglob("codeanalyzer-*.jar"), None)
134134
if codeanalyzer_jar_file is None:
135135
raise CodeanalyzerExecutionException(f"No codeanalyzer jar found in {analysis_backend_path}")
136136
codeanalyzer_exec = shlex.split(f"java -jar {analysis_backend_path / codeanalyzer_jar_file}")
137137
else:
138138
with resources.as_file(resources.files("cldk.analysis.java.codeanalyzer.jar")) as codeanalyzer_jar_path:
139-
codeanalyzer_jar_file = next(codeanalyzer_jar_path / "*.jar", None)
139+
codeanalyzer_jar_file = next(codeanalyzer_jar_path.rglob("codeanalyzer-*.jar"), None)
140140
codeanalyzer_exec = shlex.split(f"java -jar {codeanalyzer_jar_file}")
141141
return codeanalyzer_exec
142142

0 commit comments

Comments
 (0)