Skip to content

Commit

Permalink
Rename batch into scanner
Browse files Browse the repository at this point in the history
  • Loading branch information
@henryju
henryju committed Mar 18, 2016
1 parent 38ce809 commit cfcbe27
Show file tree
Hide file tree
Showing 728 changed files with 1,065 additions and 1,074 deletions.
12 changes: 6 additions & 6 deletions pom.xml
View file
Expand Up @@ -18,9 +18,9 @@
<modules> <modules>
<module>sonar-plugin-api-deps</module> <module>sonar-plugin-api-deps</module>
<module>sonar-application</module> <module>sonar-application</module>
<module>sonar-batch</module> <module>sonar-scanner-engine</module>
<module>sonar-batch-protocol</module> <module>sonar-scanner-protocol</module>
<module>sonar-batch-shaded</module> <module>sonar-scanner-engine-shaded</module>
<module>sonar-check-api</module> <module>sonar-check-api</module>
<module>sonar-colorizer</module> <module>sonar-colorizer</module>
<module>sonar-core</module> <module>sonar-core</module>
Expand Down Expand Up @@ -442,7 +442,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>sonar-batch-protocol</artifactId> <artifactId>sonar-scanner-protocol</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
Expand Down Expand Up @@ -1436,7 +1436,7 @@


<!-- <!--
The following profiles optimize the build for each team, according to their The following profiles optimize the build for each team, according to their
stack layers (batch, server and web teams) stack layers (scanner, server and web teams)
--> -->
<profile> <profile>
<!-- disable all tests --> <!-- disable all tests -->
Expand All @@ -1453,7 +1453,7 @@
</profile> </profile>


<profile> <profile>
<id>batch</id> <id>scanner</id>
<properties> <properties>
<skipServerTests>true</skipServerTests> <skipServerTests>true</skipServerTests>
</properties> </properties>
Expand Down
5 changes: 5 additions & 0 deletions server/sonar-server-benchmarks/pom.xml
View file
Expand Up @@ -60,6 +60,11 @@
<artifactId>dbunit</artifactId> <artifactId>dbunit</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>


