diff --git a/compile_protobuf.sh b/compile_protobuf.sh index 8e07c4dc2cd0..25852269d1e1 100755 --- a/compile_protobuf.sh +++ b/compile_protobuf.sh @@ -1,14 +1,25 @@ #!/bin/bash -# Usage: compile_protobuf +# Compiles all the Protocol Buffers files (*.proto) to Java source code. +# IMPORTANT - protobuf 2.6.1 must be installed. Other versions are not supported. + +# Usage: compile_protobuf function compile_protobuf { - echo "Compiling [$1] to [$2]..." - mkdir -p $2 - protoc --proto_path=$1 --java_out=$2 $1/*.proto + INPUT="$1/src/$2/protobuf" + OUTPUT="$1/src/$2/gen-java" + + if [ -d $INPUT ] + then + echo "Compiling [$INPUT] to [$OUTPUT]..." + rm -rf $OUTPUT + mkdir -p $OUTPUT + protoc --proto_path=$INPUT --java_out=$OUTPUT $INPUT/*.proto + fi } -compile_protobuf "sonar-core/src/test/protobuf" "sonar-core/src/test/gen-java" -compile_protobuf "sonar-batch-protocol/src/main/protobuf" "sonar-batch-protocol/src/main/gen-java" +compile_protobuf "sonar-batch-protocol" "main" +compile_protobuf "sonar-core" "test" +compile_protobuf "sonar-db" "main" diff --git a/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/SourceDbBenchmarkTest.java b/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/SourceDbBenchmarkTest.java index 86663dde0d4d..8993301a4867 100644 --- a/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/SourceDbBenchmarkTest.java +++ b/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/SourceDbBenchmarkTest.java @@ -23,7 +23,6 @@ import java.util.Arrays; import java.util.Timer; import java.util.concurrent.atomic.AtomicLong; - import org.apache.commons.io.IOUtils; import org.junit.Rule; import org.junit.Test; @@ -32,9 +31,9 @@ import org.sonar.api.utils.System2; import org.sonar.api.utils.internal.Uuids; import org.sonar.db.DbTester; +import org.sonar.db.FileSources; import org.sonar.db.source.FileSourceDao; import org.sonar.db.source.FileSourceDto; -import org.sonar.server.source.db.FileSourceDb; import org.sonar.server.source.index.FileSourcesUpdaterHelper; import org.sonar.server.source.index.SourceLineResultSetIterator; @@ -111,8 +110,8 @@ private FileSourceDto generateDto() throws IOException { } private byte[] generateData() { - FileSourceDb.Data.Builder dataBuilder = FileSourceDb.Data.newBuilder(); - FileSourceDb.Line.Builder lineBuilder = FileSourceDb.Line.newBuilder(); + FileSources.Data.Builder dataBuilder = FileSources.Data.newBuilder(); + FileSources.Line.Builder lineBuilder = FileSources.Line.newBuilder(); for (int i = 1; i <= NUMBER_OF_LINES; i++) { lineBuilder.clear(); dataBuilder.addLines(lineBuilder diff --git a/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/SourceIndexBenchmarkTest.java b/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/SourceIndexBenchmarkTest.java index c1c529d7cb08..746f7c1a321e 100644 --- a/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/SourceIndexBenchmarkTest.java +++ b/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/SourceIndexBenchmarkTest.java @@ -31,8 +31,8 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.sonar.db.FileSources; import org.sonar.server.es.EsClient; -import org.sonar.server.source.db.FileSourceDb; import org.sonar.server.source.index.FileSourcesUpdaterHelper; import org.sonar.server.source.index.SourceLineDoc; import org.sonar.server.source.index.SourceLineIndex; @@ -115,8 +115,8 @@ private static class SourceIterator implements Iterator coverageIterator) { } @Override - public void read(FileSourceDb.Line.Builder lineBuilder) { + public void read(FileSources.Line.Builder lineBuilder) { BatchReport.Coverage reportCoverage = getNextLineCoverageIfMatchLine(lineBuilder.getLine()); if (reportCoverage != null) { processUnitTest(lineBuilder, reportCoverage); @@ -47,7 +47,7 @@ public void read(FileSourceDb.Line.Builder lineBuilder) { } } - private static void processUnitTest(FileSourceDb.Line.Builder lineBuilder, BatchReport.Coverage reportCoverage){ + private static void processUnitTest(FileSources.Line.Builder lineBuilder, BatchReport.Coverage reportCoverage){ if (reportCoverage.hasUtHits()) { lineBuilder.setUtLineHits(reportCoverage.getUtHits() ? 1 : 0); } @@ -57,7 +57,7 @@ private static void processUnitTest(FileSourceDb.Line.Builder lineBuilder, Batch } } - private static void processIntegrationTest(FileSourceDb.Line.Builder lineBuilder, BatchReport.Coverage reportCoverage){ + private static void processIntegrationTest(FileSources.Line.Builder lineBuilder, BatchReport.Coverage reportCoverage){ if (reportCoverage.hasItHits()) { lineBuilder.setItLineHits(reportCoverage.getItHits() ? 1 : 0); } @@ -67,7 +67,7 @@ private static void processIntegrationTest(FileSourceDb.Line.Builder lineBuilder } } - private static void processOverallTest(FileSourceDb.Line.Builder lineBuilder, BatchReport.Coverage reportCoverage){ + private static void processOverallTest(FileSources.Line.Builder lineBuilder, BatchReport.Coverage reportCoverage){ if (reportCoverage.hasUtHits() || reportCoverage.hasItHits()) { lineBuilder.setOverallLineHits((reportCoverage.getUtHits() || reportCoverage.getItHits()) ? 1 : 0); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/DuplicationLineReader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/source/DuplicationLineReader.java index 1c7623aacde3..3920e15a96f3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/DuplicationLineReader.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/source/DuplicationLineReader.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.server.source.db.FileSourceDb; +import org.sonar.db.FileSources; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Maps.newHashMap; @@ -47,7 +47,7 @@ public DuplicationLineReader(Iterator duplications) { } @Override - public void read(FileSourceDb.Line.Builder lineBuilder) { + public void read(FileSources.Line.Builder lineBuilder) { int line = lineBuilder.getLine(); List blocks = findDuplicationBlockMatchingLine(line); for (BatchReport.Range block : blocks) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/HighlightingLineReader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/source/HighlightingLineReader.java index b329d72053ea..11210885da4f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/HighlightingLineReader.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/source/HighlightingLineReader.java @@ -21,15 +21,13 @@ package org.sonar.server.computation.source; import com.google.common.collect.ImmutableMap; -import org.sonar.batch.protocol.Constants; -import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.server.source.db.FileSourceDb; - -import javax.annotation.CheckForNull; - import java.util.Iterator; import java.util.List; import java.util.Map; +import javax.annotation.CheckForNull; +import org.sonar.batch.protocol.Constants; +import org.sonar.batch.protocol.output.BatchReport; +import org.sonar.db.FileSources; import static com.google.common.collect.Lists.newArrayList; @@ -58,7 +56,7 @@ public HighlightingLineReader(Iterator lineHighl } @Override - public void read(FileSourceDb.Line.Builder lineBuilder) { + public void read(FileSources.Line.Builder lineBuilder) { int line = lineBuilder.getLine(); StringBuilder highlighting = new StringBuilder(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/LineReader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/source/LineReader.java index 0ec4d573b2a7..ccab786dbeb7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/LineReader.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/source/LineReader.java @@ -20,10 +20,10 @@ package org.sonar.server.computation.source; -import org.sonar.server.source.db.FileSourceDb; +import org.sonar.db.FileSources; public interface LineReader { - void read(FileSourceDb.Line.Builder lineBuilder); + void read(FileSources.Line.Builder lineBuilder); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/ScmLineReader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/source/ScmLineReader.java index e4fadee5e1dd..491943861674 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/ScmLineReader.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/source/ScmLineReader.java @@ -21,7 +21,7 @@ package org.sonar.server.computation.source; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.server.source.db.FileSourceDb; +import org.sonar.db.FileSources; public class ScmLineReader implements LineReader { @@ -30,8 +30,9 @@ public class ScmLineReader implements LineReader { public ScmLineReader(BatchReport.Changesets scmReport) { this.scmReport = scmReport; } + @Override - public void read(FileSourceDb.Line.Builder lineBuilder) { + public void read(FileSources.Line.Builder lineBuilder) { int changeSetIndex = scmReport.getChangesetIndexByLine(lineBuilder.getLine() - 1); BatchReport.Changesets.Changeset changeset = scmReport.getChangeset(changeSetIndex); boolean hasAuthor = changeset.hasAuthor(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/SymbolsLineReader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/source/SymbolsLineReader.java index 4e4de493367f..5b44635d7b06 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/SymbolsLineReader.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/source/SymbolsLineReader.java @@ -32,7 +32,7 @@ import java.util.Map; import java.util.Set; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.server.source.db.FileSourceDb; +import org.sonar.db.FileSources; public class SymbolsLineReader implements LineReader { @@ -49,7 +49,7 @@ public SymbolsLineReader(Iterator symbols) { } @Override - public void read(FileSourceDb.Line.Builder lineBuilder) { + public void read(FileSources.Line.Builder lineBuilder) { int line = lineBuilder.getLine(); List lineSymbols = findSymbolsMatchingLine(line); for (BatchReport.Symbol lineSymbol : lineSymbols) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java index 21839fe6d24a..a2271c951389 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java @@ -47,7 +47,7 @@ import org.sonar.server.computation.source.LineReader; import org.sonar.server.computation.source.ScmLineReader; import org.sonar.server.computation.source.SymbolsLineReader; -import org.sonar.server.source.db.FileSourceDb; +import org.sonar.db.FileSources; import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; @@ -120,7 +120,7 @@ public void visitFile(Component file) { } private void persistSource(ComputeFileSourceData.Data fileSourceData, String componentUuid) { - FileSourceDb.Data fileData = fileSourceData.getFileSourceData(); + FileSources.Data fileData = fileSourceData.getFileSourceData(); byte[] data = FileSourceDto.encodeSourceData(fileData); String dataHash = DigestUtils.md5Hex(data); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java index 7433a21bc575..4032838ef406 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java @@ -40,7 +40,10 @@ import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.batch.protocol.output.BatchReport; +import org.sonar.core.util.CloseableIterator; +import org.sonar.db.DbClient; import org.sonar.db.DbSession; +import org.sonar.db.FileSources; import org.sonar.db.MyBatis; import org.sonar.db.source.FileSourceDto; import org.sonar.db.source.FileSourceDto.Type; @@ -48,10 +51,6 @@ import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DepthTraversalTypeAwareVisitor; import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.db.DbClient; -import org.sonar.server.source.db.FileSourceDb; -import org.sonar.server.source.db.FileSourceDb.Test.TestStatus; -import org.sonar.core.util.CloseableIterator; public class PersistTestsStep implements ComputationStep { @@ -121,9 +120,9 @@ public void visitFile(Component file) { } private void persistTestResults(Component component) { - Multimap testsByName = buildDbTests(component.getRef()); - Table coveredFilesByName = loadCoverageDetails(component.getRef()); - List tests = addCoveredFilesToTests(testsByName, coveredFilesByName); + Multimap testsByName = buildDbTests(component.getRef()); + Table coveredFilesByName = loadCoverageDetails(component.getRef()); + List tests = addCoveredFilesToTests(testsByName, coveredFilesByName); if (checkIfThereAreUnprocessedCoverageDetails(testsByName, coveredFilesByName, component.getKey())) { hasUnprocessedCoverageDetails = true; } @@ -154,8 +153,8 @@ private void persistTestResults(Component component) { } } - private boolean checkIfThereAreUnprocessedCoverageDetails(Multimap testsByName, - Table coveredFilesByName, String componentKey) { + private boolean checkIfThereAreUnprocessedCoverageDetails(Multimap testsByName, + Table coveredFilesByName, String componentKey) { Set unprocessedCoverageDetailNames = new HashSet<>(coveredFilesByName.rowKeySet()); unprocessedCoverageDetailNames.removeAll(testsByName.keySet()); boolean hasUnprocessedCoverage = !unprocessedCoverageDetailNames.isEmpty(); @@ -165,13 +164,13 @@ private boolean checkIfThereAreUnprocessedCoverageDetails(Multimap addCoveredFilesToTests(Multimap testsByName, - Table coveredFilesByName) { - List tests = new ArrayList<>(); - for (FileSourceDb.Test.Builder test : testsByName.values()) { - Collection coveredFiles = coveredFilesByName.row(test.getName()).values(); + private List addCoveredFilesToTests(Multimap testsByName, + Table coveredFilesByName) { + List tests = new ArrayList<>(); + for (FileSources.Test.Builder test : testsByName.values()) { + Collection coveredFiles = coveredFilesByName.row(test.getName()).values(); if (!coveredFiles.isEmpty()) { - for (FileSourceDb.Test.CoveredFile.Builder coveredFile : coveredFiles) { + for (FileSources.Test.CoveredFile.Builder coveredFile : coveredFiles) { test.addCoveredFile(coveredFile); } } @@ -181,20 +180,20 @@ private List addCoveredFilesToTests(Multimap buildDbTests(int componentRed) { - Multimap tests = ArrayListMultimap.create(); + private Multimap buildDbTests(int componentRed) { + Multimap tests = ArrayListMultimap.create(); try (CloseableIterator testIterator = reportReader.readTests(componentRed)) { while (testIterator.hasNext()) { BatchReport.Test batchTest = testIterator.next(); - FileSourceDb.Test.Builder dbTest = FileSourceDb.Test.newBuilder(); + FileSources.Test.Builder dbTest = FileSources.Test.newBuilder(); dbTest.setUuid(Uuids.create()); dbTest.setName(batchTest.getName()); if (batchTest.hasStacktrace()) { dbTest.setStacktrace(batchTest.getStacktrace()); } if (batchTest.hasStatus()) { - dbTest.setStatus(TestStatus.valueOf(batchTest.getStatus().name())); + dbTest.setStatus(FileSources.Test.TestStatus.valueOf(batchTest.getStatus().name())); } if (batchTest.hasMsg()) { dbTest.setMsg(batchTest.getMsg()); @@ -213,8 +212,8 @@ private Multimap buildDbTests(int componentRe /** * returns a Table of (test name, main file uuid, covered file) */ - private Table loadCoverageDetails(int testFileRef) { - Table nameToCoveredFiles = HashBasedTable.create(); + private Table loadCoverageDetails(int testFileRef) { + Table nameToCoveredFiles = HashBasedTable.create(); try (CloseableIterator coverageIterator = reportReader.readCoverageDetails(testFileRef)) { while (coverageIterator.hasNext()) { @@ -222,10 +221,10 @@ private Table loadCoverag for (BatchReport.CoverageDetail.CoveredFile batchCoveredFile : batchCoverageDetail.getCoveredFileList()) { String testName = batchCoverageDetail.getTestName(); String mainFileUuid = getUuid(batchCoveredFile.getFileRef()); - FileSourceDb.Test.CoveredFile.Builder existingDbCoveredFile = nameToCoveredFiles.get(testName, mainFileUuid); + FileSources.Test.CoveredFile.Builder existingDbCoveredFile = nameToCoveredFiles.get(testName, mainFileUuid); List batchCoveredLines = batchCoveredFile.getCoveredLineList(); if (existingDbCoveredFile == null) { - FileSourceDb.Test.CoveredFile.Builder dbCoveredFile = FileSourceDb.Test.CoveredFile.newBuilder() + FileSources.Test.CoveredFile.Builder dbCoveredFile = FileSources.Test.CoveredFile.newBuilder() .setFileUuid(getUuid(batchCoveredFile.getFileRef())) .addAllCoveredLine(batchCoveredLines); nameToCoveredFiles.put(testName, mainFileUuid, dbCoveredFile); diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceLineResultSetIterator.java b/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceLineResultSetIterator.java index a5be8bebec39..ef6181ea8b87 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceLineResultSetIterator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceLineResultSetIterator.java @@ -22,11 +22,11 @@ import org.elasticsearch.action.update.UpdateRequest; import org.sonar.api.utils.text.JsonWriter; import org.sonar.db.DbSession; +import org.sonar.db.FileSources; import org.sonar.db.source.FileSourceDto; import org.sonar.db.DbClient; import org.sonar.db.ResultSetIterator; import org.sonar.server.es.EsUtils; -import org.sonar.server.source.db.FileSourceDb; import javax.annotation.Nullable; @@ -64,16 +64,16 @@ protected Row read(ResultSet rs) throws SQLException { String projectUuid = rs.getString(1); String fileUuid = rs.getString(2); Date updatedAt = new Date(rs.getLong(3)); - FileSourceDb.Data data = FileSourceDto.decodeSourceData(rs.getBinaryStream(4)); + FileSources.Data data = FileSourceDto.decodeSourceData(rs.getBinaryStream(4)); return toRow(projectUuid, fileUuid, updatedAt, data); } /** * Convert protobuf message to data required for Elasticsearch indexing */ - public static Row toRow(String projectUuid, String fileUuid, Date updatedAt, FileSourceDb.Data data) { + public static Row toRow(String projectUuid, String fileUuid, Date updatedAt, FileSources.Data data) { Row result = new Row(projectUuid, fileUuid, updatedAt.getTime()); - for (FileSourceDb.Line line : data.getLinesList()) { + for (FileSources.Line line : data.getLinesList()) { ByteArrayOutputStream bytes = new ByteArrayOutputStream(); // all the fields must be present, even if value is null diff --git a/server/sonar-server/src/main/java/org/sonar/server/test/index/TestResultSetIterator.java b/server/sonar-server/src/main/java/org/sonar/server/test/index/TestResultSetIterator.java index 0ba47f50ecba..9bd984a0d2d8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/test/index/TestResultSetIterator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/test/index/TestResultSetIterator.java @@ -20,18 +20,6 @@ package org.sonar.server.test.index; -import org.elasticsearch.action.update.UpdateRequest; -import org.sonar.api.utils.text.JsonWriter; -import org.sonar.db.DbSession; -import org.sonar.db.source.FileSourceDto; -import org.sonar.db.DbClient; -import org.sonar.db.ResultSetIterator; -import org.sonar.server.source.db.FileSourceDb; -import org.sonar.server.source.index.FileSourcesUpdaterHelper; -import org.sonar.server.source.index.FileSourcesUpdaterHelper.Row; - -import javax.annotation.Nullable; - import java.io.ByteArrayOutputStream; import java.io.OutputStreamWriter; import java.nio.charset.StandardCharsets; @@ -40,6 +28,16 @@ import java.sql.SQLException; import java.util.Date; import java.util.List; +import javax.annotation.Nullable; +import org.elasticsearch.action.update.UpdateRequest; +import org.sonar.api.utils.text.JsonWriter; +import org.sonar.db.DbClient; +import org.sonar.db.DbSession; +import org.sonar.db.FileSources; +import org.sonar.db.ResultSetIterator; +import org.sonar.db.source.FileSourceDto; +import org.sonar.server.source.index.FileSourcesUpdaterHelper; +import org.sonar.server.source.index.FileSourcesUpdaterHelper.Row; import static org.sonar.server.test.index.TestIndexDefinition.FIELD_COVERED_FILES; import static org.sonar.server.test.index.TestIndexDefinition.FIELD_COVERED_FILE_LINES; @@ -78,16 +76,16 @@ protected Row read(ResultSet rs) throws SQLException { String projectUuid = rs.getString(1); String fileUuid = rs.getString(2); Date updatedAt = new Date(rs.getLong(3)); - List data = FileSourceDto.decodeTestData(rs.getBinaryStream(4)); + List data = FileSourceDto.decodeTestData(rs.getBinaryStream(4)); return toRow(projectUuid, fileUuid, updatedAt, data); } /** * Convert protobuf message to tests required for Elasticsearch indexing */ - public static Row toRow(String projectUuid, String fileUuid, Date updatedAt, List tests) { + public static Row toRow(String projectUuid, String fileUuid, Date updatedAt, List tests) { Row result = new Row(projectUuid, fileUuid, updatedAt.getTime()); - for (FileSourceDb.Test test : tests) { + for (FileSources.Test test : tests) { ByteArrayOutputStream bytes = new ByteArrayOutputStream(); // all the fields must be present, even if value is null @@ -103,7 +101,7 @@ public static Row toRow(String projectUuid, String fileUuid, Date updatedAt, Lis writer.prop(FIELD_STACKTRACE, test.hasStacktrace() ? test.getStacktrace() : null); writer.name(FIELD_COVERED_FILES); writer.beginArray(); - for (FileSourceDb.Test.CoveredFile coveredFile : test.getCoveredFileList()) { + for (FileSources.Test.CoveredFile coveredFile : test.getCoveredFileList()) { writer.beginObject(); writer.prop(FIELD_COVERED_FILE_UUID, coveredFile.getFileUuid()); writer.name(FIELD_COVERED_FILE_LINES).valueObject(coveredFile.getCoveredLineList()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/ComputeFileSourceDataTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/source/ComputeFileSourceDataTest.java index 55a1137fec16..ca88d6f5716c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/ComputeFileSourceDataTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/source/ComputeFileSourceDataTest.java @@ -22,7 +22,7 @@ import com.google.common.collect.Lists; import org.junit.Test; -import org.sonar.server.source.db.FileSourceDb; +import org.sonar.db.FileSources; import static com.google.common.collect.Lists.newArrayList; import static org.assertj.core.api.Assertions.assertThat; @@ -31,11 +31,10 @@ public class ComputeFileSourceDataTest { @Test public void compute_one_line() { - ComputeFileSourceData computeFileSourceData = new ComputeFileSourceData( - newArrayList("line1").iterator(), - Lists.newArrayList(new MockLineReader()), - 1 - ); + ComputeFileSourceData computeFileSourceData = new ComputeFileSourceData( + newArrayList("line1").iterator(), + Lists.newArrayList(new MockLineReader()), + 1); ComputeFileSourceData.Data data = computeFileSourceData.compute(); assertThat(data.getLineHashes()).isEqualTo("137f72c3708c6bd0de00a0e5a69c699b"); @@ -49,8 +48,7 @@ public void compute_two_lines() { ComputeFileSourceData computeFileSourceData = new ComputeFileSourceData( newArrayList("line1", "line2").iterator(), Lists.newArrayList(new MockLineReader()), - 2 - ); + 2); ComputeFileSourceData.Data data = computeFileSourceData.compute(); assertThat(data.getLineHashes()).isEqualTo("137f72c3708c6bd0de00a0e5a69c699b\ne6251bcf1a7dc3ba5e7933e325bbe605"); @@ -66,8 +64,7 @@ public void compute_missing_last_line() { newArrayList("line1").iterator(), Lists.newArrayList(new MockLineReader()), // There's only one line in the line iterator but the file has 2 lines - 2 - ); + 2); ComputeFileSourceData.Data data = computeFileSourceData.compute(); assertThat(data.getLineHashes()).isEqualTo("137f72c3708c6bd0de00a0e5a69c699b\n"); @@ -82,14 +79,12 @@ public void remove_tabs_and_spaces_in_line_hashes() { String refLineHashes = new ComputeFileSourceData( newArrayList("line1").iterator(), Lists.newArrayList(new MockLineReader()), - 1 - ).compute().getLineHashes(); + 1).compute().getLineHashes(); assertThat(new ComputeFileSourceData( newArrayList(" line\t \t 1 ").iterator(), Lists.newArrayList(new MockLineReader()), - 1 - ).compute().getLineHashes()).isEqualTo(refLineHashes); + 1).compute().getLineHashes()).isEqualTo(refLineHashes); } @Test @@ -97,13 +92,12 @@ public void compute_line_hashes_of_empty_lines() { assertThat(new ComputeFileSourceData( newArrayList(" ").iterator(), Lists.newArrayList(new MockLineReader()), - 1 - ).compute().getLineHashes()).isEqualTo(""); + 1).compute().getLineHashes()).isEqualTo(""); } private static class MockLineReader implements LineReader { @Override - public void read(FileSourceDb.Line.Builder lineBuilder) { + public void read(FileSources.Line.Builder lineBuilder) { lineBuilder.setHighlighting("h-" + lineBuilder.getLine()); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/CoverageLineReaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/source/CoverageLineReaderTest.java index d1791bd1592d..2fb135ddceb6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/CoverageLineReaderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/source/CoverageLineReaderTest.java @@ -20,11 +20,10 @@ package org.sonar.server.computation.source; +import java.util.Collections; import org.junit.Test; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.server.source.db.FileSourceDb; - -import java.util.Collections; +import org.sonar.db.FileSources; import static com.google.common.collect.Lists.newArrayList; import static org.assertj.core.api.Assertions.assertThat; @@ -43,7 +42,7 @@ public void set_coverage() { .setOverallCoveredConditions(4) .build()).iterator()); - FileSourceDb.Line.Builder lineBuilder = FileSourceDb.Data.newBuilder().addLinesBuilder().setLine(1); + FileSources.Line.Builder lineBuilder = FileSources.Data.newBuilder().addLinesBuilder().setLine(1); computeCoverageLine.read(lineBuilder); assertThat(lineBuilder.getUtLineHits()).isEqualTo(1); @@ -63,7 +62,7 @@ public void set_coverage_on_uncovered_lines() { .setItHits(false) .build()).iterator()); - FileSourceDb.Line.Builder lineBuilder = FileSourceDb.Data.newBuilder().addLinesBuilder().setLine(1); + FileSources.Line.Builder lineBuilder = FileSources.Data.newBuilder().addLinesBuilder().setLine(1); computeCoverageLine.read(lineBuilder); assertThat(lineBuilder.hasUtLineHits()).isTrue(); @@ -80,7 +79,7 @@ public void set_coverage_without_line_hits() { .setLine(1) .build()).iterator()); - FileSourceDb.Line.Builder lineBuilder = FileSourceDb.Data.newBuilder().addLinesBuilder().setLine(1); + FileSources.Line.Builder lineBuilder = FileSources.Data.newBuilder().addLinesBuilder().setLine(1); computeCoverageLine.read(lineBuilder); assertThat(lineBuilder.hasUtLineHits()).isFalse(); @@ -91,12 +90,12 @@ public void set_coverage_without_line_hits() { @Test public void set_overall_line_hits_with_only_ut() { CoverageLineReader computeCoverageLine = new CoverageLineReader(newArrayList(BatchReport.Coverage.newBuilder() - .setLine(1) - .setUtHits(true) - .setItHits(false) - .build()).iterator()); + .setLine(1) + .setUtHits(true) + .setItHits(false) + .build()).iterator()); - FileSourceDb.Line.Builder lineBuilder = FileSourceDb.Data.newBuilder().addLinesBuilder().setLine(1); + FileSources.Line.Builder lineBuilder = FileSources.Data.newBuilder().addLinesBuilder().setLine(1); computeCoverageLine.read(lineBuilder); assertThat(lineBuilder.getOverallLineHits()).isEqualTo(1); @@ -110,7 +109,7 @@ public void set_overall_line_hits_with_only_it() { .setItHits(true) .build()).iterator()); - FileSourceDb.Line.Builder lineBuilder = FileSourceDb.Data.newBuilder().addLinesBuilder().setLine(1); + FileSources.Line.Builder lineBuilder = FileSources.Data.newBuilder().addLinesBuilder().setLine(1); computeCoverageLine.read(lineBuilder); assertThat(lineBuilder.getOverallLineHits()).isEqualTo(1); @@ -124,7 +123,7 @@ public void set_overall_line_hits_with_ut_and_it() { .setItHits(true) .build()).iterator()); - FileSourceDb.Line.Builder lineBuilder = FileSourceDb.Data.newBuilder().addLinesBuilder().setLine(1); + FileSources.Line.Builder lineBuilder = FileSources.Data.newBuilder().addLinesBuilder().setLine(1); computeCoverageLine.read(lineBuilder); assertThat(lineBuilder.getOverallLineHits()).isEqualTo(1); @@ -134,7 +133,7 @@ public void set_overall_line_hits_with_ut_and_it() { public void nothing_to_do_when_no_coverage_info() { CoverageLineReader computeCoverageLine = new CoverageLineReader(Collections.emptyList().iterator()); - FileSourceDb.Line.Builder lineBuilder = FileSourceDb.Data.newBuilder().addLinesBuilder().setLine(1); + FileSources.Line.Builder lineBuilder = FileSources.Data.newBuilder().addLinesBuilder().setLine(1); computeCoverageLine.read(lineBuilder); assertThat(lineBuilder.hasUtLineHits()).isFalse(); @@ -158,10 +157,10 @@ public void nothing_to_do_when_no_coverage_info_for_current_line() { .setItCoveredConditions(3) .setOverallCoveredConditions(4) .build() - // No coverage info on line 2 - ).iterator()); + // No coverage info on line 2 + ).iterator()); - FileSourceDb.Line.Builder line2Builder = FileSourceDb.Data.newBuilder().addLinesBuilder().setLine(2); + FileSources.Line.Builder line2Builder = FileSources.Data.newBuilder().addLinesBuilder().setLine(2); computeCoverageLine.read(line2Builder); assertThat(line2Builder.hasUtLineHits()).isFalse(); @@ -185,12 +184,12 @@ public void nothing_to_do_when_no_coverage_info_for_next_line() { .setItCoveredConditions(3) .setOverallCoveredConditions(4) .build() - // No coverage info on line 2 - ).iterator()); + // No coverage info on line 2 + ).iterator()); - FileSourceDb.Data.Builder fileSourceBuilder = FileSourceDb.Data.newBuilder(); - FileSourceDb.Line.Builder line1Builder = fileSourceBuilder.addLinesBuilder().setLine(1); - FileSourceDb.Line.Builder line2Builder = fileSourceBuilder.addLinesBuilder().setLine(2); + FileSources.Data.Builder fileSourceBuilder = FileSources.Data.newBuilder(); + FileSources.Line.Builder line1Builder = fileSourceBuilder.addLinesBuilder().setLine(1); + FileSources.Line.Builder line2Builder = fileSourceBuilder.addLinesBuilder().setLine(2); computeCoverageLine.read(line1Builder); computeCoverageLine.read(line2Builder); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/DuplicationLineReaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/source/DuplicationLineReaderTest.java index 259ef3dc080a..2710ccaf0afe 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/DuplicationLineReaderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/source/DuplicationLineReaderTest.java @@ -24,20 +24,17 @@ import org.junit.Test; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.util.CloseableIterator; -import org.sonar.server.source.db.FileSourceDb; +import org.sonar.db.FileSources; -import java.util.Collections; - -import static com.google.common.collect.Lists.newArrayList; import static org.assertj.core.api.Assertions.assertThat; public class DuplicationLineReaderTest { - FileSourceDb.Data.Builder sourceData = FileSourceDb.Data.newBuilder(); - FileSourceDb.Line.Builder line1 = sourceData.addLinesBuilder().setSource("line1").setLine(1); - FileSourceDb.Line.Builder line2 = sourceData.addLinesBuilder().setSource("line2").setLine(2); - FileSourceDb.Line.Builder line3 = sourceData.addLinesBuilder().setSource("line3").setLine(3); - FileSourceDb.Line.Builder line4 = sourceData.addLinesBuilder().setSource("line4").setLine(4); + FileSources.Data.Builder sourceData = FileSources.Data.newBuilder(); + FileSources.Line.Builder line1 = sourceData.addLinesBuilder().setSource("line1").setLine(1); + FileSources.Line.Builder line2 = sourceData.addLinesBuilder().setSource("line2").setLine(2); + FileSources.Line.Builder line3 = sourceData.addLinesBuilder().setSource("line3").setLine(3); + FileSources.Line.Builder line4 = sourceData.addLinesBuilder().setSource("line4").setLine(4); @Test public void read_nothing() { @@ -62,8 +59,7 @@ public void read_duplication_with_duplicates_on_same_file() { .setEndLine(4) .build()) .build()) - .build() - )); + .build())); reader.read(line1); reader.read(line2); @@ -91,8 +87,7 @@ public void read_duplication_with_duplicates_on_other_file() { .setEndLine(4) .build()) .build()) - .build() - )); + .build())); reader.read(line1); reader.read(line2); @@ -120,8 +115,7 @@ public void read_duplication_with_duplicates_on_other_file_from_other_project() .setEndLine(4) .build()) .build()) - .build() - )); + .build())); reader.read(line1); reader.read(line2); @@ -160,8 +154,7 @@ public void read_many_duplications() { .setEndLine(4) .build()) .build()) - .build() - )); + .build())); reader.read(line1); reader.read(line2); @@ -200,8 +193,7 @@ public void should_be_sorted_by_line_block() { .setEndLine(3) .build()) .build()) - .build() - )); + .build())); reader.read(line1); reader.read(line2); @@ -240,8 +232,7 @@ public void should_be_sorted_by_line_length() { .setEndLine(4) .build()) .build()) - .build() - )); + .build())); reader.read(line1); reader.read(line2); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/HighlightingLineReaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/source/HighlightingLineReaderTest.java index c3159c7477fd..23b541b33fa1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/HighlightingLineReaderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/source/HighlightingLineReaderTest.java @@ -20,12 +20,11 @@ package org.sonar.server.computation.source; +import java.util.Collections; import org.junit.Test; import org.sonar.batch.protocol.Constants; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.server.source.db.FileSourceDb; - -import java.util.Collections; +import org.sonar.db.FileSources; import static com.google.common.collect.Lists.newArrayList; import static org.assertj.core.api.Assertions.assertThat; @@ -33,17 +32,17 @@ public class HighlightingLineReaderTest { - FileSourceDb.Data.Builder sourceData = FileSourceDb.Data.newBuilder(); - FileSourceDb.Line.Builder line1 = sourceData.addLinesBuilder().setSource("line1").setLine(1); - FileSourceDb.Line.Builder line2 = sourceData.addLinesBuilder().setSource("line2").setLine(2); - FileSourceDb.Line.Builder line3 = sourceData.addLinesBuilder().setSource("line3").setLine(3); - FileSourceDb.Line.Builder line4 = sourceData.addLinesBuilder().setSource("line4").setLine(4); + FileSources.Data.Builder sourceData = FileSources.Data.newBuilder(); + FileSources.Line.Builder line1 = sourceData.addLinesBuilder().setSource("line1").setLine(1); + FileSources.Line.Builder line2 = sourceData.addLinesBuilder().setSource("line2").setLine(2); + FileSources.Line.Builder line3 = sourceData.addLinesBuilder().setSource("line3").setLine(3); + FileSources.Line.Builder line4 = sourceData.addLinesBuilder().setSource("line4").setLine(4); @Test public void nothing_to_read() { HighlightingLineReader highlightingLineReader = new HighlightingLineReader(Collections.emptyList().iterator()); - FileSourceDb.Line.Builder lineBuilder = FileSourceDb.Data.newBuilder().addLinesBuilder().setLine(1); + FileSources.Line.Builder lineBuilder = FileSources.Data.newBuilder().addLinesBuilder().setLine(1); highlightingLineReader.read(lineBuilder); assertThat(lineBuilder.hasHighlighting()).isFalse(); @@ -58,8 +57,7 @@ public void read_one_line() { .setStartOffset(2).setEndOffset(4) .build()) .setType(Constants.HighlightingType.ANNOTATION) - .build() - ).iterator()); + .build()).iterator()); highlightingLineReader.read(line1); @@ -89,8 +87,7 @@ public void read_many_lines() { .setStartOffset(1).setEndOffset(2) .build()) .setType(Constants.HighlightingType.CONSTANT) - .build() - ).iterator()); + .build()).iterator()); highlightingLineReader.read(line1); highlightingLineReader.read(line2); @@ -118,8 +115,7 @@ public void read_many_syntax_highlighting_on_same_line() { .setStartOffset(4).setEndOffset(5) .build()) .setType(Constants.HighlightingType.COMMENT) - .build() - ).iterator()); + .build()).iterator()); highlightingLineReader.read(line1); @@ -143,8 +139,7 @@ public void read_nested_syntax_highlighting_on_same_line() { .setStartOffset(2).setEndOffset(3) .build()) .setType(Constants.HighlightingType.KEYWORD) - .build() - ).iterator()); + .build()).iterator()); highlightingLineReader.read(line1); @@ -161,11 +156,10 @@ public void read_one_syntax_highlighting_on_many_lines() { .setStartOffset(3).setEndOffset(2) .build()) .setType(Constants.HighlightingType.ANNOTATION) - .build() - ).iterator()); + .build()).iterator()); highlightingLineReader.read(line1); - FileSourceDb.Line.Builder line2 = sourceData.addLinesBuilder().setSource("line 2").setLine(2); + FileSources.Line.Builder line2 = sourceData.addLinesBuilder().setSource("line 2").setLine(2); highlightingLineReader.read(line2); highlightingLineReader.read(line3); @@ -197,8 +191,7 @@ public void read_many_syntax_highlighting_on_many_lines() { .setStartOffset(1).setEndOffset(2) .build()) .setType(Constants.HighlightingType.COMMENT) - .build() - ).iterator()); + .build()).iterator()); highlightingLineReader.read(line1); highlightingLineReader.read(line2); @@ -220,8 +213,7 @@ public void read_highlighting_declared_on_a_whole_line() { .setStartOffset(0).setEndOffset(0) .build()) .setType(Constants.HighlightingType.ANNOTATION) - .build() - ).iterator()); + .build()).iterator()); highlightingLineReader.read(line1); highlightingLineReader.read(line2); @@ -242,8 +234,7 @@ public void fail_when_end_offset_is_before_start_offset() { .setStartOffset(4).setEndOffset(2) .build()) .setType(Constants.HighlightingType.ANNOTATION) - .build() - ).iterator()); + .build()).iterator()); try { highlightingLineReader.read(line1); @@ -262,8 +253,7 @@ public void fail_when_end_offset_is_higher_than_line_length() { .setStartOffset(2).setEndOffset(10) .build()) .setType(Constants.HighlightingType.ANNOTATION) - .build() - ).iterator()); + .build()).iterator()); try { highlightingLineReader.read(line1); @@ -282,8 +272,7 @@ public void fail_when_start_offset_is_higher_than_line_length() { .setStartOffset(10).setEndOffset(11) .build()) .setType(Constants.HighlightingType.ANNOTATION) - .build() - ).iterator()); + .build()).iterator()); try { highlightingLineReader.read(line1); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/ScmLineReaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/source/ScmLineReaderTest.java index 16bcd8861330..8a3f15816bf2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/ScmLineReaderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/source/ScmLineReaderTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.server.source.db.FileSourceDb; +import org.sonar.db.FileSources; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; @@ -42,7 +42,7 @@ public void set_scm() { ScmLineReader lineScm = new ScmLineReader(scmReport); - FileSourceDb.Line.Builder lineBuilder = FileSourceDb.Data.newBuilder().addLinesBuilder().setLine(1); + FileSources.Line.Builder lineBuilder = FileSources.Data.newBuilder().addLinesBuilder().setLine(1); lineScm.read(lineBuilder); assertThat(lineBuilder.getScmAuthor()).isEqualTo("john"); @@ -61,7 +61,7 @@ public void set_only_author() { ScmLineReader lineScm = new ScmLineReader(scmReport); - FileSourceDb.Line.Builder lineBuilder = FileSourceDb.Data.newBuilder().addLinesBuilder().setLine(1); + FileSources.Line.Builder lineBuilder = FileSources.Data.newBuilder().addLinesBuilder().setLine(1); lineScm.read(lineBuilder); assertThat(lineBuilder.getScmAuthor()).isEqualTo("john"); @@ -80,7 +80,7 @@ public void set_only_date() { ScmLineReader lineScm = new ScmLineReader(scmReport); - FileSourceDb.Line.Builder lineBuilder = FileSourceDb.Data.newBuilder().addLinesBuilder().setLine(1); + FileSources.Line.Builder lineBuilder = FileSources.Data.newBuilder().addLinesBuilder().setLine(1); lineScm.read(lineBuilder); assertThat(lineBuilder.hasScmAuthor()).isFalse(); @@ -99,7 +99,7 @@ public void set_only_revision() { ScmLineReader lineScm = new ScmLineReader(scmReport); - FileSourceDb.Line.Builder lineBuilder = FileSourceDb.Data.newBuilder().addLinesBuilder().setLine(1); + FileSources.Line.Builder lineBuilder = FileSources.Data.newBuilder().addLinesBuilder().setLine(1); lineScm.read(lineBuilder); assertThat(lineBuilder.hasScmAuthor()).isFalse(); @@ -117,7 +117,7 @@ public void fail_when_changeset_is_empty() { ScmLineReader lineScm = new ScmLineReader(scmReport); - FileSourceDb.Line.Builder lineBuilder = FileSourceDb.Data.newBuilder().addLinesBuilder().setLine(1); + FileSources.Line.Builder lineBuilder = FileSources.Data.newBuilder().addLinesBuilder().setLine(1); try { lineScm.read(lineBuilder); failBecauseExceptionWasNotThrown(IllegalArgumentException.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/SymbolsLineReaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/source/SymbolsLineReaderTest.java index 90947a46ae73..7fc254226ff8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/SymbolsLineReaderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/source/SymbolsLineReaderTest.java @@ -20,23 +20,22 @@ package org.sonar.server.computation.source; -import java.util.Collections; import java.util.List; import org.junit.Test; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.util.CloseableIterator; -import org.sonar.server.source.db.FileSourceDb; +import org.sonar.db.FileSources; import static com.google.common.collect.Lists.newArrayList; import static org.assertj.core.api.Assertions.assertThat; public class SymbolsLineReaderTest { - FileSourceDb.Data.Builder sourceData = FileSourceDb.Data.newBuilder(); - FileSourceDb.Line.Builder line1 = sourceData.addLinesBuilder().setSource("line1").setLine(1); - FileSourceDb.Line.Builder line2 = sourceData.addLinesBuilder().setSource("line2").setLine(2); - FileSourceDb.Line.Builder line3 = sourceData.addLinesBuilder().setSource("line3").setLine(3); - FileSourceDb.Line.Builder line4 = sourceData.addLinesBuilder().setSource("line4").setLine(4); + FileSources.Data.Builder sourceData = FileSources.Data.newBuilder(); + FileSources.Line.Builder line1 = sourceData.addLinesBuilder().setSource("line1").setLine(1); + FileSources.Line.Builder line2 = sourceData.addLinesBuilder().setSource("line2").setLine(2); + FileSources.Line.Builder line3 = sourceData.addLinesBuilder().setSource("line3").setLine(3); + FileSources.Line.Builder line4 = sourceData.addLinesBuilder().setSource("line4").setLine(4); @Test public void read_nothing() { @@ -57,8 +56,7 @@ public void read_symbols() { .addReference(BatchReport.Range.newBuilder() .setStartLine(3).setEndLine(3).setStartOffset(1).setEndOffset(3) .build()) - .build() - ); + .build()); SymbolsLineReader symbolsLineReader = new SymbolsLineReader(symbols.iterator()); symbolsLineReader.read(line1); @@ -80,8 +78,7 @@ public void read_symbols_with_reference_on_same_line() { .addReference(BatchReport.Range.newBuilder() .setStartLine(1).setEndLine(1).setStartOffset(2).setEndOffset(3) .build()) - .build() - ); + .build()); SymbolsLineReader symbolsLineReader = new SymbolsLineReader(symbols.iterator()); symbolsLineReader.read(line1); @@ -102,8 +99,7 @@ public void read_symbols_with_two_references() { .addReference(BatchReport.Range.newBuilder() .setStartLine(2).setEndLine(2).setStartOffset(0).setEndOffset(2) .build()) - .build() - ); + .build()); SymbolsLineReader symbolsLineReader = new SymbolsLineReader(symbols.iterator()); symbolsLineReader.read(line1); @@ -128,8 +124,7 @@ public void read_symbols_with_two_references_on_the_same_line() { .addReference(BatchReport.Range.newBuilder() .setStartLine(2).setEndLine(2).setStartOffset(2).setEndOffset(3) .build()) - .build() - ); + .build()); SymbolsLineReader symbolsLineReader = new SymbolsLineReader(symbols.iterator()); symbolsLineReader.read(line1); @@ -149,8 +144,7 @@ public void read_symbols_when_reference_line_is_before_declaration_line() { .addReference(BatchReport.Range.newBuilder() .setStartLine(1).setEndLine(1).setStartOffset(1).setEndOffset(2) .build()) - .build() - ); + .build()); SymbolsLineReader symbolsLineReader = new SymbolsLineReader(symbols.iterator()); symbolsLineReader.read(line1); @@ -178,8 +172,7 @@ public void read_many_symbols_on_lines() { .addReference(BatchReport.Range.newBuilder() .setStartLine(3).setEndLine(3).setStartOffset(0).setEndOffset(1) .build()) - .build() - ); + .build()); SymbolsLineReader symbolsLineReader = new SymbolsLineReader(symbols.iterator()); symbolsLineReader.read(line1); @@ -287,8 +280,7 @@ public void read_symbols_declared_on_a_whole_line() { .addReference(BatchReport.Range.newBuilder() .setStartLine(3).setEndLine(3).setStartOffset(1).setEndOffset(3) .build()) - .build() - ); + .build()); SymbolsLineReader symbolsLineReader = new SymbolsLineReader(symbols.iterator()); symbolsLineReader.read(line1); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java index 4974256fe206..4cde198b47d0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java @@ -33,6 +33,7 @@ import org.sonar.batch.protocol.output.BatchReport; import org.sonar.db.DbClient; import org.sonar.db.DbTester; +import org.sonar.db.FileSources; import org.sonar.db.source.FileSourceDto; import org.sonar.db.source.FileSourceDto.Type; import org.sonar.server.computation.batch.BatchReportReaderRule; @@ -40,7 +41,6 @@ import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DumbComponent; import org.sonar.server.computation.language.LanguageRepository; -import org.sonar.server.source.db.FileSourceDb; import org.sonar.test.DbTests; import static com.google.common.collect.Lists.newArrayList; @@ -105,7 +105,7 @@ public void persist_sources() { assertThat(fileSourceDto.getCreatedAt()).isEqualTo(now); assertThat(fileSourceDto.getUpdatedAt()).isEqualTo(now); - FileSourceDb.Data data = FileSourceDto.decodeSourceData(fileSourceDto.getBinaryData()); + FileSources.Data data = FileSourceDto.decodeSourceData(fileSourceDto.getBinaryData()); assertThat(data.getLinesCount()).isEqualTo(2); assertThat(data.getLines(0).getLine()).isEqualTo(1); assertThat(data.getLines(0).getSource()).isEqualTo("line1"); @@ -127,7 +127,7 @@ public void persist_last_line() { reportReader.putComponent(BatchReport.Component.newBuilder() .setRef(FILE_REF) .setType(Constants.ComponentType.FILE) - // Lines is set to 3 but only 2 lines are read from the file -> the last lines should be added + // Lines is set to 3 but only 2 lines are read from the file -> the last lines should be added .setLines(3) .build()); reportReader.putFileSourceLines(FILE_REF, "line1", "line2"); @@ -136,7 +136,7 @@ public void persist_last_line() { assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); - FileSourceDb.Data data = FileSourceDto.decodeSourceData(fileSourceDto.getBinaryData()); + FileSources.Data data = FileSourceDto.decodeSourceData(fileSourceDto.getBinaryData()); assertThat(data.getLinesCount()).isEqualTo(3); assertThat(data.getLines(2).getLine()).isEqualTo(3); assertThat(data.getLines(2).getSource()).isEmpty(); @@ -172,7 +172,7 @@ public void persist_coverage() { assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); - FileSourceDb.Data data = FileSourceDto.decodeSourceData(fileSourceDto.getBinaryData()); + FileSources.Data data = FileSourceDto.decodeSourceData(fileSourceDto.getBinaryData()); assertThat(data.getLinesList()).hasSize(1); @@ -205,7 +205,7 @@ public void persist_scm() { assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); - FileSourceDb.Data data = FileSourceDto.decodeSourceData(fileSourceDto.getBinaryData()); + FileSources.Data data = FileSourceDto.decodeSourceData(fileSourceDto.getBinaryData()); assertThat(data.getLinesList()).hasSize(1); @@ -219,19 +219,18 @@ public void persist_highlighting() { initBasicReport(1); reportReader.putSyntaxHighlighting(FILE_REF, newArrayList(BatchReport.SyntaxHighlighting.newBuilder() - .setRange(BatchReport.Range.newBuilder() - .setStartLine(1).setEndLine(1) - .setStartOffset(2).setEndOffset(4) - .build()) - .setType(Constants.HighlightingType.ANNOTATION) - .build() - )); + .setRange(BatchReport.Range.newBuilder() + .setStartLine(1).setEndLine(1) + .setStartOffset(2).setEndOffset(4) + .build()) + .setType(Constants.HighlightingType.ANNOTATION) + .build())); underTest.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); - FileSourceDb.Data data = FileSourceDto.decodeSourceData(fileSourceDto.getBinaryData()); + FileSources.Data data = FileSourceDto.decodeSourceData(fileSourceDto.getBinaryData()); assertThat(data.getLinesList()).hasSize(1); @@ -248,16 +247,15 @@ public void persist_symbols() { .setStartLine(1).setEndLine(1).setStartOffset(2).setEndOffset(4) .build()) .addReference(BatchReport.Range.newBuilder() - .setStartLine(3).setEndLine(3).setStartOffset(1).setEndOffset(3) - .build() - ).build() - )); + .setStartLine(3).setEndLine(3).setStartOffset(1).setEndOffset(3) + .build()) + .build())); underTest.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); - FileSourceDb.Data data = FileSourceDto.decodeSourceData(fileSourceDto.getBinaryData()); + FileSources.Data data = FileSourceDto.decodeSourceData(fileSourceDto.getBinaryData()); assertThat(data.getLinesList()).hasSize(3); @@ -282,14 +280,13 @@ public void persist_duplication() { .setEndLine(4) .build()) .build()) - .build() - )); + .build())); underTest.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); - FileSourceDb.Data data = FileSourceDto.decodeSourceData(fileSourceDto.getBinaryData()); + FileSources.Data data = FileSourceDto.decodeSourceData(fileSourceDto.getBinaryData()); assertThat(data.getLinesList()).hasSize(1); @@ -310,8 +307,8 @@ public void not_update_sources_when_nothing_has_changed() { .setSrcHash(srcHash) .setLineHashes(lineHashes) .setDataHash(dataHash) - .setSourceData(FileSourceDb.Data.newBuilder() - .addLines(FileSourceDb.Line.newBuilder() + .setSourceData(FileSources.Data.newBuilder() + .addLines(FileSources.Line.newBuilder() .setLine(1) .setSource("line1") .build()) @@ -345,8 +342,8 @@ public void update_sources_when_source_updated() { .setSrcHash("5b4bd9815cdb17b8ceae19eb1810c34c") .setLineHashes("6438c669e0d0de98e6929c2cc0fac474\n") .setDataHash("6cad150e3d065976c230cddc5a09efaa") - .setSourceData(FileSourceDb.Data.newBuilder() - .addLines(FileSourceDb.Line.newBuilder() + .setSourceData(FileSources.Data.newBuilder() + .addLines(FileSources.Line.newBuilder() .setLine(1) .setSource("old line") .build()) @@ -373,11 +370,11 @@ public void update_sources_when_src_hash_is_missing() { .setProjectUuid(PROJECT_UUID) .setFileUuid(FILE_UUID) .setDataType(Type.SOURCE) - // Source hash is missing, update will be made + // Source hash is missing, update will be made .setLineHashes("137f72c3708c6bd0de00a0e5a69c699b") .setDataHash("29f25900140c94db38035128cb6de6a2") - .setSourceData(FileSourceDb.Data.newBuilder() - .addLines(FileSourceDb.Line.newBuilder() + .setSourceData(FileSources.Data.newBuilder() + .addLines(FileSources.Line.newBuilder() .setLine(1) .setSource("line") .build()) @@ -403,14 +400,13 @@ public void display_file_path_when_exception_is_generated() { initBasicReport(1); reportReader.putSyntaxHighlighting(FILE_REF, newArrayList(BatchReport.SyntaxHighlighting.newBuilder() - .setRange(BatchReport.Range.newBuilder() - .setStartLine(1).setEndLine(1) - // Wrong offset -> fail - .setStartOffset(4).setEndOffset(2) - .build()) - .setType(Constants.HighlightingType.ANNOTATION) - .build() - )); + .setRange(BatchReport.Range.newBuilder() + .setStartLine(1).setEndLine(1) + // Wrong offset -> fail + .setStartOffset(4).setEndOffset(2) + .build()) + .setType(Constants.HighlightingType.ANNOTATION) + .build())); try { underTest.execute(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java index f50c092f65c0..76a85f96797a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java @@ -33,13 +33,13 @@ import org.sonar.batch.protocol.output.BatchReport.CoverageDetail; import org.sonar.db.DbClient; import org.sonar.db.DbTester; +import org.sonar.db.FileSources; import org.sonar.db.source.FileSourceDto; import org.sonar.server.computation.batch.BatchReportReaderRule; import org.sonar.server.computation.batch.TreeRootHolderRule; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DumbComponent; import org.sonar.server.computation.component.FileAttributes; -import org.sonar.server.source.db.FileSourceDb; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; @@ -91,9 +91,8 @@ public void setup() { DumbComponent.builder(Component.Type.FILE, 3).setUuid(TEST_FILE_UUID_1).setKey("TEST_FILE1_KEY").setFileAttributes(new FileAttributes(true, null)).build(), DumbComponent.builder(Component.Type.FILE, 4).setUuid(TEST_FILE_UUID_2).setKey("TEST_FILE2_KEY").setFileAttributes(new FileAttributes(true, null)).build(), DumbComponent.builder(Component.Type.FILE, 5).setUuid(MAIN_FILE_UUID_1).setKey("MAIN_FILE1_KEY").build(), - DumbComponent.builder(Component.Type.FILE, 6).setUuid(MAIN_FILE_UUID_2).setKey("MAIN_FILE2_KEY").build() - ).build() - ).build(); + DumbComponent.builder(Component.Type.FILE, 6).setUuid(MAIN_FILE_UUID_2).setKey("MAIN_FILE2_KEY").build()).build()) + .build(); treeRootHolder.setRoot(root); } @@ -113,12 +112,10 @@ public void no_test_in_database_and_batch_report() { @Test public void insert_several_tests_in_a_report() { List batchTests = Arrays.asList( - newTest(1), newTest(2) - ); + newTest(1), newTest(2)); reportReader.putTests(TEST_FILE_REF_1, batchTests); List coverageDetails = Arrays.asList( - newCoverageDetail(1, MAIN_FILE_REF_1) - ); + newCoverageDetail(1, MAIN_FILE_REF_1)); reportReader.putCoverageDetails(TEST_FILE_REF_1, coverageDetails); underTest.execute(); @@ -153,12 +150,12 @@ public void insert_all_data_of_a_test() { assertThat(dto.getFileUuid()).isEqualTo(TEST_FILE_UUID_1); assertThat(dto.getTestData()).hasSize(1); - FileSourceDb.Test test1 = dto.getTestData().get(0); + FileSources.Test test1 = dto.getTestData().get(0); assertThat(test1.getUuid()).isNotEmpty(); assertThat(test1.getName()).isEqualTo("name#1"); assertThat(test1.getMsg()).isEqualTo("message#1"); assertThat(test1.getStacktrace()).isEqualTo("stacktrace#1"); - assertThat(test1.getStatus()).isEqualTo(FileSourceDb.Test.TestStatus.FAILURE); + assertThat(test1.getStatus()).isEqualTo(FileSources.Test.TestStatus.FAILURE); assertThat(test1.getExecutionTimeMs()).isEqualTo(1_000); assertThat(test1.getCoveredFileCount()).isEqualTo(1); assertThat(test1.getCoveredFile(0).getCoveredLineList()).containsOnly(1, 2, 3); @@ -174,7 +171,7 @@ public void insert_tests_without_coverage_details() { FileSourceDto dto = dbClient.fileSourceDao().selectTest(TEST_FILE_UUID_1); assertThat(dto.getFileUuid()).isEqualTo(TEST_FILE_UUID_1); - List tests = dto.getTestData(); + List tests = dto.getTestData(); assertThat(tests).hasSize(1); assertThat(tests.get(0).getCoveredFileList()).isEmpty(); assertThat(tests.get(0).getMsg()).isEqualTo("message#1"); @@ -218,10 +215,10 @@ public void update_existing_test() { dbClient.fileSourceDao().insert(db.getSession(), new FileSourceDto() .setProjectUuid(PROJECT_UUID) .setFileUuid(TEST_FILE_UUID_1) - .setTestData(Arrays.asList(FileSourceDb.Test.newBuilder() + .setTestData(Arrays.asList(FileSources.Test.newBuilder() .setUuid("test-uuid-1") .setName("name#1") - .setStatus(FileSourceDb.Test.TestStatus.ERROR) + .setStatus(FileSources.Test.TestStatus.ERROR) .setStacktrace("old-stacktrace#1") .setMsg("old-message#1") .setExecutionTimeMs(987_654_321L) @@ -246,10 +243,10 @@ public void update_existing_test() { assertThat(dto.getUpdatedAt()).isEqualTo(now); assertThat(dto.getTestData()).hasSize(1); - FileSourceDb.Test test = dto.getTestData().get(0); + FileSources.Test test = dto.getTestData().get(0); assertThat(test.getUuid()).isNotEqualTo("test-uuid-1"); assertThat(test.getName()).isEqualTo("name#1"); - assertThat(test.getStatus()).isEqualTo(FileSourceDb.Test.TestStatus.valueOf(newBatchTest.getStatus().name())); + assertThat(test.getStatus()).isEqualTo(FileSources.Test.TestStatus.valueOf(newBatchTest.getStatus().name())); assertThat(test.getMsg()).isEqualTo(newBatchTest.getMsg()); assertThat(test.getStacktrace()).isEqualTo(newBatchTest.getStacktrace()); assertThat(test.getExecutionTimeMs()).isEqualTo(newBatchTest.getDurationInMs()); @@ -276,10 +273,9 @@ private BatchReport.CoverageDetail newCoverageDetailWithLines(int id, int covere return CoverageDetail.newBuilder() .setTestName("name#" + id) .addCoveredFile(CoverageDetail.CoveredFile.newBuilder() - .addAllCoveredLine(Arrays.asList(lines)) - .setFileRef(covered_file_ref) - .build() - ) + .addAllCoveredLine(Arrays.asList(lines)) + .setFileRef(covered_file_ref) + .build()) .build(); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java index 4740019a2d09..b13e8248c6a3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java @@ -42,6 +42,7 @@ import org.sonar.core.permission.GlobalPermissions; import org.sonar.db.DbClient; import org.sonar.db.DbSession; +import org.sonar.db.FileSources; import org.sonar.db.component.ComponentDao; import org.sonar.db.component.ComponentDto; import org.sonar.db.issue.ActionPlanDto; @@ -62,7 +63,6 @@ import org.sonar.server.permission.InternalPermissionService; import org.sonar.server.permission.PermissionChange; import org.sonar.server.rule.db.RuleDao; -import org.sonar.server.source.db.FileSourceDb; import org.sonar.server.source.index.FileSourcesUpdaterHelper; import org.sonar.server.source.index.SourceLineIndexer; import org.sonar.server.source.index.SourceLineResultSetIterator; @@ -608,7 +608,7 @@ private IssueDto saveIssue(IssueDto issue) { } private void newSourceLine(ComponentDto file, int line, String scmAuthor) { - FileSourceDb.Data.Builder dataBuilder = FileSourceDb.Data.newBuilder(); + FileSources.Data.Builder dataBuilder = FileSources.Data.newBuilder(); dataBuilder.addLinesBuilder() .setLine(line) .setScmAuthor(scmAuthor) diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/index/FileSourceTesting.java b/server/sonar-server/src/test/java/org/sonar/server/source/index/FileSourceTesting.java index 6c05f7911c67..c9bde582d5f4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/index/FileSourceTesting.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/index/FileSourceTesting.java @@ -26,8 +26,8 @@ import java.util.Arrays; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.math.RandomUtils; +import org.sonar.db.FileSources; import org.sonar.db.source.FileSourceDto; -import org.sonar.server.source.db.FileSourceDb; public class FileSourceTesting { @@ -35,7 +35,7 @@ private FileSourceTesting() { // only static stuff } - public static void updateDataColumn(Connection connection, String fileUuid, FileSourceDb.Data data) throws SQLException { + public static void updateDataColumn(Connection connection, String fileUuid, FileSources.Data data) throws SQLException { updateDataColumn(connection, fileUuid, FileSourceDto.encodeSourceData(data)); } @@ -50,8 +50,8 @@ public static void updateDataColumn(Connection connection, String fileUuid, byte /** * Generate predefined fake data. Result is mutable. */ - public static FileSourceDb.Data.Builder newFakeData(int numberOfLines) throws IOException { - FileSourceDb.Data.Builder dataBuilder = FileSourceDb.Data.newBuilder(); + public static FileSources.Data.Builder newFakeData(int numberOfLines) throws IOException { + FileSources.Data.Builder dataBuilder = FileSources.Data.newBuilder(); for (int i = 1; i <= numberOfLines; i++) { dataBuilder.addLinesBuilder() .setLine(i) @@ -79,8 +79,8 @@ public static FileSourceDb.Data.Builder newFakeData(int numberOfLines) throws IO /** * Generate random data. Result is mutable. */ - public static FileSourceDb.Data.Builder newRandomData(int numberOfLines) throws IOException { - FileSourceDb.Data.Builder dataBuilder = FileSourceDb.Data.newBuilder(); + public static FileSources.Data.Builder newRandomData(int numberOfLines) throws IOException { + FileSources.Data.Builder dataBuilder = FileSources.Data.newBuilder(); for (int i = 1; i <= numberOfLines; i++) { dataBuilder.addLinesBuilder() .setLine(i) diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineIndexerTest.java index d654de558fe0..20191b7db00f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineIndexerTest.java @@ -40,9 +40,9 @@ import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; +import org.sonar.db.FileSources; import org.sonar.server.db.DbClient; import org.sonar.server.es.EsTester; -import org.sonar.server.source.db.FileSourceDb; import org.sonar.test.DbTests; import org.sonar.test.TestUtils; @@ -131,7 +131,7 @@ public void update_already_indexed_lines() throws Exception { indexLine("P1", "F2", 1); List duplications = ImmutableList.of(1, 2, 3); - FileSourceDb.Data.Builder dataBuilder = FileSourceDb.Data.newBuilder(); + FileSources.Data.Builder dataBuilder = FileSources.Data.newBuilder(); dataBuilder.addLinesBuilder() .setLine(1) .setScmRevision("new_revision") @@ -156,8 +156,7 @@ public void update_already_indexed_lines() throws Exception { entry(FIELD_SCM_REVISION, "new_revision"), entry(FIELD_SCM_AUTHOR, "new_author"), entry(FIELD_SOURCE, "new source"), - entry(FIELD_DUPLICATIONS, duplications) - ); + entry(FIELD_DUPLICATIONS, duplications)); } @Test @@ -195,7 +194,7 @@ public void delete_by_project_uuid() throws Exception { public void index_source_lines_with_big_test_data() { Integer bigValue = Short.MAX_VALUE * 2; - FileSourceDb.Data.Builder dataBuilder = FileSourceDb.Data.newBuilder(); + FileSources.Data.Builder dataBuilder = FileSources.Data.newBuilder(); dataBuilder.addLinesBuilder() .setLine(1) .setScmRevision("cafebabe") diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineResultSetIteratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineResultSetIteratorTest.java index dd7cdd159813..2a71fbae9c37 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineResultSetIteratorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineResultSetIteratorTest.java @@ -28,7 +28,7 @@ import org.junit.experimental.categories.Category; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; -import org.sonar.server.source.db.FileSourceDb; +import org.sonar.db.FileSources; import org.sonar.test.DbTests; import static org.assertj.core.api.Assertions.assertThat; @@ -81,8 +81,7 @@ public void traverse_db() throws Exception { MapEntry.entry(SourceLineIndexDefinition.FIELD_IT_COVERED_CONDITIONS, 6), MapEntry.entry(SourceLineIndexDefinition.FIELD_OVERALL_LINE_HITS, 7), MapEntry.entry(SourceLineIndexDefinition.FIELD_OVERALL_CONDITIONS, 8), - MapEntry.entry(SourceLineIndexDefinition.FIELD_OVERALL_COVERED_CONDITIONS, 9) - ); + MapEntry.entry(SourceLineIndexDefinition.FIELD_OVERALL_COVERED_CONDITIONS, 9)); } /** @@ -91,7 +90,7 @@ public void traverse_db() throws Exception { @Test public void minimal_data() throws Exception { db.prepareDbUnit(getClass(), "shared.xml"); - FileSourceDb.Data.Builder dataBuilder = FileSourceDb.Data.newBuilder(); + FileSources.Data.Builder dataBuilder = FileSources.Data.newBuilder(); dataBuilder.addLinesBuilder().setLine(1).build(); try (Connection connection = db.openConnection()) { FileSourceTesting.updateDataColumn(connection, "F1", dataBuilder.build()); @@ -108,8 +107,7 @@ public void minimal_data() throws Exception { assertThat(doc).contains( MapEntry.entry(SourceLineIndexDefinition.FIELD_PROJECT_UUID, "P1"), MapEntry.entry(SourceLineIndexDefinition.FIELD_FILE_UUID, "F1"), - MapEntry.entry(SourceLineIndexDefinition.FIELD_LINE, 1) - ); + MapEntry.entry(SourceLineIndexDefinition.FIELD_LINE, 1)); // null values assertThat(doc).containsKeys( SourceLineIndexDefinition.FIELD_SCM_REVISION, @@ -124,8 +122,7 @@ public void minimal_data() throws Exception { SourceLineIndexDefinition.FIELD_IT_COVERED_CONDITIONS, SourceLineIndexDefinition.FIELD_OVERALL_LINE_HITS, SourceLineIndexDefinition.FIELD_OVERALL_CONDITIONS, - SourceLineIndexDefinition.FIELD_OVERALL_COVERED_CONDITIONS - ); + SourceLineIndexDefinition.FIELD_OVERALL_COVERED_CONDITIONS); } @Test @@ -139,7 +136,7 @@ public void filter_by_date() { @Test public void filter_by_project() throws Exception { db.prepareDbUnit(getClass(), "filter_by_project.xml"); - FileSourceDb.Data.Builder dataBuilder = FileSourceDb.Data.newBuilder(); + FileSources.Data.Builder dataBuilder = FileSources.Data.newBuilder(); dataBuilder.addLinesBuilder().setLine(1).build(); try (Connection connection = db.openConnection()) { FileSourceTesting.updateDataColumn(connection, "F1", dataBuilder.build()); @@ -158,7 +155,7 @@ public void filter_by_project() throws Exception { @Test public void filter_by_project_and_date() throws Exception { db.prepareDbUnit(getClass(), "filter_by_project_and_date.xml"); - FileSourceDb.Data.Builder dataBuilder = FileSourceDb.Data.newBuilder(); + FileSources.Data.Builder dataBuilder = FileSources.Data.newBuilder(); dataBuilder.addLinesBuilder().setLine(1).build(); try (Connection connection = db.openConnection()) { FileSourceTesting.updateDataColumn(connection, "F1", dataBuilder.build()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/db/TestTesting.java b/server/sonar-server/src/test/java/org/sonar/server/test/db/TestTesting.java index bf900c2dd39a..d74b000ff0c4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/db/TestTesting.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/db/TestTesting.java @@ -20,20 +20,18 @@ package org.sonar.server.test.db; -import org.apache.commons.lang.RandomStringUtils; -import org.apache.commons.lang.math.RandomUtils; -import org.sonar.api.utils.internal.Uuids; -import org.sonar.db.DbSession; -import org.sonar.db.source.FileSourceDto; -import org.sonar.server.source.db.FileSourceDb; -import org.sonar.server.source.db.FileSourceDb.Test.TestStatus; - import java.io.IOException; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang.math.RandomUtils; +import org.sonar.api.utils.internal.Uuids; +import org.sonar.db.DbSession; +import org.sonar.db.FileSources; +import org.sonar.db.source.FileSourceDto; public class TestTesting { @@ -41,7 +39,7 @@ private TestTesting() { // only static stuff } - public static void updateDataColumn(DbSession session, String fileUuid, List tests) throws SQLException { + public static void updateDataColumn(DbSession session, String fileUuid, List tests) throws SQLException { updateDataColumn(session, fileUuid, FileSourceDto.encodeTestData(tests)); } @@ -58,22 +56,21 @@ public static void updateDataColumn(DbSession session, String fileUuid, byte[] d /** * Generate random data. */ - public static List newRandomTests(int numberOfTests) throws IOException { - List tests = new ArrayList<>(); + public static List newRandomTests(int numberOfTests) throws IOException { + List tests = new ArrayList<>(); for (int i = 1; i <= numberOfTests; i++) { - FileSourceDb.Test.Builder test = FileSourceDb.Test.newBuilder() + FileSources.Test.Builder test = FileSources.Test.newBuilder() .setUuid(Uuids.create()) .setName(RandomStringUtils.randomAlphanumeric(20)) - .setStatus(TestStatus.FAILURE) + .setStatus(FileSources.Test.TestStatus.FAILURE) .setStacktrace(RandomStringUtils.randomAlphanumeric(50)) .setMsg(RandomStringUtils.randomAlphanumeric(30)) .setExecutionTimeMs(RandomUtils.nextLong()); for (int j = 0; j < numberOfTests; j++) { test.addCoveredFile( - FileSourceDb.Test.CoveredFile.newBuilder() + FileSources.Test.CoveredFile.newBuilder() .setFileUuid(Uuids.create()) - .addCoveredLine(RandomUtils.nextInt(500)) - ); + .addCoveredLine(RandomUtils.nextInt(500))); } tests.add(test.build()); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexerTest.java index daf04e6795f0..c812ba678059 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexerTest.java @@ -39,10 +39,9 @@ import org.sonar.api.config.Settings; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; +import org.sonar.db.FileSources; import org.sonar.server.db.DbClient; import org.sonar.server.es.EsTester; -import org.sonar.server.source.db.FileSourceDb; -import org.sonar.server.source.db.FileSourceDb.Test.TestStatus; import org.sonar.server.source.index.FileSourcesUpdaterHelper; import org.sonar.server.test.db.TestTesting; import org.sonar.test.DbTests; @@ -121,16 +120,15 @@ public void update_already_indexed_test() throws Exception { indexTest("P1", "F2", "T1", "U121"); FileSourcesUpdaterHelper.Row dbRow = TestResultSetIterator.toRow("P1", "F1", new Date(), Arrays.asList( - FileSourceDb.Test.newBuilder() + FileSources.Test.newBuilder() .setUuid("U111") .setName("NAME_1") - .setStatus(TestStatus.FAILURE) + .setStatus(FileSources.Test.TestStatus.FAILURE) .setMsg("NEW_MESSAGE_1") .setStacktrace("NEW_STACKTRACE_1") .setExecutionTimeMs(123_456L) - .addCoveredFile(FileSourceDb.Test.CoveredFile.newBuilder().setFileUuid("MAIN_UUID_1").addCoveredLine(42)) - .build() - )); + .addCoveredFile(FileSources.Test.CoveredFile.newBuilder().setFileUuid("MAIN_UUID_1").addCoveredLine(42)) + .build())); underTest.index(Iterators.singletonIterator(dbRow)); assertThat(countDocuments()).isEqualTo(2L); @@ -148,8 +146,7 @@ public void update_already_indexed_test() throws Exception { entry(FIELD_STATUS, "FAILURE"), entry(FIELD_MESSAGE, "NEW_MESSAGE_1"), entry(FIELD_STACKTRACE, "NEW_STACKTRACE_1"), - entry(FIELD_DURATION_IN_MS, 123_456) - ); + entry(FIELD_DURATION_IN_MS, 123_456)); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java index 100c0ca0e727..1aa0da98c621 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java @@ -32,8 +32,7 @@ import org.junit.experimental.categories.Category; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; -import org.sonar.server.source.db.FileSourceDb; -import org.sonar.server.source.db.FileSourceDb.Test.TestStatus; +import org.sonar.db.FileSources; import org.sonar.server.source.index.FileSourcesUpdaterHelper; import org.sonar.server.test.db.TestTesting; import org.sonar.test.DbTests; @@ -78,8 +77,7 @@ public void traverse_db() throws Exception { MapEntry.entry(TestIndexDefinition.FIELD_MESSAGE, "MESSAGE_1"), MapEntry.entry(TestIndexDefinition.FIELD_DURATION_IN_MS, 1), MapEntry.entry(TestIndexDefinition.FIELD_STACKTRACE, "STACKTRACE_1"), - MapEntry.entry(TestIndexDefinition.FIELD_NAME, "NAME_1") - ); + MapEntry.entry(TestIndexDefinition.FIELD_NAME, "NAME_1")); } /** @@ -88,12 +86,11 @@ public void traverse_db() throws Exception { @Test public void minimal_data() throws Exception { dbTester.prepareDbUnit(getClass(), "shared.xml"); - List tests = Arrays.asList( - FileSourceDb.Test.newBuilder() + List tests = Arrays.asList( + FileSources.Test.newBuilder() .setUuid("U1") .setName("N1") - .build() - ); + .build()); TestTesting.updateDataColumn(dbTester.getSession(), "F1", tests); underTest = TestResultSetIterator.create(dbTester.getDbClient(), dbTester.getSession(), 0L, null); @@ -109,16 +106,14 @@ public void minimal_data() throws Exception { MapEntry.entry(TestIndexDefinition.FIELD_PROJECT_UUID, "P1"), MapEntry.entry(TestIndexDefinition.FIELD_FILE_UUID, "F1"), MapEntry.entry(TestIndexDefinition.FIELD_TEST_UUID, "U1"), - MapEntry.entry(TestIndexDefinition.FIELD_NAME, "N1") - ); + MapEntry.entry(TestIndexDefinition.FIELD_NAME, "N1")); // null values assertThat(doc).containsKeys( TestIndexDefinition.FIELD_DURATION_IN_MS, TestIndexDefinition.FIELD_STACKTRACE, TestIndexDefinition.FIELD_MESSAGE, TestIndexDefinition.FIELD_STATUS, - TestIndexDefinition.FIELD_COVERED_FILES - ); + TestIndexDefinition.FIELD_COVERED_FILES); } @Test @@ -175,22 +170,21 @@ public void fail_on_bad_data_format() throws Exception { } } - private static List newFakeTests(int numberOfTests) { - List tests = new ArrayList<>(); + private static List newFakeTests(int numberOfTests) { + List tests = new ArrayList<>(); for (int i = 1; i <= numberOfTests; i++) { - FileSourceDb.Test.Builder test = FileSourceDb.Test.newBuilder() + FileSources.Test.Builder test = FileSources.Test.newBuilder() .setUuid("TEST_FILE_UUID_" + i) .setName("NAME_" + i) - .setStatus(TestStatus.FAILURE) + .setStatus(FileSources.Test.TestStatus.FAILURE) .setStacktrace("STACKTRACE_" + i) .setMsg("MESSAGE_" + i) .setExecutionTimeMs(i); for (int j = 1; j <= numberOfTests; j++) { test.addCoveredFile( - FileSourceDb.Test.CoveredFile.newBuilder() + FileSources.Test.CoveredFile.newBuilder() .setFileUuid("MAIN_FILE_UUID_" + j) - .addCoveredLine(j) - ); + .addCoveredLine(j)); } tests.add(test.build()); } diff --git a/sonar-batch-protocol/src/main/gen-java/org/sonar/server/source/db/FileSourceTestDb.java b/sonar-batch-protocol/src/main/gen-java/org/sonar/server/source/db/FileSourceTestDb.java deleted file mode 100644 index 3fbf75e74c1d..000000000000 --- a/sonar-batch-protocol/src/main/gen-java/org/sonar/server/source/db/FileSourceTestDb.java +++ /dev/null @@ -1,3434 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: file_source_test_db.proto - -package org.sonar.server.source.db; - -public final class FileSourceTestDb { - private FileSourceTestDb() {} - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistry registry) { - } - public interface TestOrBuilder - extends com.google.protobuf.MessageOrBuilder { - - // optional string uuid = 1; - /** - * optional string uuid = 1; - */ - boolean hasUuid(); - /** - * optional string uuid = 1; - */ - java.lang.String getUuid(); - /** - * optional string uuid = 1; - */ - com.google.protobuf.ByteString - getUuidBytes(); - - // optional string key = 2; - /** - * optional string key = 2; - */ - boolean hasKey(); - /** - * optional string key = 2; - */ - java.lang.String getKey(); - /** - * optional string key = 2; - */ - com.google.protobuf.ByteString - getKeyBytes(); - - // optional string method_name = 3; - /** - * optional string method_name = 3; - */ - boolean hasMethodName(); - /** - * optional string method_name = 3; - */ - java.lang.String getMethodName(); - /** - * optional string method_name = 3; - */ - com.google.protobuf.ByteString - getMethodNameBytes(); - - // optional string status = 4; - /** - * optional string status = 4; - */ - boolean hasStatus(); - /** - * optional string status = 4; - */ - java.lang.String getStatus(); - /** - * optional string status = 4; - */ - com.google.protobuf.ByteString - getStatusBytes(); - - // optional string test_message = 5; - /** - * optional string test_message = 5; - */ - boolean hasTestMessage(); - /** - * optional string test_message = 5; - */ - java.lang.String getTestMessage(); - /** - * optional string test_message = 5; - */ - com.google.protobuf.ByteString - getTestMessageBytes(); - - // optional string type = 6; - /** - * optional string type = 6; - */ - boolean hasType(); - /** - * optional string type = 6; - */ - java.lang.String getType(); - /** - * optional string type = 6; - */ - com.google.protobuf.ByteString - getTypeBytes(); - - // repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - java.util.List - getCoverageBlockList(); - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock getCoverageBlock(int index); - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - int getCoverageBlockCount(); - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - java.util.List - getCoverageBlockOrBuilderList(); - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlockOrBuilder getCoverageBlockOrBuilder( - int index); - } - /** - * Protobuf type {@code org.sonar.server.source.db.Test} - */ - public static final class Test extends - com.google.protobuf.GeneratedMessage - implements TestOrBuilder { - // Use Test.newBuilder() to construct. - private Test(com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private Test(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - - private static final Test defaultInstance; - public static Test getDefaultInstance() { - return defaultInstance; - } - - public Test getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private Test( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - bitField0_ |= 0x00000001; - uuid_ = input.readBytes(); - break; - } - case 18: { - bitField0_ |= 0x00000002; - key_ = input.readBytes(); - break; - } - case 26: { - bitField0_ |= 0x00000004; - methodName_ = input.readBytes(); - break; - } - case 34: { - bitField0_ |= 0x00000008; - status_ = input.readBytes(); - break; - } - case 42: { - bitField0_ |= 0x00000010; - testMessage_ = input.readBytes(); - break; - } - case 50: { - bitField0_ |= 0x00000020; - type_ = input.readBytes(); - break; - } - case 58: { - if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { - coverageBlock_ = new java.util.ArrayList<>(); - mutable_bitField0_ |= 0x00000040; - } - coverageBlock_.add(input.readMessage(org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock.PARSER, extensionRegistry)); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) { - coverageBlock_ = java.util.Collections.unmodifiableList(coverageBlock_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.sonar.server.source.db.FileSourceTestDb.internal_static_org_sonar_server_source_db_Test_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.sonar.server.source.db.FileSourceTestDb.internal_static_org_sonar_server_source_db_Test_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.sonar.server.source.db.FileSourceTestDb.Test.class, org.sonar.server.source.db.FileSourceTestDb.Test.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public Test parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new Test(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - public interface CoverageBlockOrBuilder - extends com.google.protobuf.MessageOrBuilder { - - // optional string uuid = 1; - /** - * optional string uuid = 1; - */ - boolean hasUuid(); - /** - * optional string uuid = 1; - */ - java.lang.String getUuid(); - /** - * optional string uuid = 1; - */ - com.google.protobuf.ByteString - getUuidBytes(); - - // optional string key = 2; - /** - * optional string key = 2; - * - * 
-       *TODO TBE - should the key and long_name specified directly ?
-       *
- */ - boolean hasKey(); - /** - * optional string key = 2; - * - * 
-       *TODO TBE - should the key and long_name specified directly ?
-       *
- */ - java.lang.String getKey(); - /** - * optional string key = 2; - * - * 
-       *TODO TBE - should the key and long_name specified directly ?
-       *
- */ - com.google.protobuf.ByteString - getKeyBytes(); - - // optional string long_name = 3; - /** - * optional string long_name = 3; - */ - boolean hasLongName(); - /** - * optional string long_name = 3; - */ - java.lang.String getLongName(); - /** - * optional string long_name = 3; - */ - com.google.protobuf.ByteString - getLongNameBytes(); - - // repeated int32 lines = 4; - /** - * repeated int32 lines = 4; - */ - java.util.List getLinesList(); - /** - * repeated int32 lines = 4; - */ - int getLinesCount(); - /** - * repeated int32 lines = 4; - */ - int getLines(int index); - - // optional int32 nb_covered_lines = 5; - /** - * optional int32 nb_covered_lines = 5; - */ - boolean hasNbCoveredLines(); - /** - * optional int32 nb_covered_lines = 5; - */ - int getNbCoveredLines(); - } - /** - * Protobuf type {@code org.sonar.server.source.db.Test.CoverageBlock} - */ - public static final class CoverageBlock extends - com.google.protobuf.GeneratedMessage - implements CoverageBlockOrBuilder { - // Use CoverageBlock.newBuilder() to construct. - private CoverageBlock(com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private CoverageBlock(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - - private static final CoverageBlock defaultInstance; - public static CoverageBlock getDefaultInstance() { - return defaultInstance; - } - - public CoverageBlock getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private CoverageBlock( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - bitField0_ |= 0x00000001; - uuid_ = input.readBytes(); - break; - } - case 18: { - bitField0_ |= 0x00000002; - key_ = input.readBytes(); - break; - } - case 26: { - bitField0_ |= 0x00000004; - longName_ = input.readBytes(); - break; - } - case 32: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { - lines_ = new java.util.ArrayList<>(); - mutable_bitField0_ |= 0x00000008; - } - lines_.add(input.readInt32()); - break; - } - case 34: { - int length = input.readRawVarint32(); - int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008) && input.getBytesUntilLimit() > 0) { - lines_ = new java.util.ArrayList<>(); - mutable_bitField0_ |= 0x00000008; - } - while (input.getBytesUntilLimit() > 0) { - lines_.add(input.readInt32()); - } - input.popLimit(limit); - break; - } - case 40: { - bitField0_ |= 0x00000008; - nbCoveredLines_ = input.readInt32(); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { - lines_ = java.util.Collections.unmodifiableList(lines_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.sonar.server.source.db.FileSourceTestDb.internal_static_org_sonar_server_source_db_Test_CoverageBlock_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.sonar.server.source.db.FileSourceTestDb.internal_static_org_sonar_server_source_db_Test_CoverageBlock_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock.class, org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public CoverageBlock parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new CoverageBlock(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - private int bitField0_; - // optional string uuid = 1; - public static final int UUID_FIELD_NUMBER = 1; - private java.lang.Object uuid_; - /** - * optional string uuid = 1; - */ - public boolean hasUuid() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional string uuid = 1; - */ - public java.lang.String getUuid() { - java.lang.Object ref = uuid_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - uuid_ = s; - } - return s; - } - } - /** - * optional string uuid = 1; - */ - public com.google.protobuf.ByteString - getUuidBytes() { - java.lang.Object ref = uuid_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - uuid_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - // optional string key = 2; - public static final int KEY_FIELD_NUMBER = 2; - private java.lang.Object key_; - /** - * optional string key = 2; - * - * 
-       *TODO TBE - should the key and long_name specified directly ?
-       *
- */ - public boolean hasKey() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * optional string key = 2; - * - * 
-       *TODO TBE - should the key and long_name specified directly ?
-       *
- */ - public java.lang.String getKey() { - java.lang.Object ref = key_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - key_ = s; - } - return s; - } - } - /** - * optional string key = 2; - * - * 
-       *TODO TBE - should the key and long_name specified directly ?
-       *
- */ - public com.google.protobuf.ByteString - getKeyBytes() { - java.lang.Object ref = key_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - key_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - // optional string long_name = 3; - public static final int LONG_NAME_FIELD_NUMBER = 3; - private java.lang.Object longName_; - /** - * optional string long_name = 3; - */ - public boolean hasLongName() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional string long_name = 3; - */ - public java.lang.String getLongName() { - java.lang.Object ref = longName_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - longName_ = s; - } - return s; - } - } - /** - * optional string long_name = 3; - */ - public com.google.protobuf.ByteString - getLongNameBytes() { - java.lang.Object ref = longName_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - longName_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - // repeated int32 lines = 4; - public static final int LINES_FIELD_NUMBER = 4; - private java.util.List lines_; - /** - * repeated int32 lines = 4; - */ - public java.util.List - getLinesList() { - return lines_; - } - /** - * repeated int32 lines = 4; - */ - public int getLinesCount() { - return lines_.size(); - } - /** - * repeated int32 lines = 4; - */ - public int getLines(int index) { - return lines_.get(index); - } - - // optional int32 nb_covered_lines = 5; - public static final int NB_COVERED_LINES_FIELD_NUMBER = 5; - private int nbCoveredLines_; - /** - * optional int32 nb_covered_lines = 5; - */ - public boolean hasNbCoveredLines() { - return ((bitField0_ & 0x00000008) == 0x00000008); - } - /** - * optional int32 nb_covered_lines = 5; - */ - public int getNbCoveredLines() { - return nbCoveredLines_; - } - - private void initFields() { - uuid_ = ""; - key_ = ""; - longName_ = ""; - lines_ = java.util.Collections.emptyList(); - nbCoveredLines_ = 0; - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, getUuidBytes()); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeBytes(2, getKeyBytes()); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeBytes(3, getLongNameBytes()); - } - for (int i = 0; i < lines_.size(); i++) { - output.writeInt32(4, lines_.get(i)); - } - if (((bitField0_ & 0x00000008) == 0x00000008)) { - output.writeInt32(5, nbCoveredLines_); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, getUuidBytes()); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(2, getKeyBytes()); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(3, getLongNameBytes()); - } - { - int dataSize = 0; - for (int i = 0; i < lines_.size(); i++) { - dataSize += com.google.protobuf.CodedOutputStream - .computeInt32SizeNoTag(lines_.get(i)); - } - size += dataSize; - size += 1 * getLinesList().size(); - } - if (((bitField0_ & 0x00000008) == 0x00000008)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(5, nbCoveredLines_); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code org.sonar.server.source.db.Test.CoverageBlock} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlockOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.sonar.server.source.db.FileSourceTestDb.internal_static_org_sonar_server_source_db_Test_CoverageBlock_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.sonar.server.source.db.FileSourceTestDb.internal_static_org_sonar_server_source_db_Test_CoverageBlock_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock.class, org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock.Builder.class); - } - - // Construct using org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - uuid_ = ""; - bitField0_ = (bitField0_ & ~0x00000001); - key_ = ""; - bitField0_ = (bitField0_ & ~0x00000002); - longName_ = ""; - bitField0_ = (bitField0_ & ~0x00000004); - lines_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000008); - nbCoveredLines_ = 0; - bitField0_ = (bitField0_ & ~0x00000010); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.sonar.server.source.db.FileSourceTestDb.internal_static_org_sonar_server_source_db_Test_CoverageBlock_descriptor; - } - - public org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock getDefaultInstanceForType() { - return org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock.getDefaultInstance(); - } - - public org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock build() { - org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock buildPartial() { - org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock result = new org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - result.uuid_ = uuid_; - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - result.key_ = key_; - if (((from_bitField0_ & 0x00000004) == 0x00000004)) { - to_bitField0_ |= 0x00000004; - } - result.longName_ = longName_; - if (((bitField0_ & 0x00000008) == 0x00000008)) { - lines_ = java.util.Collections.unmodifiableList(lines_); - bitField0_ = (bitField0_ & ~0x00000008); - } - result.lines_ = lines_; - if (((from_bitField0_ & 0x00000010) == 0x00000010)) { - to_bitField0_ |= 0x00000008; - } - result.nbCoveredLines_ = nbCoveredLines_; - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock) { - return mergeFrom((org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock other) { - if (other == org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock.getDefaultInstance()) return this; - if (other.hasUuid()) { - bitField0_ |= 0x00000001; - uuid_ = other.uuid_; - onChanged(); - } - if (other.hasKey()) { - bitField0_ |= 0x00000002; - key_ = other.key_; - onChanged(); - } - if (other.hasLongName()) { - bitField0_ |= 0x00000004; - longName_ = other.longName_; - onChanged(); - } - if (!other.lines_.isEmpty()) { - if (lines_.isEmpty()) { - lines_ = other.lines_; - bitField0_ = (bitField0_ & ~0x00000008); - } else { - ensureLinesIsMutable(); - lines_.addAll(other.lines_); - } - onChanged(); - } - if (other.hasNbCoveredLines()) { - setNbCoveredLines(other.getNbCoveredLines()); - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // optional string uuid = 1; - private java.lang.Object uuid_ = ""; - /** - * optional string uuid = 1; - */ - public boolean hasUuid() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional string uuid = 1; - */ - public java.lang.String getUuid() { - java.lang.Object ref = uuid_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - uuid_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * optional string uuid = 1; - */ - public com.google.protobuf.ByteString - getUuidBytes() { - java.lang.Object ref = uuid_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - uuid_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * optional string uuid = 1; - */ - public Builder setUuid( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - uuid_ = value; - onChanged(); - return this; - } - /** - * optional string uuid = 1; - */ - public Builder clearUuid() { - bitField0_ = (bitField0_ & ~0x00000001); - uuid_ = getDefaultInstance().getUuid(); - onChanged(); - return this; - } - /** - * optional string uuid = 1; - */ - public Builder setUuidBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - uuid_ = value; - onChanged(); - return this; - } - - // optional string key = 2; - private java.lang.Object key_ = ""; - /** - * optional string key = 2; - * - * 
-         *TODO TBE - should the key and long_name specified directly ?
-         *
- */ - public boolean hasKey() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * optional string key = 2; - * - * 
-         *TODO TBE - should the key and long_name specified directly ?
-         *
- */ - public java.lang.String getKey() { - java.lang.Object ref = key_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - key_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * optional string key = 2; - * - * 
-         *TODO TBE - should the key and long_name specified directly ?
-         *
- */ - public com.google.protobuf.ByteString - getKeyBytes() { - java.lang.Object ref = key_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - key_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * optional string key = 2; - * - * 
-         *TODO TBE - should the key and long_name specified directly ?
-         *
- */ - public Builder setKey( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - key_ = value; - onChanged(); - return this; - } - /** - * optional string key = 2; - * - * 
-         *TODO TBE - should the key and long_name specified directly ?
-         *
- */ - public Builder clearKey() { - bitField0_ = (bitField0_ & ~0x00000002); - key_ = getDefaultInstance().getKey(); - onChanged(); - return this; - } - /** - * optional string key = 2; - * - * 
-         *TODO TBE - should the key and long_name specified directly ?
-         *
- */ - public Builder setKeyBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - key_ = value; - onChanged(); - return this; - } - - // optional string long_name = 3; - private java.lang.Object longName_ = ""; - /** - * optional string long_name = 3; - */ - public boolean hasLongName() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional string long_name = 3; - */ - public java.lang.String getLongName() { - java.lang.Object ref = longName_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - longName_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * optional string long_name = 3; - */ - public com.google.protobuf.ByteString - getLongNameBytes() { - java.lang.Object ref = longName_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - longName_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * optional string long_name = 3; - */ - public Builder setLongName( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000004; - longName_ = value; - onChanged(); - return this; - } - /** - * optional string long_name = 3; - */ - public Builder clearLongName() { - bitField0_ = (bitField0_ & ~0x00000004); - longName_ = getDefaultInstance().getLongName(); - onChanged(); - return this; - } - /** - * optional string long_name = 3; - */ - public Builder setLongNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000004; - longName_ = value; - onChanged(); - return this; - } - - // repeated int32 lines = 4; - private java.util.List lines_ = java.util.Collections.emptyList(); - private void ensureLinesIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { - lines_ = new java.util.ArrayList<>(lines_); - bitField0_ |= 0x00000008; - } - } - /** - * repeated int32 lines = 4; - */ - public java.util.List - getLinesList() { - return java.util.Collections.unmodifiableList(lines_); - } - /** - * repeated int32 lines = 4; - */ - public int getLinesCount() { - return lines_.size(); - } - /** - * repeated int32 lines = 4; - */ - public int getLines(int index) { - return lines_.get(index); - } - /** - * repeated int32 lines = 4; - */ - public Builder setLines( - int index, int value) { - ensureLinesIsMutable(); - lines_.set(index, value); - onChanged(); - return this; - } - /** - * repeated int32 lines = 4; - */ - public Builder addLines(int value) { - ensureLinesIsMutable(); - lines_.add(value); - onChanged(); - return this; - } - /** - * repeated int32 lines = 4; - */ - public Builder addAllLines( - java.lang.Iterable values) { - ensureLinesIsMutable(); - super.addAll(values, lines_); - onChanged(); - return this; - } - /** - * repeated int32 lines = 4; - */ - public Builder clearLines() { - lines_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000008); - onChanged(); - return this; - } - - // optional int32 nb_covered_lines = 5; - private int nbCoveredLines_ ; - /** - * optional int32 nb_covered_lines = 5; - */ - public boolean hasNbCoveredLines() { - return ((bitField0_ & 0x00000010) == 0x00000010); - } - /** - * optional int32 nb_covered_lines = 5; - */ - public int getNbCoveredLines() { - return nbCoveredLines_; - } - /** - * optional int32 nb_covered_lines = 5; - */ - public Builder setNbCoveredLines(int value) { - bitField0_ |= 0x00000010; - nbCoveredLines_ = value; - onChanged(); - return this; - } - /** - * optional int32 nb_covered_lines = 5; - */ - public Builder clearNbCoveredLines() { - bitField0_ = (bitField0_ & ~0x00000010); - nbCoveredLines_ = 0; - onChanged(); - return this; - } - - // @@protoc_insertion_point(builder_scope:org.sonar.server.source.db.Test.CoverageBlock) - } - - static { - defaultInstance = new CoverageBlock(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.sonar.server.source.db.Test.CoverageBlock) - } - - private int bitField0_; - // optional string uuid = 1; - public static final int UUID_FIELD_NUMBER = 1; - private java.lang.Object uuid_; - /** - * optional string uuid = 1; - */ - public boolean hasUuid() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional string uuid = 1; - */ - public java.lang.String getUuid() { - java.lang.Object ref = uuid_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - uuid_ = s; - } - return s; - } - } - /** - * optional string uuid = 1; - */ - public com.google.protobuf.ByteString - getUuidBytes() { - java.lang.Object ref = uuid_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - uuid_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - // optional string key = 2; - public static final int KEY_FIELD_NUMBER = 2; - private java.lang.Object key_; - /** - * optional string key = 2; - */ - public boolean hasKey() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * optional string key = 2; - */ - public java.lang.String getKey() { - java.lang.Object ref = key_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - key_ = s; - } - return s; - } - } - /** - * optional string key = 2; - */ - public com.google.protobuf.ByteString - getKeyBytes() { - java.lang.Object ref = key_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - key_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - // optional string method_name = 3; - public static final int METHOD_NAME_FIELD_NUMBER = 3; - private java.lang.Object methodName_; - /** - * optional string method_name = 3; - */ - public boolean hasMethodName() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional string method_name = 3; - */ - public java.lang.String getMethodName() { - java.lang.Object ref = methodName_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - methodName_ = s; - } - return s; - } - } - /** - * optional string method_name = 3; - */ - public com.google.protobuf.ByteString - getMethodNameBytes() { - java.lang.Object ref = methodName_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - methodName_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - // optional string status = 4; - public static final int STATUS_FIELD_NUMBER = 4; - private java.lang.Object status_; - /** - * optional string status = 4; - */ - public boolean hasStatus() { - return ((bitField0_ & 0x00000008) == 0x00000008); - } - /** - * optional string status = 4; - */ - public java.lang.String getStatus() { - java.lang.Object ref = status_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - status_ = s; - } - return s; - } - } - /** - * optional string status = 4; - */ - public com.google.protobuf.ByteString - getStatusBytes() { - java.lang.Object ref = status_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - status_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - // optional string test_message = 5; - public static final int TEST_MESSAGE_FIELD_NUMBER = 5; - private java.lang.Object testMessage_; - /** - * optional string test_message = 5; - */ - public boolean hasTestMessage() { - return ((bitField0_ & 0x00000010) == 0x00000010); - } - /** - * optional string test_message = 5; - */ - public java.lang.String getTestMessage() { - java.lang.Object ref = testMessage_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - testMessage_ = s; - } - return s; - } - } - /** - * optional string test_message = 5; - */ - public com.google.protobuf.ByteString - getTestMessageBytes() { - java.lang.Object ref = testMessage_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - testMessage_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - // optional string type = 6; - public static final int TYPE_FIELD_NUMBER = 6; - private java.lang.Object type_; - /** - * optional string type = 6; - */ - public boolean hasType() { - return ((bitField0_ & 0x00000020) == 0x00000020); - } - /** - * optional string type = 6; - */ - public java.lang.String getType() { - java.lang.Object ref = type_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - type_ = s; - } - return s; - } - } - /** - * optional string type = 6; - */ - public com.google.protobuf.ByteString - getTypeBytes() { - java.lang.Object ref = type_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - type_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - // repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - public static final int COVERAGE_BLOCK_FIELD_NUMBER = 7; - private java.util.List coverageBlock_; - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - public java.util.List getCoverageBlockList() { - return coverageBlock_; - } - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - public java.util.List - getCoverageBlockOrBuilderList() { - return coverageBlock_; - } - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - public int getCoverageBlockCount() { - return coverageBlock_.size(); - } - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - public org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock getCoverageBlock(int index) { - return coverageBlock_.get(index); - } - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - public org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlockOrBuilder getCoverageBlockOrBuilder( - int index) { - return coverageBlock_.get(index); - } - - private void initFields() { - uuid_ = ""; - key_ = ""; - methodName_ = ""; - status_ = ""; - testMessage_ = ""; - type_ = ""; - coverageBlock_ = java.util.Collections.emptyList(); - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, getUuidBytes()); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeBytes(2, getKeyBytes()); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeBytes(3, getMethodNameBytes()); - } - if (((bitField0_ & 0x00000008) == 0x00000008)) { - output.writeBytes(4, getStatusBytes()); - } - if (((bitField0_ & 0x00000010) == 0x00000010)) { - output.writeBytes(5, getTestMessageBytes()); - } - if (((bitField0_ & 0x00000020) == 0x00000020)) { - output.writeBytes(6, getTypeBytes()); - } - for (int i = 0; i < coverageBlock_.size(); i++) { - output.writeMessage(7, coverageBlock_.get(i)); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, getUuidBytes()); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(2, getKeyBytes()); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(3, getMethodNameBytes()); - } - if (((bitField0_ & 0x00000008) == 0x00000008)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(4, getStatusBytes()); - } - if (((bitField0_ & 0x00000010) == 0x00000010)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(5, getTestMessageBytes()); - } - if (((bitField0_ & 0x00000020) == 0x00000020)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(6, getTypeBytes()); - } - for (int i = 0; i < coverageBlock_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(7, coverageBlock_.get(i)); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.sonar.server.source.db.FileSourceTestDb.Test parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.sonar.server.source.db.FileSourceTestDb.Test parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.sonar.server.source.db.FileSourceTestDb.Test parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.sonar.server.source.db.FileSourceTestDb.Test parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.sonar.server.source.db.FileSourceTestDb.Test parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.sonar.server.source.db.FileSourceTestDb.Test parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static org.sonar.server.source.db.FileSourceTestDb.Test parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.sonar.server.source.db.FileSourceTestDb.Test parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static org.sonar.server.source.db.FileSourceTestDb.Test parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.sonar.server.source.db.FileSourceTestDb.Test parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.sonar.server.source.db.FileSourceTestDb.Test prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code org.sonar.server.source.db.Test} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements org.sonar.server.source.db.FileSourceTestDb.TestOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.sonar.server.source.db.FileSourceTestDb.internal_static_org_sonar_server_source_db_Test_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.sonar.server.source.db.FileSourceTestDb.internal_static_org_sonar_server_source_db_Test_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.sonar.server.source.db.FileSourceTestDb.Test.class, org.sonar.server.source.db.FileSourceTestDb.Test.Builder.class); - } - - // Construct using org.sonar.server.source.db.FileSourceTestDb.Test.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getCoverageBlockFieldBuilder(); - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - uuid_ = ""; - bitField0_ = (bitField0_ & ~0x00000001); - key_ = ""; - bitField0_ = (bitField0_ & ~0x00000002); - methodName_ = ""; - bitField0_ = (bitField0_ & ~0x00000004); - status_ = ""; - bitField0_ = (bitField0_ & ~0x00000008); - testMessage_ = ""; - bitField0_ = (bitField0_ & ~0x00000010); - type_ = ""; - bitField0_ = (bitField0_ & ~0x00000020); - if (coverageBlockBuilder_ == null) { - coverageBlock_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000040); - } else { - coverageBlockBuilder_.clear(); - } - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.sonar.server.source.db.FileSourceTestDb.internal_static_org_sonar_server_source_db_Test_descriptor; - } - - public org.sonar.server.source.db.FileSourceTestDb.Test getDefaultInstanceForType() { - return org.sonar.server.source.db.FileSourceTestDb.Test.getDefaultInstance(); - } - - public org.sonar.server.source.db.FileSourceTestDb.Test build() { - org.sonar.server.source.db.FileSourceTestDb.Test result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.sonar.server.source.db.FileSourceTestDb.Test buildPartial() { - org.sonar.server.source.db.FileSourceTestDb.Test result = new org.sonar.server.source.db.FileSourceTestDb.Test(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - result.uuid_ = uuid_; - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - result.key_ = key_; - if (((from_bitField0_ & 0x00000004) == 0x00000004)) { - to_bitField0_ |= 0x00000004; - } - result.methodName_ = methodName_; - if (((from_bitField0_ & 0x00000008) == 0x00000008)) { - to_bitField0_ |= 0x00000008; - } - result.status_ = status_; - if (((from_bitField0_ & 0x00000010) == 0x00000010)) { - to_bitField0_ |= 0x00000010; - } - result.testMessage_ = testMessage_; - if (((from_bitField0_ & 0x00000020) == 0x00000020)) { - to_bitField0_ |= 0x00000020; - } - result.type_ = type_; - if (coverageBlockBuilder_ == null) { - if (((bitField0_ & 0x00000040) == 0x00000040)) { - coverageBlock_ = java.util.Collections.unmodifiableList(coverageBlock_); - bitField0_ = (bitField0_ & ~0x00000040); - } - result.coverageBlock_ = coverageBlock_; - } else { - result.coverageBlock_ = coverageBlockBuilder_.build(); - } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.sonar.server.source.db.FileSourceTestDb.Test) { - return mergeFrom((org.sonar.server.source.db.FileSourceTestDb.Test)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.sonar.server.source.db.FileSourceTestDb.Test other) { - if (other == org.sonar.server.source.db.FileSourceTestDb.Test.getDefaultInstance()) return this; - if (other.hasUuid()) { - bitField0_ |= 0x00000001; - uuid_ = other.uuid_; - onChanged(); - } - if (other.hasKey()) { - bitField0_ |= 0x00000002; - key_ = other.key_; - onChanged(); - } - if (other.hasMethodName()) { - bitField0_ |= 0x00000004; - methodName_ = other.methodName_; - onChanged(); - } - if (other.hasStatus()) { - bitField0_ |= 0x00000008; - status_ = other.status_; - onChanged(); - } - if (other.hasTestMessage()) { - bitField0_ |= 0x00000010; - testMessage_ = other.testMessage_; - onChanged(); - } - if (other.hasType()) { - bitField0_ |= 0x00000020; - type_ = other.type_; - onChanged(); - } - if (coverageBlockBuilder_ == null) { - if (!other.coverageBlock_.isEmpty()) { - if (coverageBlock_.isEmpty()) { - coverageBlock_ = other.coverageBlock_; - bitField0_ = (bitField0_ & ~0x00000040); - } else { - ensureCoverageBlockIsMutable(); - coverageBlock_.addAll(other.coverageBlock_); - } - onChanged(); - } - } else { - if (!other.coverageBlock_.isEmpty()) { - if (coverageBlockBuilder_.isEmpty()) { - coverageBlockBuilder_.dispose(); - coverageBlockBuilder_ = null; - coverageBlock_ = other.coverageBlock_; - bitField0_ = (bitField0_ & ~0x00000040); - coverageBlockBuilder_ = - com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getCoverageBlockFieldBuilder() : null; - } else { - coverageBlockBuilder_.addAllMessages(other.coverageBlock_); - } - } - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.sonar.server.source.db.FileSourceTestDb.Test parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.sonar.server.source.db.FileSourceTestDb.Test) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // optional string uuid = 1; - private java.lang.Object uuid_ = ""; - /** - * optional string uuid = 1; - */ - public boolean hasUuid() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional string uuid = 1; - */ - public java.lang.String getUuid() { - java.lang.Object ref = uuid_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - uuid_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * optional string uuid = 1; - */ - public com.google.protobuf.ByteString - getUuidBytes() { - java.lang.Object ref = uuid_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - uuid_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * optional string uuid = 1; - */ - public Builder setUuid( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - uuid_ = value; - onChanged(); - return this; - } - /** - * optional string uuid = 1; - */ - public Builder clearUuid() { - bitField0_ = (bitField0_ & ~0x00000001); - uuid_ = getDefaultInstance().getUuid(); - onChanged(); - return this; - } - /** - * optional string uuid = 1; - */ - public Builder setUuidBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - uuid_ = value; - onChanged(); - return this; - } - - // optional string key = 2; - private java.lang.Object key_ = ""; - /** - * optional string key = 2; - */ - public boolean hasKey() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * optional string key = 2; - */ - public java.lang.String getKey() { - java.lang.Object ref = key_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - key_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * optional string key = 2; - */ - public com.google.protobuf.ByteString - getKeyBytes() { - java.lang.Object ref = key_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - key_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * optional string key = 2; - */ - public Builder setKey( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - key_ = value; - onChanged(); - return this; - } - /** - * optional string key = 2; - */ - public Builder clearKey() { - bitField0_ = (bitField0_ & ~0x00000002); - key_ = getDefaultInstance().getKey(); - onChanged(); - return this; - } - /** - * optional string key = 2; - */ - public Builder setKeyBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - key_ = value; - onChanged(); - return this; - } - - // optional string method_name = 3; - private java.lang.Object methodName_ = ""; - /** - * optional string method_name = 3; - */ - public boolean hasMethodName() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional string method_name = 3; - */ - public java.lang.String getMethodName() { - java.lang.Object ref = methodName_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - methodName_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * optional string method_name = 3; - */ - public com.google.protobuf.ByteString - getMethodNameBytes() { - java.lang.Object ref = methodName_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - methodName_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * optional string method_name = 3; - */ - public Builder setMethodName( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000004; - methodName_ = value; - onChanged(); - return this; - } - /** - * optional string method_name = 3; - */ - public Builder clearMethodName() { - bitField0_ = (bitField0_ & ~0x00000004); - methodName_ = getDefaultInstance().getMethodName(); - onChanged(); - return this; - } - /** - * optional string method_name = 3; - */ - public Builder setMethodNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000004; - methodName_ = value; - onChanged(); - return this; - } - - // optional string status = 4; - private java.lang.Object status_ = ""; - /** - * optional string status = 4; - */ - public boolean hasStatus() { - return ((bitField0_ & 0x00000008) == 0x00000008); - } - /** - * optional string status = 4; - */ - public java.lang.String getStatus() { - java.lang.Object ref = status_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - status_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * optional string status = 4; - */ - public com.google.protobuf.ByteString - getStatusBytes() { - java.lang.Object ref = status_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - status_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * optional string status = 4; - */ - public Builder setStatus( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000008; - status_ = value; - onChanged(); - return this; - } - /** - * optional string status = 4; - */ - public Builder clearStatus() { - bitField0_ = (bitField0_ & ~0x00000008); - status_ = getDefaultInstance().getStatus(); - onChanged(); - return this; - } - /** - * optional string status = 4; - */ - public Builder setStatusBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000008; - status_ = value; - onChanged(); - return this; - } - - // optional string test_message = 5; - private java.lang.Object testMessage_ = ""; - /** - * optional string test_message = 5; - */ - public boolean hasTestMessage() { - return ((bitField0_ & 0x00000010) == 0x00000010); - } - /** - * optional string test_message = 5; - */ - public java.lang.String getTestMessage() { - java.lang.Object ref = testMessage_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - testMessage_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * optional string test_message = 5; - */ - public com.google.protobuf.ByteString - getTestMessageBytes() { - java.lang.Object ref = testMessage_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - testMessage_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * optional string test_message = 5; - */ - public Builder setTestMessage( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000010; - testMessage_ = value; - onChanged(); - return this; - } - /** - * optional string test_message = 5; - */ - public Builder clearTestMessage() { - bitField0_ = (bitField0_ & ~0x00000010); - testMessage_ = getDefaultInstance().getTestMessage(); - onChanged(); - return this; - } - /** - * optional string test_message = 5; - */ - public Builder setTestMessageBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000010; - testMessage_ = value; - onChanged(); - return this; - } - - // optional string type = 6; - private java.lang.Object type_ = ""; - /** - * optional string type = 6; - */ - public boolean hasType() { - return ((bitField0_ & 0x00000020) == 0x00000020); - } - /** - * optional string type = 6; - */ - public java.lang.String getType() { - java.lang.Object ref = type_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - type_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * optional string type = 6; - */ - public com.google.protobuf.ByteString - getTypeBytes() { - java.lang.Object ref = type_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - type_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * optional string type = 6; - */ - public Builder setType( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000020; - type_ = value; - onChanged(); - return this; - } - /** - * optional string type = 6; - */ - public Builder clearType() { - bitField0_ = (bitField0_ & ~0x00000020); - type_ = getDefaultInstance().getType(); - onChanged(); - return this; - } - /** - * optional string type = 6; - */ - public Builder setTypeBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000020; - type_ = value; - onChanged(); - return this; - } - - // repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - private java.util.List coverageBlock_ = - java.util.Collections.emptyList(); - private void ensureCoverageBlockIsMutable() { - if (!((bitField0_ & 0x00000040) == 0x00000040)) { - coverageBlock_ = new java.util.ArrayList<>(coverageBlock_); - bitField0_ |= 0x00000040; - } - } - - private com.google.protobuf.RepeatedFieldBuilder< - org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock, org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock.Builder, org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlockOrBuilder> coverageBlockBuilder_; - - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - public java.util.List getCoverageBlockList() { - if (coverageBlockBuilder_ == null) { - return java.util.Collections.unmodifiableList(coverageBlock_); - } else { - return coverageBlockBuilder_.getMessageList(); - } - } - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - public int getCoverageBlockCount() { - if (coverageBlockBuilder_ == null) { - return coverageBlock_.size(); - } else { - return coverageBlockBuilder_.getCount(); - } - } - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - public org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock getCoverageBlock(int index) { - if (coverageBlockBuilder_ == null) { - return coverageBlock_.get(index); - } else { - return coverageBlockBuilder_.getMessage(index); - } - } - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - public Builder setCoverageBlock( - int index, org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock value) { - if (coverageBlockBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureCoverageBlockIsMutable(); - coverageBlock_.set(index, value); - onChanged(); - } else { - coverageBlockBuilder_.setMessage(index, value); - } - return this; - } - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - public Builder setCoverageBlock( - int index, org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock.Builder builderForValue) { - if (coverageBlockBuilder_ == null) { - ensureCoverageBlockIsMutable(); - coverageBlock_.set(index, builderForValue.build()); - onChanged(); - } else { - coverageBlockBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - public Builder addCoverageBlock(org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock value) { - if (coverageBlockBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureCoverageBlockIsMutable(); - coverageBlock_.add(value); - onChanged(); - } else { - coverageBlockBuilder_.addMessage(value); - } - return this; - } - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - public Builder addCoverageBlock( - int index, org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock value) { - if (coverageBlockBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureCoverageBlockIsMutable(); - coverageBlock_.add(index, value); - onChanged(); - } else { - coverageBlockBuilder_.addMessage(index, value); - } - return this; - } - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - public Builder addCoverageBlock( - org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock.Builder builderForValue) { - if (coverageBlockBuilder_ == null) { - ensureCoverageBlockIsMutable(); - coverageBlock_.add(builderForValue.build()); - onChanged(); - } else { - coverageBlockBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - public Builder addCoverageBlock( - int index, org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock.Builder builderForValue) { - if (coverageBlockBuilder_ == null) { - ensureCoverageBlockIsMutable(); - coverageBlock_.add(index, builderForValue.build()); - onChanged(); - } else { - coverageBlockBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - public Builder addAllCoverageBlock( - java.lang.Iterable values) { - if (coverageBlockBuilder_ == null) { - ensureCoverageBlockIsMutable(); - super.addAll(values, coverageBlock_); - onChanged(); - } else { - coverageBlockBuilder_.addAllMessages(values); - } - return this; - } - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - public Builder clearCoverageBlock() { - if (coverageBlockBuilder_ == null) { - coverageBlock_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000040); - onChanged(); - } else { - coverageBlockBuilder_.clear(); - } - return this; - } - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - public Builder removeCoverageBlock(int index) { - if (coverageBlockBuilder_ == null) { - ensureCoverageBlockIsMutable(); - coverageBlock_.remove(index); - onChanged(); - } else { - coverageBlockBuilder_.remove(index); - } - return this; - } - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - public org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock.Builder getCoverageBlockBuilder( - int index) { - return getCoverageBlockFieldBuilder().getBuilder(index); - } - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - public org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlockOrBuilder getCoverageBlockOrBuilder( - int index) { - if (coverageBlockBuilder_ == null) { - return coverageBlock_.get(index); } else { - return coverageBlockBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - public java.util.List - getCoverageBlockOrBuilderList() { - if (coverageBlockBuilder_ != null) { - return coverageBlockBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(coverageBlock_); - } - } - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - public org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock.Builder addCoverageBlockBuilder() { - return getCoverageBlockFieldBuilder().addBuilder( - org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock.getDefaultInstance()); - } - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - public org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock.Builder addCoverageBlockBuilder( - int index) { - return getCoverageBlockFieldBuilder().addBuilder( - index, org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock.getDefaultInstance()); - } - /** - * repeated .org.sonar.server.source.db.Test.CoverageBlock coverage_block = 7; - */ - public java.util.List - getCoverageBlockBuilderList() { - return getCoverageBlockFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilder< - org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock, org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlock.Builder, org.sonar.server.source.db.FileSourceTestDb.Test.CoverageBlockOrBuilder> - getCoverageBlockFieldBuilder() { - if (coverageBlockBuilder_ == null) { - coverageBlockBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( - coverageBlock_, - ((bitField0_ & 0x00000040) == 0x00000040), - getParentForChildren(), - isClean()); - coverageBlock_ = null; - } - return coverageBlockBuilder_; - } - - // @@protoc_insertion_point(builder_scope:org.sonar.server.source.db.Test) - } - - static { - defaultInstance = new Test(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.sonar.server.source.db.Test) - } - - public interface TestsOrBuilder - extends com.google.protobuf.MessageOrBuilder { - - // repeated .org.sonar.server.source.db.Test test = 1; - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - java.util.List - getTestList(); - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - org.sonar.server.source.db.FileSourceTestDb.Test getTest(int index); - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - int getTestCount(); - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - java.util.List - getTestOrBuilderList(); - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - org.sonar.server.source.db.FileSourceTestDb.TestOrBuilder getTestOrBuilder( - int index); - } - /** - * Protobuf type {@code org.sonar.server.source.db.Tests} - */ - public static final class Tests extends - com.google.protobuf.GeneratedMessage - implements TestsOrBuilder { - // Use Tests.newBuilder() to construct. - private Tests(com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private Tests(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - - private static final Tests defaultInstance; - public static Tests getDefaultInstance() { - return defaultInstance; - } - - public Tests getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private Tests( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - test_ = new java.util.ArrayList<>(); - mutable_bitField0_ |= 0x00000001; - } - test_.add(input.readMessage(org.sonar.server.source.db.FileSourceTestDb.Test.PARSER, extensionRegistry)); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - test_ = java.util.Collections.unmodifiableList(test_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.sonar.server.source.db.FileSourceTestDb.internal_static_org_sonar_server_source_db_Tests_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.sonar.server.source.db.FileSourceTestDb.internal_static_org_sonar_server_source_db_Tests_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.sonar.server.source.db.FileSourceTestDb.Tests.class, org.sonar.server.source.db.FileSourceTestDb.Tests.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public Tests parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new Tests(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - // repeated .org.sonar.server.source.db.Test test = 1; - public static final int TEST_FIELD_NUMBER = 1; - private java.util.List test_; - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - public java.util.List getTestList() { - return test_; - } - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - public java.util.List - getTestOrBuilderList() { - return test_; - } - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - public int getTestCount() { - return test_.size(); - } - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - public org.sonar.server.source.db.FileSourceTestDb.Test getTest(int index) { - return test_.get(index); - } - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - public org.sonar.server.source.db.FileSourceTestDb.TestOrBuilder getTestOrBuilder( - int index) { - return test_.get(index); - } - - private void initFields() { - test_ = java.util.Collections.emptyList(); - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - for (int i = 0; i < test_.size(); i++) { - output.writeMessage(1, test_.get(i)); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - for (int i = 0; i < test_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, test_.get(i)); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.sonar.server.source.db.FileSourceTestDb.Tests parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.sonar.server.source.db.FileSourceTestDb.Tests parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.sonar.server.source.db.FileSourceTestDb.Tests parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.sonar.server.source.db.FileSourceTestDb.Tests parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.sonar.server.source.db.FileSourceTestDb.Tests parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.sonar.server.source.db.FileSourceTestDb.Tests parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static org.sonar.server.source.db.FileSourceTestDb.Tests parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.sonar.server.source.db.FileSourceTestDb.Tests parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static org.sonar.server.source.db.FileSourceTestDb.Tests parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.sonar.server.source.db.FileSourceTestDb.Tests parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.sonar.server.source.db.FileSourceTestDb.Tests prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code org.sonar.server.source.db.Tests} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements org.sonar.server.source.db.FileSourceTestDb.TestsOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.sonar.server.source.db.FileSourceTestDb.internal_static_org_sonar_server_source_db_Tests_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.sonar.server.source.db.FileSourceTestDb.internal_static_org_sonar_server_source_db_Tests_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.sonar.server.source.db.FileSourceTestDb.Tests.class, org.sonar.server.source.db.FileSourceTestDb.Tests.Builder.class); - } - - // Construct using org.sonar.server.source.db.FileSourceTestDb.Tests.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getTestFieldBuilder(); - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - if (testBuilder_ == null) { - test_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - } else { - testBuilder_.clear(); - } - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.sonar.server.source.db.FileSourceTestDb.internal_static_org_sonar_server_source_db_Tests_descriptor; - } - - public org.sonar.server.source.db.FileSourceTestDb.Tests getDefaultInstanceForType() { - return org.sonar.server.source.db.FileSourceTestDb.Tests.getDefaultInstance(); - } - - public org.sonar.server.source.db.FileSourceTestDb.Tests build() { - org.sonar.server.source.db.FileSourceTestDb.Tests result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.sonar.server.source.db.FileSourceTestDb.Tests buildPartial() { - org.sonar.server.source.db.FileSourceTestDb.Tests result = new org.sonar.server.source.db.FileSourceTestDb.Tests(this); - int from_bitField0_ = bitField0_; - if (testBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { - test_ = java.util.Collections.unmodifiableList(test_); - bitField0_ = (bitField0_ & ~0x00000001); - } - result.test_ = test_; - } else { - result.test_ = testBuilder_.build(); - } - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.sonar.server.source.db.FileSourceTestDb.Tests) { - return mergeFrom((org.sonar.server.source.db.FileSourceTestDb.Tests)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.sonar.server.source.db.FileSourceTestDb.Tests other) { - if (other == org.sonar.server.source.db.FileSourceTestDb.Tests.getDefaultInstance()) return this; - if (testBuilder_ == null) { - if (!other.test_.isEmpty()) { - if (test_.isEmpty()) { - test_ = other.test_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureTestIsMutable(); - test_.addAll(other.test_); - } - onChanged(); - } - } else { - if (!other.test_.isEmpty()) { - if (testBuilder_.isEmpty()) { - testBuilder_.dispose(); - testBuilder_ = null; - test_ = other.test_; - bitField0_ = (bitField0_ & ~0x00000001); - testBuilder_ = - com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getTestFieldBuilder() : null; - } else { - testBuilder_.addAllMessages(other.test_); - } - } - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.sonar.server.source.db.FileSourceTestDb.Tests parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.sonar.server.source.db.FileSourceTestDb.Tests) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // repeated .org.sonar.server.source.db.Test test = 1; - private java.util.List test_ = - java.util.Collections.emptyList(); - private void ensureTestIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { - test_ = new java.util.ArrayList<>(test_); - bitField0_ |= 0x00000001; - } - } - - private com.google.protobuf.RepeatedFieldBuilder< - org.sonar.server.source.db.FileSourceTestDb.Test, org.sonar.server.source.db.FileSourceTestDb.Test.Builder, org.sonar.server.source.db.FileSourceTestDb.TestOrBuilder> testBuilder_; - - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - public java.util.List getTestList() { - if (testBuilder_ == null) { - return java.util.Collections.unmodifiableList(test_); - } else { - return testBuilder_.getMessageList(); - } - } - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - public int getTestCount() { - if (testBuilder_ == null) { - return test_.size(); - } else { - return testBuilder_.getCount(); - } - } - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - public org.sonar.server.source.db.FileSourceTestDb.Test getTest(int index) { - if (testBuilder_ == null) { - return test_.get(index); - } else { - return testBuilder_.getMessage(index); - } - } - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - public Builder setTest( - int index, org.sonar.server.source.db.FileSourceTestDb.Test value) { - if (testBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTestIsMutable(); - test_.set(index, value); - onChanged(); - } else { - testBuilder_.setMessage(index, value); - } - return this; - } - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - public Builder setTest( - int index, org.sonar.server.source.db.FileSourceTestDb.Test.Builder builderForValue) { - if (testBuilder_ == null) { - ensureTestIsMutable(); - test_.set(index, builderForValue.build()); - onChanged(); - } else { - testBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - public Builder addTest(org.sonar.server.source.db.FileSourceTestDb.Test value) { - if (testBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTestIsMutable(); - test_.add(value); - onChanged(); - } else { - testBuilder_.addMessage(value); - } - return this; - } - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - public Builder addTest( - int index, org.sonar.server.source.db.FileSourceTestDb.Test value) { - if (testBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTestIsMutable(); - test_.add(index, value); - onChanged(); - } else { - testBuilder_.addMessage(index, value); - } - return this; - } - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - public Builder addTest( - org.sonar.server.source.db.FileSourceTestDb.Test.Builder builderForValue) { - if (testBuilder_ == null) { - ensureTestIsMutable(); - test_.add(builderForValue.build()); - onChanged(); - } else { - testBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - public Builder addTest( - int index, org.sonar.server.source.db.FileSourceTestDb.Test.Builder builderForValue) { - if (testBuilder_ == null) { - ensureTestIsMutable(); - test_.add(index, builderForValue.build()); - onChanged(); - } else { - testBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - public Builder addAllTest( - java.lang.Iterable values) { - if (testBuilder_ == null) { - ensureTestIsMutable(); - super.addAll(values, test_); - onChanged(); - } else { - testBuilder_.addAllMessages(values); - } - return this; - } - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - public Builder clearTest() { - if (testBuilder_ == null) { - test_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - onChanged(); - } else { - testBuilder_.clear(); - } - return this; - } - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - public Builder removeTest(int index) { - if (testBuilder_ == null) { - ensureTestIsMutable(); - test_.remove(index); - onChanged(); - } else { - testBuilder_.remove(index); - } - return this; - } - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - public org.sonar.server.source.db.FileSourceTestDb.Test.Builder getTestBuilder( - int index) { - return getTestFieldBuilder().getBuilder(index); - } - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - public org.sonar.server.source.db.FileSourceTestDb.TestOrBuilder getTestOrBuilder( - int index) { - if (testBuilder_ == null) { - return test_.get(index); } else { - return testBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - public java.util.List - getTestOrBuilderList() { - if (testBuilder_ != null) { - return testBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(test_); - } - } - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - public org.sonar.server.source.db.FileSourceTestDb.Test.Builder addTestBuilder() { - return getTestFieldBuilder().addBuilder( - org.sonar.server.source.db.FileSourceTestDb.Test.getDefaultInstance()); - } - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - public org.sonar.server.source.db.FileSourceTestDb.Test.Builder addTestBuilder( - int index) { - return getTestFieldBuilder().addBuilder( - index, org.sonar.server.source.db.FileSourceTestDb.Test.getDefaultInstance()); - } - /** - * repeated .org.sonar.server.source.db.Test test = 1; - */ - public java.util.List - getTestBuilderList() { - return getTestFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilder< - org.sonar.server.source.db.FileSourceTestDb.Test, org.sonar.server.source.db.FileSourceTestDb.Test.Builder, org.sonar.server.source.db.FileSourceTestDb.TestOrBuilder> - getTestFieldBuilder() { - if (testBuilder_ == null) { - testBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( - test_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); - test_ = null; - } - return testBuilder_; - } - - // @@protoc_insertion_point(builder_scope:org.sonar.server.source.db.Tests) - } - - static { - defaultInstance = new Tests(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.sonar.server.source.db.Tests) - } - - private static com.google.protobuf.Descriptors.Descriptor - internal_static_org_sonar_server_source_db_Test_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_org_sonar_server_source_db_Test_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor - internal_static_org_sonar_server_source_db_Test_CoverageBlock_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_org_sonar_server_source_db_Test_CoverageBlock_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor - internal_static_org_sonar_server_source_db_Tests_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_org_sonar_server_source_db_Tests_fieldAccessorTable; - - public static com.google.protobuf.Descriptors.FileDescriptor - getDescriptor() { - return descriptor; - } - private static com.google.protobuf.Descriptors.FileDescriptor - descriptor; - static { - java.lang.String[] descriptorData = { - "\n\031file_source_test_db.proto\022\032org.sonar.s" + - "erver.source.db\"\232\002\n\004Test\022\014\n\004uuid\030\001 \001(\t\022\013" + - "\n\003key\030\002 \001(\t\022\023\n\013method_name\030\003 \001(\t\022\016\n\006stat" + - "us\030\004 \001(\t\022\024\n\014test_message\030\005 \001(\t\022\014\n\004type\030\006" + - " \001(\t\022F\n\016coverage_block\030\007 \003(\0132..org.sonar" + - ".server.source.db.Test.CoverageBlock\032f\n\r" + - "CoverageBlock\022\014\n\004uuid\030\001 \001(\t\022\013\n\003key\030\002 \001(\t" + - "\022\021\n\tlong_name\030\003 \001(\t\022\r\n\005lines\030\004 \003(\005\022\030\n\020nb" + - "_covered_lines\030\005 \001(\005\"7\n\005Tests\022.\n\004test\030\001 " + - "\003(\0132 .org.sonar.server.source.db.TestB\002H", - "\001" - }; - com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = - new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { - public com.google.protobuf.ExtensionRegistry assignDescriptors( - com.google.protobuf.Descriptors.FileDescriptor root) { - descriptor = root; - internal_static_org_sonar_server_source_db_Test_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_org_sonar_server_source_db_Test_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_sonar_server_source_db_Test_descriptor, - new java.lang.String[] { "Uuid", "Key", "MethodName", "Status", "TestMessage", "Type", "CoverageBlock", }); - internal_static_org_sonar_server_source_db_Test_CoverageBlock_descriptor = - internal_static_org_sonar_server_source_db_Test_descriptor.getNestedTypes().get(0); - internal_static_org_sonar_server_source_db_Test_CoverageBlock_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_sonar_server_source_db_Test_CoverageBlock_descriptor, - new java.lang.String[] { "Uuid", "Key", "LongName", "Lines", "NbCoveredLines", }); - internal_static_org_sonar_server_source_db_Tests_descriptor = - getDescriptor().getMessageTypes().get(1); - internal_static_org_sonar_server_source_db_Tests_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_sonar_server_source_db_Tests_descriptor, - new java.lang.String[] { "Test", }); - return null; - } - }; - com.google.protobuf.Descriptors.FileDescriptor - .internalBuildGeneratedFileFrom(descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[] { - }, assigner); - } - - // @@protoc_insertion_point(outer_class_scope) -} diff --git a/sonar-db/pom.xml b/sonar-db/pom.xml index 741e47caa352..a1977e527d36 100644 --- a/sonar-db/pom.xml +++ b/sonar-db/pom.xml @@ -123,6 +123,24 @@ + + org.codehaus.mojo + build-helper-maven-plugin + + + add-source + generate-sources + + add-source + + + + src/main/gen-java + + + + + org.apache.maven.plugins maven-surefire-plugin diff --git a/sonar-batch-protocol/src/main/gen-java/org/sonar/server/source/db/FileSourceDb.java b/sonar-db/src/main/gen-java/org/sonar/db/FileSources.java similarity index 87% rename from sonar-batch-protocol/src/main/gen-java/org/sonar/server/source/db/FileSourceDb.java rename to sonar-db/src/main/gen-java/org/sonar/db/FileSources.java index afc771a998ff..1d68bf013268 100644 --- a/sonar-batch-protocol/src/main/gen-java/org/sonar/server/source/db/FileSourceDb.java +++ b/sonar-db/src/main/gen-java/org/sonar/db/FileSources.java @@ -1,10 +1,10 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: file_source_db.proto +// source: file_sources.proto -package org.sonar.server.source.db; +package org.sonar.db; -public final class FileSourceDb { - private FileSourceDb() {} +public final class FileSources { + private FileSources() {} public static void registerAllExtensions( com.google.protobuf.ExtensionRegistry registry) { } @@ -405,14 +405,14 @@ private Line( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.sonar.server.source.db.FileSourceDb.internal_static_org_sonar_server_source_db_Line_descriptor; + return org.sonar.db.FileSources.internal_static_org_sonar_server_source_db_Line_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.sonar.server.source.db.FileSourceDb.internal_static_org_sonar_server_source_db_Line_fieldAccessorTable + return org.sonar.db.FileSources.internal_static_org_sonar_server_source_db_Line_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.sonar.server.source.db.FileSourceDb.Line.class, org.sonar.server.source.db.FileSourceDb.Line.Builder.class); + org.sonar.db.FileSources.Line.class, org.sonar.db.FileSources.Line.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1051,53 +1051,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static org.sonar.server.source.db.FileSourceDb.Line parseFrom( + public static org.sonar.db.FileSources.Line parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.sonar.server.source.db.FileSourceDb.Line parseFrom( + public static org.sonar.db.FileSources.Line parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.sonar.server.source.db.FileSourceDb.Line parseFrom(byte[] data) + public static org.sonar.db.FileSources.Line parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.sonar.server.source.db.FileSourceDb.Line parseFrom( + public static org.sonar.db.FileSources.Line parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.sonar.server.source.db.FileSourceDb.Line parseFrom(java.io.InputStream input) + public static org.sonar.db.FileSources.Line parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.sonar.server.source.db.FileSourceDb.Line parseFrom( + public static org.sonar.db.FileSources.Line parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.sonar.server.source.db.FileSourceDb.Line parseDelimitedFrom(java.io.InputStream input) + public static org.sonar.db.FileSources.Line parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.sonar.server.source.db.FileSourceDb.Line parseDelimitedFrom( + public static org.sonar.db.FileSources.Line parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.sonar.server.source.db.FileSourceDb.Line parseFrom( + public static org.sonar.db.FileSources.Line parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.sonar.server.source.db.FileSourceDb.Line parseFrom( + public static org.sonar.db.FileSources.Line parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1106,7 +1106,7 @@ public static org.sonar.server.source.db.FileSourceDb.Line parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.sonar.server.source.db.FileSourceDb.Line prototype) { + public static Builder newBuilder(org.sonar.db.FileSources.Line prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1123,20 +1123,20 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:org.sonar.server.source.db.Line) - org.sonar.server.source.db.FileSourceDb.LineOrBuilder { + org.sonar.db.FileSources.LineOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.sonar.server.source.db.FileSourceDb.internal_static_org_sonar_server_source_db_Line_descriptor; + return org.sonar.db.FileSources.internal_static_org_sonar_server_source_db_Line_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.sonar.server.source.db.FileSourceDb.internal_static_org_sonar_server_source_db_Line_fieldAccessorTable + return org.sonar.db.FileSources.internal_static_org_sonar_server_source_db_Line_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.sonar.server.source.db.FileSourceDb.Line.class, org.sonar.server.source.db.FileSourceDb.Line.Builder.class); + org.sonar.db.FileSources.Line.class, org.sonar.db.FileSources.Line.Builder.class); } - // Construct using org.sonar.server.source.db.FileSourceDb.Line.newBuilder() + // Construct using org.sonar.db.FileSources.Line.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -1199,23 +1199,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.sonar.server.source.db.FileSourceDb.internal_static_org_sonar_server_source_db_Line_descriptor; + return org.sonar.db.FileSources.internal_static_org_sonar_server_source_db_Line_descriptor; } - public org.sonar.server.source.db.FileSourceDb.Line getDefaultInstanceForType() { - return org.sonar.server.source.db.FileSourceDb.Line.getDefaultInstance(); + public org.sonar.db.FileSources.Line getDefaultInstanceForType() { + return org.sonar.db.FileSources.Line.getDefaultInstance(); } - public org.sonar.server.source.db.FileSourceDb.Line build() { - org.sonar.server.source.db.FileSourceDb.Line result = buildPartial(); + public org.sonar.db.FileSources.Line build() { + org.sonar.db.FileSources.Line result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.sonar.server.source.db.FileSourceDb.Line buildPartial() { - org.sonar.server.source.db.FileSourceDb.Line result = new org.sonar.server.source.db.FileSourceDb.Line(this); + public org.sonar.db.FileSources.Line buildPartial() { + org.sonar.db.FileSources.Line result = new org.sonar.db.FileSources.Line(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -1293,16 +1293,16 @@ public org.sonar.server.source.db.FileSourceDb.Line buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.sonar.server.source.db.FileSourceDb.Line) { - return mergeFrom((org.sonar.server.source.db.FileSourceDb.Line)other); + if (other instanceof org.sonar.db.FileSources.Line) { + return mergeFrom((org.sonar.db.FileSources.Line)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.sonar.server.source.db.FileSourceDb.Line other) { - if (other == org.sonar.server.source.db.FileSourceDb.Line.getDefaultInstance()) return this; + public Builder mergeFrom(org.sonar.db.FileSources.Line other) { + if (other == org.sonar.db.FileSources.Line.getDefaultInstance()) return this; if (other.hasLine()) { setLine(other.getLine()); } @@ -1383,11 +1383,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.sonar.server.source.db.FileSourceDb.Line parsedMessage = null; + org.sonar.db.FileSources.Line parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.sonar.server.source.db.FileSourceDb.Line) e.getUnfinishedMessage(); + parsedMessage = (org.sonar.db.FileSources.Line) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -2286,12 +2286,12 @@ public interface DataOrBuilder extends /** * repeated .org.sonar.server.source.db.Line lines = 1; */ - java.util.List + java.util.List getLinesList(); /** * repeated .org.sonar.server.source.db.Line lines = 1; */ - org.sonar.server.source.db.FileSourceDb.Line getLines(int index); + org.sonar.db.FileSources.Line getLines(int index); /** * repeated .org.sonar.server.source.db.Line lines = 1; */ @@ -2299,16 +2299,20 @@ public interface DataOrBuilder extends /** * repeated .org.sonar.server.source.db.Line lines = 1; */ - java.util.List + java.util.List getLinesOrBuilderList(); /** * repeated .org.sonar.server.source.db.Line lines = 1; */ - org.sonar.server.source.db.FileSourceDb.LineOrBuilder getLinesOrBuilder( + org.sonar.db.FileSources.LineOrBuilder getLinesOrBuilder( int index); } /** * Protobuf type {@code org.sonar.server.source.db.Data} + * + * 
+   * TODO should be dropped as it prevents streaming
+   *
*/ public static final class Data extends com.google.protobuf.GeneratedMessage implements @@ -2361,10 +2365,10 @@ private Data( } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - lines_ = new java.util.ArrayList(); + lines_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - lines_.add(input.readMessage(org.sonar.server.source.db.FileSourceDb.Line.PARSER, extensionRegistry)); + lines_.add(input.readMessage(org.sonar.db.FileSources.Line.PARSER, extensionRegistry)); break; } } @@ -2384,14 +2388,14 @@ private Data( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.sonar.server.source.db.FileSourceDb.internal_static_org_sonar_server_source_db_Data_descriptor; + return org.sonar.db.FileSources.internal_static_org_sonar_server_source_db_Data_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.sonar.server.source.db.FileSourceDb.internal_static_org_sonar_server_source_db_Data_fieldAccessorTable + return org.sonar.db.FileSources.internal_static_org_sonar_server_source_db_Data_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.sonar.server.source.db.FileSourceDb.Data.class, org.sonar.server.source.db.FileSourceDb.Data.Builder.class); + org.sonar.db.FileSources.Data.class, org.sonar.db.FileSources.Data.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -2410,17 +2414,17 @@ public com.google.protobuf.Parser getParserForType() { } public static final int LINES_FIELD_NUMBER = 1; - private java.util.List lines_; + private java.util.List lines_; /** * repeated .org.sonar.server.source.db.Line lines = 1; */ - public java.util.List getLinesList() { + public java.util.List getLinesList() { return lines_; } /** * repeated .org.sonar.server.source.db.Line lines = 1; */ - public java.util.List + public java.util.List getLinesOrBuilderList() { return lines_; } @@ -2433,13 +2437,13 @@ public int getLinesCount() { /** * repeated .org.sonar.server.source.db.Line lines = 1; */ - public org.sonar.server.source.db.FileSourceDb.Line getLines(int index) { + public org.sonar.db.FileSources.Line getLines(int index) { return lines_.get(index); } /** * repeated .org.sonar.server.source.db.Line lines = 1; */ - public org.sonar.server.source.db.FileSourceDb.LineOrBuilder getLinesOrBuilder( + public org.sonar.db.FileSources.LineOrBuilder getLinesOrBuilder( int index) { return lines_.get(index); } @@ -2488,53 +2492,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static org.sonar.server.source.db.FileSourceDb.Data parseFrom( + public static org.sonar.db.FileSources.Data parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.sonar.server.source.db.FileSourceDb.Data parseFrom( + public static org.sonar.db.FileSources.Data parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.sonar.server.source.db.FileSourceDb.Data parseFrom(byte[] data) + public static org.sonar.db.FileSources.Data parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.sonar.server.source.db.FileSourceDb.Data parseFrom( + public static org.sonar.db.FileSources.Data parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.sonar.server.source.db.FileSourceDb.Data parseFrom(java.io.InputStream input) + public static org.sonar.db.FileSources.Data parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.sonar.server.source.db.FileSourceDb.Data parseFrom( + public static org.sonar.db.FileSources.Data parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.sonar.server.source.db.FileSourceDb.Data parseDelimitedFrom(java.io.InputStream input) + public static org.sonar.db.FileSources.Data parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.sonar.server.source.db.FileSourceDb.Data parseDelimitedFrom( + public static org.sonar.db.FileSources.Data parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.sonar.server.source.db.FileSourceDb.Data parseFrom( + public static org.sonar.db.FileSources.Data parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.sonar.server.source.db.FileSourceDb.Data parseFrom( + public static org.sonar.db.FileSources.Data parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2543,7 +2547,7 @@ public static org.sonar.server.source.db.FileSourceDb.Data parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.sonar.server.source.db.FileSourceDb.Data prototype) { + public static Builder newBuilder(org.sonar.db.FileSources.Data prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -2556,24 +2560,28 @@ protected Builder newBuilderForType( } /** * Protobuf type {@code org.sonar.server.source.db.Data} + * + * 
+     * TODO should be dropped as it prevents streaming
+     *
*/ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:org.sonar.server.source.db.Data) - org.sonar.server.source.db.FileSourceDb.DataOrBuilder { + org.sonar.db.FileSources.DataOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.sonar.server.source.db.FileSourceDb.internal_static_org_sonar_server_source_db_Data_descriptor; + return org.sonar.db.FileSources.internal_static_org_sonar_server_source_db_Data_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.sonar.server.source.db.FileSourceDb.internal_static_org_sonar_server_source_db_Data_fieldAccessorTable + return org.sonar.db.FileSources.internal_static_org_sonar_server_source_db_Data_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.sonar.server.source.db.FileSourceDb.Data.class, org.sonar.server.source.db.FileSourceDb.Data.Builder.class); + org.sonar.db.FileSources.Data.class, org.sonar.db.FileSources.Data.Builder.class); } - // Construct using org.sonar.server.source.db.FileSourceDb.Data.newBuilder() + // Construct using org.sonar.db.FileSources.Data.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -2609,23 +2617,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.sonar.server.source.db.FileSourceDb.internal_static_org_sonar_server_source_db_Data_descriptor; + return org.sonar.db.FileSources.internal_static_org_sonar_server_source_db_Data_descriptor; } - public org.sonar.server.source.db.FileSourceDb.Data getDefaultInstanceForType() { - return org.sonar.server.source.db.FileSourceDb.Data.getDefaultInstance(); + public org.sonar.db.FileSources.Data getDefaultInstanceForType() { + return org.sonar.db.FileSources.Data.getDefaultInstance(); } - public org.sonar.server.source.db.FileSourceDb.Data build() { - org.sonar.server.source.db.FileSourceDb.Data result = buildPartial(); + public org.sonar.db.FileSources.Data build() { + org.sonar.db.FileSources.Data result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.sonar.server.source.db.FileSourceDb.Data buildPartial() { - org.sonar.server.source.db.FileSourceDb.Data result = new org.sonar.server.source.db.FileSourceDb.Data(this); + public org.sonar.db.FileSources.Data buildPartial() { + org.sonar.db.FileSources.Data result = new org.sonar.db.FileSources.Data(this); int from_bitField0_ = bitField0_; if (linesBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -2641,16 +2649,16 @@ public org.sonar.server.source.db.FileSourceDb.Data buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.sonar.server.source.db.FileSourceDb.Data) { - return mergeFrom((org.sonar.server.source.db.FileSourceDb.Data)other); + if (other instanceof org.sonar.db.FileSources.Data) { + return mergeFrom((org.sonar.db.FileSources.Data)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.sonar.server.source.db.FileSourceDb.Data other) { - if (other == org.sonar.server.source.db.FileSourceDb.Data.getDefaultInstance()) return this; + public Builder mergeFrom(org.sonar.db.FileSources.Data other) { + if (other == org.sonar.db.FileSources.Data.getDefaultInstance()) return this; if (linesBuilder_ == null) { if (!other.lines_.isEmpty()) { if (lines_.isEmpty()) { @@ -2689,11 +2697,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.sonar.server.source.db.FileSourceDb.Data parsedMessage = null; + org.sonar.db.FileSources.Data parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.sonar.server.source.db.FileSourceDb.Data) e.getUnfinishedMessage(); + parsedMessage = (org.sonar.db.FileSources.Data) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -2704,22 +2712,22 @@ public Builder mergeFrom( } private int bitField0_; - private java.util.List lines_ = + private java.util.List lines_ = java.util.Collections.emptyList(); private void ensureLinesIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - lines_ = new java.util.ArrayList(lines_); + lines_ = new java.util.ArrayList(lines_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilder< - org.sonar.server.source.db.FileSourceDb.Line, org.sonar.server.source.db.FileSourceDb.Line.Builder, org.sonar.server.source.db.FileSourceDb.LineOrBuilder> linesBuilder_; + org.sonar.db.FileSources.Line, org.sonar.db.FileSources.Line.Builder, org.sonar.db.FileSources.LineOrBuilder> linesBuilder_; /** * repeated .org.sonar.server.source.db.Line lines = 1; */ - public java.util.List getLinesList() { + public java.util.List getLinesList() { if (linesBuilder_ == null) { return java.util.Collections.unmodifiableList(lines_); } else { @@ -2739,7 +2747,7 @@ public int getLinesCount() { /** * repeated .org.sonar.server.source.db.Line lines = 1; */ - public org.sonar.server.source.db.FileSourceDb.Line getLines(int index) { + public org.sonar.db.FileSources.Line getLines(int index) { if (linesBuilder_ == null) { return lines_.get(index); } else { @@ -2750,7 +2758,7 @@ public org.sonar.server.source.db.FileSourceDb.Line getLines(int index) { * repeated .org.sonar.server.source.db.Line lines = 1; */ public Builder setLines( - int index, org.sonar.server.source.db.FileSourceDb.Line value) { + int index, org.sonar.db.FileSources.Line value) { if (linesBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2767,7 +2775,7 @@ public Builder setLines( * repeated .org.sonar.server.source.db.Line lines = 1; */ public Builder setLines( - int index, org.sonar.server.source.db.FileSourceDb.Line.Builder builderForValue) { + int index, org.sonar.db.FileSources.Line.Builder builderForValue) { if (linesBuilder_ == null) { ensureLinesIsMutable(); lines_.set(index, builderForValue.build()); @@ -2780,7 +2788,7 @@ public Builder setLines( /** * repeated .org.sonar.server.source.db.Line lines = 1; */ - public Builder addLines(org.sonar.server.source.db.FileSourceDb.Line value) { + public Builder addLines(org.sonar.db.FileSources.Line value) { if (linesBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2797,7 +2805,7 @@ public Builder addLines(org.sonar.server.source.db.FileSourceDb.Line value) { * repeated .org.sonar.server.source.db.Line lines = 1; */ public Builder addLines( - int index, org.sonar.server.source.db.FileSourceDb.Line value) { + int index, org.sonar.db.FileSources.Line value) { if (linesBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2814,7 +2822,7 @@ public Builder addLines( * repeated .org.sonar.server.source.db.Line lines = 1; */ public Builder addLines( - org.sonar.server.source.db.FileSourceDb.Line.Builder builderForValue) { + org.sonar.db.FileSources.Line.Builder builderForValue) { if (linesBuilder_ == null) { ensureLinesIsMutable(); lines_.add(builderForValue.build()); @@ -2828,7 +2836,7 @@ public Builder addLines( * repeated .org.sonar.server.source.db.Line lines = 1; */ public Builder addLines( - int index, org.sonar.server.source.db.FileSourceDb.Line.Builder builderForValue) { + int index, org.sonar.db.FileSources.Line.Builder builderForValue) { if (linesBuilder_ == null) { ensureLinesIsMutable(); lines_.add(index, builderForValue.build()); @@ -2842,7 +2850,7 @@ public Builder addLines( * repeated .org.sonar.server.source.db.Line lines = 1; */ public Builder addAllLines( - java.lang.Iterable values) { + java.lang.Iterable values) { if (linesBuilder_ == null) { ensureLinesIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -2882,14 +2890,14 @@ public Builder removeLines(int index) { /** * repeated .org.sonar.server.source.db.Line lines = 1; */ - public org.sonar.server.source.db.FileSourceDb.Line.Builder getLinesBuilder( + public org.sonar.db.FileSources.Line.Builder getLinesBuilder( int index) { return getLinesFieldBuilder().getBuilder(index); } /** * repeated .org.sonar.server.source.db.Line lines = 1; */ - public org.sonar.server.source.db.FileSourceDb.LineOrBuilder getLinesOrBuilder( + public org.sonar.db.FileSources.LineOrBuilder getLinesOrBuilder( int index) { if (linesBuilder_ == null) { return lines_.get(index); } else { @@ -2899,7 +2907,7 @@ public org.sonar.server.source.db.FileSourceDb.LineOrBuilder getLinesOrBuilder( /** * repeated .org.sonar.server.source.db.Line lines = 1; */ - public java.util.List + public java.util.List getLinesOrBuilderList() { if (linesBuilder_ != null) { return linesBuilder_.getMessageOrBuilderList(); @@ -2910,31 +2918,31 @@ public org.sonar.server.source.db.FileSourceDb.LineOrBuilder getLinesOrBuilder( /** * repeated .org.sonar.server.source.db.Line lines = 1; */ - public org.sonar.server.source.db.FileSourceDb.Line.Builder addLinesBuilder() { + public org.sonar.db.FileSources.Line.Builder addLinesBuilder() { return getLinesFieldBuilder().addBuilder( - org.sonar.server.source.db.FileSourceDb.Line.getDefaultInstance()); + org.sonar.db.FileSources.Line.getDefaultInstance()); } /** * repeated .org.sonar.server.source.db.Line lines = 1; */ - public org.sonar.server.source.db.FileSourceDb.Line.Builder addLinesBuilder( + public org.sonar.db.FileSources.Line.Builder addLinesBuilder( int index) { return getLinesFieldBuilder().addBuilder( - index, org.sonar.server.source.db.FileSourceDb.Line.getDefaultInstance()); + index, org.sonar.db.FileSources.Line.getDefaultInstance()); } /** * repeated .org.sonar.server.source.db.Line lines = 1; */ - public java.util.List + public java.util.List getLinesBuilderList() { return getLinesFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - org.sonar.server.source.db.FileSourceDb.Line, org.sonar.server.source.db.FileSourceDb.Line.Builder, org.sonar.server.source.db.FileSourceDb.LineOrBuilder> + org.sonar.db.FileSources.Line, org.sonar.db.FileSources.Line.Builder, org.sonar.db.FileSources.LineOrBuilder> getLinesFieldBuilder() { if (linesBuilder_ == null) { linesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.sonar.server.source.db.FileSourceDb.Line, org.sonar.server.source.db.FileSourceDb.Line.Builder, org.sonar.server.source.db.FileSourceDb.LineOrBuilder>( + org.sonar.db.FileSources.Line, org.sonar.db.FileSources.Line.Builder, org.sonar.db.FileSources.LineOrBuilder>( lines_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), @@ -2994,7 +3002,7 @@ public interface TestOrBuilder extends /** * optional .org.sonar.server.source.db.Test.TestStatus status = 3; */ - org.sonar.server.source.db.FileSourceDb.Test.TestStatus getStatus(); + org.sonar.db.FileSources.Test.TestStatus getStatus(); /** * optional int64 execution_time_ms = 4; @@ -3036,12 +3044,12 @@ public interface TestOrBuilder extends /** * repeated .org.sonar.server.source.db.Test.CoveredFile covered_file = 7; */ - java.util.List + java.util.List getCoveredFileList(); /** * repeated .org.sonar.server.source.db.Test.CoveredFile covered_file = 7; */ - org.sonar.server.source.db.FileSourceDb.Test.CoveredFile getCoveredFile(int index); + org.sonar.db.FileSources.Test.CoveredFile getCoveredFile(int index); /** * repeated .org.sonar.server.source.db.Test.CoveredFile covered_file = 7; */ @@ -3049,12 +3057,12 @@ public interface TestOrBuilder extends /** * repeated .org.sonar.server.source.db.Test.CoveredFile covered_file = 7; */ - java.util.List + java.util.List getCoveredFileOrBuilderList(); /** * repeated .org.sonar.server.source.db.Test.CoveredFile covered_file = 7; */ - org.sonar.server.source.db.FileSourceDb.Test.CoveredFileOrBuilder getCoveredFileOrBuilder( + org.sonar.db.FileSources.Test.CoveredFileOrBuilder getCoveredFileOrBuilder( int index); } /** @@ -3123,7 +3131,7 @@ private Test( } case 24: { int rawValue = input.readEnum(); - org.sonar.server.source.db.FileSourceDb.Test.TestStatus value = org.sonar.server.source.db.FileSourceDb.Test.TestStatus.valueOf(rawValue); + org.sonar.db.FileSources.Test.TestStatus value = org.sonar.db.FileSources.Test.TestStatus.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(3, rawValue); } else { @@ -3151,10 +3159,10 @@ private Test( } case 58: { if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { - coveredFile_ = new java.util.ArrayList(); + coveredFile_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000040; } - coveredFile_.add(input.readMessage(org.sonar.server.source.db.FileSourceDb.Test.CoveredFile.PARSER, extensionRegistry)); + coveredFile_.add(input.readMessage(org.sonar.db.FileSources.Test.CoveredFile.PARSER, extensionRegistry)); break; } } @@ -3174,14 +3182,14 @@ private Test( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.sonar.server.source.db.FileSourceDb.internal_static_org_sonar_server_source_db_Test_descriptor; + return org.sonar.db.FileSources.internal_static_org_sonar_server_source_db_Test_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.sonar.server.source.db.FileSourceDb.internal_static_org_sonar_server_source_db_Test_fieldAccessorTable + return org.sonar.db.FileSources.internal_static_org_sonar_server_source_db_Test_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.sonar.server.source.db.FileSourceDb.Test.class, org.sonar.server.source.db.FileSourceDb.Test.Builder.class); + org.sonar.db.FileSources.Test.class, org.sonar.db.FileSources.Test.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -3274,7 +3282,7 @@ public TestStatus findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.sonar.server.source.db.FileSourceDb.Test.getDescriptor().getEnumTypes().get(0); + return org.sonar.db.FileSources.Test.getDescriptor().getEnumTypes().get(0); } private static final TestStatus[] VALUES = values(); @@ -3426,14 +3434,14 @@ private CoveredFile( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.sonar.server.source.db.FileSourceDb.internal_static_org_sonar_server_source_db_Test_CoveredFile_descriptor; + return org.sonar.db.FileSources.internal_static_org_sonar_server_source_db_Test_CoveredFile_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.sonar.server.source.db.FileSourceDb.internal_static_org_sonar_server_source_db_Test_CoveredFile_fieldAccessorTable + return org.sonar.db.FileSources.internal_static_org_sonar_server_source_db_Test_CoveredFile_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.sonar.server.source.db.FileSourceDb.Test.CoveredFile.class, org.sonar.server.source.db.FileSourceDb.Test.CoveredFile.Builder.class); + org.sonar.db.FileSources.Test.CoveredFile.class, org.sonar.db.FileSources.Test.CoveredFile.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -3583,53 +3591,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static org.sonar.server.source.db.FileSourceDb.Test.CoveredFile parseFrom( + public static org.sonar.db.FileSources.Test.CoveredFile parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.sonar.server.source.db.FileSourceDb.Test.CoveredFile parseFrom( + public static org.sonar.db.FileSources.Test.CoveredFile parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.sonar.server.source.db.FileSourceDb.Test.CoveredFile parseFrom(byte[] data) + public static org.sonar.db.FileSources.Test.CoveredFile parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.sonar.server.source.db.FileSourceDb.Test.CoveredFile parseFrom( + public static org.sonar.db.FileSources.Test.CoveredFile parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.sonar.server.source.db.FileSourceDb.Test.CoveredFile parseFrom(java.io.InputStream input) + public static org.sonar.db.FileSources.Test.CoveredFile parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.sonar.server.source.db.FileSourceDb.Test.CoveredFile parseFrom( + public static org.sonar.db.FileSources.Test.CoveredFile parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.sonar.server.source.db.FileSourceDb.Test.CoveredFile parseDelimitedFrom(java.io.InputStream input) + public static org.sonar.db.FileSources.Test.CoveredFile parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.sonar.server.source.db.FileSourceDb.Test.CoveredFile parseDelimitedFrom( + public static org.sonar.db.FileSources.Test.CoveredFile parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.sonar.server.source.db.FileSourceDb.Test.CoveredFile parseFrom( + public static org.sonar.db.FileSources.Test.CoveredFile parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.sonar.server.source.db.FileSourceDb.Test.CoveredFile parseFrom( + public static org.sonar.db.FileSources.Test.CoveredFile parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3638,7 +3646,7 @@ public static org.sonar.server.source.db.FileSourceDb.Test.CoveredFile parseFrom public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.sonar.server.source.db.FileSourceDb.Test.CoveredFile prototype) { + public static Builder newBuilder(org.sonar.db.FileSources.Test.CoveredFile prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -3655,20 +3663,20 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:org.sonar.server.source.db.Test.CoveredFile) - org.sonar.server.source.db.FileSourceDb.Test.CoveredFileOrBuilder { + org.sonar.db.FileSources.Test.CoveredFileOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.sonar.server.source.db.FileSourceDb.internal_static_org_sonar_server_source_db_Test_CoveredFile_descriptor; + return org.sonar.db.FileSources.internal_static_org_sonar_server_source_db_Test_CoveredFile_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.sonar.server.source.db.FileSourceDb.internal_static_org_sonar_server_source_db_Test_CoveredFile_fieldAccessorTable + return org.sonar.db.FileSources.internal_static_org_sonar_server_source_db_Test_CoveredFile_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.sonar.server.source.db.FileSourceDb.Test.CoveredFile.class, org.sonar.server.source.db.FileSourceDb.Test.CoveredFile.Builder.class); + org.sonar.db.FileSources.Test.CoveredFile.class, org.sonar.db.FileSources.Test.CoveredFile.Builder.class); } - // Construct using org.sonar.server.source.db.FileSourceDb.Test.CoveredFile.newBuilder() + // Construct using org.sonar.db.FileSources.Test.CoveredFile.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -3701,23 +3709,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.sonar.server.source.db.FileSourceDb.internal_static_org_sonar_server_source_db_Test_CoveredFile_descriptor; + return org.sonar.db.FileSources.internal_static_org_sonar_server_source_db_Test_CoveredFile_descriptor; } - public org.sonar.server.source.db.FileSourceDb.Test.CoveredFile getDefaultInstanceForType() { - return org.sonar.server.source.db.FileSourceDb.Test.CoveredFile.getDefaultInstance(); + public org.sonar.db.FileSources.Test.CoveredFile getDefaultInstanceForType() { + return org.sonar.db.FileSources.Test.CoveredFile.getDefaultInstance(); } - public org.sonar.server.source.db.FileSourceDb.Test.CoveredFile build() { - org.sonar.server.source.db.FileSourceDb.Test.CoveredFile result = buildPartial(); + public org.sonar.db.FileSources.Test.CoveredFile build() { + org.sonar.db.FileSources.Test.CoveredFile result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.sonar.server.source.db.FileSourceDb.Test.CoveredFile buildPartial() { - org.sonar.server.source.db.FileSourceDb.Test.CoveredFile result = new org.sonar.server.source.db.FileSourceDb.Test.CoveredFile(this); + public org.sonar.db.FileSources.Test.CoveredFile buildPartial() { + org.sonar.db.FileSources.Test.CoveredFile result = new org.sonar.db.FileSources.Test.CoveredFile(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -3735,16 +3743,16 @@ public org.sonar.server.source.db.FileSourceDb.Test.CoveredFile buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.sonar.server.source.db.FileSourceDb.Test.CoveredFile) { - return mergeFrom((org.sonar.server.source.db.FileSourceDb.Test.CoveredFile)other); + if (other instanceof org.sonar.db.FileSources.Test.CoveredFile) { + return mergeFrom((org.sonar.db.FileSources.Test.CoveredFile)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.sonar.server.source.db.FileSourceDb.Test.CoveredFile other) { - if (other == org.sonar.server.source.db.FileSourceDb.Test.CoveredFile.getDefaultInstance()) return this; + public Builder mergeFrom(org.sonar.db.FileSources.Test.CoveredFile other) { + if (other == org.sonar.db.FileSources.Test.CoveredFile.getDefaultInstance()) return this; if (other.hasFileUuid()) { bitField0_ |= 0x00000001; fileUuid_ = other.fileUuid_; @@ -3772,11 +3780,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.sonar.server.source.db.FileSourceDb.Test.CoveredFile parsedMessage = null; + org.sonar.db.FileSources.Test.CoveredFile parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.sonar.server.source.db.FileSourceDb.Test.CoveredFile) e.getUnfinishedMessage(); + parsedMessage = (org.sonar.db.FileSources.Test.CoveredFile) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -4026,7 +4034,7 @@ public java.lang.String getName() { } public static final int STATUS_FIELD_NUMBER = 3; - private org.sonar.server.source.db.FileSourceDb.Test.TestStatus status_; + private org.sonar.db.FileSources.Test.TestStatus status_; /** * optional .org.sonar.server.source.db.Test.TestStatus status = 3; */ @@ -4036,7 +4044,7 @@ public boolean hasStatus() { /** * optional .org.sonar.server.source.db.Test.TestStatus status = 3; */ - public org.sonar.server.source.db.FileSourceDb.Test.TestStatus getStatus() { + public org.sonar.db.FileSources.Test.TestStatus getStatus() { return status_; } @@ -4140,17 +4148,17 @@ public java.lang.String getMsg() { } public static final int COVERED_FILE_FIELD_NUMBER = 7; - private java.util.List coveredFile_; + private java.util.List coveredFile_; /** * repeated .org.sonar.server.source.db.Test.CoveredFile covered_file = 7; */ - public java.util.List getCoveredFileList() { + public java.util.List getCoveredFileList() { return coveredFile_; } /** * repeated .org.sonar.server.source.db.Test.CoveredFile covered_file = 7; */ - public java.util.List + public java.util.List getCoveredFileOrBuilderList() { return coveredFile_; } @@ -4163,13 +4171,13 @@ public int getCoveredFileCount() { /** * repeated .org.sonar.server.source.db.Test.CoveredFile covered_file = 7; */ - public org.sonar.server.source.db.FileSourceDb.Test.CoveredFile getCoveredFile(int index) { + public org.sonar.db.FileSources.Test.CoveredFile getCoveredFile(int index) { return coveredFile_.get(index); } /** * repeated .org.sonar.server.source.db.Test.CoveredFile covered_file = 7; */ - public org.sonar.server.source.db.FileSourceDb.Test.CoveredFileOrBuilder getCoveredFileOrBuilder( + public org.sonar.db.FileSources.Test.CoveredFileOrBuilder getCoveredFileOrBuilder( int index) { return coveredFile_.get(index); } @@ -4177,7 +4185,7 @@ public org.sonar.server.source.db.FileSourceDb.Test.CoveredFileOrBuilder getCove private void initFields() { uuid_ = ""; name_ = ""; - status_ = org.sonar.server.source.db.FileSourceDb.Test.TestStatus.OK; + status_ = org.sonar.db.FileSources.Test.TestStatus.OK; executionTimeMs_ = 0L; stacktrace_ = ""; msg_ = ""; @@ -4266,53 +4274,53 @@ protected java.lang.Object writeReplace() return super.writeReplace(); } - public static org.sonar.server.source.db.FileSourceDb.Test parseFrom( + public static org.sonar.db.FileSources.Test parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.sonar.server.source.db.FileSourceDb.Test parseFrom( + public static org.sonar.db.FileSources.Test parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.sonar.server.source.db.FileSourceDb.Test parseFrom(byte[] data) + public static org.sonar.db.FileSources.Test parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.sonar.server.source.db.FileSourceDb.Test parseFrom( + public static org.sonar.db.FileSources.Test parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.sonar.server.source.db.FileSourceDb.Test parseFrom(java.io.InputStream input) + public static org.sonar.db.FileSources.Test parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.sonar.server.source.db.FileSourceDb.Test parseFrom( + public static org.sonar.db.FileSources.Test parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.sonar.server.source.db.FileSourceDb.Test parseDelimitedFrom(java.io.InputStream input) + public static org.sonar.db.FileSources.Test parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.sonar.server.source.db.FileSourceDb.Test parseDelimitedFrom( + public static org.sonar.db.FileSources.Test parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.sonar.server.source.db.FileSourceDb.Test parseFrom( + public static org.sonar.db.FileSources.Test parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.sonar.server.source.db.FileSourceDb.Test parseFrom( + public static org.sonar.db.FileSources.Test parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -4321,7 +4329,7 @@ public static org.sonar.server.source.db.FileSourceDb.Test parseFrom( public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.sonar.server.source.db.FileSourceDb.Test prototype) { + public static Builder newBuilder(org.sonar.db.FileSources.Test prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -4338,20 +4346,20 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:org.sonar.server.source.db.Test) - org.sonar.server.source.db.FileSourceDb.TestOrBuilder { + org.sonar.db.FileSources.TestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.sonar.server.source.db.FileSourceDb.internal_static_org_sonar_server_source_db_Test_descriptor; + return org.sonar.db.FileSources.internal_static_org_sonar_server_source_db_Test_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.sonar.server.source.db.FileSourceDb.internal_static_org_sonar_server_source_db_Test_fieldAccessorTable + return org.sonar.db.FileSources.internal_static_org_sonar_server_source_db_Test_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.sonar.server.source.db.FileSourceDb.Test.class, org.sonar.server.source.db.FileSourceDb.Test.Builder.class); + org.sonar.db.FileSources.Test.class, org.sonar.db.FileSources.Test.Builder.class); } - // Construct using org.sonar.server.source.db.FileSourceDb.Test.newBuilder() + // Construct using org.sonar.db.FileSources.Test.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -4376,7 +4384,7 @@ public Builder clear() { bitField0_ = (bitField0_ & ~0x00000001); name_ = ""; bitField0_ = (bitField0_ & ~0x00000002); - status_ = org.sonar.server.source.db.FileSourceDb.Test.TestStatus.OK; + status_ = org.sonar.db.FileSources.Test.TestStatus.OK; bitField0_ = (bitField0_ & ~0x00000004); executionTimeMs_ = 0L; bitField0_ = (bitField0_ & ~0x00000008); @@ -4399,23 +4407,23 @@ public Builder clone() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.sonar.server.source.db.FileSourceDb.internal_static_org_sonar_server_source_db_Test_descriptor; + return org.sonar.db.FileSources.internal_static_org_sonar_server_source_db_Test_descriptor; } - public org.sonar.server.source.db.FileSourceDb.Test getDefaultInstanceForType() { - return org.sonar.server.source.db.FileSourceDb.Test.getDefaultInstance(); + public org.sonar.db.FileSources.Test getDefaultInstanceForType() { + return org.sonar.db.FileSources.Test.getDefaultInstance(); } - public org.sonar.server.source.db.FileSourceDb.Test build() { - org.sonar.server.source.db.FileSourceDb.Test result = buildPartial(); + public org.sonar.db.FileSources.Test build() { + org.sonar.db.FileSources.Test result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.sonar.server.source.db.FileSourceDb.Test buildPartial() { - org.sonar.server.source.db.FileSourceDb.Test result = new org.sonar.server.source.db.FileSourceDb.Test(this); + public org.sonar.db.FileSources.Test buildPartial() { + org.sonar.db.FileSources.Test result = new org.sonar.db.FileSources.Test(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -4457,16 +4465,16 @@ public org.sonar.server.source.db.FileSourceDb.Test buildPartial() { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.sonar.server.source.db.FileSourceDb.Test) { - return mergeFrom((org.sonar.server.source.db.FileSourceDb.Test)other); + if (other instanceof org.sonar.db.FileSources.Test) { + return mergeFrom((org.sonar.db.FileSources.Test)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.sonar.server.source.db.FileSourceDb.Test other) { - if (other == org.sonar.server.source.db.FileSourceDb.Test.getDefaultInstance()) return this; + public Builder mergeFrom(org.sonar.db.FileSources.Test other) { + if (other == org.sonar.db.FileSources.Test.getDefaultInstance()) return this; if (other.hasUuid()) { bitField0_ |= 0x00000001; uuid_ = other.uuid_; @@ -4531,11 +4539,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.sonar.server.source.db.FileSourceDb.Test parsedMessage = null; + org.sonar.db.FileSources.Test parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.sonar.server.source.db.FileSourceDb.Test) e.getUnfinishedMessage(); + parsedMessage = (org.sonar.db.FileSources.Test) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -4698,7 +4706,7 @@ public Builder setNameBytes( return this; } - private org.sonar.server.source.db.FileSourceDb.Test.TestStatus status_ = org.sonar.server.source.db.FileSourceDb.Test.TestStatus.OK; + private org.sonar.db.FileSources.Test.TestStatus status_ = org.sonar.db.FileSources.Test.TestStatus.OK; /** * optional .org.sonar.server.source.db.Test.TestStatus status = 3; */ @@ -4708,13 +4716,13 @@ public boolean hasStatus() { /** * optional .org.sonar.server.source.db.Test.TestStatus status = 3; */ - public org.sonar.server.source.db.FileSourceDb.Test.TestStatus getStatus() { + public org.sonar.db.FileSources.Test.TestStatus getStatus() { return status_; } /** * optional .org.sonar.server.source.db.Test.TestStatus status = 3; */ - public Builder setStatus(org.sonar.server.source.db.FileSourceDb.Test.TestStatus value) { + public Builder setStatus(org.sonar.db.FileSources.Test.TestStatus value) { if (value == null) { throw new NullPointerException(); } @@ -4728,7 +4736,7 @@ public Builder setStatus(org.sonar.server.source.db.FileSourceDb.Test.TestStatus */ public Builder clearStatus() { bitField0_ = (bitField0_ & ~0x00000004); - status_ = org.sonar.server.source.db.FileSourceDb.Test.TestStatus.OK; + status_ = org.sonar.db.FileSources.Test.TestStatus.OK; onChanged(); return this; } @@ -4917,22 +4925,22 @@ public Builder setMsgBytes( return this; } - private java.util.List coveredFile_ = + private java.util.List coveredFile_ = java.util.Collections.emptyList(); private void ensureCoveredFileIsMutable() { if (!((bitField0_ & 0x00000040) == 0x00000040)) { - coveredFile_ = new java.util.ArrayList(coveredFile_); + coveredFile_ = new java.util.ArrayList(coveredFile_); bitField0_ |= 0x00000040; } } private com.google.protobuf.RepeatedFieldBuilder< - org.sonar.server.source.db.FileSourceDb.Test.CoveredFile, org.sonar.server.source.db.FileSourceDb.Test.CoveredFile.Builder, org.sonar.server.source.db.FileSourceDb.Test.CoveredFileOrBuilder> coveredFileBuilder_; + org.sonar.db.FileSources.Test.CoveredFile, org.sonar.db.FileSources.Test.CoveredFile.Builder, org.sonar.db.FileSources.Test.CoveredFileOrBuilder> coveredFileBuilder_; /** * repeated .org.sonar.server.source.db.Test.CoveredFile covered_file = 7; */ - public java.util.List getCoveredFileList() { + public java.util.List getCoveredFileList() { if (coveredFileBuilder_ == null) { return java.util.Collections.unmodifiableList(coveredFile_); } else { @@ -4952,7 +4960,7 @@ public int getCoveredFileCount() { /** * repeated .org.sonar.server.source.db.Test.CoveredFile covered_file = 7; */ - public org.sonar.server.source.db.FileSourceDb.Test.CoveredFile getCoveredFile(int index) { + public org.sonar.db.FileSources.Test.CoveredFile getCoveredFile(int index) { if (coveredFileBuilder_ == null) { return coveredFile_.get(index); } else { @@ -4963,7 +4971,7 @@ public org.sonar.server.source.db.FileSourceDb.Test.CoveredFile getCoveredFile(i * repeated .org.sonar.server.source.db.Test.CoveredFile covered_file = 7; */ public Builder setCoveredFile( - int index, org.sonar.server.source.db.FileSourceDb.Test.CoveredFile value) { + int index, org.sonar.db.FileSources.Test.CoveredFile value) { if (coveredFileBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -4980,7 +4988,7 @@ public Builder setCoveredFile( * repeated .org.sonar.server.source.db.Test.CoveredFile covered_file = 7; */ public Builder setCoveredFile( - int index, org.sonar.server.source.db.FileSourceDb.Test.CoveredFile.Builder builderForValue) { + int index, org.sonar.db.FileSources.Test.CoveredFile.Builder builderForValue) { if (coveredFileBuilder_ == null) { ensureCoveredFileIsMutable(); coveredFile_.set(index, builderForValue.build()); @@ -4993,7 +5001,7 @@ public Builder setCoveredFile( /** * repeated .org.sonar.server.source.db.Test.CoveredFile covered_file = 7; */ - public Builder addCoveredFile(org.sonar.server.source.db.FileSourceDb.Test.CoveredFile value) { + public Builder addCoveredFile(org.sonar.db.FileSources.Test.CoveredFile value) { if (coveredFileBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -5010,7 +5018,7 @@ public Builder addCoveredFile(org.sonar.server.source.db.FileSourceDb.Test.Cover * repeated .org.sonar.server.source.db.Test.CoveredFile covered_file = 7; */ public Builder addCoveredFile( - int index, org.sonar.server.source.db.FileSourceDb.Test.CoveredFile value) { + int index, org.sonar.db.FileSources.Test.CoveredFile value) { if (coveredFileBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -5027,7 +5035,7 @@ public Builder addCoveredFile( * repeated .org.sonar.server.source.db.Test.CoveredFile covered_file = 7; */ public Builder addCoveredFile( - org.sonar.server.source.db.FileSourceDb.Test.CoveredFile.Builder builderForValue) { + org.sonar.db.FileSources.Test.CoveredFile.Builder builderForValue) { if (coveredFileBuilder_ == null) { ensureCoveredFileIsMutable(); coveredFile_.add(builderForValue.build()); @@ -5041,7 +5049,7 @@ public Builder addCoveredFile( * repeated .org.sonar.server.source.db.Test.CoveredFile covered_file = 7; */ public Builder addCoveredFile( - int index, org.sonar.server.source.db.FileSourceDb.Test.CoveredFile.Builder builderForValue) { + int index, org.sonar.db.FileSources.Test.CoveredFile.Builder builderForValue) { if (coveredFileBuilder_ == null) { ensureCoveredFileIsMutable(); coveredFile_.add(index, builderForValue.build()); @@ -5055,7 +5063,7 @@ public Builder addCoveredFile( * repeated .org.sonar.server.source.db.Test.CoveredFile covered_file = 7; */ public Builder addAllCoveredFile( - java.lang.Iterable values) { + java.lang.Iterable values) { if (coveredFileBuilder_ == null) { ensureCoveredFileIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -5095,14 +5103,14 @@ public Builder removeCoveredFile(int index) { /** * repeated .org.sonar.server.source.db.Test.CoveredFile covered_file = 7; */ - public org.sonar.server.source.db.FileSourceDb.Test.CoveredFile.Builder getCoveredFileBuilder( + public org.sonar.db.FileSources.Test.CoveredFile.Builder getCoveredFileBuilder( int index) { return getCoveredFileFieldBuilder().getBuilder(index); } /** * repeated .org.sonar.server.source.db.Test.CoveredFile covered_file = 7; */ - public org.sonar.server.source.db.FileSourceDb.Test.CoveredFileOrBuilder getCoveredFileOrBuilder( + public org.sonar.db.FileSources.Test.CoveredFileOrBuilder getCoveredFileOrBuilder( int index) { if (coveredFileBuilder_ == null) { return coveredFile_.get(index); } else { @@ -5112,7 +5120,7 @@ public org.sonar.server.source.db.FileSourceDb.Test.CoveredFileOrBuilder getCove /** * repeated .org.sonar.server.source.db.Test.CoveredFile covered_file = 7; */ - public java.util.List + public java.util.List getCoveredFileOrBuilderList() { if (coveredFileBuilder_ != null) { return coveredFileBuilder_.getMessageOrBuilderList(); @@ -5123,31 +5131,31 @@ public org.sonar.server.source.db.FileSourceDb.Test.CoveredFileOrBuilder getCove /** * repeated .org.sonar.server.source.db.Test.CoveredFile covered_file = 7; */ - public org.sonar.server.source.db.FileSourceDb.Test.CoveredFile.Builder addCoveredFileBuilder() { + public org.sonar.db.FileSources.Test.CoveredFile.Builder addCoveredFileBuilder() { return getCoveredFileFieldBuilder().addBuilder( - org.sonar.server.source.db.FileSourceDb.Test.CoveredFile.getDefaultInstance()); + org.sonar.db.FileSources.Test.CoveredFile.getDefaultInstance()); } /** * repeated .org.sonar.server.source.db.Test.CoveredFile covered_file = 7; */ - public org.sonar.server.source.db.FileSourceDb.Test.CoveredFile.Builder addCoveredFileBuilder( + public org.sonar.db.FileSources.Test.CoveredFile.Builder addCoveredFileBuilder( int index) { return getCoveredFileFieldBuilder().addBuilder( - index, org.sonar.server.source.db.FileSourceDb.Test.CoveredFile.getDefaultInstance()); + index, org.sonar.db.FileSources.Test.CoveredFile.getDefaultInstance()); } /** * repeated .org.sonar.server.source.db.Test.CoveredFile covered_file = 7; */ - public java.util.List + public java.util.List getCoveredFileBuilderList() { return getCoveredFileFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - org.sonar.server.source.db.FileSourceDb.Test.CoveredFile, org.sonar.server.source.db.FileSourceDb.Test.CoveredFile.Builder, org.sonar.server.source.db.FileSourceDb.Test.CoveredFileOrBuilder> + org.sonar.db.FileSources.Test.CoveredFile, org.sonar.db.FileSources.Test.CoveredFile.Builder, org.sonar.db.FileSources.Test.CoveredFileOrBuilder> getCoveredFileFieldBuilder() { if (coveredFileBuilder_ == null) { coveredFileBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.sonar.server.source.db.FileSourceDb.Test.CoveredFile, org.sonar.server.source.db.FileSourceDb.Test.CoveredFile.Builder, org.sonar.server.source.db.FileSourceDb.Test.CoveredFileOrBuilder>( + org.sonar.db.FileSources.Test.CoveredFile, org.sonar.db.FileSources.Test.CoveredFile.Builder, org.sonar.db.FileSources.Test.CoveredFileOrBuilder>( coveredFile_, ((bitField0_ & 0x00000040) == 0x00000040), getParentForChildren(), @@ -5197,28 +5205,28 @@ public org.sonar.server.source.db.FileSourceDb.Test.CoveredFile.Builder addCover descriptor; static { java.lang.String[] descriptorData = { - "\n\024file_source_db.proto\022\032org.sonar.server" + - ".source.db\"\223\003\n\004Line\022\014\n\004line\030\001 \001(\005\022\016\n\006sou" + - "rce\030\002 \001(\t\022\024\n\014scm_revision\030\003 \001(\t\022\022\n\nscm_a" + - "uthor\030\004 \001(\t\022\020\n\010scm_date\030\005 \001(\003\022\024\n\014ut_line" + - "_hits\030\006 \001(\005\022\025\n\rut_conditions\030\007 \001(\005\022\035\n\025ut" + - "_covered_conditions\030\010 \001(\005\022\024\n\014it_line_hit" + - "s\030\t \001(\005\022\025\n\rit_conditions\030\n \001(\005\022\035\n\025it_cov" + - "ered_conditions\030\013 \001(\005\022\031\n\021overall_line_hi" + - "ts\030\014 \001(\005\022\032\n\022overall_conditions\030\r \001(\005\022\"\n\032" + - "overall_covered_conditions\030\016 \001(\005\022\024\n\014high", - "lighting\030\017 \001(\t\022\017\n\007symbols\030\020 \001(\t\022\027\n\013dupli" + - "cation\030\021 \003(\005B\002\020\001\"7\n\004Data\022/\n\005lines\030\001 \003(\0132" + - " .org.sonar.server.source.db.Line\"\326\002\n\004Te" + - "st\022\014\n\004uuid\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\022;\n\006status" + - "\030\003 \001(\0162+.org.sonar.server.source.db.Test" + - ".TestStatus\022\031\n\021execution_time_ms\030\004 \001(\003\022\022" + - "\n\nstacktrace\030\005 \001(\t\022\013\n\003msg\030\006 \001(\t\022B\n\014cover" + - "ed_file\030\007 \003(\0132,.org.sonar.server.source." + - "db.Test.CoveredFile\032:\n\013CoveredFile\022\021\n\tfi" + - "le_uuid\030\001 \001(\t\022\030\n\014covered_line\030\002 \003(\005B\002\020\001\"", - "9\n\nTestStatus\022\006\n\002OK\020\001\022\013\n\007FAILURE\020\002\022\t\n\005ER" + - "ROR\020\003\022\013\n\007SKIPPED\020\004B\002H\001" + "\n\022file_sources.proto\022\032org.sonar.server.s" + + "ource.db\"\223\003\n\004Line\022\014\n\004line\030\001 \001(\005\022\016\n\006sourc" + + "e\030\002 \001(\t\022\024\n\014scm_revision\030\003 \001(\t\022\022\n\nscm_aut" + + "hor\030\004 \001(\t\022\020\n\010scm_date\030\005 \001(\003\022\024\n\014ut_line_h" + + "its\030\006 \001(\005\022\025\n\rut_conditions\030\007 \001(\005\022\035\n\025ut_c" + + "overed_conditions\030\010 \001(\005\022\024\n\014it_line_hits\030" + + "\t \001(\005\022\025\n\rit_conditions\030\n \001(\005\022\035\n\025it_cover" + + "ed_conditions\030\013 \001(\005\022\031\n\021overall_line_hits" + + "\030\014 \001(\005\022\032\n\022overall_conditions\030\r \001(\005\022\"\n\032ov" + + "erall_covered_conditions\030\016 \001(\005\022\024\n\014highli", + "ghting\030\017 \001(\t\022\017\n\007symbols\030\020 \001(\t\022\027\n\013duplica" + + "tion\030\021 \003(\005B\002\020\001\"7\n\004Data\022/\n\005lines\030\001 \003(\0132 ." + + "org.sonar.server.source.db.Line\"\326\002\n\004Test" + + "\022\014\n\004uuid\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\022;\n\006status\030\003" + + " \001(\0162+.org.sonar.server.source.db.Test.T" + + "estStatus\022\031\n\021execution_time_ms\030\004 \001(\003\022\022\n\n" + + "stacktrace\030\005 \001(\t\022\013\n\003msg\030\006 \001(\t\022B\n\014covered" + + "_file\030\007 \003(\0132,.org.sonar.server.source.db" + + ".Test.CoveredFile\032:\n\013CoveredFile\022\021\n\tfile" + + "_uuid\030\001 \001(\t\022\030\n\014covered_line\030\002 \003(\005B\002\020\001\"9\n", + "\nTestStatus\022\006\n\002OK\020\001\022\013\n\007FAILURE\020\002\022\t\n\005ERRO" + + "R\020\003\022\013\n\007SKIPPED\020\004B\020\n\014org.sonar.dbH\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/sonar-db/src/main/java/org/sonar/db/source/FileSourceDto.java b/sonar-db/src/main/java/org/sonar/db/source/FileSourceDto.java index 0ac7561084fd..997b1a68b51f 100644 --- a/sonar-db/src/main/java/org/sonar/db/source/FileSourceDto.java +++ b/sonar-db/src/main/java/org/sonar/db/source/FileSourceDto.java @@ -30,8 +30,7 @@ import net.jpountz.lz4.LZ4BlockInputStream; import net.jpountz.lz4.LZ4BlockOutputStream; import org.apache.commons.io.IOUtils; -import org.sonar.server.source.db.FileSourceDb; -import org.sonar.server.source.db.FileSourceDb.Test; +import org.sonar.db.FileSources; public class FileSourceDto { @@ -86,7 +85,7 @@ public FileSourceDto setDataHash(String s) { return this; } - public static FileSourceDb.Data decodeSourceData(byte[] binaryData) { + public static FileSources.Data decodeSourceData(byte[] binaryData) { // stream is always closed return decodeSourceData(new ByteArrayInputStream(binaryData)); } @@ -95,11 +94,11 @@ public static FileSourceDb.Data decodeSourceData(byte[] binaryData) { * Decompress and deserialize content of column FILE_SOURCES.BINARY_DATA. * The parameter "input" is always closed by this method. */ - public static FileSourceDb.Data decodeSourceData(InputStream binaryInput) { + public static FileSources.Data decodeSourceData(InputStream binaryInput) { LZ4BlockInputStream lz4Input = null; try { lz4Input = new LZ4BlockInputStream(binaryInput); - return FileSourceDb.Data.parseFrom(lz4Input); + return FileSources.Data.parseFrom(lz4Input); } catch (IOException e) { throw new IllegalStateException("Fail to decompress and deserialize source data", e); } finally { @@ -108,10 +107,10 @@ public static FileSourceDb.Data decodeSourceData(InputStream binaryInput) { } /** - * Serialize and compress protobuf message {@link org.sonar.server.source.db.FileSourceDb.Data} + * Serialize and compress protobuf message {@link org.sonar.db.FileSources.Data} * in the column BINARY_DATA. */ - public static byte[] encodeSourceData(FileSourceDb.Data data) { + public static byte[] encodeSourceData(FileSources.Data data) { ByteArrayOutputStream byteOutput = new ByteArrayOutputStream(); LZ4BlockOutputStream compressedOutput = new LZ4BlockOutputStream(byteOutput); try { @@ -125,7 +124,7 @@ public static byte[] encodeSourceData(FileSourceDb.Data data) { } } - public static List decodeTestData(byte[] binaryData) { + public static List decodeTestData(byte[] binaryData) { // stream is always closed return decodeTestData(new ByteArrayInputStream(binaryData)); } @@ -134,15 +133,15 @@ public static List decodeTestData(byte[] binaryData) { * Decompress and deserialize content of column FILE_SOURCES.BINARY_DATA. * The parameter "input" is always closed by this method. */ - public static List decodeTestData(InputStream binaryInput) { + public static List decodeTestData(InputStream binaryInput) { LZ4BlockInputStream lz4Input = null; - List tests = new ArrayList<>(); + List tests = new ArrayList<>(); try { lz4Input = new LZ4BlockInputStream(binaryInput); - Test currentTest; + FileSources.Test currentTest; do { - currentTest = Test.parseDelimitedFrom(lz4Input); + currentTest = FileSources.Test.parseDelimitedFrom(lz4Input); if (currentTest != null) { tests.add(currentTest); } @@ -156,14 +155,14 @@ public static List decodeTestData(InputStream binaryInput) { } /** - * Serialize and compress protobuf message {@link org.sonar.server.source.db.FileSourceDb.Data} + * Serialize and compress protobuf message {@link org.sonar.db.FileSources.Data} * in the column BINARY_DATA. */ - public static byte[] encodeTestData(List tests) { + public static byte[] encodeTestData(List tests) { ByteArrayOutputStream byteOutput = new ByteArrayOutputStream(); LZ4BlockOutputStream compressedOutput = new LZ4BlockOutputStream(byteOutput); try { - for (Test test : tests) { + for (FileSources.Test test : tests) { test.writeDelimitedTo(compressedOutput); } compressedOutput.close(); @@ -176,14 +175,14 @@ public static byte[] encodeTestData(List tests) { } /** - * Compressed value of serialized protobuf message {@link org.sonar.server.source.db.FileSourceDb.Data} + * Compressed value of serialized protobuf message {@link org.sonar.db.FileSources.Data} */ public byte[] getBinaryData() { return binaryData; } /** - * Set compressed value of the protobuf message {@link org.sonar.server.source.db.FileSourceDb.Data} + * Set compressed value of the protobuf message {@link org.sonar.db.FileSources.Data} */ public FileSourceDto setBinaryData(byte[] data) { this.binaryData = data; @@ -191,26 +190,26 @@ public FileSourceDto setBinaryData(byte[] data) { } /** - * Compressed value of serialized protobuf message {@link org.sonar.server.source.db.FileSourceDb.Data} + * Compressed value of serialized protobuf message {@link org.sonar.db.FileSources.Data} */ - public FileSourceDb.Data getSourceData() { + public FileSources.Data getSourceData() { return decodeSourceData(binaryData); } - public FileSourceDto setSourceData(FileSourceDb.Data data) { + public FileSourceDto setSourceData(FileSources.Data data) { this.dataType = Type.SOURCE; this.binaryData = encodeSourceData(data); return this; } /** - * Compressed value of serialized protobuf message {@link org.sonar.server.source.db.FileSourceDb.Data} + * Compressed value of serialized protobuf message {@link org.sonar.db.FileSources.Data} */ - public List getTestData() { + public List getTestData() { return decodeTestData(binaryData); } - public FileSourceDto setTestData(List data) { + public FileSourceDto setTestData(List data) { this.dataType = Type.TEST; this.binaryData = encodeTestData(data); return this; diff --git a/sonar-db/src/main/java/org/sonar/db/version/v51/FeedFileSourcesBinaryData.java b/sonar-db/src/main/java/org/sonar/db/version/v51/FeedFileSourcesBinaryData.java index 7e3d5e5ef74e..3aa34c9ea96b 100644 --- a/sonar-db/src/main/java/org/sonar/db/version/v51/FeedFileSourcesBinaryData.java +++ b/sonar-db/src/main/java/org/sonar/db/version/v51/FeedFileSourcesBinaryData.java @@ -38,7 +38,7 @@ import org.sonar.db.version.MassUpdate; import org.sonar.db.version.Select; import org.sonar.db.version.SqlStatement; -import org.sonar.server.source.db.FileSourceDb; +import org.sonar.db.FileSources; public class FeedFileSourcesBinaryData extends BaseDataChange { @@ -63,7 +63,7 @@ public boolean handle(Select.Row row, SqlStatement update) throws SQLException { } private byte[] toBinary(Long fileSourceId, @Nullable String data) { - FileSourceDb.Data.Builder dataBuilder = FileSourceDb.Data.newBuilder(); + FileSources.Data.Builder dataBuilder = FileSources.Data.newBuilder(); CSVParser parser = null; try { if (data != null) { @@ -74,7 +74,7 @@ private byte[] toBinary(Long fileSourceId, @Nullable String data) { CSVRecord row = rows.next(); if (row.size() == 16) { - FileSourceDb.Line.Builder lineBuilder = dataBuilder.addLinesBuilder(); + FileSources.Line.Builder lineBuilder = dataBuilder.addLinesBuilder(); lineBuilder.setLine(line); String s = row.get(0); if (StringUtils.isNotEmpty(s)) { diff --git a/sonar-batch-protocol/src/main/protobuf/file_source_db.proto b/sonar-db/src/main/protobuf/file_sources.proto similarity index 77% rename from sonar-batch-protocol/src/main/protobuf/file_source_db.proto rename to sonar-db/src/main/protobuf/file_sources.proto index 48b916dbd78d..feafa462ea4b 100644 --- a/sonar-batch-protocol/src/main/protobuf/file_source_db.proto +++ b/sonar-db/src/main/protobuf/file_sources.proto @@ -18,25 +18,15 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* -Notes - - - "required" fields are not used as recommended by Google to keep forward-compatibility: - https://developers.google.com/protocol-buffers/docs/proto#simple - - - the related Java files are not generated during build. Indeed the existing protoc maven - plugins require protobuf to be installed on boxes. That means that generated Java files - are updated and committed for each change (see src/main/gen-java). -*/ - -// structure of db column FILE_SOURCES.BINARY_DATA - -// Temporarily in sonar-batch-protocol as this db table -// is still fed on batch-side. However generated sources -// are already in correct package +// Structure of db column FILE_SOURCES.BINARY_DATA +// Package must not be changed for backward-compatibility +// with the DB rows inserted in DB before 5.2 package org.sonar.server.source.db; +// The java package can be changed without breaking compatibility. +// it impacts only the generated Java code. +option java_package = "org.sonar.db"; option optimize_for = SPEED; message Line { @@ -68,6 +58,7 @@ message Line { repeated int32 duplication = 17 [packed = true]; } +// TODO should be dropped as it prevents streaming message Data { repeated Line lines = 1; } diff --git a/sonar-db/src/test/java/org/sonar/db/source/FileSourceDtoTest.java b/sonar-db/src/test/java/org/sonar/db/source/FileSourceDtoTest.java index 34d78e127798..556de7564464 100644 --- a/sonar-db/src/test/java/org/sonar/db/source/FileSourceDtoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/source/FileSourceDtoTest.java @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.List; import org.junit.Test; -import org.sonar.server.source.db.FileSourceDb; +import org.sonar.db.FileSources; import static org.assertj.core.api.Assertions.assertThat; @@ -31,14 +31,13 @@ public class FileSourceDtoTest { @Test public void encode_and_decode_test_data() { - List tests = Arrays.asList( - FileSourceDb.Test.newBuilder() + List tests = Arrays.asList( + FileSources.Test.newBuilder() .setName("name#1") .build(), - FileSourceDb.Test.newBuilder() + FileSources.Test.newBuilder() .setName("name#2") - .build() - ); + .build()); FileSourceDto underTest = new FileSourceDto().setTestData(tests); diff --git a/sonar-db/src/test/java/org/sonar/db/version/v51/FeedFileSourcesBinaryDataTest.java b/sonar-db/src/test/java/org/sonar/db/version/v51/FeedFileSourcesBinaryDataTest.java index 2bf3bc230043..e9b433f9deec 100644 --- a/sonar-db/src/test/java/org/sonar/db/version/v51/FeedFileSourcesBinaryDataTest.java +++ b/sonar-db/src/test/java/org/sonar/db/version/v51/FeedFileSourcesBinaryDataTest.java @@ -30,9 +30,9 @@ import org.junit.rules.ExpectedException; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; +import org.sonar.db.FileSources; import org.sonar.db.source.FileSourceDto; import org.sonar.db.version.MigrationStep; -import org.sonar.server.source.db.FileSourceDb; import static org.assertj.core.api.Assertions.assertThat; @@ -55,7 +55,7 @@ public void convert_csv_to_protobuf() throws Exception { assertThat(count).isEqualTo(3); try (Connection connection = db.openConnection()) { - FileSourceDb.Data data = selectData(connection, 1L); + FileSources.Data data = selectData(connection, 1L); assertThat(data.getLinesCount()).isEqualTo(4); assertThat(data.getLines(0).getScmRevision()).isEqualTo("aef12a"); @@ -80,7 +80,7 @@ public void fail_to_parse_csv() throws Exception { migration.execute(); } - private FileSourceDb.Data selectData(Connection connection, long fileSourceId) throws SQLException { + private FileSources.Data selectData(Connection connection, long fileSourceId) throws SQLException { PreparedStatement pstmt = connection.prepareStatement("select binary_data from file_sources where id=?"); ResultSet rs = null; try {