Skip to content
Closed
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
5 changes: 5 additions & 0 deletions java-checks-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.sonarsource.scanner.engine</groupId>
<artifactId>sensor-test-fixtures</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,16 @@
package org.sonar.java.checks.helpers;

import com.google.common.io.Files;
import com.sonarsource.scanner.engine.sensor.test.fixtures.TestInputFileBuilder;
import java.io.File;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import org.sonar.java.model.JParserConfig;
import org.sonar.java.AnalysisProgress;
import org.sonar.java.model.JParseResult;
import org.sonar.java.model.JParser;
import org.sonar.plugins.java.api.JavaVersion;
import org.sonar.plugins.java.api.tree.*;

Expand Down Expand Up @@ -73,8 +77,21 @@ public static CompilationUnitTree parse(File file) {

public static CompilationUnitTree parse(String source) {
List<File> classpath = Arrays.asList(new File("target/test-classes"), new File("target/classes"));
JavaVersion version = JParserConfig.MAXIMUM_SUPPORTED_JAVA_VERSION;
return JParserConfig.Mode.FILE_BY_FILE.create(version, classpath).parse("test", source);
JavaVersion version = JParser.MAXIMUM_SUPPORTED_JAVA_VERSION;
var inputFile = new TestInputFileBuilder("", "test")
.setContents(source)
.setCharset(StandardCharsets.UTF_8)
.build();
List<JParseResult> results = new ArrayList<>();
JParser.Mode.FILE_BY_FILE.create(version, classpath)
.parse(List.of(inputFile), () -> false, new AnalysisProgress(1), (input, result) -> results.add(result));
try {
return results.getFirst().get();
} catch (RuntimeException e) {
throw e;
} catch (Exception e) {
throw new IllegalStateException("Unable to parse source", e);
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,16 @@
package org.sonar.java.checks.helpers;

import com.google.common.io.Files;
import com.sonarsource.scanner.engine.sensor.test.fixtures.TestInputFileBuilder;
import java.io.File;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import org.sonar.java.model.JParserConfig;
import org.sonar.java.AnalysisProgress;
import org.sonar.java.model.JParseResult;
import org.sonar.java.model.JParser;
import org.sonar.plugins.java.api.JavaVersion;
import org.sonar.plugins.java.api.tree.AssignmentExpressionTree;
import org.sonar.plugins.java.api.tree.ClassTree;
Expand Down Expand Up @@ -83,8 +87,21 @@ public static CompilationUnitTree parse(File file) {

public static CompilationUnitTree parse(String source) {
List<File> classpath = Arrays.asList(new File("target/test-classes"), new File("target/classes"));
JavaVersion version = JParserConfig.MAXIMUM_SUPPORTED_JAVA_VERSION;
return JParserConfig.Mode.FILE_BY_FILE.create(version, classpath).parse("test", source);
JavaVersion version = JParser.MAXIMUM_SUPPORTED_JAVA_VERSION;
var inputFile = new TestInputFileBuilder("", "test")
.setContents(source)
.setCharset(StandardCharsets.UTF_8)
.build();
List<JParseResult> results = new ArrayList<>();
JParser.Mode.FILE_BY_FILE.create(version, classpath)
.parse(List.of(inputFile), () -> false, new AnalysisProgress(1), (input, result) -> results.add(result));
try {
return results.getFirst().get();
} catch (RuntimeException e) {
throw e;
} catch (Exception e) {
throw new IllegalStateException("Unable to parse source", e);
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,16 @@
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.function.UnaryOperator;
import org.sonar.api.batch.fs.InputFile;
import org.sonar.java.AnalysisProgress;
import org.sonar.java.SonarComponents;
import org.sonar.java.checks.verifier.TestUtils;
import org.sonar.java.model.JParserConfig;
import org.sonar.java.model.JParseResult;
import org.sonar.java.model.JParser;
import org.sonar.java.model.VisitorsBridge;
import org.sonar.java.model.springcontext.BeanDefinitionGatherer;
import org.sonar.java.model.springcontext.BeanDefinitionHolder;
Expand Down Expand Up @@ -166,13 +169,16 @@ private static InputFile inputFile(File file) {
}

private static CompilationUnitTree parse(File file, List<File> classpath) {
String source;
List<JParseResult> results = new ArrayList<>();
JavaVersion version = JParser.MAXIMUM_SUPPORTED_JAVA_VERSION;
JParser.Mode.FILE_BY_FILE.create(version, classpath)
.parse(List.of(inputFile(file)), () -> false, new AnalysisProgress(1), (input, result) -> results.add(result));
try {
source = Files.readString(file.toPath(), StandardCharsets.UTF_8);
return results.getFirst().get();
} catch (RuntimeException e) {
throw e;
} catch (Exception e) {
throw new IllegalStateException("Unable to read file '" + file.getAbsolutePath() + "'", e);
throw new IllegalStateException("Unable to parse file '" + file.getAbsolutePath() + "'", e);
}
JavaVersion version = JParserConfig.MAXIMUM_SUPPORTED_JAVA_VERSION;
return JParserConfig.Mode.FILE_BY_FILE.create(version, classpath).parse(file.getName(), source);
}
}
7 changes: 4 additions & 3 deletions java-frontend/src/main/java/org/sonar/java/JavaFrontend.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
import org.sonar.java.collections.CollectionUtils;
import org.sonar.java.exceptions.ApiMismatchException;
import org.sonar.java.filters.SonarJavaIssueFilter;
import org.sonar.java.model.JParserConfig;
import org.sonar.java.model.JParseResult;
import org.sonar.java.model.JParser;
import org.sonar.java.model.VisitorsBridge;
import org.sonar.java.telemetry.Telemetry;
import org.sonar.java.telemetry.TelemetryKey;
Expand Down Expand Up @@ -237,15 +238,15 @@ private void scanInBatches(BatchModeContext context, List<InputFile> allInputFil
private void scanBatch(BatchModeContext context, List<InputFile> batchFiles, AnalysisProgress analysisProgress) {
analysisProgress.startBatch(batchFiles.size());
Set<Runnable> environmentsCleaners = new HashSet<>();
JParserConfig.Mode.BATCH
JParser.Mode.BATCH
.create(javaVersion, context.getClasspath(), sonarComponents.shouldIgnoreUnnamedModuleForSplitPackage())
.parse(batchFiles, sonarComponents::analysisCancelled, analysisProgress, (input, result) -> scanAsBatchCallback(input, result, context, environmentsCleaners));
// Due to a bug in ECJ, JAR files remain locked after the analysis on Windows, we unlock them manually, at the end of each batches. See SONARJAVA-3609.
environmentsCleaners.forEach(Runnable::run);
analysisProgress.endBatch();
}

private static void scanAsBatchCallback(InputFile inputFile, JParserConfig.Result result, BatchModeContext context, Set<Runnable> environmentsCleaners) {
private static void scanAsBatchCallback(InputFile inputFile, JParseResult result, BatchModeContext context, Set<Runnable> environmentsCleaners) {
JavaAstScanner scanner = context.selectScanner(inputFile);
Duration duration = PerformanceMeasure.start(context.descriptor(inputFile));
scanner.simpleScan(inputFile, result, ast ->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
import org.sonar.java.SonarComponents;
import org.sonar.java.annotations.VisibleForTesting;
import org.sonar.java.model.InputFileUtils;
import org.sonar.java.model.JParserConfig;
import org.sonar.java.model.JParseResult;
import org.sonar.java.model.JParser;
import org.sonar.java.model.JavaTree;
import org.sonar.java.model.VisitorsBridge;
import org.sonar.java.telemetry.NoOpTelemetry;
Expand Down Expand Up @@ -108,7 +109,7 @@ private void scan(Iterable<? extends InputFile> inputFiles, Consumer<Compilation
try {
boolean shouldIgnoreUnnamedModuleForSplitPacakge = sonarComponents != null &&
sonarComponents.shouldIgnoreUnnamedModuleForSplitPackage();
JParserConfig.Mode.FILE_BY_FILE
JParser.Mode.FILE_BY_FILE
.create(visitor.getJavaVersion(), visitor.getClasspath(), shouldIgnoreUnnamedModuleForSplitPacakge)
.parse(filesNames,
this::analysisCancelled,
Expand Down Expand Up @@ -150,12 +151,12 @@ private boolean analysisCancelled() {
return sonarComponents != null && sonarComponents.analysisCancelled();
}

public void simpleScan(InputFile inputFile, JParserConfig.Result result, Consumer<JavaTree.CompilationUnitTreeImpl> cleanUp) {
public void simpleScan(InputFile inputFile, JParseResult result, Consumer<JavaTree.CompilationUnitTreeImpl> cleanUp) {
simpleScan(inputFile, result, cleanUp, compilationUnitTree -> {});
}

// modifyCompilationUnit should be used for testing.
public void simpleScan(InputFile inputFile, JParserConfig.Result result, Consumer<JavaTree.CompilationUnitTreeImpl> cleanUp,
public void simpleScan(InputFile inputFile, JParseResult result, Consumer<JavaTree.CompilationUnitTreeImpl> cleanUp,
Consumer<CompilationUnitTree> modifyCompilationUnit) {
long startTime = currentTimeMillis();
visitor.setCurrentFile(inputFile);
Expand Down
Loading
Loading