aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-batch-protocol/src
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@sonarsource.com>2015-04-09 12:15:07 +0200
committerJulien Lancelot <julien.lancelot@sonarsource.com>2015-04-09 12:15:07 +0200
commit7155123011053abae8646c6b8ac79bbe19d1355c (patch)
tree0f1d4215ff2899f0e1f1d421397367aff29294e3 /sonar-batch-protocol/src
parent9a934db810c4b91b13ff6fafa2bb50dcdd933d63 (diff)
downloadsonarqube-7155123011053abae8646c6b8ac79bbe19d1355c.tar.gz
sonarqube-7155123011053abae8646c6b8ac79bbe19d1355c.zip
SONAR-6258 Read/write Highlighting using Streaming
Diffstat (limited to 'sonar-batch-protocol/src')
-rw-r--r--sonar-batch-protocol/src/main/gen-java/org/sonar/batch/protocol/output/BatchReport.java1219
-rw-r--r--sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/BatchReportReader.java15
-rw-r--r--sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/BatchReportWriter.java9
-rw-r--r--sonar-batch-protocol/src/main/protobuf/batch_report.proto13
-rw-r--r--sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchReportReaderTest.java45
-rw-r--r--sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchReportWriterTest.java28
6 files changed, 227 insertions, 1102 deletions
diff --git a/sonar-batch-protocol/src/main/gen-java/org/sonar/batch/protocol/output/BatchReport.java b/sonar-batch-protocol/src/main/gen-java/org/sonar/batch/protocol/output/BatchReport.java
index 064899e2b24..4b04e4ff9e2 100644
--- a/sonar-batch-protocol/src/main/gen-java/org/sonar/batch/protocol/output/BatchReport.java
+++ b/sonar-batch-protocol/src/main/gen-java/org/sonar/batch/protocol/output/BatchReport.java
@@ -19649,6 +19649,7 @@ public final class BatchReport {
*
* <pre>
* Only FILE component has coverage information
+ * TODO rename it LineCoverage ?
* </pre>
*/
public static final class Coverage extends
@@ -20051,6 +20052,7 @@ public final class BatchReport {
*
* <pre>
* Only FILE component has coverage information
+ * TODO rename it LineCoverage ?
* </pre>
*/
public static final class Builder extends
@@ -20479,60 +20481,34 @@ public final class BatchReport {
com.google.protobuf.MessageOrBuilder {
/**
- * <code>optional int32 file_ref = 1;</code>
+ * <code>optional .Range range = 1;</code>
*/
- boolean hasFileRef();
- /**
- * <code>optional int32 file_ref = 1;</code>
- */
- int getFileRef();
-
- /**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
- */
- java.util.List<org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule>
- getHighlightingRuleList();
+ boolean hasRange();
/**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
+ * <code>optional .Range range = 1;</code>
*/
- org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule getHighlightingRule(int index);
+ org.sonar.batch.protocol.output.BatchReport.Range getRange();
/**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
+ * <code>optional .Range range = 1;</code>
*/
- int getHighlightingRuleCount();
+ org.sonar.batch.protocol.output.BatchReport.RangeOrBuilder getRangeOrBuilder();
+
/**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
+ * <code>optional .HighlightingType type = 2;</code>
*/
- java.util.List<? extends org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRuleOrBuilder>
- getHighlightingRuleOrBuilderList();
+ boolean hasType();
/**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
+ * <code>optional .HighlightingType type = 2;</code>
*/
- org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRuleOrBuilder getHighlightingRuleOrBuilder(
- int index);
+ org.sonar.batch.protocol.Constants.HighlightingType getType();
}
/**
* Protobuf type {@code SyntaxHighlighting}
+ *
+ * <pre>
+ * Must be sorted by line and start offset
+ * TODO rename it SyntaxHighlightingRule ?
+ * </pre>
*/
public static final class SyntaxHighlighting extends
com.google.protobuf.GeneratedMessage implements
@@ -20583,17 +20559,28 @@ public final class BatchReport {
}
break;
}
- case 8: {
+ case 10: {
+ org.sonar.batch.protocol.output.BatchReport.Range.Builder subBuilder = null;
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ subBuilder = range_.toBuilder();
+ }
+ range_ = input.readMessage(org.sonar.batch.protocol.output.BatchReport.Range.PARSER, extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(range_);
+ range_ = subBuilder.buildPartial();
+ }
bitField0_ |= 0x00000001;
- fileRef_ = input.readInt32();
break;
}
- case 18: {
- if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
- highlightingRule_ = new java.util.ArrayList<org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule>();
- mutable_bitField0_ |= 0x00000002;
+ case 16: {
+ int rawValue = input.readEnum();
+ org.sonar.batch.protocol.Constants.HighlightingType value = org.sonar.batch.protocol.Constants.HighlightingType.valueOf(rawValue);
+ if (value == null) {
+ unknownFields.mergeVarintField(2, rawValue);
+ } else {
+ bitField0_ |= 0x00000002;
+ type_ = value;
}
- highlightingRule_.add(input.readMessage(org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule.PARSER, extensionRegistry));
break;
}
}
@@ -20604,9 +20591,6 @@ public final class BatchReport {
throw new com.google.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
- if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
- highlightingRule_ = java.util.Collections.unmodifiableList(highlightingRule_);
- }
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
@@ -20638,675 +20622,46 @@ public final class BatchReport {
return PARSER;
}
- public interface HighlightingRuleOrBuilder extends
- // @@protoc_insertion_point(interface_extends:SyntaxHighlighting.HighlightingRule)
- com.google.protobuf.MessageOrBuilder {
-
- /**
- * <code>optional .Range range = 1;</code>
- */
- boolean hasRange();
- /**
- * <code>optional .Range range = 1;</code>
- */
- org.sonar.batch.protocol.output.BatchReport.Range getRange();
- /**
- * <code>optional .Range range = 1;</code>
- */
- org.sonar.batch.protocol.output.BatchReport.RangeOrBuilder getRangeOrBuilder();
-
- /**
- * <code>optional .HighlightingType type = 2;</code>
- */
- boolean hasType();
- /**
- * <code>optional .HighlightingType type = 2;</code>
- */
- org.sonar.batch.protocol.Constants.HighlightingType getType();
- }
- /**
- * Protobuf type {@code SyntaxHighlighting.HighlightingRule}
- */
- public static final class HighlightingRule extends
- com.google.protobuf.GeneratedMessage implements
- // @@protoc_insertion_point(message_implements:SyntaxHighlighting.HighlightingRule)
- HighlightingRuleOrBuilder {
- // Use HighlightingRule.newBuilder() to construct.
- private HighlightingRule(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
- super(builder);
- this.unknownFields = builder.getUnknownFields();
- }
- private HighlightingRule(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
- private static final HighlightingRule defaultInstance;
- public static HighlightingRule getDefaultInstance() {
- return defaultInstance;
- }
-
- public HighlightingRule getDefaultInstanceForType() {
- return defaultInstance;
- }
-
- private final com.google.protobuf.UnknownFieldSet unknownFields;
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
- getUnknownFields() {
- return this.unknownFields;
- }
- private HighlightingRule(
- 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: {
- org.sonar.batch.protocol.output.BatchReport.Range.Builder subBuilder = null;
- if (((bitField0_ & 0x00000001) == 0x00000001)) {
- subBuilder = range_.toBuilder();
- }
- range_ = input.readMessage(org.sonar.batch.protocol.output.BatchReport.Range.PARSER, extensionRegistry);
- if (subBuilder != null) {
- subBuilder.mergeFrom(range_);
- range_ = subBuilder.buildPartial();
- }
- bitField0_ |= 0x00000001;
- break;
- }
- case 16: {
- int rawValue = input.readEnum();
- org.sonar.batch.protocol.Constants.HighlightingType value = org.sonar.batch.protocol.Constants.HighlightingType.valueOf(rawValue);
- if (value == null) {
- unknownFields.mergeVarintField(2, rawValue);
- } else {
- bitField0_ |= 0x00000002;
- type_ = value;
- }
- 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 {
- this.unknownFields = unknownFields.build();
- makeExtensionsImmutable();
- }
- }
- public static final com.google.protobuf.Descriptors.Descriptor
- getDescriptor() {
- return org.sonar.batch.protocol.output.BatchReport.internal_static_SyntaxHighlighting_HighlightingRule_descriptor;
- }
-
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
- internalGetFieldAccessorTable() {
- return org.sonar.batch.protocol.output.BatchReport.internal_static_SyntaxHighlighting_HighlightingRule_fieldAccessorTable
- .ensureFieldAccessorsInitialized(
- org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule.class, org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule.Builder.class);
- }
-
- public static com.google.protobuf.Parser<HighlightingRule> PARSER =
- new com.google.protobuf.AbstractParser<HighlightingRule>() {
- public HighlightingRule parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return new HighlightingRule(input, extensionRegistry);
- }
- };
-
- @java.lang.Override
- public com.google.protobuf.Parser<HighlightingRule> getParserForType() {
- return PARSER;
- }
-
- private int bitField0_;
- public static final int RANGE_FIELD_NUMBER = 1;
- private org.sonar.batch.protocol.output.BatchReport.Range range_;
- /**
- * <code>optional .Range range = 1;</code>
- */
- public boolean hasRange() {
- return ((bitField0_ & 0x00000001) == 0x00000001);
- }
- /**
- * <code>optional .Range range = 1;</code>
- */
- public org.sonar.batch.protocol.output.BatchReport.Range getRange() {
- return range_;
- }
- /**
- * <code>optional .Range range = 1;</code>
- */
- public org.sonar.batch.protocol.output.BatchReport.RangeOrBuilder getRangeOrBuilder() {
- return range_;
- }
-
- public static final int TYPE_FIELD_NUMBER = 2;
- private org.sonar.batch.protocol.Constants.HighlightingType type_;
- /**
- * <code>optional .HighlightingType type = 2;</code>
- */
- public boolean hasType() {
- return ((bitField0_ & 0x00000002) == 0x00000002);
- }
- /**
- * <code>optional .HighlightingType type = 2;</code>
- */
- public org.sonar.batch.protocol.Constants.HighlightingType getType() {
- return type_;
- }
-
- private void initFields() {
- range_ = org.sonar.batch.protocol.output.BatchReport.Range.getDefaultInstance();
- type_ = org.sonar.batch.protocol.Constants.HighlightingType.ANNOTATION;
- }
- private byte memoizedIsInitialized = -1;
- public final boolean isInitialized() {
- byte isInitialized = memoizedIsInitialized;
- if (isInitialized == 1) return true;
- if (isInitialized == 0) return false;
-
- memoizedIsInitialized = 1;
- return true;
- }
-
- public void writeTo(com.google.protobuf.CodedOutputStream output)
- throws java.io.IOException {
- getSerializedSize();
- if (((bitField0_ & 0x00000001) == 0x00000001)) {
- output.writeMessage(1, range_);
- }
- if (((bitField0_ & 0x00000002) == 0x00000002)) {
- output.writeEnum(2, type_.getNumber());
- }
- 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
- .computeMessageSize(1, range_);
- }
- if (((bitField0_ & 0x00000002) == 0x00000002)) {
- size += com.google.protobuf.CodedOutputStream
- .computeEnumSize(2, type_.getNumber());
- }
- 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.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data);
- }
- public static org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule 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.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data);
- }
- public static org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule parseFrom(
- byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data, extensionRegistry);
- }
- public static org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule parseFrom(java.io.InputStream input)
- throws java.io.IOException {
- return PARSER.parseFrom(input);
- }
- public static org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule parseFrom(
- java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return PARSER.parseFrom(input, extensionRegistry);
- }
- public static org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule parseDelimitedFrom(java.io.InputStream input)
- throws java.io.IOException {
- return PARSER.parseDelimitedFrom(input);
- }
- public static org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule parseDelimitedFrom(
- java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return PARSER.parseDelimitedFrom(input, extensionRegistry);
- }
- public static org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule parseFrom(
- com.google.protobuf.CodedInputStream input)
- throws java.io.IOException {
- return PARSER.parseFrom(input);
- }
- public static org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule 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.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule 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 SyntaxHighlighting.HighlightingRule}
- */
- public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder> implements
- // @@protoc_insertion_point(builder_implements:SyntaxHighlighting.HighlightingRule)
- org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRuleOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
- getDescriptor() {
- return org.sonar.batch.protocol.output.BatchReport.internal_static_SyntaxHighlighting_HighlightingRule_descriptor;
- }
-
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
- internalGetFieldAccessorTable() {
- return org.sonar.batch.protocol.output.BatchReport.internal_static_SyntaxHighlighting_HighlightingRule_fieldAccessorTable
- .ensureFieldAccessorsInitialized(
- org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule.class, org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule.Builder.class);
- }
-
- // Construct using org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule.newBuilder()
- private Builder() {
- maybeForceBuilderInitialization();
- }
-
- private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
- super(parent);
- maybeForceBuilderInitialization();
- }
- private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
- getRangeFieldBuilder();
- }
- }
- private static Builder create() {
- return new Builder();
- }
-
- public Builder clear() {
- super.clear();
- if (rangeBuilder_ == null) {
- range_ = org.sonar.batch.protocol.output.BatchReport.Range.getDefaultInstance();
- } else {
- rangeBuilder_.clear();
- }
- bitField0_ = (bitField0_ & ~0x00000001);
- type_ = org.sonar.batch.protocol.Constants.HighlightingType.ANNOTATION;
- bitField0_ = (bitField0_ & ~0x00000002);
- return this;
- }
-
- public Builder clone() {
- return create().mergeFrom(buildPartial());
- }
-
- public com.google.protobuf.Descriptors.Descriptor
- getDescriptorForType() {
- return org.sonar.batch.protocol.output.BatchReport.internal_static_SyntaxHighlighting_HighlightingRule_descriptor;
- }
-
- public org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule getDefaultInstanceForType() {
- return org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule.getDefaultInstance();
- }
-
- public org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule build() {
- org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule result = buildPartial();
- if (!result.isInitialized()) {
- throw newUninitializedMessageException(result);
- }
- return result;
- }
-
- public org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule buildPartial() {
- org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule result = new org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule(this);
- int from_bitField0_ = bitField0_;
- int to_bitField0_ = 0;
- if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
- to_bitField0_ |= 0x00000001;
- }
- if (rangeBuilder_ == null) {
- result.range_ = range_;
- } else {
- result.range_ = rangeBuilder_.build();
- }
- if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
- to_bitField0_ |= 0x00000002;
- }
- result.type_ = type_;
- result.bitField0_ = to_bitField0_;
- onBuilt();
- return result;
- }
-
- public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule) {
- return mergeFrom((org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule)other);
- } else {
- super.mergeFrom(other);
- return this;
- }
- }
-
- public Builder mergeFrom(org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule other) {
- if (other == org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule.getDefaultInstance()) return this;
- if (other.hasRange()) {
- mergeRange(other.getRange());
- }
- if (other.hasType()) {
- setType(other.getType());
- }
- 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.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule parsedMessage = null;
- try {
- parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule) e.getUnfinishedMessage();
- throw e;
- } finally {
- if (parsedMessage != null) {
- mergeFrom(parsedMessage);
- }
- }
- return this;
- }
- private int bitField0_;
-
- private org.sonar.batch.protocol.output.BatchReport.Range range_ = org.sonar.batch.protocol.output.BatchReport.Range.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
- org.sonar.batch.protocol.output.BatchReport.Range, org.sonar.batch.protocol.output.BatchReport.Range.Builder, org.sonar.batch.protocol.output.BatchReport.RangeOrBuilder> rangeBuilder_;
- /**
- * <code>optional .Range range = 1;</code>
- */
- public boolean hasRange() {
- return ((bitField0_ & 0x00000001) == 0x00000001);
- }
- /**
- * <code>optional .Range range = 1;</code>
- */
- public org.sonar.batch.protocol.output.BatchReport.Range getRange() {
- if (rangeBuilder_ == null) {
- return range_;
- } else {
- return rangeBuilder_.getMessage();
- }
- }
- /**
- * <code>optional .Range range = 1;</code>
- */
- public Builder setRange(org.sonar.batch.protocol.output.BatchReport.Range value) {
- if (rangeBuilder_ == null) {
- if (value == null) {
- throw new NullPointerException();
- }
- range_ = value;
- onChanged();
- } else {
- rangeBuilder_.setMessage(value);
- }
- bitField0_ |= 0x00000001;
- return this;
- }
- /**
- * <code>optional .Range range = 1;</code>
- */
- public Builder setRange(
- org.sonar.batch.protocol.output.BatchReport.Range.Builder builderForValue) {
- if (rangeBuilder_ == null) {
- range_ = builderForValue.build();
- onChanged();
- } else {
- rangeBuilder_.setMessage(builderForValue.build());
- }
- bitField0_ |= 0x00000001;
- return this;
- }
- /**
- * <code>optional .Range range = 1;</code>
- */
- public Builder mergeRange(org.sonar.batch.protocol.output.BatchReport.Range value) {
- if (rangeBuilder_ == null) {
- if (((bitField0_ & 0x00000001) == 0x00000001) &&
- range_ != org.sonar.batch.protocol.output.BatchReport.Range.getDefaultInstance()) {
- range_ =
- org.sonar.batch.protocol.output.BatchReport.Range.newBuilder(range_).mergeFrom(value).buildPartial();
- } else {
- range_ = value;
- }
- onChanged();
- } else {
- rangeBuilder_.mergeFrom(value);
- }
- bitField0_ |= 0x00000001;
- return this;
- }
- /**
- * <code>optional .Range range = 1;</code>
- */
- public Builder clearRange() {
- if (rangeBuilder_ == null) {
- range_ = org.sonar.batch.protocol.output.BatchReport.Range.getDefaultInstance();
- onChanged();
- } else {
- rangeBuilder_.clear();
- }
- bitField0_ = (bitField0_ & ~0x00000001);
- return this;
- }
- /**
- * <code>optional .Range range = 1;</code>
- */
- public org.sonar.batch.protocol.output.BatchReport.Range.Builder getRangeBuilder() {
- bitField0_ |= 0x00000001;
- onChanged();
- return getRangeFieldBuilder().getBuilder();
- }
- /**
- * <code>optional .Range range = 1;</code>
- */
- public org.sonar.batch.protocol.output.BatchReport.RangeOrBuilder getRangeOrBuilder() {
- if (rangeBuilder_ != null) {
- return rangeBuilder_.getMessageOrBuilder();
- } else {
- return range_;
- }
- }
- /**
- * <code>optional .Range range = 1;</code>
- */
- private com.google.protobuf.SingleFieldBuilder<
- org.sonar.batch.protocol.output.BatchReport.Range, org.sonar.batch.protocol.output.BatchReport.Range.Builder, org.sonar.batch.protocol.output.BatchReport.RangeOrBuilder>
- getRangeFieldBuilder() {
- if (rangeBuilder_ == null) {
- rangeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
- org.sonar.batch.protocol.output.BatchReport.Range, org.sonar.batch.protocol.output.BatchReport.Range.Builder, org.sonar.batch.protocol.output.BatchReport.RangeOrBuilder>(
- getRange(),
- getParentForChildren(),
- isClean());
- range_ = null;
- }
- return rangeBuilder_;
- }
-
- private org.sonar.batch.protocol.Constants.HighlightingType type_ = org.sonar.batch.protocol.Constants.HighlightingType.ANNOTATION;
- /**
- * <code>optional .HighlightingType type = 2;</code>
- */
- public boolean hasType() {
- return ((bitField0_ & 0x00000002) == 0x00000002);
- }
- /**
- * <code>optional .HighlightingType type = 2;</code>
- */
- public org.sonar.batch.protocol.Constants.HighlightingType getType() {
- return type_;
- }
- /**
- * <code>optional .HighlightingType type = 2;</code>
- */
- public Builder setType(org.sonar.batch.protocol.Constants.HighlightingType value) {
- if (value == null) {
- throw new NullPointerException();
- }
- bitField0_ |= 0x00000002;
- type_ = value;
- onChanged();
- return this;
- }
- /**
- * <code>optional .HighlightingType type = 2;</code>
- */
- public Builder clearType() {
- bitField0_ = (bitField0_ & ~0x00000002);
- type_ = org.sonar.batch.protocol.Constants.HighlightingType.ANNOTATION;
- onChanged();
- return this;
- }
-
- // @@protoc_insertion_point(builder_scope:SyntaxHighlighting.HighlightingRule)
- }
-
- static {
- defaultInstance = new HighlightingRule(true);
- defaultInstance.initFields();
- }
-
- // @@protoc_insertion_point(class_scope:SyntaxHighlighting.HighlightingRule)
- }
-
private int bitField0_;
- public static final int FILE_REF_FIELD_NUMBER = 1;
- private int fileRef_;
+ public static final int RANGE_FIELD_NUMBER = 1;
+ private org.sonar.batch.protocol.output.BatchReport.Range range_;
/**
- * <code>optional int32 file_ref = 1;</code>
+ * <code>optional .Range range = 1;</code>
*/
- public boolean hasFileRef() {
+ public boolean hasRange() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
- * <code>optional int32 file_ref = 1;</code>
- */
- public int getFileRef() {
- return fileRef_;
- }
-
- public static final int HIGHLIGHTING_RULE_FIELD_NUMBER = 2;
- private java.util.List<org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule> highlightingRule_;
- /**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
- */
- public java.util.List<org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule> getHighlightingRuleList() {
- return highlightingRule_;
- }
- /**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
+ * <code>optional .Range range = 1;</code>
*/
- public java.util.List<? extends org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRuleOrBuilder>
- getHighlightingRuleOrBuilderList() {
- return highlightingRule_;
+ public org.sonar.batch.protocol.output.BatchReport.Range getRange() {
+ return range_;
}
/**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
+ * <code>optional .Range range = 1;</code>
*/
- public int getHighlightingRuleCount() {
- return highlightingRule_.size();
+ public org.sonar.batch.protocol.output.BatchReport.RangeOrBuilder getRangeOrBuilder() {
+ return range_;
}
+
+ public static final int TYPE_FIELD_NUMBER = 2;
+ private org.sonar.batch.protocol.Constants.HighlightingType type_;
/**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
+ * <code>optional .HighlightingType type = 2;</code>
*/
- public org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule getHighlightingRule(int index) {
- return highlightingRule_.get(index);
+ public boolean hasType() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
+ * <code>optional .HighlightingType type = 2;</code>
*/
- public org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRuleOrBuilder getHighlightingRuleOrBuilder(
- int index) {
- return highlightingRule_.get(index);
+ public org.sonar.batch.protocol.Constants.HighlightingType getType() {
+ return type_;
}
private void initFields() {
- fileRef_ = 0;
- highlightingRule_ = java.util.Collections.emptyList();
+ range_ = org.sonar.batch.protocol.output.BatchReport.Range.getDefaultInstance();
+ type_ = org.sonar.batch.protocol.Constants.HighlightingType.ANNOTATION;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -21322,10 +20677,10 @@ public final class BatchReport {
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- output.writeInt32(1, fileRef_);
+ output.writeMessage(1, range_);
}
- for (int i = 0; i < highlightingRule_.size(); i++) {
- output.writeMessage(2, highlightingRule_.get(i));
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeEnum(2, type_.getNumber());
}
getUnknownFields().writeTo(output);
}
@@ -21338,11 +20693,11 @@ public final class BatchReport {
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream
- .computeInt32Size(1, fileRef_);
+ .computeMessageSize(1, range_);
}
- for (int i = 0; i < highlightingRule_.size(); i++) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(2, highlightingRule_.get(i));
+ .computeEnumSize(2, type_.getNumber());
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
@@ -21424,6 +20779,11 @@ public final class BatchReport {
}
/**
* Protobuf type {@code SyntaxHighlighting}
+ *
+ * <pre>
+ * Must be sorted by line and start offset
+ * TODO rename it SyntaxHighlightingRule ?
+ * </pre>
*/
public static final class Builder extends
com.google.protobuf.GeneratedMessage.Builder<Builder> implements
@@ -21453,7 +20813,7 @@ public final class BatchReport {
}
private void maybeForceBuilderInitialization() {
if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
- getHighlightingRuleFieldBuilder();
+ getRangeFieldBuilder();
}
}
private static Builder create() {
@@ -21462,14 +20822,14 @@ public final class BatchReport {
public Builder clear() {
super.clear();
- fileRef_ = 0;
- bitField0_ = (bitField0_ & ~0x00000001);
- if (highlightingRuleBuilder_ == null) {
- highlightingRule_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000002);
+ if (rangeBuilder_ == null) {
+ range_ = org.sonar.batch.protocol.output.BatchReport.Range.getDefaultInstance();
} else {
- highlightingRuleBuilder_.clear();
+ rangeBuilder_.clear();
}
+ bitField0_ = (bitField0_ & ~0x00000001);
+ type_ = org.sonar.batch.protocol.Constants.HighlightingType.ANNOTATION;
+ bitField0_ = (bitField0_ & ~0x00000002);
return this;
}
@@ -21501,16 +20861,15 @@ public final class BatchReport {
if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
to_bitField0_ |= 0x00000001;
}
- result.fileRef_ = fileRef_;
- if (highlightingRuleBuilder_ == null) {
- if (((bitField0_ & 0x00000002) == 0x00000002)) {
- highlightingRule_ = java.util.Collections.unmodifiableList(highlightingRule_);
- bitField0_ = (bitField0_ & ~0x00000002);
- }
- result.highlightingRule_ = highlightingRule_;
+ if (rangeBuilder_ == null) {
+ result.range_ = range_;
} else {
- result.highlightingRule_ = highlightingRuleBuilder_.build();
+ result.range_ = rangeBuilder_.build();
+ }
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000002;
}
+ result.type_ = type_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@@ -21527,34 +20886,11 @@ public final class BatchReport {
public Builder mergeFrom(org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting other) {
if (other == org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.getDefaultInstance()) return this;
- if (other.hasFileRef()) {
- setFileRef(other.getFileRef());
+ if (other.hasRange()) {
+ mergeRange(other.getRange());
}
- if (highlightingRuleBuilder_ == null) {
- if (!other.highlightingRule_.isEmpty()) {
- if (highlightingRule_.isEmpty()) {
- highlightingRule_ = other.highlightingRule_;
- bitField0_ = (bitField0_ & ~0x00000002);
- } else {
- ensureHighlightingRuleIsMutable();
- highlightingRule_.addAll(other.highlightingRule_);
- }
- onChanged();
- }
- } else {
- if (!other.highlightingRule_.isEmpty()) {
- if (highlightingRuleBuilder_.isEmpty()) {
- highlightingRuleBuilder_.dispose();
- highlightingRuleBuilder_ = null;
- highlightingRule_ = other.highlightingRule_;
- bitField0_ = (bitField0_ & ~0x00000002);
- highlightingRuleBuilder_ =
- com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
- getHighlightingRuleFieldBuilder() : null;
- } else {
- highlightingRuleBuilder_.addAllMessages(other.highlightingRule_);
- }
- }
+ if (other.hasType()) {
+ setType(other.getType());
}
this.mergeUnknownFields(other.getUnknownFields());
return this;
@@ -21583,348 +20919,155 @@ public final class BatchReport {
}
private int bitField0_;
- private int fileRef_ ;
+ private org.sonar.batch.protocol.output.BatchReport.Range range_ = org.sonar.batch.protocol.output.BatchReport.Range.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ org.sonar.batch.protocol.output.BatchReport.Range, org.sonar.batch.protocol.output.BatchReport.Range.Builder, org.sonar.batch.protocol.output.BatchReport.RangeOrBuilder> rangeBuilder_;
/**
- * <code>optional int32 file_ref = 1;</code>
+ * <code>optional .Range range = 1;</code>
*/
- public boolean hasFileRef() {
+ public boolean hasRange() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
- * <code>optional int32 file_ref = 1;</code>
- */
- public int getFileRef() {
- return fileRef_;
- }
- /**
- * <code>optional int32 file_ref = 1;</code>
- */
- public Builder setFileRef(int value) {
- bitField0_ |= 0x00000001;
- fileRef_ = value;
- onChanged();
- return this;
- }
- /**
- * <code>optional int32 file_ref = 1;</code>
- */
- public Builder clearFileRef() {
- bitField0_ = (bitField0_ & ~0x00000001);
- fileRef_ = 0;
- onChanged();
- return this;
- }
-
- private java.util.List<org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule> highlightingRule_ =
- java.util.Collections.emptyList();
- private void ensureHighlightingRuleIsMutable() {
- if (!((bitField0_ & 0x00000002) == 0x00000002)) {
- highlightingRule_ = new java.util.ArrayList<org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule>(highlightingRule_);
- bitField0_ |= 0x00000002;
- }
- }
-
- private com.google.protobuf.RepeatedFieldBuilder<
- org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule, org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule.Builder, org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRuleOrBuilder> highlightingRuleBuilder_;
-
- /**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
- */
- public java.util.List<org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule> getHighlightingRuleList() {
- if (highlightingRuleBuilder_ == null) {
- return java.util.Collections.unmodifiableList(highlightingRule_);
- } else {
- return highlightingRuleBuilder_.getMessageList();
- }
- }
- /**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
- */
- public int getHighlightingRuleCount() {
- if (highlightingRuleBuilder_ == null) {
- return highlightingRule_.size();
- } else {
- return highlightingRuleBuilder_.getCount();
- }
- }
- /**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
+ * <code>optional .Range range = 1;</code>
*/
- public org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule getHighlightingRule(int index) {
- if (highlightingRuleBuilder_ == null) {
- return highlightingRule_.get(index);
+ public org.sonar.batch.protocol.output.BatchReport.Range getRange() {
+ if (rangeBuilder_ == null) {
+ return range_;
} else {
- return highlightingRuleBuilder_.getMessage(index);
+ return rangeBuilder_.getMessage();
}
}
/**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
+ * <code>optional .Range range = 1;</code>
*/
- public Builder setHighlightingRule(
- int index, org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule value) {
- if (highlightingRuleBuilder_ == null) {
+ public Builder setRange(org.sonar.batch.protocol.output.BatchReport.Range value) {
+ if (rangeBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
- ensureHighlightingRuleIsMutable();
- highlightingRule_.set(index, value);
- onChanged();
- } else {
- highlightingRuleBuilder_.setMessage(index, value);
- }
- return this;
- }
- /**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
- */
- public Builder setHighlightingRule(
- int index, org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule.Builder builderForValue) {
- if (highlightingRuleBuilder_ == null) {
- ensureHighlightingRuleIsMutable();
- highlightingRule_.set(index, builderForValue.build());
+ range_ = value;
onChanged();
} else {
- highlightingRuleBuilder_.setMessage(index, builderForValue.build());
+ rangeBuilder_.setMessage(value);
}
+ bitField0_ |= 0x00000001;
return this;
}
/**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
+ * <code>optional .Range range = 1;</code>
*/
- public Builder addHighlightingRule(org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule value) {
- if (highlightingRuleBuilder_ == null) {
- if (value == null) {
- throw new NullPointerException();
- }
- ensureHighlightingRuleIsMutable();
- highlightingRule_.add(value);
+ public Builder setRange(
+ org.sonar.batch.protocol.output.BatchReport.Range.Builder builderForValue) {
+ if (rangeBuilder_ == null) {
+ range_ = builderForValue.build();
onChanged();
} else {
- highlightingRuleBuilder_.addMessage(value);
+ rangeBuilder_.setMessage(builderForValue.build());
}
+ bitField0_ |= 0x00000001;
return this;
}
/**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
+ * <code>optional .Range range = 1;</code>
*/
- public Builder addHighlightingRule(
- int index, org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule value) {
- if (highlightingRuleBuilder_ == null) {
- if (value == null) {
- throw new NullPointerException();
+ public Builder mergeRange(org.sonar.batch.protocol.output.BatchReport.Range value) {
+ if (rangeBuilder_ == null) {
+ if (((bitField0_ & 0x00000001) == 0x00000001) &&
+ range_ != org.sonar.batch.protocol.output.BatchReport.Range.getDefaultInstance()) {
+ range_ =
+ org.sonar.batch.protocol.output.BatchReport.Range.newBuilder(range_).mergeFrom(value).buildPartial();
+ } else {
+ range_ = value;
}
- ensureHighlightingRuleIsMutable();
- highlightingRule_.add(index, value);
onChanged();
} else {
- highlightingRuleBuilder_.addMessage(index, value);
- }
- return this;
- }
- /**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
- */
- public Builder addHighlightingRule(
- org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule.Builder builderForValue) {
- if (highlightingRuleBuilder_ == null) {
- ensureHighlightingRuleIsMutable();
- highlightingRule_.add(builderForValue.build());
- onChanged();
- } else {
- highlightingRuleBuilder_.addMessage(builderForValue.build());
+ rangeBuilder_.mergeFrom(value);
}
+ bitField0_ |= 0x00000001;
return this;
}
/**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
+ * <code>optional .Range range = 1;</code>
*/
- public Builder addHighlightingRule(
- int index, org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule.Builder builderForValue) {
- if (highlightingRuleBuilder_ == null) {
- ensureHighlightingRuleIsMutable();
- highlightingRule_.add(index, builderForValue.build());
+ public Builder clearRange() {
+ if (rangeBuilder_ == null) {
+ range_ = org.sonar.batch.protocol.output.BatchReport.Range.getDefaultInstance();
onChanged();
} else {
- highlightingRuleBuilder_.addMessage(index, builderForValue.build());
+ rangeBuilder_.clear();
}
+ bitField0_ = (bitField0_ & ~0x00000001);
return this;
}
/**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
+ * <code>optional .Range range = 1;</code>
*/
- public Builder addAllHighlightingRule(
- java.lang.Iterable<? extends org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule> values) {
- if (highlightingRuleBuilder_ == null) {
- ensureHighlightingRuleIsMutable();
- com.google.protobuf.AbstractMessageLite.Builder.addAll(
- values, highlightingRule_);
- onChanged();
- } else {
- highlightingRuleBuilder_.addAllMessages(values);
- }
- return this;
+ public org.sonar.batch.protocol.output.BatchReport.Range.Builder getRangeBuilder() {
+ bitField0_ |= 0x00000001;
+ onChanged();
+ return getRangeFieldBuilder().getBuilder();
}
/**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
+ * <code>optional .Range range = 1;</code>
*/
- public Builder clearHighlightingRule() {
- if (highlightingRuleBuilder_ == null) {
- highlightingRule_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000002);
- onChanged();
+ public org.sonar.batch.protocol.output.BatchReport.RangeOrBuilder getRangeOrBuilder() {
+ if (rangeBuilder_ != null) {
+ return rangeBuilder_.getMessageOrBuilder();
} else {
- highlightingRuleBuilder_.clear();
+ return range_;
}
- return this;
}
/**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
+ * <code>optional .Range range = 1;</code>
*/
- public Builder removeHighlightingRule(int index) {
- if (highlightingRuleBuilder_ == null) {
- ensureHighlightingRuleIsMutable();
- highlightingRule_.remove(index);
- onChanged();
- } else {
- highlightingRuleBuilder_.remove(index);
+ private com.google.protobuf.SingleFieldBuilder<
+ org.sonar.batch.protocol.output.BatchReport.Range, org.sonar.batch.protocol.output.BatchReport.Range.Builder, org.sonar.batch.protocol.output.BatchReport.RangeOrBuilder>
+ getRangeFieldBuilder() {
+ if (rangeBuilder_ == null) {
+ rangeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ org.sonar.batch.protocol.output.BatchReport.Range, org.sonar.batch.protocol.output.BatchReport.Range.Builder, org.sonar.batch.protocol.output.BatchReport.RangeOrBuilder>(
+ getRange(),
+ getParentForChildren(),
+ isClean());
+ range_ = null;
}
- return this;
+ return rangeBuilder_;
}
+
+ private org.sonar.batch.protocol.Constants.HighlightingType type_ = org.sonar.batch.protocol.Constants.HighlightingType.ANNOTATION;
/**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
+ * <code>optional .HighlightingType type = 2;</code>
*/
- public org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule.Builder getHighlightingRuleBuilder(
- int index) {
- return getHighlightingRuleFieldBuilder().getBuilder(index);
+ public boolean hasType() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
+ * <code>optional .HighlightingType type = 2;</code>
*/
- public org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRuleOrBuilder getHighlightingRuleOrBuilder(
- int index) {
- if (highlightingRuleBuilder_ == null) {
- return highlightingRule_.get(index); } else {
- return highlightingRuleBuilder_.getMessageOrBuilder(index);
- }
+ public org.sonar.batch.protocol.Constants.HighlightingType getType() {
+ return type_;
}
/**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
+ * <code>optional .HighlightingType type = 2;</code>
*/
- public java.util.List<? extends org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRuleOrBuilder>
- getHighlightingRuleOrBuilderList() {
- if (highlightingRuleBuilder_ != null) {
- return highlightingRuleBuilder_.getMessageOrBuilderList();
- } else {
- return java.util.Collections.unmodifiableList(highlightingRule_);
+ public Builder setType(org.sonar.batch.protocol.Constants.HighlightingType value) {
+ if (value == null) {
+ throw new NullPointerException();
}
+ bitField0_ |= 0x00000002;
+ type_ = value;
+ onChanged();
+ return this;
}
/**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
- */
- public org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule.Builder addHighlightingRuleBuilder() {
- return getHighlightingRuleFieldBuilder().addBuilder(
- org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule.getDefaultInstance());
- }
- /**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
- */
- public org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule.Builder addHighlightingRuleBuilder(
- int index) {
- return getHighlightingRuleFieldBuilder().addBuilder(
- index, org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule.getDefaultInstance());
- }
- /**
- * <code>repeated .SyntaxHighlighting.HighlightingRule highlighting_rule = 2;</code>
- *
- * <pre>
- * Rule must be sorted by line and start offset
- * </pre>
+ * <code>optional .HighlightingType type = 2;</code>
*/
- public java.util.List<org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule.Builder>
- getHighlightingRuleBuilderList() {
- return getHighlightingRuleFieldBuilder().getBuilderList();
- }
- private com.google.protobuf.RepeatedFieldBuilder<
- org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule, org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule.Builder, org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRuleOrBuilder>
- getHighlightingRuleFieldBuilder() {
- if (highlightingRuleBuilder_ == null) {
- highlightingRuleBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
- org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule, org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRule.Builder, org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.HighlightingRuleOrBuilder>(
- highlightingRule_,
- ((bitField0_ & 0x00000002) == 0x00000002),
- getParentForChildren(),
- isClean());
- highlightingRule_ = null;
- }
- return highlightingRuleBuilder_;
+ public Builder clearType() {
+ bitField0_ = (bitField0_ & ~0x00000002);
+ type_ = org.sonar.batch.protocol.Constants.HighlightingType.ANNOTATION;
+ onChanged();
+ return this;
}
// @@protoc_insertion_point(builder_scope:SyntaxHighlighting)
@@ -22028,11 +21171,6 @@ public final class BatchReport {
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_SyntaxHighlighting_fieldAccessorTable;
- private static final com.google.protobuf.Descriptors.Descriptor
- internal_static_SyntaxHighlighting_HighlightingRule_descriptor;
- private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
- internal_static_SyntaxHighlighting_HighlightingRule_fieldAccessorTable;
public static com.google.protobuf.Descriptors.FileDescriptor
getDescriptor() {
@@ -22107,13 +21245,10 @@ public final class BatchReport {
"nditions\030\002 \001(\005\022\017\n\007ut_hits\030\003 \001(\010\022\017\n\007it_hi" +
"ts\030\004 \001(\010\022\035\n\025ut_covered_conditions\030\005 \001(\005\022" +
"\035\n\025it_covered_conditions\030\006 \001(\005\022\"\n\032overal" +
- "l_covered_conditions\030\007 \001(\005\"\263\001\n\022SyntaxHig" +
- "hlighting\022\020\n\010file_ref\030\001 \001(\005\022?\n\021highlight" +
- "ing_rule\030\002 \003(\0132$.SyntaxHighlighting.High" +
- "lightingRule\032J\n\020HighlightingRule\022\025\n\005rang" +
- "e\030\001 \001(\0132\006.Range\022\037\n\004type\030\002 \001(\0162\021.Highligh",
- "tingTypeB#\n\037org.sonar.batch.protocol.out" +
- "putH\001"
+ "l_covered_conditions\030\007 \001(\005\"L\n\022SyntaxHigh" +
+ "lighting\022\025\n\005range\030\001 \001(\0132\006.Range\022\037\n\004type\030" +
+ "\002 \001(\0162\021.HighlightingTypeB#\n\037org.sonar.ba" +
+ "tch.protocol.outputH\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
@@ -22235,12 +21370,6 @@ public final class BatchReport {
internal_static_SyntaxHighlighting_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_SyntaxHighlighting_descriptor,
- new java.lang.String[] { "FileRef", "HighlightingRule", });
- internal_static_SyntaxHighlighting_HighlightingRule_descriptor =
- internal_static_SyntaxHighlighting_descriptor.getNestedTypes().get(0);
- internal_static_SyntaxHighlighting_HighlightingRule_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_SyntaxHighlighting_HighlightingRule_descriptor,
new java.lang.String[] { "Range", "Type", });
org.sonar.batch.protocol.Constants.getDescriptor();
}
diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/BatchReportReader.java b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/BatchReportReader.java
index 90720f6e5e1..fa11aa19b1b 100644
--- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/BatchReportReader.java
+++ b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/BatchReportReader.java
@@ -115,18 +115,17 @@ public class BatchReportReader {
return file.exists();
}
- public List<BatchReport.SyntaxHighlighting.HighlightingRule> readComponentSyntaxHighlighting(int componentRef) {
- File file = fileStructure.fileFor(FileStructure.Domain.SYNTAX_HIGHLIGHTING, componentRef);
- if (file.exists() && file.isFile()) {
- // all the highlighting are loaded in memory
- BatchReport.SyntaxHighlighting syntaxHighlighting = ProtobufUtil.readFile(file, BatchReport.SyntaxHighlighting.PARSER);
- return syntaxHighlighting.getHighlightingRuleList();
+ @CheckForNull
+ public File readComponentSyntaxHighlighting(int fileRef) {
+ File file = fileStructure.fileFor(FileStructure.Domain.SYNTAX_HIGHLIGHTING, fileRef);
+ if (doesFileExists(file)) {
+ return file;
}
- return Collections.emptyList();
+ return null;
}
@CheckForNull
- public File readFileCoverage(int fileRef) {
+ public File readComponentCoverage(int fileRef) {
File file = fileStructure.fileFor(FileStructure.Domain.COVERAGE, fileRef);
if (doesFileExists(file)) {
return file;
diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/BatchReportWriter.java b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/BatchReportWriter.java
index 86ec1c53f6e..8011382f086 100644
--- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/BatchReportWriter.java
+++ b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/output/BatchReportWriter.java
@@ -105,15 +105,12 @@ public class BatchReportWriter {
ProtobufUtil.writeToFile(builder.build(), file);
}
- public void writeComponentSyntaxHighlighting(int componentRef, Iterable<BatchReport.SyntaxHighlighting.HighlightingRule> highlightingRules) {
- BatchReport.SyntaxHighlighting.Builder builder = BatchReport.SyntaxHighlighting.newBuilder();
- builder.setFileRef(componentRef);
- builder.addAllHighlightingRule(highlightingRules);
+ public void writeComponentSyntaxHighlighting(int componentRef, Iterable<BatchReport.SyntaxHighlighting> syntaxHighlightingRules) {
File file = fileStructure.fileFor(FileStructure.Domain.SYNTAX_HIGHLIGHTING, componentRef);
- ProtobufUtil.writeToFile(builder.build(), file);
+ ProtobufUtil.writeMessagesToFile(syntaxHighlightingRules, file);
}
- public void writeFileCoverage(int componentRef, Iterable<BatchReport.Coverage> coverageList) {
+ public void writeComponentCoverage(int componentRef, Iterable<BatchReport.Coverage> coverageList) {
File file = fileStructure.fileFor(FileStructure.Domain.COVERAGE, componentRef);
ProtobufUtil.writeMessagesToFile(coverageList, file);
}
diff --git a/sonar-batch-protocol/src/main/protobuf/batch_report.proto b/sonar-batch-protocol/src/main/protobuf/batch_report.proto
index 52c746be7a0..3ab4bfc463f 100644
--- a/sonar-batch-protocol/src/main/protobuf/batch_report.proto
+++ b/sonar-batch-protocol/src/main/protobuf/batch_report.proto
@@ -213,6 +213,7 @@ message Symbols {
}
// Only FILE component has coverage information
+// TODO rename it LineCoverage ?
message Coverage {
optional int32 line = 1;
@@ -225,14 +226,10 @@ message Coverage {
optional int32 overall_covered_conditions = 7;
}
+// Must be sorted by line and start offset
+// TODO rename it SyntaxHighlightingRule ?
message SyntaxHighlighting {
- optional int32 file_ref = 1;
- // Rule must be sorted by line and start offset
- repeated HighlightingRule highlighting_rule = 2;
-
- message HighlightingRule {
- optional Range range = 1;
- optional HighlightingType type = 2;
- }
+ optional Range range = 1;
+ optional HighlightingType type = 2;
}
diff --git a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchReportReaderTest.java b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchReportReaderTest.java
index 184e1209804..4d785ba153f 100644
--- a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchReportReaderTest.java
+++ b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchReportReaderTest.java
@@ -109,24 +109,31 @@ public class BatchReportReaderTest {
BatchReportWriter writer = new BatchReportWriter(dir);
writer.writeMetadata(BatchReport.Metadata.newBuilder()
- .setRootComponentRef(1).build());
+ .setRootComponentRef(1)
+ .build());
writer.writeComponent(BatchReport.Component.newBuilder()
.setRef(1).build());
- BatchReport.SyntaxHighlighting.HighlightingRule highlightingRule = BatchReport.SyntaxHighlighting.HighlightingRule.newBuilder()
- .setRange(BatchReport.Range.newBuilder()
- .setStartLine(1)
- .setEndLine(1)
- .build())
- .setType(Constants.HighlightingType.ANNOTATION)
- .build();
- writer.writeComponentSyntaxHighlighting(1, Arrays.asList(highlightingRule));
+ writer.writeComponentSyntaxHighlighting(1, Arrays.asList(
+ BatchReport.SyntaxHighlighting.newBuilder()
+ .setRange(BatchReport.Range.newBuilder()
+ .setStartLine(1)
+ .setEndLine(10)
+ .build())
+ .setType(Constants.HighlightingType.ANNOTATION)
+ .build()
+ ));
- BatchReportReader sut = new BatchReportReader(dir);
- assertThat(sut.readComponentSyntaxHighlighting(1)).hasSize(1);
- assertThat(sut.readComponentSyntaxHighlighting(1).get(0).getRange()).isNotNull();
- assertThat(sut.readComponentSyntaxHighlighting(1).get(0).getType()).isEqualTo(Constants.HighlightingType.ANNOTATION);
+ sut = new BatchReportReader(dir);
+
+ try (InputStream inputStream = FileUtils.openInputStream(new BatchReportReader(dir).readComponentSyntaxHighlighting(1))) {
+ BatchReport.SyntaxHighlighting syntaxHighlighting = BatchReport.SyntaxHighlighting.PARSER.parseDelimitedFrom(inputStream);
+ assertThat(syntaxHighlighting.getRange()).isNotNull();
+ assertThat(syntaxHighlighting.getRange().getStartLine()).isEqualTo(1);
+ assertThat(syntaxHighlighting.getRange().getEndLine()).isEqualTo(10);
+ assertThat(syntaxHighlighting.getType()).isEqualTo(Constants.HighlightingType.ANNOTATION);
+ }
}
@Test
@@ -174,7 +181,7 @@ public class BatchReportReaderTest {
writer.writeComponent(BatchReport.Component.newBuilder()
.setRef(1).build());
- writer.writeFileCoverage(1, Arrays.asList(
+ writer.writeComponentCoverage(1, Arrays.asList(
BatchReport.Coverage.newBuilder()
.setLine(1)
.setConditions(1)
@@ -196,7 +203,7 @@ public class BatchReportReaderTest {
sut = new BatchReportReader(dir);
- try (InputStream inputStream = FileUtils.openInputStream(new BatchReportReader(dir).readFileCoverage(1))) {
+ try (InputStream inputStream = FileUtils.openInputStream(new BatchReportReader(dir).readComponentCoverage(1))) {
BatchReport.Coverage coverage = BatchReport.Coverage.PARSER.parseDelimitedFrom(inputStream);
assertThat(coverage.getLine()).isEqualTo(1);
assertThat(coverage.getConditions()).isEqualTo(1);
@@ -264,18 +271,18 @@ public class BatchReportReaderTest {
}
@Test
- public void empty_list_if_no_highlighting_found() throws Exception {
- assertThat(sut.readComponentSyntaxHighlighting(123)).isEmpty();
+ public void return_null_if_no_highlighting_found() throws Exception {
+ assertThat(sut.readComponentSyntaxHighlighting(123)).isNull();
}
@Test
public void return_null_if_no_coverage_found() throws Exception {
- assertThat(sut.readFileCoverage(123)).isNull();
+ assertThat(sut.readComponentCoverage(123)).isNull();
}
@Test
public void return_null_if_no_source_found() throws Exception {
- assertThat(sut.readFileCoverage(123)).isNull();
+ assertThat(sut.readComponentCoverage(123)).isNull();
}
/**
diff --git a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchReportWriterTest.java b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchReportWriterTest.java
index b0d666a52d7..c58ecbb67df 100644
--- a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchReportWriterTest.java
+++ b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchReportWriterTest.java
@@ -277,24 +277,20 @@ public class BatchReportWriterTest {
File dir = temp.newFolder();
BatchReportWriter writer = new BatchReportWriter(dir);
+ // no data yet
assertThat(writer.hasComponentData(FileStructure.Domain.SYNTAX_HIGHLIGHTING, 1)).isFalse();
- BatchReport.SyntaxHighlighting.HighlightingRule highlightingRule = BatchReport.SyntaxHighlighting.HighlightingRule.newBuilder()
- .setRange(BatchReport.Range.newBuilder()
- .setStartLine(1)
- .setEndLine(1)
- .build())
- .setType(Constants.HighlightingType.ANNOTATION)
- .build();
- writer.writeComponentSyntaxHighlighting(1, Arrays.asList(highlightingRule));
+ writer.writeComponentSyntaxHighlighting(1, Arrays.asList(
+ BatchReport.SyntaxHighlighting.newBuilder()
+ .setRange(BatchReport.Range.newBuilder()
+ .setStartLine(1)
+ .setEndLine(1)
+ .build())
+ .setType(Constants.HighlightingType.ANNOTATION)
+ .build()
+ ));
assertThat(writer.hasComponentData(FileStructure.Domain.SYNTAX_HIGHLIGHTING, 1)).isTrue();
- File file = writer.getFileStructure().fileFor(FileStructure.Domain.SYNTAX_HIGHLIGHTING, 1);
- assertThat(file).exists().isFile();
- BatchReport.SyntaxHighlighting syntaxHighlighting = ProtobufUtil.readFile(file, BatchReport.SyntaxHighlighting.PARSER);
- assertThat(syntaxHighlighting.getFileRef()).isEqualTo(1);
- assertThat(syntaxHighlighting.getHighlightingRuleList()).hasSize(1);
- assertThat(syntaxHighlighting.getHighlightingRule(0).getType()).isEqualTo(Constants.HighlightingType.ANNOTATION);
}
@Test
@@ -305,7 +301,7 @@ public class BatchReportWriterTest {
// no data yet
assertThat(writer.hasComponentData(FileStructure.Domain.COVERAGE, 1)).isFalse();
- writer.writeFileCoverage(1, Arrays.asList(
+ writer.writeComponentCoverage(1, Arrays.asList(
BatchReport.Coverage.newBuilder()
.setLine(1)
.setConditions(1)
@@ -315,7 +311,7 @@ public class BatchReportWriterTest {
.setItCoveredConditions(1)
.setOverallCoveredConditions(1)
.build()
- ));
+ ));
assertThat(writer.hasComponentData(FileStructure.Domain.COVERAGE, 1)).isTrue();
}