Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 0 additions & 7 deletions java-frontend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -158,13 +158,6 @@
<resource>
<directory>src/main/resources</directory>
</resource>
<resource>
<directory>${maven.multiModuleProjectDirectory}/semsitter-bridge/prebuilt</directory>
<includes>
<include>bridge-*.xz</include>
</includes>
<targetPath>bridge</targetPath>
</resource>
</resources>
<plugins>
<plugin>
Expand Down
14 changes: 14 additions & 0 deletions java-frontend/src/main/java/org/sonar/java/JavaFrontend.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
Expand All @@ -42,6 +43,7 @@
import org.sonar.java.filters.SonarJavaIssueFilter;
import org.sonar.java.model.JParserConfig;
import org.sonar.java.model.VisitorsBridge;
import org.sonar.java.semsitter.SemsitterBridge;
import org.sonar.java.telemetry.Telemetry;
import org.sonar.java.telemetry.TelemetryKey;
import org.sonar.plugins.java.api.JavaCheck;
Expand Down Expand Up @@ -237,6 +239,18 @@ private void scanInBatches(BatchModeContext context, List<InputFile> allInputFil
private <T extends InputFile> void scanBatch(BatchModeContext context, List<T> batchFiles, AnalysisProgress analysisProgress) {
analysisProgress.startBatch(batchFiles.size());
Set<Runnable> environmentsCleaners = new HashSet<>();
if (sonarComponents.context() != null) {
SemsitterBridge.moduleRoot(sonarComponents.context().fileSystem().baseDir().toPath());
var config = sonarComponents.context().config();
Map<String, List<String>> settings = new HashMap<>();
settings.put("jvm.libraries", List.of(config.getStringArray("sonar.java.libraries")));
settings.put("jvm.binaries", List.of(config.getStringArray("sonar.java.binaries")));
settings.put("jvm.test_libraries", List.of(config.getStringArray("sonar.java.test.libraries")));
settings.put("jvm.test_binaries", List.of(config.getStringArray("sonar.java.test.binaries")));
config.get("sonar.java.jdkHome").ifPresent(home -> settings.put("jvm.jdk_home", List.of(home)));
settings.values().removeIf(List::isEmpty);
SemsitterBridge.moduleSettings(settings);
}
JParserConfig.Mode.BATCH
.create(javaVersion, context.getClasspath(), sonarComponents.shouldIgnoreUnnamedModuleForSplitPackage())
.parse(batchFiles, sonarComponents::analysisCancelled, analysisProgress, (input, result) -> scanAsBatchCallback(input, result, context, environmentsCleaners));
Expand Down
15 changes: 7 additions & 8 deletions java-frontend/src/main/java/org/sonar/java/model/JParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@
import java.util.Objects;
import java.util.stream.Stream;
import javax.annotation.Nullable;
import org.sonar.java.semsitter.BridgeExtractor;
import org.sonar.java.semsitter.PlatformDetection;
import org.sonar.java.semsitter.EmbeddedUdgGen;
import org.sonar.java.semsitter.SemsitterBridge;

public final class JParser {
Expand Down Expand Up @@ -132,19 +131,19 @@ private static Path privateTempDirectory() throws IOException {
return Files.createTempDirectory("sonar-java-unit");
}

/** The {@code udg-gen} executable: {@code -Dsonar.java.semsitter.udg}, else {@code SEMSITTER_UDG_GEN}, else the packaged one. */
static Path bridgePath() {
String configured = System.getProperty("sonar.java.semsitter.bridge");
String configured = System.getProperty("sonar.java.semsitter.udg");
if (configured == null || configured.isBlank()) {
configured = System.getenv("SEMSITTER_BRIDGE");
configured = System.getenv("SEMSITTER_UDG_GEN");
}
if (configured != null && !configured.isBlank()) {
return Path.of(configured);
}
try {
Path target = Path.of(System.getProperty("java.io.tmpdir"), "sonar-java", "semsitter-bridge");
return BridgeExtractor.extract(target, new PlatformDetection().getPlatform());
} catch (Exception failure) {
throw new RecognitionException(1, "SemSitter bridge is unavailable: " + failure.getMessage(), failure);
return EmbeddedUdgGen.extract();
} catch (IOException failure) {
throw new RecognitionException(1, "SemSitter server is unavailable: " + failure.getMessage(), failure);
}
}

Expand Down
Loading