<build> <build>
Expand Down
54 changes: 26 additions & 28 deletions ...erver-benchmarks/src/test/java/org/sonar/server/benchmark/PersistFileSourcesStepTest.java
View file
Expand Up @@ -31,12 +31,12 @@
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.sonar.api.utils.System2; import org.sonar.api.utils.System2;
import org.sonar.batch.protocol.Constants;
import org.sonar.batch.protocol.output.BatchReport;
import org.sonar.batch.protocol.output.BatchReportWriter;
import org.sonar.core.util.Uuids; import org.sonar.core.util.Uuids;
import org.sonar.db.DbClient; import org.sonar.db.DbClient;
import org.sonar.db.DbTester; import org.sonar.db.DbTester;
import org.sonar.scanner.protocol.Constants;
import org.sonar.scanner.protocol.output.ScannerReport;
import org.sonar.scanner.protocol.output.ScannerReportWriter;
import org.sonar.server.computation.analysis.AnalysisMetadataHolderRule; import org.sonar.server.computation.analysis.AnalysisMetadataHolderRule;
import org.sonar.server.computation.batch.BatchReportDirectoryHolderImpl; import org.sonar.server.computation.batch.BatchReportDirectoryHolderImpl;
import org.sonar.server.computation.batch.BatchReportReaderImpl; import org.sonar.server.computation.batch.BatchReportReaderImpl;
Expand Down Expand Up @@ -88,14 +88,14 @@ private void persistFileSources(File reportDir) {


long start = System.currentTimeMillis(); long start = System.currentTimeMillis();


BatchReportDirectoryHolderImpl batchReportDirectoryHolder = new BatchReportDirectoryHolderImpl(); BatchReportDirectoryHolderImpl ScannerReportDirectoryHolder = new BatchReportDirectoryHolderImpl();
batchReportDirectoryHolder.setDirectory(reportDir); ScannerReportDirectoryHolder.setDirectory(reportDir);
org.sonar.server.computation.batch.BatchReportReader batchReportReader = new BatchReportReaderImpl(batchReportDirectoryHolder); org.sonar.server.computation.batch.BatchReportReader ScannerReportReader = new BatchReportReaderImpl(ScannerReportDirectoryHolder);
analysisMetadataHolder.setBaseProjectSnapshot(null); analysisMetadataHolder.setBaseProjectSnapshot(null);
SourceLinesRepositoryImpl sourceLinesRepository = new SourceLinesRepositoryImpl(batchReportReader); SourceLinesRepositoryImpl sourceLinesRepository = new SourceLinesRepositoryImpl(ScannerReportReader);
SourceHashRepositoryImpl sourceHashRepository = new SourceHashRepositoryImpl(sourceLinesRepository); SourceHashRepositoryImpl sourceHashRepository = new SourceHashRepositoryImpl(sourceLinesRepository);
ScmInfoRepositoryImpl scmInfoRepository = new ScmInfoRepositoryImpl(batchReportReader, analysisMetadataHolder, dbClient, sourceHashRepository); ScmInfoRepositoryImpl scmInfoRepository = new ScmInfoRepositoryImpl(ScannerReportReader, analysisMetadataHolder, dbClient, sourceHashRepository);
PersistFileSourcesStep step = new PersistFileSourcesStep(dbClient, System2.INSTANCE, treeRootHolder, batchReportReader, sourceLinesRepository, scmInfoRepository, PersistFileSourcesStep step = new PersistFileSourcesStep(dbClient, System2.INSTANCE, treeRootHolder, ScannerReportReader, sourceLinesRepository, scmInfoRepository,
duplicationRepository); duplicationRepository);
step.execute(); step.execute();


Expand All @@ -112,11 +112,11 @@ private File prepareReport() throws IOException {
LOGGER.info("Create report"); LOGGER.info("Create report");
File reportDir = temp.newFolder(); File reportDir = temp.newFolder();


BatchReportWriter writer = new BatchReportWriter(reportDir); ScannerReportWriter writer = new ScannerReportWriter(reportDir);
writer.writeMetadata(BatchReport.Metadata.newBuilder() writer.writeMetadata(ScannerReport.Metadata.newBuilder()
.setRootComponentRef(1) .setRootComponentRef(1)
.build()); .build());
BatchReport.Component.Builder project = BatchReport.Component.newBuilder() ScannerReport.Component.Builder project = ScannerReport.Component.newBuilder()
.setRef(1) .setRef(1)
.setType(Constants.ComponentType.PROJECT); .setType(Constants.ComponentType.PROJECT);


Expand All @@ -140,19 +140,17 @@ private File prepareReport() throws IOException {
return reportDir; return reportDir;
} }


private Component generateFileReport(BatchReportWriter writer, int fileRef) throws IOException { private Component generateFileReport(ScannerReportWriter writer, int fileRef) throws IOException {
LineData lineData = new LineData(); LineData lineData = new LineData();
for (int line = 1; line <= NUMBER_OF_LINES; line++) { for (int line = 1; line <= NUMBER_OF_LINES; line++) {
lineData.generateLineData(line); lineData.generateLineData(line);
duplicationRepository.add( duplicationRepository.add(
fileRef, fileRef,
new Duplication( new Duplication(
new TextBlock(line, line), new TextBlock(line, line),
Arrays.<Duplicate>asList(new InnerDuplicate(new TextBlock(line + 1, line + 1))) Arrays.<Duplicate>asList(new InnerDuplicate(new TextBlock(line + 1, line + 1)))));
)
);
} }
writer.writeComponent(BatchReport.Component.newBuilder() writer.writeComponent(ScannerReport.Component.newBuilder()
.setRef(fileRef) .setRef(fileRef)
.setType(Constants.ComponentType.FILE) .setType(Constants.ComponentType.FILE)
.setLines(NUMBER_OF_LINES) .setLines(NUMBER_OF_LINES)
Expand All @@ -169,22 +167,22 @@ private Component generateFileReport(BatchReportWriter writer, int fileRef) thro


private static class LineData { private static class LineData {
List<String> lines = new ArrayList<>(); List<String> lines = new ArrayList<>();
BatchReport.Changesets.Builder changesetsBuilder = BatchReport.Changesets.newBuilder(); ScannerReport.Changesets.Builder changesetsBuilder = ScannerReport.Changesets.newBuilder();
List<BatchReport.Coverage> coverages = new ArrayList<>(); List<ScannerReport.Coverage> coverages = new ArrayList<>();
List<BatchReport.SyntaxHighlighting> highlightings = new ArrayList<>(); List<ScannerReport.SyntaxHighlighting> highlightings = new ArrayList<>();
List<BatchReport.Symbol> symbols = new ArrayList<>(); List<ScannerReport.Symbol> symbols = new ArrayList<>();


void generateLineData(int line) { void generateLineData(int line) {
lines.add("line-" + line); lines.add("line-" + line);


changesetsBuilder.addChangeset(BatchReport.Changesets.Changeset.newBuilder() changesetsBuilder.addChangeset(ScannerReport.Changesets.Changeset.newBuilder()
.setAuthor("author-" + line) .setAuthor("author-" + line)
.setDate(123456789L) .setDate(123456789L)
.setRevision("rev-" + line) .setRevision("rev-" + line)
.build()) .build())
.addChangesetIndexByLine(line - 1); .addChangesetIndexByLine(line - 1);


coverages.add(BatchReport.Coverage.newBuilder() coverages.add(ScannerReport.Coverage.newBuilder()
.setLine(line) .setLine(line)
.setConditions(10) .setConditions(10)
.setUtHits(true) .setUtHits(true)
Expand All @@ -194,19 +192,19 @@ void generateLineData(int line) {
.setOverallCoveredConditions(4) .setOverallCoveredConditions(4)
.build()); .build());


highlightings.add(BatchReport.SyntaxHighlighting.newBuilder() highlightings.add(ScannerReport.SyntaxHighlighting.newBuilder()
.setRange(BatchReport.TextRange.newBuilder() .setRange(ScannerReport.TextRange.newBuilder()
.setStartLine(line).setEndLine(line) .setStartLine(line).setEndLine(line)
.setStartOffset(1).setEndOffset(3) .setStartOffset(1).setEndOffset(3)
.build()) .build())
.setType(Constants.HighlightingType.ANNOTATION) .setType(Constants.HighlightingType.ANNOTATION)
.build()); .build());


symbols.add(BatchReport.Symbol.newBuilder() symbols.add(ScannerReport.Symbol.newBuilder()
.setDeclaration(BatchReport.TextRange.newBuilder() .setDeclaration(ScannerReport.TextRange.newBuilder()
.setStartLine(line).setEndLine(line).setStartOffset(2).setEndOffset(4) .setStartLine(line).setEndLine(line).setStartOffset(2).setEndOffset(4)
.build()) .build())
.addReference(BatchReport.TextRange.newBuilder() .addReference(ScannerReport.TextRange.newBuilder()
.setStartLine(line + 1).setEndLine(line + 1).setStartOffset(1).setEndOffset(3) .setStartLine(line + 1).setEndLine(line + 1).setStartOffset(1).setEndOffset(3)
.build()) .build())
.build()); .build());
Expand Down
2 changes: 1 addition & 1 deletion server/sonar-server/pom.xml
View file
Expand Up @@ -69,7 +69,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>sonar-batch-protocol</artifactId> <artifactId>sonar-scanner-protocol</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
Expand Down
4 changes: 2 additions & 2 deletions server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java
View file
Expand Up @@ -23,13 +23,13 @@
import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Request;
import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.Response;
import org.sonar.api.server.ws.WebService; import org.sonar.api.server.ws.WebService;
import org.sonar.batch.protocol.input.GlobalRepositories;
import org.sonar.db.DbClient; import org.sonar.db.DbClient;
import org.sonar.db.DbSession; import org.sonar.db.DbSession;
import org.sonar.db.MyBatis; import org.sonar.db.MyBatis;
import org.sonar.db.metric.MetricDto; import org.sonar.db.metric.MetricDto;
import org.sonar.db.property.PropertiesDao; import org.sonar.db.property.PropertiesDao;
import org.sonar.db.property.PropertyDto; import org.sonar.db.property.PropertyDto;
import org.sonar.scanner.protocol.input.GlobalRepositories;
import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.ForbiddenException;
import org.sonar.server.user.UserSession; import org.sonar.server.user.UserSession;
import org.sonarqube.ws.MediaTypes; import org.sonarqube.ws.MediaTypes;
Expand Down Expand Up @@ -82,7 +82,7 @@ public void handle(Request request, Response response) throws Exception {
private void addMetrics(GlobalRepositories ref, DbSession session) { private void addMetrics(GlobalRepositories ref, DbSession session) {
for (MetricDto metric : dbClient.metricDao().selectEnabled(session)) { for (MetricDto metric : dbClient.metricDao().selectEnabled(session)) {
ref.addMetric( ref.addMetric(
new org.sonar.batch.protocol.input.Metric(metric.getId(), metric.getKey(), new org.sonar.scanner.protocol.input.Metric(metric.getId(), metric.getKey(),
metric.getValueType(), metric.getValueType(),
metric.getDescription(), metric.getDescription(),
metric.getDirection(), metric.getDirection(),
Expand Down
8 changes: 4 additions & 4 deletions server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java
View file
Expand Up @@ -28,11 +28,11 @@
import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Request;
import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.Response;
import org.sonar.api.server.ws.WebService; import org.sonar.api.server.ws.WebService;
import org.sonar.batch.protocol.input.BatchInput;
import org.sonar.db.DbClient; import org.sonar.db.DbClient;
import org.sonar.db.DbSession; import org.sonar.db.DbSession;
import org.sonar.db.MyBatis; import org.sonar.db.MyBatis;
import org.sonar.db.component.ComponentDto; import org.sonar.db.component.ComponentDto;
import org.sonar.scanner.protocol.input.ScannerInput;
import org.sonar.server.component.ComponentFinder; import org.sonar.server.component.ComponentFinder;
import org.sonar.server.issue.index.IssueDoc; import org.sonar.server.issue.index.IssueDoc;
import org.sonar.server.issue.index.IssueIndex; import org.sonar.server.issue.index.IssueIndex;
Expand Down Expand Up @@ -86,7 +86,7 @@ public void handle(Request request, Response response) throws Exception {
ComponentDto component = componentFinder.getByKey(session, componentKey); ComponentDto component = componentFinder.getByKey(session, componentKey);
Map<String, String> keysByUUid = keysByUUid(session, component); Map<String, String> keysByUUid = keysByUUid(session, component);


BatchInput.ServerIssue.Builder issueBuilder = BatchInput.ServerIssue.newBuilder(); ScannerInput.ServerIssue.Builder issueBuilder = ScannerInput.ServerIssue.newBuilder();
for (Iterator<IssueDoc> issueDocIterator = issueIndex.selectIssuesForBatch(component); issueDocIterator.hasNext();) { for (Iterator<IssueDoc> issueDocIterator = issueIndex.selectIssuesForBatch(component); issueDocIterator.hasNext();) {
handleIssue(issueDocIterator.next(), issueBuilder, keysByUUid, response.stream().output()); handleIssue(issueDocIterator.next(), issueBuilder, keysByUUid, response.stream().output());
} }
Expand All @@ -95,7 +95,7 @@ public void handle(Request request, Response response) throws Exception {
} }
} }


private static void handleIssue(IssueDoc issue, BatchInput.ServerIssue.Builder issueBuilder, Map<String, String> keysByUUid, OutputStream out) { private static void handleIssue(IssueDoc issue, ScannerInput.ServerIssue.Builder issueBuilder, Map<String, String> keysByUUid, OutputStream out) {
issueBuilder.setKey(issue.key()); issueBuilder.setKey(issue.key());
issueBuilder.setModuleKey(keysByUUid.get(issue.moduleUuid())); issueBuilder.setModuleKey(keysByUUid.get(issue.moduleUuid()));
String path = issue.filePath(); String path = issue.filePath();
Expand All @@ -120,7 +120,7 @@ private static void handleIssue(IssueDoc issue, BatchInput.ServerIssue.Builder i
if (message != null) { if (message != null) {
issueBuilder.setMsg(message); issueBuilder.setMsg(message);
} }
issueBuilder.setSeverity(org.sonar.batch.protocol.Constants.Severity.valueOf(issue.severity())); issueBuilder.setSeverity(org.sonar.scanner.protocol.Constants.Severity.valueOf(issue.severity()));
issueBuilder.setManualSeverity(issue.isManualSeverity()); issueBuilder.setManualSeverity(issue.isManualSeverity());
issueBuilder.setStatus(issue.status()); issueBuilder.setStatus(issue.status());
String resolution = issue.resolution(); String resolution = issue.resolution();
Expand Down
4 changes: 2 additions & 2 deletions server/sonar-server/src/main/java/org/sonar/server/batch/ProjectAction.java
View file
Expand Up @@ -25,8 +25,8 @@
import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Request;
import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.Response;
import org.sonar.api.server.ws.WebService; import org.sonar.api.server.ws.WebService;
import org.sonar.batch.protocol.input.FileData; import org.sonar.scanner.protocol.input.FileData;
import org.sonar.batch.protocol.input.ProjectRepositories; import org.sonar.scanner.protocol.input.ProjectRepositories;
import org.sonarqube.ws.WsBatch.WsProjectResponse; import org.sonarqube.ws.WsBatch.WsProjectResponse;
import org.sonarqube.ws.WsBatch.WsProjectResponse.FileData.Builder; import org.sonarqube.ws.WsBatch.WsProjectResponse.FileData.Builder;


Expand Down
4 changes: 2 additions & 2 deletions server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java
View file
Expand Up @@ -27,14 +27,14 @@
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.sonar.api.server.ServerSide; import org.sonar.api.server.ServerSide;
import org.sonar.batch.protocol.input.FileData;
import org.sonar.batch.protocol.input.ProjectRepositories;
import org.sonar.db.DbClient; import org.sonar.db.DbClient;
import org.sonar.db.DbSession; import org.sonar.db.DbSession;
import org.sonar.db.MyBatis; import org.sonar.db.MyBatis;
import org.sonar.db.component.ComponentDto; import org.sonar.db.component.ComponentDto;
import org.sonar.db.component.FilePathWithHashDto; import org.sonar.db.component.FilePathWithHashDto;
import org.sonar.db.property.PropertyDto; import org.sonar.db.property.PropertyDto;
import org.sonar.scanner.protocol.input.FileData;
import org.sonar.scanner.protocol.input.ProjectRepositories;
import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.ForbiddenException;
import org.sonar.server.user.UserSession; import org.sonar.server.user.UserSession;


Expand Down
6 changes: 3 additions & 3 deletions server/sonar-server/src/main/java/org/sonar/server/batch/UsersAction.java
View file
Expand Up @@ -26,7 +26,7 @@
import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Request;
import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.Response;
import org.sonar.api.server.ws.WebService; import org.sonar.api.server.ws.WebService;
import org.sonar.batch.protocol.input.BatchInput; import org.sonar.scanner.protocol.input.ScannerInput;
import org.sonar.server.user.UserSession; import org.sonar.server.user.UserSession;
import org.sonar.server.user.index.UserDoc; import org.sonar.server.user.index.UserDoc;
import org.sonar.server.user.index.UserIndex; import org.sonar.server.user.index.UserIndex;
Expand Down Expand Up @@ -66,7 +66,7 @@ public void handle(Request request, Response response) throws Exception {
List<String> logins = request.mandatoryParamAsStrings(PARAM_LOGINS); List<String> logins = request.mandatoryParamAsStrings(PARAM_LOGINS);


response.stream().setMediaType(MediaTypes.PROTOBUF); response.stream().setMediaType(MediaTypes.PROTOBUF);
BatchInput.User.Builder userBuilder = BatchInput.User.newBuilder(); ScannerInput.User.Builder userBuilder = ScannerInput.User.newBuilder();
OutputStream output = response.stream().output(); OutputStream output = response.stream().output();
try { try {
for (Iterator<UserDoc> userDocIterator = userIndex.selectUsersForBatch(logins); userDocIterator.hasNext();) { for (Iterator<UserDoc> userDocIterator = userIndex.selectUsersForBatch(logins); userDocIterator.hasNext();) {
Expand All @@ -77,7 +77,7 @@ public void handle(Request request, Response response) throws Exception {
} }
} }


private static void handleUser(UserDoc user, BatchInput.User.Builder userBuilder, OutputStream out) { private static void handleUser(UserDoc user, ScannerInput.User.Builder userBuilder, OutputStream out) {
userBuilder userBuilder
.clear() .clear()
.setLogin(user.login()) .setLogin(user.login())
Expand Down
28 changes: 14 additions & 14 deletions server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportReader.java
View file
Expand Up @@ -21,41 +21,41 @@


import com.google.common.base.Optional; import com.google.common.base.Optional;
import javax.annotation.CheckForNull; import javax.annotation.CheckForNull;
import org.sonar.batch.protocol.output.BatchReport;
import org.sonar.core.util.CloseableIterator; import org.sonar.core.util.CloseableIterator;
import org.sonar.scanner.protocol.output.ScannerReport;


public interface BatchReportReader { public interface BatchReportReader {
BatchReport.Metadata readMetadata(); ScannerReport.Metadata readMetadata();


CloseableIterator<String> readScannerLogs(); CloseableIterator<String> readScannerLogs();


CloseableIterator<BatchReport.ActiveRule> readActiveRules(); CloseableIterator<ScannerReport.ActiveRule> readActiveRules();


CloseableIterator<BatchReport.Measure> readComponentMeasures(int componentRef); CloseableIterator<ScannerReport.Measure> readComponentMeasures(int componentRef);


@CheckForNull @CheckForNull
BatchReport.Changesets readChangesets(int componentRef); ScannerReport.Changesets readChangesets(int componentRef);


BatchReport.Component readComponent(int componentRef); ScannerReport.Component readComponent(int componentRef);


CloseableIterator<BatchReport.Issue> readComponentIssues(int componentRef); CloseableIterator<ScannerReport.Issue> readComponentIssues(int componentRef);


CloseableIterator<BatchReport.Duplication> readComponentDuplications(int componentRef); CloseableIterator<ScannerReport.Duplication> readComponentDuplications(int componentRef);


CloseableIterator<BatchReport.CpdTextBlock> readCpdTextBlocks(int componentRef); CloseableIterator<ScannerReport.CpdTextBlock> readCpdTextBlocks(int componentRef);


CloseableIterator<BatchReport.Symbol> readComponentSymbols(int componentRef); CloseableIterator<ScannerReport.Symbol> readComponentSymbols(int componentRef);


CloseableIterator<BatchReport.SyntaxHighlighting> readComponentSyntaxHighlighting(int fileRef); CloseableIterator<ScannerReport.SyntaxHighlighting> readComponentSyntaxHighlighting(int fileRef);


CloseableIterator<BatchReport.Coverage> readComponentCoverage(int fileRef); CloseableIterator<ScannerReport.Coverage> readComponentCoverage(int fileRef);


/** /**
* Reads file source line by line. Return an absent optional if the file doest not exist * Reads file source line by line. Return an absent optional if the file doest not exist
*/ */
Optional<CloseableIterator<String>> readFileSource(int fileRef); Optional<CloseableIterator<String>> readFileSource(int fileRef);


CloseableIterator<BatchReport.Test> readTests(int testFileRef); CloseableIterator<ScannerReport.Test> readTests(int testFileRef);


CloseableIterator<BatchReport.CoverageDetail> readCoverageDetails(int testFileRef); CloseableIterator<ScannerReport.CoverageDetail> readCoverageDetails(int testFileRef);
} }

0 comments on commit cfcbe27

Please sign in to comment.