diff options
12 files changed, 849 insertions, 638 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java index 4c10a8be07d..1e775f705c3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java @@ -117,6 +117,7 @@ public class PersistMeasuresStep implements ComputationStep { out.setMetricId(metricCache.get(in.getMetricKey()).getId()); out.setRuleId(in.hasRuleKey() ? ruleCache.get(RuleKey.parse(in.getRuleKey())).getId() : null); out.setCharacteristicId(in.hasCharactericId() ? in.getCharactericId() : null); + out.setPersonId(in.hasPersonId() ? in.getPersonId() : null); out.setValue(valueAsDouble(in)); setData(in, out); return out; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java index 1925596643d..cba0cf1a85e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java @@ -178,6 +178,7 @@ public class PersistMeasuresStepTest extends BaseStepTest { .setMetricKey("metric-key") .setRuleKey("repo:rule-key") .setCharactericId(123456) + .setPersonId(5432) .build(); MeasureDto measure = sut.toMeasureDto(batchMeasure, component); @@ -321,6 +322,7 @@ public class PersistMeasuresStepTest extends BaseStepTest { .setComponentId(2L) .setSnapshotId(3L) .setCharacteristicId(123456) + .setPersonId(5432) .setValue(123.123d) .setTendency(2) .setVariation(1, 1.1d) diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/persistence/MeasureDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/persistence/MeasureDaoTest.java index d37060f1b1a..910f0b6ff26 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/persistence/MeasureDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/persistence/MeasureDaoTest.java @@ -141,6 +141,7 @@ public class MeasureDaoTest { .setSnapshotId(2L) .setMetricId(3) .setCharacteristicId(4) + .setPersonId(23) .setRuleId(5) .setComponentId(6L) .setValue(2.0d) diff --git a/server/sonar-server/src/test/resources/org/sonar/server/measure/persistence/MeasureDaoTest/insert-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/measure/persistence/MeasureDaoTest/insert-result.xml index 6714a2ad41c..62b7c66cac3 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/measure/persistence/MeasureDaoTest/insert-result.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/measure/persistence/MeasureDaoTest/insert-result.xml @@ -6,7 +6,7 @@ characteristic_id="4" rule_id="5" project_id="6" - person_id="[null]" + person_id="23" value="2.0" text_value="measure-value" tendency="42" diff --git a/sonar-batch-protocol/src/main/gen-java/org/sonar/batch/protocol/Constants.java b/sonar-batch-protocol/src/main/gen-java/org/sonar/batch/protocol/Constants.java index fe5456aaf32..3e6debab7a7 100644 --- a/sonar-batch-protocol/src/main/gen-java/org/sonar/batch/protocol/Constants.java +++ b/sonar-batch-protocol/src/main/gen-java/org/sonar/batch/protocol/Constants.java @@ -560,13 +560,13 @@ public final class Constants { "\006\n\002CI\020\004B\034\n\030org.sonar.batch.protocolH\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; - return null; - } - }; + new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { + public com.google.protobuf.ExtensionRegistry assignDescriptors( + com.google.protobuf.Descriptors.FileDescriptor root) { + descriptor = root; + return null; + } + }; com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { diff --git a/sonar-batch-protocol/src/main/gen-java/org/sonar/batch/protocol/input/BatchInput.java b/sonar-batch-protocol/src/main/gen-java/org/sonar/batch/protocol/input/BatchInput.java index 464e4d9bb03..6ecbcc83d31 100644 --- a/sonar-batch-protocol/src/main/gen-java/org/sonar/batch/protocol/input/BatchInput.java +++ b/sonar-batch-protocol/src/main/gen-java/org/sonar/batch/protocol/input/BatchInput.java @@ -8,10 +8,10 @@ public final class BatchInput { public static void registerAllExtensions( com.google.protobuf.ExtensionRegistry registry) { } - public interface ServerIssueOrBuilder extends - // @@protoc_insertion_point(interface_extends:ServerIssue) - com.google.protobuf.MessageOrBuilder { + public interface ServerIssueOrBuilder + extends com.google.protobuf.MessageOrBuilder { + // optional string key = 1; /** * <code>optional string key = 1;</code> */ @@ -26,6 +26,7 @@ public final class BatchInput { com.google.protobuf.ByteString getKeyBytes(); + // optional string module_key = 2; /** * <code>optional string module_key = 2;</code> */ @@ -40,6 +41,7 @@ public final class BatchInput { com.google.protobuf.ByteString getModuleKeyBytes(); + // optional string path = 3; /** * <code>optional string path = 3;</code> */ @@ -54,6 +56,7 @@ public final class BatchInput { com.google.protobuf.ByteString getPathBytes(); + // optional string rule_repository = 4; /** * <code>optional string rule_repository = 4;</code> */ @@ -68,6 +71,7 @@ public final class BatchInput { com.google.protobuf.ByteString getRuleRepositoryBytes(); + // optional string rule_key = 5; /** * <code>optional string rule_key = 5;</code> */ @@ -82,6 +86,7 @@ public final class BatchInput { com.google.protobuf.ByteString getRuleKeyBytes(); + // optional int32 line = 6; /** * <code>optional int32 line = 6;</code> */ @@ -91,6 +96,7 @@ public final class BatchInput { */ int getLine(); + // optional string msg = 7; /** * <code>optional string msg = 7;</code> */ @@ -105,6 +111,7 @@ public final class BatchInput { com.google.protobuf.ByteString getMsgBytes(); + // optional .Severity severity = 8; /** * <code>optional .Severity severity = 8;</code> */ @@ -114,6 +121,7 @@ public final class BatchInput { */ org.sonar.batch.protocol.Constants.Severity getSeverity(); + // optional bool manual_severity = 9; /** * <code>optional bool manual_severity = 9;</code> */ @@ -123,6 +131,7 @@ public final class BatchInput { */ boolean getManualSeverity(); + // optional string resolution = 10; /** * <code>optional string resolution = 10;</code> */ @@ -137,6 +146,7 @@ public final class BatchInput { com.google.protobuf.ByteString getResolutionBytes(); + // optional string status = 11; /** * <code>optional string status = 11;</code> */ @@ -151,6 +161,7 @@ public final class BatchInput { com.google.protobuf.ByteString getStatusBytes(); + // optional string checksum = 12; /** * <code>optional string checksum = 12;</code> */ @@ -165,6 +176,7 @@ public final class BatchInput { com.google.protobuf.ByteString getChecksumBytes(); + // optional string assignee_login = 13; /** * <code>optional string assignee_login = 13;</code> */ @@ -179,6 +191,7 @@ public final class BatchInput { com.google.protobuf.ByteString getAssigneeLoginBytes(); + // optional int64 creation_date = 14; /** * <code>optional int64 creation_date = 14;</code> */ @@ -192,9 +205,8 @@ public final class BatchInput { * Protobuf type {@code ServerIssue} */ public static final class ServerIssue extends - com.google.protobuf.GeneratedMessage implements - // @@protoc_insertion_point(message_implements:ServerIssue) - ServerIssueOrBuilder { + com.google.protobuf.GeneratedMessage + implements ServerIssueOrBuilder { // Use ServerIssue.newBuilder() to construct. private ServerIssue(com.google.protobuf.GeneratedMessage.Builder<?> builder) { super(builder); @@ -241,33 +253,28 @@ public final class BatchInput { break; } case 10: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000001; - key_ = bs; + key_ = input.readBytes(); break; } case 18: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000002; - moduleKey_ = bs; + moduleKey_ = input.readBytes(); break; } case 26: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000004; - path_ = bs; + path_ = input.readBytes(); break; } case 34: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000008; - ruleRepository_ = bs; + ruleRepository_ = input.readBytes(); break; } case 42: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000010; - ruleKey_ = bs; + ruleKey_ = input.readBytes(); break; } case 48: { @@ -276,9 +283,8 @@ public final class BatchInput { break; } case 58: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000040; - msg_ = bs; + msg_ = input.readBytes(); break; } case 64: { @@ -298,27 +304,23 @@ public final class BatchInput { break; } case 82: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000200; - resolution_ = bs; + resolution_ = input.readBytes(); break; } case 90: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000400; - status_ = bs; + status_ = input.readBytes(); break; } case 98: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000800; - checksum_ = bs; + checksum_ = input.readBytes(); break; } case 106: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00001000; - assigneeLogin_ = bs; + assigneeLogin_ = input.readBytes(); break; } case 112: { @@ -366,6 +368,7 @@ public final class BatchInput { } private int bitField0_; + // optional string key = 1; public static final int KEY_FIELD_NUMBER = 1; private java.lang.Object key_; /** @@ -408,6 +411,7 @@ public final class BatchInput { } } + // optional string module_key = 2; public static final int MODULE_KEY_FIELD_NUMBER = 2; private java.lang.Object moduleKey_; /** @@ -450,6 +454,7 @@ public final class BatchInput { } } + // optional string path = 3; public static final int PATH_FIELD_NUMBER = 3; private java.lang.Object path_; /** @@ -492,6 +497,7 @@ public final class BatchInput { } } + // optional string rule_repository = 4; public static final int RULE_REPOSITORY_FIELD_NUMBER = 4; private java.lang.Object ruleRepository_; /** @@ -534,6 +540,7 @@ public final class BatchInput { } } + // optional string rule_key = 5; public static final int RULE_KEY_FIELD_NUMBER = 5; private java.lang.Object ruleKey_; /** @@ -576,6 +583,7 @@ public final class BatchInput { } } + // optional int32 line = 6; public static final int LINE_FIELD_NUMBER = 6; private int line_; /** @@ -591,6 +599,7 @@ public final class BatchInput { return line_; } + // optional string msg = 7; public static final int MSG_FIELD_NUMBER = 7; private java.lang.Object msg_; /** @@ -633,6 +642,7 @@ public final class BatchInput { } } + // optional .Severity severity = 8; public static final int SEVERITY_FIELD_NUMBER = 8; private org.sonar.batch.protocol.Constants.Severity severity_; /** @@ -648,6 +658,7 @@ public final class BatchInput { return severity_; } + // optional bool manual_severity = 9; public static final int MANUAL_SEVERITY_FIELD_NUMBER = 9; private boolean manualSeverity_; /** @@ -663,6 +674,7 @@ public final class BatchInput { return manualSeverity_; } + // optional string resolution = 10; public static final int RESOLUTION_FIELD_NUMBER = 10; private java.lang.Object resolution_; /** @@ -705,6 +717,7 @@ public final class BatchInput { } } + // optional string status = 11; public static final int STATUS_FIELD_NUMBER = 11; private java.lang.Object status_; /** @@ -747,6 +760,7 @@ public final class BatchInput { } } + // optional string checksum = 12; public static final int CHECKSUM_FIELD_NUMBER = 12; private java.lang.Object checksum_; /** @@ -789,6 +803,7 @@ public final class BatchInput { } } + // optional string assignee_login = 13; public static final int ASSIGNEE_LOGIN_FIELD_NUMBER = 13; private java.lang.Object assigneeLogin_; /** @@ -831,6 +846,7 @@ public final class BatchInput { } } + // optional int64 creation_date = 14; public static final int CREATION_DATE_FIELD_NUMBER = 14; private long creationDate_; /** @@ -865,8 +881,7 @@ public final class BatchInput { private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; + if (isInitialized != -1) return isInitialized == 1; memoizedIsInitialized = 1; return true; @@ -1064,9 +1079,8 @@ public final class BatchInput { * Protobuf type {@code ServerIssue} */ public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder<Builder> implements - // @@protoc_insertion_point(builder_implements:ServerIssue) - org.sonar.batch.protocol.input.BatchInput.ServerIssueOrBuilder { + com.google.protobuf.GeneratedMessage.Builder<Builder> + implements org.sonar.batch.protocol.input.BatchInput.ServerIssueOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.sonar.batch.protocol.input.BatchInput.internal_static_ServerIssue_descriptor; @@ -1316,6 +1330,7 @@ public final class BatchInput { } private int bitField0_; + // optional string key = 1; private java.lang.Object key_ = ""; /** * <code>optional string key = 1;</code> @@ -1329,12 +1344,9 @@ public final class BatchInput { public java.lang.String getKey() { java.lang.Object ref = key_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - key_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + key_ = s; return s; } else { return (java.lang.String) ref; @@ -1392,6 +1404,7 @@ public final class BatchInput { return this; } + // optional string module_key = 2; private java.lang.Object moduleKey_ = ""; /** * <code>optional string module_key = 2;</code> @@ -1405,12 +1418,9 @@ public final class BatchInput { public java.lang.String getModuleKey() { java.lang.Object ref = moduleKey_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - moduleKey_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + moduleKey_ = s; return s; } else { return (java.lang.String) ref; @@ -1468,6 +1478,7 @@ public final class BatchInput { return this; } + // optional string path = 3; private java.lang.Object path_ = ""; /** * <code>optional string path = 3;</code> @@ -1481,12 +1492,9 @@ public final class BatchInput { public java.lang.String getPath() { java.lang.Object ref = path_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - path_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + path_ = s; return s; } else { return (java.lang.String) ref; @@ -1544,6 +1552,7 @@ public final class BatchInput { return this; } + // optional string rule_repository = 4; private java.lang.Object ruleRepository_ = ""; /** * <code>optional string rule_repository = 4;</code> @@ -1557,12 +1566,9 @@ public final class BatchInput { public java.lang.String getRuleRepository() { java.lang.Object ref = ruleRepository_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - ruleRepository_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + ruleRepository_ = s; return s; } else { return (java.lang.String) ref; @@ -1620,6 +1626,7 @@ public final class BatchInput { return this; } + // optional string rule_key = 5; private java.lang.Object ruleKey_ = ""; /** * <code>optional string rule_key = 5;</code> @@ -1633,12 +1640,9 @@ public final class BatchInput { public java.lang.String getRuleKey() { java.lang.Object ref = ruleKey_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - ruleKey_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + ruleKey_ = s; return s; } else { return (java.lang.String) ref; @@ -1696,6 +1700,7 @@ public final class BatchInput { return this; } + // optional int32 line = 6; private int line_ ; /** * <code>optional int32 line = 6;</code> @@ -1728,6 +1733,7 @@ public final class BatchInput { return this; } + // optional string msg = 7; private java.lang.Object msg_ = ""; /** * <code>optional string msg = 7;</code> @@ -1741,12 +1747,9 @@ public final class BatchInput { public java.lang.String getMsg() { java.lang.Object ref = msg_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - msg_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + msg_ = s; return s; } else { return (java.lang.String) ref; @@ -1804,6 +1807,7 @@ public final class BatchInput { return this; } + // optional .Severity severity = 8; private org.sonar.batch.protocol.Constants.Severity severity_ = org.sonar.batch.protocol.Constants.Severity.INFO; /** * <code>optional .Severity severity = 8;</code> @@ -1839,6 +1843,7 @@ public final class BatchInput { return this; } + // optional bool manual_severity = 9; private boolean manualSeverity_ ; /** * <code>optional bool manual_severity = 9;</code> @@ -1871,6 +1876,7 @@ public final class BatchInput { return this; } + // optional string resolution = 10; private java.lang.Object resolution_ = ""; /** * <code>optional string resolution = 10;</code> @@ -1884,12 +1890,9 @@ public final class BatchInput { public java.lang.String getResolution() { java.lang.Object ref = resolution_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - resolution_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + resolution_ = s; return s; } else { return (java.lang.String) ref; @@ -1947,6 +1950,7 @@ public final class BatchInput { return this; } + // optional string status = 11; private java.lang.Object status_ = ""; /** * <code>optional string status = 11;</code> @@ -1960,12 +1964,9 @@ public final class BatchInput { public java.lang.String getStatus() { java.lang.Object ref = status_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - status_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + status_ = s; return s; } else { return (java.lang.String) ref; @@ -2023,6 +2024,7 @@ public final class BatchInput { return this; } + // optional string checksum = 12; private java.lang.Object checksum_ = ""; /** * <code>optional string checksum = 12;</code> @@ -2036,12 +2038,9 @@ public final class BatchInput { public java.lang.String getChecksum() { java.lang.Object ref = checksum_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - checksum_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + checksum_ = s; return s; } else { return (java.lang.String) ref; @@ -2099,6 +2098,7 @@ public final class BatchInput { return this; } + // optional string assignee_login = 13; private java.lang.Object assigneeLogin_ = ""; /** * <code>optional string assignee_login = 13;</code> @@ -2112,12 +2112,9 @@ public final class BatchInput { public java.lang.String getAssigneeLogin() { java.lang.Object ref = assigneeLogin_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - assigneeLogin_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + assigneeLogin_ = s; return s; } else { return (java.lang.String) ref; @@ -2175,6 +2172,7 @@ public final class BatchInput { return this; } + // optional int64 creation_date = 14; private long creationDate_ ; /** * <code>optional int64 creation_date = 14;</code> @@ -2218,7 +2216,7 @@ public final class BatchInput { // @@protoc_insertion_point(class_scope:ServerIssue) } - private static final com.google.protobuf.Descriptors.Descriptor + private static com.google.protobuf.Descriptors.Descriptor internal_static_ServerIssue_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable @@ -2243,25 +2241,24 @@ public final class BatchInput { " \001(\003B\"\n\036org.sonar.batch.protocol.inputH\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; - return null; - } - }; + new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { + public com.google.protobuf.ExtensionRegistry assignDescriptors( + com.google.protobuf.Descriptors.FileDescriptor root) { + descriptor = root; + internal_static_ServerIssue_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_ServerIssue_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_ServerIssue_descriptor, + new java.lang.String[] { "Key", "ModuleKey", "Path", "RuleRepository", "RuleKey", "Line", "Msg", "Severity", "ManualSeverity", "Resolution", "Status", "Checksum", "AssigneeLogin", "CreationDate", }); + return null; + } + }; com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { org.sonar.batch.protocol.Constants.getDescriptor(), }, assigner); - internal_static_ServerIssue_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_ServerIssue_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_ServerIssue_descriptor, - new java.lang.String[] { "Key", "ModuleKey", "Path", "RuleRepository", "RuleKey", "Line", "Msg", "Severity", "ManualSeverity", "Resolution", "Status", "Checksum", "AssigneeLogin", "CreationDate", }); - org.sonar.batch.protocol.Constants.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) 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 3cb6acd48be..dd486288906 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 @@ -8,10 +8,10 @@ public final class BatchReport { public static void registerAllExtensions( com.google.protobuf.ExtensionRegistry registry) { } - public interface MetadataOrBuilder extends - // @@protoc_insertion_point(interface_extends:Metadata) - com.google.protobuf.MessageOrBuilder { + public interface MetadataOrBuilder + extends com.google.protobuf.MessageOrBuilder { + // optional int64 analysis_date = 1; /** * <code>optional int64 analysis_date = 1;</code> */ @@ -21,6 +21,7 @@ public final class BatchReport { */ long getAnalysisDate(); + // optional string project_key = 2; /** * <code>optional string project_key = 2;</code> */ @@ -35,6 +36,7 @@ public final class BatchReport { com.google.protobuf.ByteString getProjectKeyBytes(); + // optional int32 root_component_ref = 3; /** * <code>optional int32 root_component_ref = 3;</code> */ @@ -44,6 +46,7 @@ public final class BatchReport { */ int getRootComponentRef(); + // optional int64 snapshot_id = 4; /** * <code>optional int64 snapshot_id = 4;</code> * @@ -61,6 +64,7 @@ public final class BatchReport { */ long getSnapshotId(); + // optional int32 deleted_components_count = 5; /** * <code>optional int32 deleted_components_count = 5;</code> */ @@ -74,9 +78,8 @@ public final class BatchReport { * Protobuf type {@code Metadata} */ public static final class Metadata extends - com.google.protobuf.GeneratedMessage implements - // @@protoc_insertion_point(message_implements:Metadata) - MetadataOrBuilder { + com.google.protobuf.GeneratedMessage + implements MetadataOrBuilder { // Use Metadata.newBuilder() to construct. private Metadata(com.google.protobuf.GeneratedMessage.Builder<?> builder) { super(builder); @@ -128,9 +131,8 @@ public final class BatchReport { break; } case 18: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000002; - projectKey_ = bs; + projectKey_ = input.readBytes(); break; } case 24: { @@ -188,6 +190,7 @@ public final class BatchReport { } private int bitField0_; + // optional int64 analysis_date = 1; public static final int ANALYSIS_DATE_FIELD_NUMBER = 1; private long analysisDate_; /** @@ -203,6 +206,7 @@ public final class BatchReport { return analysisDate_; } + // optional string project_key = 2; public static final int PROJECT_KEY_FIELD_NUMBER = 2; private java.lang.Object projectKey_; /** @@ -245,6 +249,7 @@ public final class BatchReport { } } + // optional int32 root_component_ref = 3; public static final int ROOT_COMPONENT_REF_FIELD_NUMBER = 3; private int rootComponentRef_; /** @@ -260,6 +265,7 @@ public final class BatchReport { return rootComponentRef_; } + // optional int64 snapshot_id = 4; public static final int SNAPSHOT_ID_FIELD_NUMBER = 4; private long snapshotId_; /** @@ -283,6 +289,7 @@ public final class BatchReport { return snapshotId_; } + // optional int32 deleted_components_count = 5; public static final int DELETED_COMPONENTS_COUNT_FIELD_NUMBER = 5; private int deletedComponentsCount_; /** @@ -308,8 +315,7 @@ public final class BatchReport { private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; + if (isInitialized != -1) return isInitialized == 1; memoizedIsInitialized = 1; return true; @@ -444,9 +450,8 @@ public final class BatchReport { * Protobuf type {@code Metadata} */ public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder<Builder> implements - // @@protoc_insertion_point(builder_implements:Metadata) - org.sonar.batch.protocol.output.BatchReport.MetadataOrBuilder { + com.google.protobuf.GeneratedMessage.Builder<Builder> + implements org.sonar.batch.protocol.output.BatchReport.MetadataOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.sonar.batch.protocol.output.BatchReport.internal_static_Metadata_descriptor; @@ -597,6 +602,7 @@ public final class BatchReport { } private int bitField0_; + // optional int64 analysis_date = 1; private long analysisDate_ ; /** * <code>optional int64 analysis_date = 1;</code> @@ -629,6 +635,7 @@ public final class BatchReport { return this; } + // optional string project_key = 2; private java.lang.Object projectKey_ = ""; /** * <code>optional string project_key = 2;</code> @@ -642,12 +649,9 @@ public final class BatchReport { public java.lang.String getProjectKey() { java.lang.Object ref = projectKey_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - projectKey_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + projectKey_ = s; return s; } else { return (java.lang.String) ref; @@ -705,6 +709,7 @@ public final class BatchReport { return this; } + // optional int32 root_component_ref = 3; private int rootComponentRef_ ; /** * <code>optional int32 root_component_ref = 3;</code> @@ -737,6 +742,7 @@ public final class BatchReport { return this; } + // optional int64 snapshot_id = 4; private long snapshotId_ ; /** * <code>optional int64 snapshot_id = 4;</code> @@ -785,6 +791,7 @@ public final class BatchReport { return this; } + // optional int32 deleted_components_count = 5; private int deletedComponentsCount_ ; /** * <code>optional int32 deleted_components_count = 5;</code> @@ -828,10 +835,10 @@ public final class BatchReport { // @@protoc_insertion_point(class_scope:Metadata) } - public interface ComponentLinkOrBuilder extends - // @@protoc_insertion_point(interface_extends:ComponentLink) - com.google.protobuf.MessageOrBuilder { + public interface ComponentLinkOrBuilder + extends com.google.protobuf.MessageOrBuilder { + // optional .ComponentLinkType type = 1; /** * <code>optional .ComponentLinkType type = 1;</code> */ @@ -841,6 +848,7 @@ public final class BatchReport { */ org.sonar.batch.protocol.Constants.ComponentLinkType getType(); + // optional string href = 2; /** * <code>optional string href = 2;</code> */ @@ -859,9 +867,8 @@ public final class BatchReport { * Protobuf type {@code ComponentLink} */ public static final class ComponentLink extends - com.google.protobuf.GeneratedMessage implements - // @@protoc_insertion_point(message_implements:ComponentLink) - ComponentLinkOrBuilder { + com.google.protobuf.GeneratedMessage + implements ComponentLinkOrBuilder { // Use ComponentLink.newBuilder() to construct. private ComponentLink(com.google.protobuf.GeneratedMessage.Builder<?> builder) { super(builder); @@ -919,9 +926,8 @@ public final class BatchReport { break; } case 18: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000002; - href_ = bs; + href_ = input.readBytes(); break; } } @@ -964,6 +970,7 @@ public final class BatchReport { } private int bitField0_; + // optional .ComponentLinkType type = 1; public static final int TYPE_FIELD_NUMBER = 1; private org.sonar.batch.protocol.Constants.ComponentLinkType type_; /** @@ -979,6 +986,7 @@ public final class BatchReport { return type_; } + // optional string href = 2; public static final int HREF_FIELD_NUMBER = 2; private java.lang.Object href_; /** @@ -1028,8 +1036,7 @@ public final class BatchReport { private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; + if (isInitialized != -1) return isInitialized == 1; memoizedIsInitialized = 1; return true; @@ -1143,9 +1150,8 @@ public final class BatchReport { * Protobuf type {@code ComponentLink} */ public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder<Builder> implements - // @@protoc_insertion_point(builder_implements:ComponentLink) - org.sonar.batch.protocol.output.BatchReport.ComponentLinkOrBuilder { + com.google.protobuf.GeneratedMessage.Builder<Builder> + implements org.sonar.batch.protocol.output.BatchReport.ComponentLinkOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.sonar.batch.protocol.output.BatchReport.internal_static_ComponentLink_descriptor; @@ -1269,6 +1275,7 @@ public final class BatchReport { } private int bitField0_; + // optional .ComponentLinkType type = 1; private org.sonar.batch.protocol.Constants.ComponentLinkType type_ = org.sonar.batch.protocol.Constants.ComponentLinkType.HOME; /** * <code>optional .ComponentLinkType type = 1;</code> @@ -1304,6 +1311,7 @@ public final class BatchReport { return this; } + // optional string href = 2; private java.lang.Object href_ = ""; /** * <code>optional string href = 2;</code> @@ -1317,12 +1325,9 @@ public final class BatchReport { public java.lang.String getHref() { java.lang.Object ref = href_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - href_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + href_ = s; return s; } else { return (java.lang.String) ref; @@ -1391,10 +1396,10 @@ public final class BatchReport { // @@protoc_insertion_point(class_scope:ComponentLink) } - public interface EventOrBuilder extends - // @@protoc_insertion_point(interface_extends:Event) - com.google.protobuf.MessageOrBuilder { + public interface EventOrBuilder + extends com.google.protobuf.MessageOrBuilder { + // optional int32 component_ref = 1; /** * <code>optional int32 component_ref = 1;</code> */ @@ -1404,6 +1409,7 @@ public final class BatchReport { */ int getComponentRef(); + // optional string name = 2; /** * <code>optional string name = 2;</code> */ @@ -1418,6 +1424,7 @@ public final class BatchReport { com.google.protobuf.ByteString getNameBytes(); + // optional string description = 3; /** * <code>optional string description = 3;</code> */ @@ -1432,6 +1439,7 @@ public final class BatchReport { com.google.protobuf.ByteString getDescriptionBytes(); + // optional .EventCategory category = 4; /** * <code>optional .EventCategory category = 4;</code> */ @@ -1441,6 +1449,7 @@ public final class BatchReport { */ org.sonar.batch.protocol.Constants.EventCategory getCategory(); + // optional string event_data = 5; /** * <code>optional string event_data = 5;</code> */ @@ -1463,9 +1472,8 @@ public final class BatchReport { * </pre> */ public static final class Event extends - com.google.protobuf.GeneratedMessage implements - // @@protoc_insertion_point(message_implements:Event) - EventOrBuilder { + com.google.protobuf.GeneratedMessage + implements EventOrBuilder { // Use Event.newBuilder() to construct. private Event(com.google.protobuf.GeneratedMessage.Builder<?> builder) { super(builder); @@ -1517,15 +1525,13 @@ public final class BatchReport { break; } case 18: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000002; - name_ = bs; + name_ = input.readBytes(); break; } case 26: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000004; - description_ = bs; + description_ = input.readBytes(); break; } case 32: { @@ -1540,9 +1546,8 @@ public final class BatchReport { break; } case 42: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000010; - eventData_ = bs; + eventData_ = input.readBytes(); break; } } @@ -1585,6 +1590,7 @@ public final class BatchReport { } private int bitField0_; + // optional int32 component_ref = 1; public static final int COMPONENT_REF_FIELD_NUMBER = 1; private int componentRef_; /** @@ -1600,6 +1606,7 @@ public final class BatchReport { return componentRef_; } + // optional string name = 2; public static final int NAME_FIELD_NUMBER = 2; private java.lang.Object name_; /** @@ -1642,6 +1649,7 @@ public final class BatchReport { } } + // optional string description = 3; public static final int DESCRIPTION_FIELD_NUMBER = 3; private java.lang.Object description_; /** @@ -1684,6 +1692,7 @@ public final class BatchReport { } } + // optional .EventCategory category = 4; public static final int CATEGORY_FIELD_NUMBER = 4; private org.sonar.batch.protocol.Constants.EventCategory category_; /** @@ -1699,6 +1708,7 @@ public final class BatchReport { return category_; } + // optional string event_data = 5; public static final int EVENT_DATA_FIELD_NUMBER = 5; private java.lang.Object eventData_; /** @@ -1751,8 +1761,7 @@ public final class BatchReport { private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; + if (isInitialized != -1) return isInitialized == 1; memoizedIsInitialized = 1; return true; @@ -1891,9 +1900,8 @@ public final class BatchReport { * </pre> */ public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder<Builder> implements - // @@protoc_insertion_point(builder_implements:Event) - org.sonar.batch.protocol.output.BatchReport.EventOrBuilder { + com.google.protobuf.GeneratedMessage.Builder<Builder> + implements org.sonar.batch.protocol.output.BatchReport.EventOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.sonar.batch.protocol.output.BatchReport.internal_static_Event_descriptor; @@ -2048,6 +2056,7 @@ public final class BatchReport { } private int bitField0_; + // optional int32 component_ref = 1; private int componentRef_ ; /** * <code>optional int32 component_ref = 1;</code> @@ -2080,6 +2089,7 @@ public final class BatchReport { return this; } + // optional string name = 2; private java.lang.Object name_ = ""; /** * <code>optional string name = 2;</code> @@ -2093,12 +2103,9 @@ public final class BatchReport { public java.lang.String getName() { java.lang.Object ref = name_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - name_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + name_ = s; return s; } else { return (java.lang.String) ref; @@ -2156,6 +2163,7 @@ public final class BatchReport { return this; } + // optional string description = 3; private java.lang.Object description_ = ""; /** * <code>optional string description = 3;</code> @@ -2169,12 +2177,9 @@ public final class BatchReport { public java.lang.String getDescription() { java.lang.Object ref = description_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - description_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + description_ = s; return s; } else { return (java.lang.String) ref; @@ -2232,6 +2237,7 @@ public final class BatchReport { return this; } + // optional .EventCategory category = 4; private org.sonar.batch.protocol.Constants.EventCategory category_ = org.sonar.batch.protocol.Constants.EventCategory.ALERT; /** * <code>optional .EventCategory category = 4;</code> @@ -2267,6 +2273,7 @@ public final class BatchReport { return this; } + // optional string event_data = 5; private java.lang.Object eventData_ = ""; /** * <code>optional string event_data = 5;</code> @@ -2280,12 +2287,9 @@ public final class BatchReport { public java.lang.String getEventData() { java.lang.Object ref = eventData_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - eventData_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + eventData_ = s; return s; } else { return (java.lang.String) ref; @@ -2354,10 +2358,10 @@ public final class BatchReport { // @@protoc_insertion_point(class_scope:Event) } - public interface ComponentOrBuilder extends - // @@protoc_insertion_point(interface_extends:Component) - com.google.protobuf.MessageOrBuilder { + public interface ComponentOrBuilder + extends com.google.protobuf.MessageOrBuilder { + // optional int32 ref = 1; /** * <code>optional int32 ref = 1;</code> */ @@ -2367,6 +2371,7 @@ public final class BatchReport { */ int getRef(); + // optional string path = 2; /** * <code>optional string path = 2;</code> */ @@ -2381,6 +2386,7 @@ public final class BatchReport { com.google.protobuf.ByteString getPathBytes(); + // optional string name = 3; /** * <code>optional string name = 3;</code> */ @@ -2395,6 +2401,7 @@ public final class BatchReport { com.google.protobuf.ByteString getNameBytes(); + // optional .ComponentType type = 4; /** * <code>optional .ComponentType type = 4;</code> */ @@ -2404,6 +2411,7 @@ public final class BatchReport { */ org.sonar.batch.protocol.Constants.ComponentType getType(); + // optional bool is_test = 5; /** * <code>optional bool is_test = 5;</code> */ @@ -2413,6 +2421,7 @@ public final class BatchReport { */ boolean getIsTest(); + // optional string language = 6; /** * <code>optional string language = 6;</code> */ @@ -2427,6 +2436,7 @@ public final class BatchReport { com.google.protobuf.ByteString getLanguageBytes(); + // repeated int32 child_ref = 7 [packed = true]; /** * <code>repeated int32 child_ref = 7 [packed = true];</code> */ @@ -2440,6 +2450,7 @@ public final class BatchReport { */ int getChildRef(int index); + // repeated .ComponentLink link = 10; /** * <code>repeated .ComponentLink link = 10;</code> */ @@ -2464,6 +2475,7 @@ public final class BatchReport { org.sonar.batch.protocol.output.BatchReport.ComponentLinkOrBuilder getLinkOrBuilder( int index); + // optional string version = 12; /** * <code>optional string version = 12;</code> * @@ -2490,6 +2502,7 @@ public final class BatchReport { com.google.protobuf.ByteString getVersionBytes(); + // optional int64 id = 13; /** * <code>optional int64 id = 13;</code> * @@ -2507,6 +2520,7 @@ public final class BatchReport { */ long getId(); + // optional int64 snapshot_id = 8; /** * <code>optional int64 snapshot_id = 8;</code> */ @@ -2516,6 +2530,7 @@ public final class BatchReport { */ long getSnapshotId(); + // optional string uuid = 9; /** * <code>optional string uuid = 9;</code> */ @@ -2530,6 +2545,7 @@ public final class BatchReport { com.google.protobuf.ByteString getUuidBytes(); + // repeated .Event event = 11; /** * <code>repeated .Event event = 11;</code> */ @@ -2558,9 +2574,8 @@ public final class BatchReport { * Protobuf type {@code Component} */ public static final class Component extends - com.google.protobuf.GeneratedMessage implements - // @@protoc_insertion_point(message_implements:Component) - ComponentOrBuilder { + com.google.protobuf.GeneratedMessage + implements ComponentOrBuilder { // Use Component.newBuilder() to construct. private Component(com.google.protobuf.GeneratedMessage.Builder<?> builder) { super(builder); @@ -2612,15 +2627,13 @@ public final class BatchReport { break; } case 18: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000002; - path_ = bs; + path_ = input.readBytes(); break; } case 26: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000004; - name_ = bs; + name_ = input.readBytes(); break; } case 32: { @@ -2640,9 +2653,8 @@ public final class BatchReport { break; } case 50: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000020; - language_ = bs; + language_ = input.readBytes(); break; } case 56: { @@ -2672,9 +2684,8 @@ public final class BatchReport { break; } case 74: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000200; - uuid_ = bs; + uuid_ = input.readBytes(); break; } case 82: { @@ -2694,9 +2705,8 @@ public final class BatchReport { break; } case 98: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000040; - version_ = bs; + version_ = input.readBytes(); break; } case 104: { @@ -2753,6 +2763,7 @@ public final class BatchReport { } private int bitField0_; + // optional int32 ref = 1; public static final int REF_FIELD_NUMBER = 1; private int ref_; /** @@ -2768,6 +2779,7 @@ public final class BatchReport { return ref_; } + // optional string path = 2; public static final int PATH_FIELD_NUMBER = 2; private java.lang.Object path_; /** @@ -2810,6 +2822,7 @@ public final class BatchReport { } } + // optional string name = 3; public static final int NAME_FIELD_NUMBER = 3; private java.lang.Object name_; /** @@ -2852,6 +2865,7 @@ public final class BatchReport { } } + // optional .ComponentType type = 4; public static final int TYPE_FIELD_NUMBER = 4; private org.sonar.batch.protocol.Constants.ComponentType type_; /** @@ -2867,6 +2881,7 @@ public final class BatchReport { return type_; } + // optional bool is_test = 5; public static final int IS_TEST_FIELD_NUMBER = 5; private boolean isTest_; /** @@ -2882,6 +2897,7 @@ public final class BatchReport { return isTest_; } + // optional string language = 6; public static final int LANGUAGE_FIELD_NUMBER = 6; private java.lang.Object language_; /** @@ -2924,6 +2940,7 @@ public final class BatchReport { } } + // repeated int32 child_ref = 7 [packed = true]; public static final int CHILD_REF_FIELD_NUMBER = 7; private java.util.List<java.lang.Integer> childRef_; /** @@ -2947,6 +2964,7 @@ public final class BatchReport { } private int childRefMemoizedSerializedSize = -1; + // repeated .ComponentLink link = 10; public static final int LINK_FIELD_NUMBER = 10; private java.util.List<org.sonar.batch.protocol.output.BatchReport.ComponentLink> link_; /** @@ -2982,6 +3000,7 @@ public final class BatchReport { return link_.get(index); } + // optional string version = 12; public static final int VERSION_FIELD_NUMBER = 12; private java.lang.Object version_; /** @@ -3036,6 +3055,7 @@ public final class BatchReport { } } + // optional int64 id = 13; public static final int ID_FIELD_NUMBER = 13; private long id_; /** @@ -3059,6 +3079,7 @@ public final class BatchReport { return id_; } + // optional int64 snapshot_id = 8; public static final int SNAPSHOT_ID_FIELD_NUMBER = 8; private long snapshotId_; /** @@ -3074,6 +3095,7 @@ public final class BatchReport { return snapshotId_; } + // optional string uuid = 9; public static final int UUID_FIELD_NUMBER = 9; private java.lang.Object uuid_; /** @@ -3116,6 +3138,7 @@ public final class BatchReport { } } + // repeated .Event event = 11; public static final int EVENT_FIELD_NUMBER = 11; private java.util.List<org.sonar.batch.protocol.output.BatchReport.Event> event_; /** @@ -3169,8 +3192,7 @@ public final class BatchReport { private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; + if (isInitialized != -1) return isInitialized == 1; memoizedIsInitialized = 1; return true; @@ -3375,9 +3397,8 @@ public final class BatchReport { * Protobuf type {@code Component} */ public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder<Builder> implements - // @@protoc_insertion_point(builder_implements:Component) - org.sonar.batch.protocol.output.BatchReport.ComponentOrBuilder { + com.google.protobuf.GeneratedMessage.Builder<Builder> + implements org.sonar.batch.protocol.output.BatchReport.ComponentOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.sonar.batch.protocol.output.BatchReport.internal_static_Component_descriptor; @@ -3682,6 +3703,7 @@ public final class BatchReport { } private int bitField0_; + // optional int32 ref = 1; private int ref_ ; /** * <code>optional int32 ref = 1;</code> @@ -3714,6 +3736,7 @@ public final class BatchReport { return this; } + // optional string path = 2; private java.lang.Object path_ = ""; /** * <code>optional string path = 2;</code> @@ -3727,12 +3750,9 @@ public final class BatchReport { public java.lang.String getPath() { java.lang.Object ref = path_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - path_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + path_ = s; return s; } else { return (java.lang.String) ref; @@ -3790,6 +3810,7 @@ public final class BatchReport { return this; } + // optional string name = 3; private java.lang.Object name_ = ""; /** * <code>optional string name = 3;</code> @@ -3803,12 +3824,9 @@ public final class BatchReport { public java.lang.String getName() { java.lang.Object ref = name_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - name_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + name_ = s; return s; } else { return (java.lang.String) ref; @@ -3866,6 +3884,7 @@ public final class BatchReport { return this; } + // optional .ComponentType type = 4; private org.sonar.batch.protocol.Constants.ComponentType type_ = org.sonar.batch.protocol.Constants.ComponentType.PROJECT; /** * <code>optional .ComponentType type = 4;</code> @@ -3901,6 +3920,7 @@ public final class BatchReport { return this; } + // optional bool is_test = 5; private boolean isTest_ ; /** * <code>optional bool is_test = 5;</code> @@ -3933,6 +3953,7 @@ public final class BatchReport { return this; } + // optional string language = 6; private java.lang.Object language_ = ""; /** * <code>optional string language = 6;</code> @@ -3946,12 +3967,9 @@ public final class BatchReport { public java.lang.String getLanguage() { java.lang.Object ref = language_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - language_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + language_ = s; return s; } else { return (java.lang.String) ref; @@ -4009,6 +4027,7 @@ public final class BatchReport { return this; } + // repeated int32 child_ref = 7 [packed = true]; private java.util.List<java.lang.Integer> childRef_ = java.util.Collections.emptyList(); private void ensureChildRefIsMutable() { if (!((bitField0_ & 0x00000040) == 0x00000040)) { @@ -4060,8 +4079,7 @@ public final class BatchReport { public Builder addAllChildRef( java.lang.Iterable<? extends java.lang.Integer> values) { ensureChildRefIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, childRef_); + super.addAll(values, childRef_); onChanged(); return this; } @@ -4075,6 +4093,7 @@ public final class BatchReport { return this; } + // repeated .ComponentLink link = 10; private java.util.List<org.sonar.batch.protocol.output.BatchReport.ComponentLink> link_ = java.util.Collections.emptyList(); private void ensureLinkIsMutable() { @@ -4216,8 +4235,7 @@ public final class BatchReport { java.lang.Iterable<? extends org.sonar.batch.protocol.output.BatchReport.ComponentLink> values) { if (linkBuilder_ == null) { ensureLinkIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, link_); + super.addAll(values, link_); onChanged(); } else { linkBuilder_.addAllMessages(values); @@ -4315,6 +4333,7 @@ public final class BatchReport { return linkBuilder_; } + // optional string version = 12; private java.lang.Object version_ = ""; /** * <code>optional string version = 12;</code> @@ -4336,12 +4355,9 @@ public final class BatchReport { public java.lang.String getVersion() { java.lang.Object ref = version_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - version_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + version_ = s; return s; } else { return (java.lang.String) ref; @@ -4415,6 +4431,7 @@ public final class BatchReport { return this; } + // optional int64 id = 13; private long id_ ; /** * <code>optional int64 id = 13;</code> @@ -4463,6 +4480,7 @@ public final class BatchReport { return this; } + // optional int64 snapshot_id = 8; private long snapshotId_ ; /** * <code>optional int64 snapshot_id = 8;</code> @@ -4495,6 +4513,7 @@ public final class BatchReport { return this; } + // optional string uuid = 9; private java.lang.Object uuid_ = ""; /** * <code>optional string uuid = 9;</code> @@ -4508,12 +4527,9 @@ public final class BatchReport { public java.lang.String getUuid() { java.lang.Object ref = uuid_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - uuid_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + uuid_ = s; return s; } else { return (java.lang.String) ref; @@ -4571,6 +4587,7 @@ public final class BatchReport { return this; } + // repeated .Event event = 11; private java.util.List<org.sonar.batch.protocol.output.BatchReport.Event> event_ = java.util.Collections.emptyList(); private void ensureEventIsMutable() { @@ -4712,8 +4729,7 @@ public final class BatchReport { java.lang.Iterable<? extends org.sonar.batch.protocol.output.BatchReport.Event> values) { if (eventBuilder_ == null) { ensureEventIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, event_); + super.addAll(values, event_); onChanged(); } else { eventBuilder_.addAllMessages(values); @@ -4822,10 +4838,10 @@ public final class BatchReport { // @@protoc_insertion_point(class_scope:Component) } - public interface MeasureOrBuilder extends - // @@protoc_insertion_point(interface_extends:Measure) - com.google.protobuf.MessageOrBuilder { + public interface MeasureOrBuilder + extends com.google.protobuf.MessageOrBuilder { + // optional .MeasureValueType value_type = 1; /** * <code>optional .MeasureValueType value_type = 1;</code> */ @@ -4835,15 +4851,25 @@ public final class BatchReport { */ org.sonar.batch.protocol.Constants.MeasureValueType getValueType(); + // optional bool boolean_value = 2; /** * <code>optional bool boolean_value = 2;</code> + * + * <pre> + * all values may be unset for "new_xxx" measures (only variations are populated) + * </pre> */ boolean hasBooleanValue(); /** * <code>optional bool boolean_value = 2;</code> + * + * <pre> + * all values may be unset for "new_xxx" measures (only variations are populated) + * </pre> */ boolean getBooleanValue(); + // optional int32 int_value = 3; /** * <code>optional int32 int_value = 3;</code> */ @@ -4853,6 +4879,7 @@ public final class BatchReport { */ int getIntValue(); + // optional int64 long_value = 4; /** * <code>optional int64 long_value = 4;</code> */ @@ -4862,6 +4889,7 @@ public final class BatchReport { */ long getLongValue(); + // optional double double_value = 5; /** * <code>optional double double_value = 5;</code> */ @@ -4871,6 +4899,7 @@ public final class BatchReport { */ double getDoubleValue(); + // optional string string_value = 6; /** * <code>optional string string_value = 6;</code> */ @@ -4885,6 +4914,7 @@ public final class BatchReport { com.google.protobuf.ByteString getStringValueBytes(); + // optional string metric_key = 7; /** * <code>optional string metric_key = 7;</code> */ @@ -4899,6 +4929,7 @@ public final class BatchReport { com.google.protobuf.ByteString getMetricKeyBytes(); + // optional string description = 9; /** * <code>optional string description = 9;</code> * @@ -4925,6 +4956,7 @@ public final class BatchReport { com.google.protobuf.ByteString getDescriptionBytes(); + // optional string rule_key = 10; /** * <code>optional string rule_key = 10;</code> */ @@ -4939,6 +4971,7 @@ public final class BatchReport { com.google.protobuf.ByteString getRuleKeyBytes(); + // optional .Severity severity = 11; /** * <code>optional .Severity severity = 11;</code> */ @@ -4948,6 +4981,7 @@ public final class BatchReport { */ org.sonar.batch.protocol.Constants.Severity getSeverity(); + // optional string alert_status = 12; /** * <code>optional string alert_status = 12;</code> */ @@ -4962,6 +4996,7 @@ public final class BatchReport { com.google.protobuf.ByteString getAlertStatusBytes(); + // optional string alert_text = 13; /** * <code>optional string alert_text = 13;</code> */ @@ -4976,6 +5011,7 @@ public final class BatchReport { com.google.protobuf.ByteString getAlertTextBytes(); + // optional double variation_value_1 = 14; /** * <code>optional double variation_value_1 = 14;</code> */ @@ -4985,6 +5021,7 @@ public final class BatchReport { */ double getVariationValue1(); + // optional double variation_value_2 = 15; /** * <code>optional double variation_value_2 = 15;</code> */ @@ -4994,6 +5031,7 @@ public final class BatchReport { */ double getVariationValue2(); + // optional double variation_value_3 = 16; /** * <code>optional double variation_value_3 = 16;</code> */ @@ -5003,6 +5041,7 @@ public final class BatchReport { */ double getVariationValue3(); + // optional double variation_value_4 = 17; /** * <code>optional double variation_value_4 = 17;</code> */ @@ -5012,6 +5051,7 @@ public final class BatchReport { */ double getVariationValue4(); + // optional double variation_value_5 = 18; /** * <code>optional double variation_value_5 = 18;</code> */ @@ -5021,6 +5061,7 @@ public final class BatchReport { */ double getVariationValue5(); + // optional int32 tendency = 19; /** * <code>optional int32 tendency = 19;</code> */ @@ -5030,6 +5071,7 @@ public final class BatchReport { */ int getTendency(); + // optional int32 characteric_id = 20; /** * <code>optional int32 characteric_id = 20;</code> */ @@ -5038,14 +5080,23 @@ public final class BatchReport { * <code>optional int32 characteric_id = 20;</code> */ int getCharactericId(); + + // optional int32 person_id = 21; + /** + * <code>optional int32 person_id = 21;</code> + */ + boolean hasPersonId(); + /** + * <code>optional int32 person_id = 21;</code> + */ + int getPersonId(); } /** * Protobuf type {@code Measure} */ public static final class Measure extends - com.google.protobuf.GeneratedMessage implements - // @@protoc_insertion_point(message_implements:Measure) - MeasureOrBuilder { + com.google.protobuf.GeneratedMessage + implements MeasureOrBuilder { // Use Measure.newBuilder() to construct. private Measure(com.google.protobuf.GeneratedMessage.Builder<?> builder) { super(builder); @@ -5123,27 +5174,23 @@ public final class BatchReport { break; } case 50: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000020; - stringValue_ = bs; + stringValue_ = input.readBytes(); break; } case 58: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000040; - metricKey_ = bs; + metricKey_ = input.readBytes(); break; } case 74: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000080; - description_ = bs; + description_ = input.readBytes(); break; } case 82: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000100; - ruleKey_ = bs; + ruleKey_ = input.readBytes(); break; } case 88: { @@ -5158,15 +5205,13 @@ public final class BatchReport { break; } case 98: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000400; - alertStatus_ = bs; + alertStatus_ = input.readBytes(); break; } case 106: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000800; - alertText_ = bs; + alertText_ = input.readBytes(); break; } case 113: { @@ -5204,6 +5249,11 @@ public final class BatchReport { charactericId_ = input.readInt32(); break; } + case 168: { + bitField0_ |= 0x00080000; + personId_ = input.readInt32(); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -5244,6 +5294,7 @@ public final class BatchReport { } private int bitField0_; + // optional .MeasureValueType value_type = 1; public static final int VALUE_TYPE_FIELD_NUMBER = 1; private org.sonar.batch.protocol.Constants.MeasureValueType valueType_; /** @@ -5259,21 +5310,31 @@ public final class BatchReport { return valueType_; } + // optional bool boolean_value = 2; public static final int BOOLEAN_VALUE_FIELD_NUMBER = 2; private boolean booleanValue_; /** * <code>optional bool boolean_value = 2;</code> + * + * <pre> + * all values may be unset for "new_xxx" measures (only variations are populated) + * </pre> */ public boolean hasBooleanValue() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** * <code>optional bool boolean_value = 2;</code> + * + * <pre> + * all values may be unset for "new_xxx" measures (only variations are populated) + * </pre> */ public boolean getBooleanValue() { return booleanValue_; } + // optional int32 int_value = 3; public static final int INT_VALUE_FIELD_NUMBER = 3; private int intValue_; /** @@ -5289,6 +5350,7 @@ public final class BatchReport { return intValue_; } + // optional int64 long_value = 4; public static final int LONG_VALUE_FIELD_NUMBER = 4; private long longValue_; /** @@ -5304,6 +5366,7 @@ public final class BatchReport { return longValue_; } + // optional double double_value = 5; public static final int DOUBLE_VALUE_FIELD_NUMBER = 5; private double doubleValue_; /** @@ -5319,6 +5382,7 @@ public final class BatchReport { return doubleValue_; } + // optional string string_value = 6; public static final int STRING_VALUE_FIELD_NUMBER = 6; private java.lang.Object stringValue_; /** @@ -5361,6 +5425,7 @@ public final class BatchReport { } } + // optional string metric_key = 7; public static final int METRIC_KEY_FIELD_NUMBER = 7; private java.lang.Object metricKey_; /** @@ -5403,6 +5468,7 @@ public final class BatchReport { } } + // optional string description = 9; public static final int DESCRIPTION_FIELD_NUMBER = 9; private java.lang.Object description_; /** @@ -5457,6 +5523,7 @@ public final class BatchReport { } } + // optional string rule_key = 10; public static final int RULE_KEY_FIELD_NUMBER = 10; private java.lang.Object ruleKey_; /** @@ -5499,6 +5566,7 @@ public final class BatchReport { } } + // optional .Severity severity = 11; public static final int SEVERITY_FIELD_NUMBER = 11; private org.sonar.batch.protocol.Constants.Severity severity_; /** @@ -5514,6 +5582,7 @@ public final class BatchReport { return severity_; } + // optional string alert_status = 12; public static final int ALERT_STATUS_FIELD_NUMBER = 12; private java.lang.Object alertStatus_; /** @@ -5556,6 +5625,7 @@ public final class BatchReport { } } + // optional string alert_text = 13; public static final int ALERT_TEXT_FIELD_NUMBER = 13; private java.lang.Object alertText_; /** @@ -5598,6 +5668,7 @@ public final class BatchReport { } } + // optional double variation_value_1 = 14; public static final int VARIATION_VALUE_1_FIELD_NUMBER = 14; private double variationValue1_; /** @@ -5613,6 +5684,7 @@ public final class BatchReport { return variationValue1_; } + // optional double variation_value_2 = 15; public static final int VARIATION_VALUE_2_FIELD_NUMBER = 15; private double variationValue2_; /** @@ -5628,6 +5700,7 @@ public final class BatchReport { return variationValue2_; } + // optional double variation_value_3 = 16; public static final int VARIATION_VALUE_3_FIELD_NUMBER = 16; private double variationValue3_; /** @@ -5643,6 +5716,7 @@ public final class BatchReport { return variationValue3_; } + // optional double variation_value_4 = 17; public static final int VARIATION_VALUE_4_FIELD_NUMBER = 17; private double variationValue4_; /** @@ -5658,6 +5732,7 @@ public final class BatchReport { return variationValue4_; } + // optional double variation_value_5 = 18; public static final int VARIATION_VALUE_5_FIELD_NUMBER = 18; private double variationValue5_; /** @@ -5673,6 +5748,7 @@ public final class BatchReport { return variationValue5_; } + // optional int32 tendency = 19; public static final int TENDENCY_FIELD_NUMBER = 19; private int tendency_; /** @@ -5688,6 +5764,7 @@ public final class BatchReport { return tendency_; } + // optional int32 characteric_id = 20; public static final int CHARACTERIC_ID_FIELD_NUMBER = 20; private int charactericId_; /** @@ -5703,6 +5780,22 @@ public final class BatchReport { return charactericId_; } + // optional int32 person_id = 21; + public static final int PERSON_ID_FIELD_NUMBER = 21; + private int personId_; + /** + * <code>optional int32 person_id = 21;</code> + */ + public boolean hasPersonId() { + return ((bitField0_ & 0x00080000) == 0x00080000); + } + /** + * <code>optional int32 person_id = 21;</code> + */ + public int getPersonId() { + return personId_; + } + private void initFields() { valueType_ = org.sonar.batch.protocol.Constants.MeasureValueType.INT; booleanValue_ = false; @@ -5723,12 +5816,12 @@ public final class BatchReport { variationValue5_ = 0D; tendency_ = 0; charactericId_ = 0; + personId_ = 0; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; + if (isInitialized != -1) return isInitialized == 1; memoizedIsInitialized = 1; return true; @@ -5794,6 +5887,9 @@ public final class BatchReport { if (((bitField0_ & 0x00040000) == 0x00040000)) { output.writeInt32(20, charactericId_); } + if (((bitField0_ & 0x00080000) == 0x00080000)) { + output.writeInt32(21, personId_); + } getUnknownFields().writeTo(output); } @@ -5879,6 +5975,10 @@ public final class BatchReport { size += com.google.protobuf.CodedOutputStream .computeInt32Size(20, charactericId_); } + if (((bitField0_ & 0x00080000) == 0x00080000)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(21, personId_); + } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -5961,9 +6061,8 @@ public final class BatchReport { * Protobuf type {@code Measure} */ public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder<Builder> implements - // @@protoc_insertion_point(builder_implements:Measure) - org.sonar.batch.protocol.output.BatchReport.MeasureOrBuilder { + com.google.protobuf.GeneratedMessage.Builder<Builder> + implements org.sonar.batch.protocol.output.BatchReport.MeasureOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.sonar.batch.protocol.output.BatchReport.internal_static_Measure_descriptor; @@ -6034,6 +6133,8 @@ public final class BatchReport { bitField0_ = (bitField0_ & ~0x00020000); charactericId_ = 0; bitField0_ = (bitField0_ & ~0x00040000); + personId_ = 0; + bitField0_ = (bitField0_ & ~0x00080000); return this; } @@ -6138,6 +6239,10 @@ public final class BatchReport { to_bitField0_ |= 0x00040000; } result.charactericId_ = charactericId_; + if (((from_bitField0_ & 0x00080000) == 0x00080000)) { + to_bitField0_ |= 0x00080000; + } + result.personId_ = personId_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -6223,6 +6328,9 @@ public final class BatchReport { if (other.hasCharactericId()) { setCharactericId(other.getCharactericId()); } + if (other.hasPersonId()) { + setPersonId(other.getPersonId()); + } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -6250,6 +6358,7 @@ public final class BatchReport { } private int bitField0_; + // optional .MeasureValueType value_type = 1; private org.sonar.batch.protocol.Constants.MeasureValueType valueType_ = org.sonar.batch.protocol.Constants.MeasureValueType.INT; /** * <code>optional .MeasureValueType value_type = 1;</code> @@ -6285,21 +6394,34 @@ public final class BatchReport { return this; } + // optional bool boolean_value = 2; private boolean booleanValue_ ; /** * <code>optional bool boolean_value = 2;</code> + * + * <pre> + * all values may be unset for "new_xxx" measures (only variations are populated) + * </pre> */ public boolean hasBooleanValue() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** * <code>optional bool boolean_value = 2;</code> + * + * <pre> + * all values may be unset for "new_xxx" measures (only variations are populated) + * </pre> */ public boolean getBooleanValue() { return booleanValue_; } /** * <code>optional bool boolean_value = 2;</code> + * + * <pre> + * all values may be unset for "new_xxx" measures (only variations are populated) + * </pre> */ public Builder setBooleanValue(boolean value) { bitField0_ |= 0x00000002; @@ -6309,6 +6431,10 @@ public final class BatchReport { } /** * <code>optional bool boolean_value = 2;</code> + * + * <pre> + * all values may be unset for "new_xxx" measures (only variations are populated) + * </pre> */ public Builder clearBooleanValue() { bitField0_ = (bitField0_ & ~0x00000002); @@ -6317,6 +6443,7 @@ public final class BatchReport { return this; } + // optional int32 int_value = 3; private int intValue_ ; /** * <code>optional int32 int_value = 3;</code> @@ -6349,6 +6476,7 @@ public final class BatchReport { return this; } + // optional int64 long_value = 4; private long longValue_ ; /** * <code>optional int64 long_value = 4;</code> @@ -6381,6 +6509,7 @@ public final class BatchReport { return this; } + // optional double double_value = 5; private double doubleValue_ ; /** * <code>optional double double_value = 5;</code> @@ -6413,6 +6542,7 @@ public final class BatchReport { return this; } + // optional string string_value = 6; private java.lang.Object stringValue_ = ""; /** * <code>optional string string_value = 6;</code> @@ -6426,12 +6556,9 @@ public final class BatchReport { public java.lang.String getStringValue() { java.lang.Object ref = stringValue_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - stringValue_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + stringValue_ = s; return s; } else { return (java.lang.String) ref; @@ -6489,6 +6616,7 @@ public final class BatchReport { return this; } + // optional string metric_key = 7; private java.lang.Object metricKey_ = ""; /** * <code>optional string metric_key = 7;</code> @@ -6502,12 +6630,9 @@ public final class BatchReport { public java.lang.String getMetricKey() { java.lang.Object ref = metricKey_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - metricKey_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + metricKey_ = s; return s; } else { return (java.lang.String) ref; @@ -6565,6 +6690,7 @@ public final class BatchReport { return this; } + // optional string description = 9; private java.lang.Object description_ = ""; /** * <code>optional string description = 9;</code> @@ -6586,12 +6712,9 @@ public final class BatchReport { public java.lang.String getDescription() { java.lang.Object ref = description_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - description_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + description_ = s; return s; } else { return (java.lang.String) ref; @@ -6665,6 +6788,7 @@ public final class BatchReport { return this; } + // optional string rule_key = 10; private java.lang.Object ruleKey_ = ""; /** * <code>optional string rule_key = 10;</code> @@ -6678,12 +6802,9 @@ public final class BatchReport { public java.lang.String getRuleKey() { java.lang.Object ref = ruleKey_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - ruleKey_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + ruleKey_ = s; return s; } else { return (java.lang.String) ref; @@ -6741,6 +6862,7 @@ public final class BatchReport { return this; } + // optional .Severity severity = 11; private org.sonar.batch.protocol.Constants.Severity severity_ = org.sonar.batch.protocol.Constants.Severity.INFO; /** * <code>optional .Severity severity = 11;</code> @@ -6776,6 +6898,7 @@ public final class BatchReport { return this; } + // optional string alert_status = 12; private java.lang.Object alertStatus_ = ""; /** * <code>optional string alert_status = 12;</code> @@ -6789,12 +6912,9 @@ public final class BatchReport { public java.lang.String getAlertStatus() { java.lang.Object ref = alertStatus_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - alertStatus_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + alertStatus_ = s; return s; } else { return (java.lang.String) ref; @@ -6852,6 +6972,7 @@ public final class BatchReport { return this; } + // optional string alert_text = 13; private java.lang.Object alertText_ = ""; /** * <code>optional string alert_text = 13;</code> @@ -6865,12 +6986,9 @@ public final class BatchReport { public java.lang.String getAlertText() { java.lang.Object ref = alertText_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - alertText_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + alertText_ = s; return s; } else { return (java.lang.String) ref; @@ -6928,6 +7046,7 @@ public final class BatchReport { return this; } + // optional double variation_value_1 = 14; private double variationValue1_ ; /** * <code>optional double variation_value_1 = 14;</code> @@ -6960,6 +7079,7 @@ public final class BatchReport { return this; } + // optional double variation_value_2 = 15; private double variationValue2_ ; /** * <code>optional double variation_value_2 = 15;</code> @@ -6992,6 +7112,7 @@ public final class BatchReport { return this; } + // optional double variation_value_3 = 16; private double variationValue3_ ; /** * <code>optional double variation_value_3 = 16;</code> @@ -7024,6 +7145,7 @@ public final class BatchReport { return this; } + // optional double variation_value_4 = 17; private double variationValue4_ ; /** * <code>optional double variation_value_4 = 17;</code> @@ -7056,6 +7178,7 @@ public final class BatchReport { return this; } + // optional double variation_value_5 = 18; private double variationValue5_ ; /** * <code>optional double variation_value_5 = 18;</code> @@ -7088,6 +7211,7 @@ public final class BatchReport { return this; } + // optional int32 tendency = 19; private int tendency_ ; /** * <code>optional int32 tendency = 19;</code> @@ -7120,6 +7244,7 @@ public final class BatchReport { return this; } + // optional int32 characteric_id = 20; private int charactericId_ ; /** * <code>optional int32 characteric_id = 20;</code> @@ -7152,6 +7277,39 @@ public final class BatchReport { return this; } + // optional int32 person_id = 21; + private int personId_ ; + /** + * <code>optional int32 person_id = 21;</code> + */ + public boolean hasPersonId() { + return ((bitField0_ & 0x00080000) == 0x00080000); + } + /** + * <code>optional int32 person_id = 21;</code> + */ + public int getPersonId() { + return personId_; + } + /** + * <code>optional int32 person_id = 21;</code> + */ + public Builder setPersonId(int value) { + bitField0_ |= 0x00080000; + personId_ = value; + onChanged(); + return this; + } + /** + * <code>optional int32 person_id = 21;</code> + */ + public Builder clearPersonId() { + bitField0_ = (bitField0_ & ~0x00080000); + personId_ = 0; + onChanged(); + return this; + } + // @@protoc_insertion_point(builder_scope:Measure) } @@ -7163,10 +7321,10 @@ public final class BatchReport { // @@protoc_insertion_point(class_scope:Measure) } - public interface MeasuresOrBuilder extends - // @@protoc_insertion_point(interface_extends:Measures) - com.google.protobuf.MessageOrBuilder { + public interface MeasuresOrBuilder + extends com.google.protobuf.MessageOrBuilder { + // optional int32 component_ref = 1; /** * <code>optional int32 component_ref = 1;</code> */ @@ -7176,6 +7334,7 @@ public final class BatchReport { */ int getComponentRef(); + // repeated .Measure measure = 2; /** * <code>repeated .Measure measure = 2;</code> */ @@ -7204,9 +7363,8 @@ public final class BatchReport { * Protobuf type {@code Measures} */ public static final class Measures extends - com.google.protobuf.GeneratedMessage implements - // @@protoc_insertion_point(message_implements:Measures) - MeasuresOrBuilder { + com.google.protobuf.GeneratedMessage + implements MeasuresOrBuilder { // Use Measures.newBuilder() to construct. private Measures(com.google.protobuf.GeneratedMessage.Builder<?> builder) { super(builder); @@ -7308,6 +7466,7 @@ public final class BatchReport { } private int bitField0_; + // optional int32 component_ref = 1; public static final int COMPONENT_REF_FIELD_NUMBER = 1; private int componentRef_; /** @@ -7323,6 +7482,7 @@ public final class BatchReport { return componentRef_; } + // repeated .Measure measure = 2; public static final int MEASURE_FIELD_NUMBER = 2; private java.util.List<org.sonar.batch.protocol.output.BatchReport.Measure> measure_; /** @@ -7365,8 +7525,7 @@ public final class BatchReport { private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; + if (isInitialized != -1) return isInitialized == 1; memoizedIsInitialized = 1; return true; @@ -7480,9 +7639,8 @@ public final class BatchReport { * Protobuf type {@code Measures} */ public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder<Builder> implements - // @@protoc_insertion_point(builder_implements:Measures) - org.sonar.batch.protocol.output.BatchReport.MeasuresOrBuilder { + com.google.protobuf.GeneratedMessage.Builder<Builder> + implements org.sonar.batch.protocol.output.BatchReport.MeasuresOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.sonar.batch.protocol.output.BatchReport.internal_static_Measures_descriptor; @@ -7637,6 +7795,7 @@ public final class BatchReport { } private int bitField0_; + // optional int32 component_ref = 1; private int componentRef_ ; /** * <code>optional int32 component_ref = 1;</code> @@ -7669,6 +7828,7 @@ public final class BatchReport { return this; } + // repeated .Measure measure = 2; private java.util.List<org.sonar.batch.protocol.output.BatchReport.Measure> measure_ = java.util.Collections.emptyList(); private void ensureMeasureIsMutable() { @@ -7810,8 +7970,7 @@ public final class BatchReport { java.lang.Iterable<? extends org.sonar.batch.protocol.output.BatchReport.Measure> values) { if (measureBuilder_ == null) { ensureMeasureIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, measure_); + super.addAll(values, measure_); onChanged(); } else { measureBuilder_.addAllMessages(values); @@ -7920,10 +8079,10 @@ public final class BatchReport { // @@protoc_insertion_point(class_scope:Measures) } - public interface IssueOrBuilder extends - // @@protoc_insertion_point(interface_extends:Issue) - com.google.protobuf.MessageOrBuilder { + public interface IssueOrBuilder + extends com.google.protobuf.MessageOrBuilder { + // optional string rule_repository = 1; /** * <code>optional string rule_repository = 1;</code> */ @@ -7938,6 +8097,7 @@ public final class BatchReport { com.google.protobuf.ByteString getRuleRepositoryBytes(); + // optional string rule_key = 2; /** * <code>optional string rule_key = 2;</code> */ @@ -7952,6 +8112,7 @@ public final class BatchReport { com.google.protobuf.ByteString getRuleKeyBytes(); + // optional int32 line = 3; /** * <code>optional int32 line = 3;</code> */ @@ -7961,6 +8122,7 @@ public final class BatchReport { */ int getLine(); + // optional string msg = 4; /** * <code>optional string msg = 4;</code> */ @@ -7975,6 +8137,7 @@ public final class BatchReport { com.google.protobuf.ByteString getMsgBytes(); + // optional .Severity severity = 5; /** * <code>optional .Severity severity = 5;</code> */ @@ -7984,11 +8147,12 @@ public final class BatchReport { */ org.sonar.batch.protocol.Constants.Severity getSeverity(); + // repeated string tag = 6; /** * <code>repeated string tag = 6;</code> */ - com.google.protobuf.ProtocolStringList - getTagList(); + java.util.List<java.lang.String> + getTagList(); /** * <code>repeated string tag = 6;</code> */ @@ -8003,6 +8167,7 @@ public final class BatchReport { com.google.protobuf.ByteString getTagBytes(int index); + // optional double effort_to_fix = 7; /** * <code>optional double effort_to_fix = 7;</code> * @@ -8020,6 +8185,7 @@ public final class BatchReport { */ double getEffortToFix(); + // optional bool is_new = 8; /** * <code>optional bool is_new = 8;</code> */ @@ -8029,6 +8195,7 @@ public final class BatchReport { */ boolean getIsNew(); + // optional string uuid = 9; /** * <code>optional string uuid = 9;</code> */ @@ -8043,6 +8210,7 @@ public final class BatchReport { com.google.protobuf.ByteString getUuidBytes(); + // optional int64 debt_in_minutes = 10; /** * <code>optional int64 debt_in_minutes = 10;</code> */ @@ -8052,6 +8220,7 @@ public final class BatchReport { */ long getDebtInMinutes(); + // optional string resolution = 11; /** * <code>optional string resolution = 11;</code> */ @@ -8066,6 +8235,7 @@ public final class BatchReport { com.google.protobuf.ByteString getResolutionBytes(); + // optional string status = 12; /** * <code>optional string status = 12;</code> */ @@ -8080,6 +8250,7 @@ public final class BatchReport { com.google.protobuf.ByteString getStatusBytes(); + // optional string checksum = 13; /** * <code>optional string checksum = 13;</code> */ @@ -8094,6 +8265,7 @@ public final class BatchReport { com.google.protobuf.ByteString getChecksumBytes(); + // optional bool manual_severity = 14; /** * <code>optional bool manual_severity = 14;</code> */ @@ -8103,6 +8275,7 @@ public final class BatchReport { */ boolean getManualSeverity(); + // optional string reporter = 15; /** * <code>optional string reporter = 15;</code> */ @@ -8117,6 +8290,7 @@ public final class BatchReport { com.google.protobuf.ByteString getReporterBytes(); + // optional string assignee = 16; /** * <code>optional string assignee = 16;</code> */ @@ -8131,6 +8305,7 @@ public final class BatchReport { com.google.protobuf.ByteString getAssigneeBytes(); + // optional string action_plan_key = 17; /** * <code>optional string action_plan_key = 17;</code> */ @@ -8145,6 +8320,7 @@ public final class BatchReport { com.google.protobuf.ByteString getActionPlanKeyBytes(); + // optional string attributes = 18; /** * <code>optional string attributes = 18;</code> */ @@ -8159,6 +8335,7 @@ public final class BatchReport { com.google.protobuf.ByteString getAttributesBytes(); + // optional string author_login = 19; /** * <code>optional string author_login = 19;</code> */ @@ -8173,6 +8350,7 @@ public final class BatchReport { com.google.protobuf.ByteString getAuthorLoginBytes(); + // optional int64 creation_date = 20; /** * <code>optional int64 creation_date = 20;</code> */ @@ -8182,6 +8360,7 @@ public final class BatchReport { */ long getCreationDate(); + // optional int64 close_date = 21; /** * <code>optional int64 close_date = 21;</code> */ @@ -8191,6 +8370,7 @@ public final class BatchReport { */ long getCloseDate(); + // optional int64 update_date = 22; /** * <code>optional int64 update_date = 22;</code> */ @@ -8200,6 +8380,7 @@ public final class BatchReport { */ long getUpdateDate(); + // optional int64 selected_at = 23; /** * <code>optional int64 selected_at = 23;</code> */ @@ -8209,6 +8390,7 @@ public final class BatchReport { */ long getSelectedAt(); + // optional string diff_fields = 24; /** * <code>optional string diff_fields = 24;</code> */ @@ -8223,6 +8405,7 @@ public final class BatchReport { com.google.protobuf.ByteString getDiffFieldsBytes(); + // optional bool is_changed = 25; /** * <code>optional bool is_changed = 25;</code> */ @@ -8232,6 +8415,7 @@ public final class BatchReport { */ boolean getIsChanged(); + // optional bool must_send_notification = 26; /** * <code>optional bool must_send_notification = 26;</code> */ @@ -8245,9 +8429,8 @@ public final class BatchReport { * Protobuf type {@code Issue} */ public static final class Issue extends - com.google.protobuf.GeneratedMessage implements - // @@protoc_insertion_point(message_implements:Issue) - IssueOrBuilder { + com.google.protobuf.GeneratedMessage + implements IssueOrBuilder { // Use Issue.newBuilder() to construct. private Issue(com.google.protobuf.GeneratedMessage.Builder<?> builder) { super(builder); @@ -8294,15 +8477,13 @@ public final class BatchReport { break; } case 10: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000001; - ruleRepository_ = bs; + ruleRepository_ = input.readBytes(); break; } case 18: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000002; - ruleKey_ = bs; + ruleKey_ = input.readBytes(); break; } case 24: { @@ -8311,9 +8492,8 @@ public final class BatchReport { break; } case 34: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000008; - msg_ = bs; + msg_ = input.readBytes(); break; } case 40: { @@ -8328,12 +8508,11 @@ public final class BatchReport { break; } case 50: { - com.google.protobuf.ByteString bs = input.readBytes(); if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { tag_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000020; } - tag_.add(bs); + tag_.add(input.readBytes()); break; } case 57: { @@ -8347,9 +8526,8 @@ public final class BatchReport { break; } case 74: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000080; - uuid_ = bs; + uuid_ = input.readBytes(); break; } case 80: { @@ -8358,21 +8536,18 @@ public final class BatchReport { break; } case 90: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000200; - resolution_ = bs; + resolution_ = input.readBytes(); break; } case 98: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000400; - status_ = bs; + status_ = input.readBytes(); break; } case 106: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000800; - checksum_ = bs; + checksum_ = input.readBytes(); break; } case 112: { @@ -8381,33 +8556,28 @@ public final class BatchReport { break; } case 122: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00002000; - reporter_ = bs; + reporter_ = input.readBytes(); break; } case 130: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00004000; - assignee_ = bs; + assignee_ = input.readBytes(); break; } case 138: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00008000; - actionPlanKey_ = bs; + actionPlanKey_ = input.readBytes(); break; } case 146: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00010000; - attributes_ = bs; + attributes_ = input.readBytes(); break; } case 154: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00020000; - authorLogin_ = bs; + authorLogin_ = input.readBytes(); break; } case 160: { @@ -8431,9 +8601,8 @@ public final class BatchReport { break; } case 194: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00400000; - diffFields_ = bs; + diffFields_ = input.readBytes(); break; } case 200: { @@ -8455,7 +8624,7 @@ public final class BatchReport { e.getMessage()).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { - tag_ = tag_.getUnmodifiableView(); + tag_ = new com.google.protobuf.UnmodifiableLazyStringList(tag_); } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -8489,6 +8658,7 @@ public final class BatchReport { } private int bitField0_; + // optional string rule_repository = 1; public static final int RULE_REPOSITORY_FIELD_NUMBER = 1; private java.lang.Object ruleRepository_; /** @@ -8531,6 +8701,7 @@ public final class BatchReport { } } + // optional string rule_key = 2; public static final int RULE_KEY_FIELD_NUMBER = 2; private java.lang.Object ruleKey_; /** @@ -8573,6 +8744,7 @@ public final class BatchReport { } } + // optional int32 line = 3; public static final int LINE_FIELD_NUMBER = 3; private int line_; /** @@ -8588,6 +8760,7 @@ public final class BatchReport { return line_; } + // optional string msg = 4; public static final int MSG_FIELD_NUMBER = 4; private java.lang.Object msg_; /** @@ -8630,6 +8803,7 @@ public final class BatchReport { } } + // optional .Severity severity = 5; public static final int SEVERITY_FIELD_NUMBER = 5; private org.sonar.batch.protocol.Constants.Severity severity_; /** @@ -8645,12 +8819,13 @@ public final class BatchReport { return severity_; } + // repeated string tag = 6; public static final int TAG_FIELD_NUMBER = 6; private com.google.protobuf.LazyStringList tag_; /** * <code>repeated string tag = 6;</code> */ - public com.google.protobuf.ProtocolStringList + public java.util.List<java.lang.String> getTagList() { return tag_; } @@ -8674,6 +8849,7 @@ public final class BatchReport { return tag_.getByteString(index); } + // optional double effort_to_fix = 7; public static final int EFFORT_TO_FIX_FIELD_NUMBER = 7; private double effortToFix_; /** @@ -8697,6 +8873,7 @@ public final class BatchReport { return effortToFix_; } + // optional bool is_new = 8; public static final int IS_NEW_FIELD_NUMBER = 8; private boolean isNew_; /** @@ -8712,6 +8889,7 @@ public final class BatchReport { return isNew_; } + // optional string uuid = 9; public static final int UUID_FIELD_NUMBER = 9; private java.lang.Object uuid_; /** @@ -8754,6 +8932,7 @@ public final class BatchReport { } } + // optional int64 debt_in_minutes = 10; public static final int DEBT_IN_MINUTES_FIELD_NUMBER = 10; private long debtInMinutes_; /** @@ -8769,6 +8948,7 @@ public final class BatchReport { return debtInMinutes_; } + // optional string resolution = 11; public static final int RESOLUTION_FIELD_NUMBER = 11; private java.lang.Object resolution_; /** @@ -8811,6 +8991,7 @@ public final class BatchReport { } } + // optional string status = 12; public static final int STATUS_FIELD_NUMBER = 12; private java.lang.Object status_; /** @@ -8853,6 +9034,7 @@ public final class BatchReport { } } + // optional string checksum = 13; public static final int CHECKSUM_FIELD_NUMBER = 13; private java.lang.Object checksum_; /** @@ -8895,6 +9077,7 @@ public final class BatchReport { } } + // optional bool manual_severity = 14; public static final int MANUAL_SEVERITY_FIELD_NUMBER = 14; private boolean manualSeverity_; /** @@ -8910,6 +9093,7 @@ public final class BatchReport { return manualSeverity_; } + // optional string reporter = 15; public static final int REPORTER_FIELD_NUMBER = 15; private java.lang.Object reporter_; /** @@ -8952,6 +9136,7 @@ public final class BatchReport { } } + // optional string assignee = 16; public static final int ASSIGNEE_FIELD_NUMBER = 16; private java.lang.Object assignee_; /** @@ -8994,6 +9179,7 @@ public final class BatchReport { } } + // optional string action_plan_key = 17; public static final int ACTION_PLAN_KEY_FIELD_NUMBER = 17; private java.lang.Object actionPlanKey_; /** @@ -9036,6 +9222,7 @@ public final class BatchReport { } } + // optional string attributes = 18; public static final int ATTRIBUTES_FIELD_NUMBER = 18; private java.lang.Object attributes_; /** @@ -9078,6 +9265,7 @@ public final class BatchReport { } } + // optional string author_login = 19; public static final int AUTHOR_LOGIN_FIELD_NUMBER = 19; private java.lang.Object authorLogin_; /** @@ -9120,6 +9308,7 @@ public final class BatchReport { } } + // optional int64 creation_date = 20; public static final int CREATION_DATE_FIELD_NUMBER = 20; private long creationDate_; /** @@ -9135,6 +9324,7 @@ public final class BatchReport { return creationDate_; } + // optional int64 close_date = 21; public static final int CLOSE_DATE_FIELD_NUMBER = 21; private long closeDate_; /** @@ -9150,6 +9340,7 @@ public final class BatchReport { return closeDate_; } + // optional int64 update_date = 22; public static final int UPDATE_DATE_FIELD_NUMBER = 22; private long updateDate_; /** @@ -9165,6 +9356,7 @@ public final class BatchReport { return updateDate_; } + // optional int64 selected_at = 23; public static final int SELECTED_AT_FIELD_NUMBER = 23; private long selectedAt_; /** @@ -9180,6 +9372,7 @@ public final class BatchReport { return selectedAt_; } + // optional string diff_fields = 24; public static final int DIFF_FIELDS_FIELD_NUMBER = 24; private java.lang.Object diffFields_; /** @@ -9222,6 +9415,7 @@ public final class BatchReport { } } + // optional bool is_changed = 25; public static final int IS_CHANGED_FIELD_NUMBER = 25; private boolean isChanged_; /** @@ -9237,6 +9431,7 @@ public final class BatchReport { return isChanged_; } + // optional bool must_send_notification = 26; public static final int MUST_SEND_NOTIFICATION_FIELD_NUMBER = 26; private boolean mustSendNotification_; /** @@ -9283,8 +9478,7 @@ public final class BatchReport { private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; + if (isInitialized != -1) return isInitialized == 1; memoizedIsInitialized = 1; return true; @@ -9571,9 +9765,8 @@ public final class BatchReport { * Protobuf type {@code Issue} */ public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder<Builder> implements - // @@protoc_insertion_point(builder_implements:Issue) - org.sonar.batch.protocol.output.BatchReport.IssueOrBuilder { + com.google.protobuf.GeneratedMessage.Builder<Builder> + implements org.sonar.batch.protocol.output.BatchReport.IssueOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.sonar.batch.protocol.output.BatchReport.internal_static_Issue_descriptor; @@ -9707,7 +9900,8 @@ public final class BatchReport { } result.severity_ = severity_; if (((bitField0_ & 0x00000020) == 0x00000020)) { - tag_ = tag_.getUnmodifiableView(); + tag_ = new com.google.protobuf.UnmodifiableLazyStringList( + tag_); bitField0_ = (bitField0_ & ~0x00000020); } result.tag_ = tag_; @@ -9945,6 +10139,7 @@ public final class BatchReport { } private int bitField0_; + // optional string rule_repository = 1; private java.lang.Object ruleRepository_ = ""; /** * <code>optional string rule_repository = 1;</code> @@ -9958,12 +10153,9 @@ public final class BatchReport { public java.lang.String getRuleRepository() { java.lang.Object ref = ruleRepository_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - ruleRepository_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + ruleRepository_ = s; return s; } else { return (java.lang.String) ref; @@ -10021,6 +10213,7 @@ public final class BatchReport { return this; } + // optional string rule_key = 2; private java.lang.Object ruleKey_ = ""; /** * <code>optional string rule_key = 2;</code> @@ -10034,12 +10227,9 @@ public final class BatchReport { public java.lang.String getRuleKey() { java.lang.Object ref = ruleKey_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - ruleKey_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + ruleKey_ = s; return s; } else { return (java.lang.String) ref; @@ -10097,6 +10287,7 @@ public final class BatchReport { return this; } + // optional int32 line = 3; private int line_ ; /** * <code>optional int32 line = 3;</code> @@ -10129,6 +10320,7 @@ public final class BatchReport { return this; } + // optional string msg = 4; private java.lang.Object msg_ = ""; /** * <code>optional string msg = 4;</code> @@ -10142,12 +10334,9 @@ public final class BatchReport { public java.lang.String getMsg() { java.lang.Object ref = msg_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - msg_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + msg_ = s; return s; } else { return (java.lang.String) ref; @@ -10205,6 +10394,7 @@ public final class BatchReport { return this; } + // optional .Severity severity = 5; private org.sonar.batch.protocol.Constants.Severity severity_ = org.sonar.batch.protocol.Constants.Severity.INFO; /** * <code>optional .Severity severity = 5;</code> @@ -10240,6 +10430,7 @@ public final class BatchReport { return this; } + // repeated string tag = 6; private com.google.protobuf.LazyStringList tag_ = com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureTagIsMutable() { if (!((bitField0_ & 0x00000020) == 0x00000020)) { @@ -10250,9 +10441,9 @@ public final class BatchReport { /** * <code>repeated string tag = 6;</code> */ - public com.google.protobuf.ProtocolStringList + public java.util.List<java.lang.String> getTagList() { - return tag_.getUnmodifiableView(); + return java.util.Collections.unmodifiableList(tag_); } /** * <code>repeated string tag = 6;</code> @@ -10305,8 +10496,7 @@ public final class BatchReport { public Builder addAllTag( java.lang.Iterable<java.lang.String> values) { ensureTagIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, tag_); + super.addAll(values, tag_); onChanged(); return this; } @@ -10333,6 +10523,7 @@ public final class BatchReport { return this; } + // optional double effort_to_fix = 7; private double effortToFix_ ; /** * <code>optional double effort_to_fix = 7;</code> @@ -10381,6 +10572,7 @@ public final class BatchReport { return this; } + // optional bool is_new = 8; private boolean isNew_ ; /** * <code>optional bool is_new = 8;</code> @@ -10413,6 +10605,7 @@ public final class BatchReport { return this; } + // optional string uuid = 9; private java.lang.Object uuid_ = ""; /** * <code>optional string uuid = 9;</code> @@ -10426,12 +10619,9 @@ public final class BatchReport { public java.lang.String getUuid() { java.lang.Object ref = uuid_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - uuid_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + uuid_ = s; return s; } else { return (java.lang.String) ref; @@ -10489,6 +10679,7 @@ public final class BatchReport { return this; } + // optional int64 debt_in_minutes = 10; private long debtInMinutes_ ; /** * <code>optional int64 debt_in_minutes = 10;</code> @@ -10521,6 +10712,7 @@ public final class BatchReport { return this; } + // optional string resolution = 11; private java.lang.Object resolution_ = ""; /** * <code>optional string resolution = 11;</code> @@ -10534,12 +10726,9 @@ public final class BatchReport { public java.lang.String getResolution() { java.lang.Object ref = resolution_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - resolution_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + resolution_ = s; return s; } else { return (java.lang.String) ref; @@ -10597,6 +10786,7 @@ public final class BatchReport { return this; } + // optional string status = 12; private java.lang.Object status_ = ""; /** * <code>optional string status = 12;</code> @@ -10610,12 +10800,9 @@ public final class BatchReport { public java.lang.String getStatus() { java.lang.Object ref = status_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - status_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + status_ = s; return s; } else { return (java.lang.String) ref; @@ -10673,6 +10860,7 @@ public final class BatchReport { return this; } + // optional string checksum = 13; private java.lang.Object checksum_ = ""; /** * <code>optional string checksum = 13;</code> @@ -10686,12 +10874,9 @@ public final class BatchReport { public java.lang.String getChecksum() { java.lang.Object ref = checksum_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - checksum_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + checksum_ = s; return s; } else { return (java.lang.String) ref; @@ -10749,6 +10934,7 @@ public final class BatchReport { return this; } + // optional bool manual_severity = 14; private boolean manualSeverity_ ; /** * <code>optional bool manual_severity = 14;</code> @@ -10781,6 +10967,7 @@ public final class BatchReport { return this; } + // optional string reporter = 15; private java.lang.Object reporter_ = ""; /** * <code>optional string reporter = 15;</code> @@ -10794,12 +10981,9 @@ public final class BatchReport { public java.lang.String getReporter() { java.lang.Object ref = reporter_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - reporter_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + reporter_ = s; return s; } else { return (java.lang.String) ref; @@ -10857,6 +11041,7 @@ public final class BatchReport { return this; } + // optional string assignee = 16; private java.lang.Object assignee_ = ""; /** * <code>optional string assignee = 16;</code> @@ -10870,12 +11055,9 @@ public final class BatchReport { public java.lang.String getAssignee() { java.lang.Object ref = assignee_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - assignee_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + assignee_ = s; return s; } else { return (java.lang.String) ref; @@ -10933,6 +11115,7 @@ public final class BatchReport { return this; } + // optional string action_plan_key = 17; private java.lang.Object actionPlanKey_ = ""; /** * <code>optional string action_plan_key = 17;</code> @@ -10946,12 +11129,9 @@ public final class BatchReport { public java.lang.String getActionPlanKey() { java.lang.Object ref = actionPlanKey_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - actionPlanKey_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + actionPlanKey_ = s; return s; } else { return (java.lang.String) ref; @@ -11009,6 +11189,7 @@ public final class BatchReport { return this; } + // optional string attributes = 18; private java.lang.Object attributes_ = ""; /** * <code>optional string attributes = 18;</code> @@ -11022,12 +11203,9 @@ public final class BatchReport { public java.lang.String getAttributes() { java.lang.Object ref = attributes_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - attributes_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + attributes_ = s; return s; } else { return (java.lang.String) ref; @@ -11085,6 +11263,7 @@ public final class BatchReport { return this; } + // optional string author_login = 19; private java.lang.Object authorLogin_ = ""; /** * <code>optional string author_login = 19;</code> @@ -11098,12 +11277,9 @@ public final class BatchReport { public java.lang.String getAuthorLogin() { java.lang.Object ref = authorLogin_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - authorLogin_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + authorLogin_ = s; return s; } else { return (java.lang.String) ref; @@ -11161,6 +11337,7 @@ public final class BatchReport { return this; } + // optional int64 creation_date = 20; private long creationDate_ ; /** * <code>optional int64 creation_date = 20;</code> @@ -11193,6 +11370,7 @@ public final class BatchReport { return this; } + // optional int64 close_date = 21; private long closeDate_ ; /** * <code>optional int64 close_date = 21;</code> @@ -11225,6 +11403,7 @@ public final class BatchReport { return this; } + // optional int64 update_date = 22; private long updateDate_ ; /** * <code>optional int64 update_date = 22;</code> @@ -11257,6 +11436,7 @@ public final class BatchReport { return this; } + // optional int64 selected_at = 23; private long selectedAt_ ; /** * <code>optional int64 selected_at = 23;</code> @@ -11289,6 +11469,7 @@ public final class BatchReport { return this; } + // optional string diff_fields = 24; private java.lang.Object diffFields_ = ""; /** * <code>optional string diff_fields = 24;</code> @@ -11302,12 +11483,9 @@ public final class BatchReport { public java.lang.String getDiffFields() { java.lang.Object ref = diffFields_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - diffFields_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + diffFields_ = s; return s; } else { return (java.lang.String) ref; @@ -11365,6 +11543,7 @@ public final class BatchReport { return this; } + // optional bool is_changed = 25; private boolean isChanged_ ; /** * <code>optional bool is_changed = 25;</code> @@ -11397,6 +11576,7 @@ public final class BatchReport { return this; } + // optional bool must_send_notification = 26; private boolean mustSendNotification_ ; /** * <code>optional bool must_send_notification = 26;</code> @@ -11440,10 +11620,10 @@ public final class BatchReport { // @@protoc_insertion_point(class_scope:Issue) } - public interface IssuesOrBuilder extends - // @@protoc_insertion_point(interface_extends:Issues) - com.google.protobuf.MessageOrBuilder { + public interface IssuesOrBuilder + extends com.google.protobuf.MessageOrBuilder { + // optional int32 component_ref = 1; /** * <code>optional int32 component_ref = 1;</code> */ @@ -11453,6 +11633,7 @@ public final class BatchReport { */ int getComponentRef(); + // repeated .Issue issue = 2; /** * <code>repeated .Issue issue = 2;</code> */ @@ -11477,6 +11658,7 @@ public final class BatchReport { org.sonar.batch.protocol.output.BatchReport.IssueOrBuilder getIssueOrBuilder( int index); + // optional string component_uuid = 3; /** * <code>optional string component_uuid = 3;</code> * @@ -11507,9 +11689,8 @@ public final class BatchReport { * Protobuf type {@code Issues} */ public static final class Issues extends - com.google.protobuf.GeneratedMessage implements - // @@protoc_insertion_point(message_implements:Issues) - IssuesOrBuilder { + com.google.protobuf.GeneratedMessage + implements IssuesOrBuilder { // Use Issues.newBuilder() to construct. private Issues(com.google.protobuf.GeneratedMessage.Builder<?> builder) { super(builder); @@ -11569,9 +11750,8 @@ public final class BatchReport { break; } case 26: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000002; - componentUuid_ = bs; + componentUuid_ = input.readBytes(); break; } } @@ -11617,6 +11797,7 @@ public final class BatchReport { } private int bitField0_; + // optional int32 component_ref = 1; public static final int COMPONENT_REF_FIELD_NUMBER = 1; private int componentRef_; /** @@ -11632,6 +11813,7 @@ public final class BatchReport { return componentRef_; } + // repeated .Issue issue = 2; public static final int ISSUE_FIELD_NUMBER = 2; private java.util.List<org.sonar.batch.protocol.output.BatchReport.Issue> issue_; /** @@ -11667,6 +11849,7 @@ public final class BatchReport { return issue_.get(index); } + // optional string component_uuid = 3; public static final int COMPONENT_UUID_FIELD_NUMBER = 3; private java.lang.Object componentUuid_; /** @@ -11729,8 +11912,7 @@ public final class BatchReport { private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; + if (isInitialized != -1) return isInitialized == 1; memoizedIsInitialized = 1; return true; @@ -11851,9 +12033,8 @@ public final class BatchReport { * Protobuf type {@code Issues} */ public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder<Builder> implements - // @@protoc_insertion_point(builder_implements:Issues) - org.sonar.batch.protocol.output.BatchReport.IssuesOrBuilder { + com.google.protobuf.GeneratedMessage.Builder<Builder> + implements org.sonar.batch.protocol.output.BatchReport.IssuesOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.sonar.batch.protocol.output.BatchReport.internal_static_Issues_descriptor; @@ -12019,6 +12200,7 @@ public final class BatchReport { } private int bitField0_; + // optional int32 component_ref = 1; private int componentRef_ ; /** * <code>optional int32 component_ref = 1;</code> @@ -12051,6 +12233,7 @@ public final class BatchReport { return this; } + // repeated .Issue issue = 2; private java.util.List<org.sonar.batch.protocol.output.BatchReport.Issue> issue_ = java.util.Collections.emptyList(); private void ensureIssueIsMutable() { @@ -12192,8 +12375,7 @@ public final class BatchReport { java.lang.Iterable<? extends org.sonar.batch.protocol.output.BatchReport.Issue> values) { if (issueBuilder_ == null) { ensureIssueIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, issue_); + super.addAll(values, issue_); onChanged(); } else { issueBuilder_.addAllMessages(values); @@ -12291,6 +12473,7 @@ public final class BatchReport { return issueBuilder_; } + // optional string component_uuid = 3; private java.lang.Object componentUuid_ = ""; /** * <code>optional string component_uuid = 3;</code> @@ -12312,12 +12495,9 @@ public final class BatchReport { public java.lang.String getComponentUuid() { java.lang.Object ref = componentUuid_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - componentUuid_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + componentUuid_ = s; return s; } else { return (java.lang.String) ref; @@ -12402,42 +12582,42 @@ public final class BatchReport { // @@protoc_insertion_point(class_scope:Issues) } - private static final com.google.protobuf.Descriptors.Descriptor + private static com.google.protobuf.Descriptors.Descriptor internal_static_Metadata_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_Metadata_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor + private static com.google.protobuf.Descriptors.Descriptor internal_static_ComponentLink_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_ComponentLink_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor + private static com.google.protobuf.Descriptors.Descriptor internal_static_Event_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_Event_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor + private static com.google.protobuf.Descriptors.Descriptor internal_static_Component_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_Component_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor + private static com.google.protobuf.Descriptors.Descriptor internal_static_Measure_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_Measure_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor + private static com.google.protobuf.Descriptors.Descriptor internal_static_Measures_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_Measures_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor + private static com.google.protobuf.Descriptors.Descriptor internal_static_Issue_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_Issue_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor + private static com.google.protobuf.Descriptors.Descriptor internal_static_Issues_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable @@ -12466,7 +12646,7 @@ public final class BatchReport { "\001(\t\022\025\n\tchild_ref\030\007 \003(\005B\002\020\001\022\034\n\004link\030\n \003(\013" + "2\016.ComponentLink\022\017\n\007version\030\014 \001(\t\022\n\n\002id\030" + "\r \001(\003\022\023\n\013snapshot_id\030\010 \001(\003\022\014\n\004uuid\030\t \001(\t" + - "\022\025\n\005event\030\013 \003(\0132\006.Event\"\315\003\n\007Measure\022%\n\nv" + + "\022\025\n\005event\030\013 \003(\0132\006.Event\"\340\003\n\007Measure\022%\n\nv" + "alue_type\030\001 \001(\0162\021.MeasureValueType\022\025\n\rbo" + "olean_value\030\002 \001(\010\022\021\n\tint_value\030\003 \001(\005\022\022\n\n" + "long_value\030\004 \001(\003\022\024\n\014double_value\030\005 \001(\001\022\024" + @@ -12478,88 +12658,87 @@ public final class BatchReport { " \001(\001\022\031\n\021variation_value_3\030\020 \001(\001\022\031\n\021varia" + "tion_value_4\030\021 \001(\001\022\031\n\021variation_value_5\030" + "\022 \001(\001\022\020\n\010tendency\030\023 \001(\005\022\026\n\016characteric_i" + - "d\030\024 \001(\005\"<\n\010Measures\022\025\n\rcomponent_ref\030\001 \001" + - "(\005\022\031\n\007measure\030\002 \003(\0132\010.Measure\"\231\004\n\005Issue\022" + - "\027\n\017rule_repository\030\001 \001(\t\022\020\n\010rule_key\030\002 \001", - "(\t\022\014\n\004line\030\003 \001(\005\022\013\n\003msg\030\004 \001(\t\022\033\n\010severit" + - "y\030\005 \001(\0162\t.Severity\022\013\n\003tag\030\006 \003(\t\022\025\n\reffor" + - "t_to_fix\030\007 \001(\001\022\016\n\006is_new\030\010 \001(\010\022\014\n\004uuid\030\t" + - " \001(\t\022\027\n\017debt_in_minutes\030\n \001(\003\022\022\n\nresolut" + - "ion\030\013 \001(\t\022\016\n\006status\030\014 \001(\t\022\020\n\010checksum\030\r " + - "\001(\t\022\027\n\017manual_severity\030\016 \001(\010\022\020\n\010reporter" + - "\030\017 \001(\t\022\020\n\010assignee\030\020 \001(\t\022\027\n\017action_plan_" + - "key\030\021 \001(\t\022\022\n\nattributes\030\022 \001(\t\022\024\n\014author_" + - "login\030\023 \001(\t\022\025\n\rcreation_date\030\024 \001(\003\022\022\n\ncl" + - "ose_date\030\025 \001(\003\022\023\n\013update_date\030\026 \001(\003\022\023\n\013s", - "elected_at\030\027 \001(\003\022\023\n\013diff_fields\030\030 \001(\t\022\022\n" + - "\nis_changed\030\031 \001(\010\022\036\n\026must_send_notificat" + - "ion\030\032 \001(\010\"N\n\006Issues\022\025\n\rcomponent_ref\030\001 \001" + - "(\005\022\025\n\005issue\030\002 \003(\0132\006.Issue\022\026\n\016component_u" + - "uid\030\003 \001(\tB#\n\037org.sonar.batch.protocol.ou" + - "tputH\001" + "d\030\024 \001(\005\022\021\n\tperson_id\030\025 \001(\005\"<\n\010Measures\022\025" + + "\n\rcomponent_ref\030\001 \001(\005\022\031\n\007measure\030\002 \003(\0132\010" + + ".Measure\"\231\004\n\005Issue\022\027\n\017rule_repository\030\001 ", + "\001(\t\022\020\n\010rule_key\030\002 \001(\t\022\014\n\004line\030\003 \001(\005\022\013\n\003m" + + "sg\030\004 \001(\t\022\033\n\010severity\030\005 \001(\0162\t.Severity\022\013\n" + + "\003tag\030\006 \003(\t\022\025\n\reffort_to_fix\030\007 \001(\001\022\016\n\006is_" + + "new\030\010 \001(\010\022\014\n\004uuid\030\t \001(\t\022\027\n\017debt_in_minut" + + "es\030\n \001(\003\022\022\n\nresolution\030\013 \001(\t\022\016\n\006status\030\014" + + " \001(\t\022\020\n\010checksum\030\r \001(\t\022\027\n\017manual_severit" + + "y\030\016 \001(\010\022\020\n\010reporter\030\017 \001(\t\022\020\n\010assignee\030\020 " + + "\001(\t\022\027\n\017action_plan_key\030\021 \001(\t\022\022\n\nattribut" + + "es\030\022 \001(\t\022\024\n\014author_login\030\023 \001(\t\022\025\n\rcreati" + + "on_date\030\024 \001(\003\022\022\n\nclose_date\030\025 \001(\003\022\023\n\013upd", + "ate_date\030\026 \001(\003\022\023\n\013selected_at\030\027 \001(\003\022\023\n\013d" + + "iff_fields\030\030 \001(\t\022\022\n\nis_changed\030\031 \001(\010\022\036\n\026" + + "must_send_notification\030\032 \001(\010\"N\n\006Issues\022\025" + + "\n\rcomponent_ref\030\001 \001(\005\022\025\n\005issue\030\002 \003(\0132\006.I" + + "ssue\022\026\n\016component_uuid\030\003 \001(\tB#\n\037org.sona" + + "r.batch.protocol.outputH\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; - return null; - } - }; + new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { + public com.google.protobuf.ExtensionRegistry assignDescriptors( + com.google.protobuf.Descriptors.FileDescriptor root) { + descriptor = root; + internal_static_Metadata_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_Metadata_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_Metadata_descriptor, + new java.lang.String[] { "AnalysisDate", "ProjectKey", "RootComponentRef", "SnapshotId", "DeletedComponentsCount", }); + internal_static_ComponentLink_descriptor = + getDescriptor().getMessageTypes().get(1); + internal_static_ComponentLink_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_ComponentLink_descriptor, + new java.lang.String[] { "Type", "Href", }); + internal_static_Event_descriptor = + getDescriptor().getMessageTypes().get(2); + internal_static_Event_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_Event_descriptor, + new java.lang.String[] { "ComponentRef", "Name", "Description", "Category", "EventData", }); + internal_static_Component_descriptor = + getDescriptor().getMessageTypes().get(3); + internal_static_Component_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_Component_descriptor, + new java.lang.String[] { "Ref", "Path", "Name", "Type", "IsTest", "Language", "ChildRef", "Link", "Version", "Id", "SnapshotId", "Uuid", "Event", }); + internal_static_Measure_descriptor = + getDescriptor().getMessageTypes().get(4); + internal_static_Measure_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_Measure_descriptor, + new java.lang.String[] { "ValueType", "BooleanValue", "IntValue", "LongValue", "DoubleValue", "StringValue", "MetricKey", "Description", "RuleKey", "Severity", "AlertStatus", "AlertText", "VariationValue1", "VariationValue2", "VariationValue3", "VariationValue4", "VariationValue5", "Tendency", "CharactericId", "PersonId", }); + internal_static_Measures_descriptor = + getDescriptor().getMessageTypes().get(5); + internal_static_Measures_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_Measures_descriptor, + new java.lang.String[] { "ComponentRef", "Measure", }); + internal_static_Issue_descriptor = + getDescriptor().getMessageTypes().get(6); + internal_static_Issue_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_Issue_descriptor, + new java.lang.String[] { "RuleRepository", "RuleKey", "Line", "Msg", "Severity", "Tag", "EffortToFix", "IsNew", "Uuid", "DebtInMinutes", "Resolution", "Status", "Checksum", "ManualSeverity", "Reporter", "Assignee", "ActionPlanKey", "Attributes", "AuthorLogin", "CreationDate", "CloseDate", "UpdateDate", "SelectedAt", "DiffFields", "IsChanged", "MustSendNotification", }); + internal_static_Issues_descriptor = + getDescriptor().getMessageTypes().get(7); + internal_static_Issues_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_Issues_descriptor, + new java.lang.String[] { "ComponentRef", "Issue", "ComponentUuid", }); + return null; + } + }; com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { org.sonar.batch.protocol.Constants.getDescriptor(), }, assigner); - internal_static_Metadata_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_Metadata_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_Metadata_descriptor, - new java.lang.String[] { "AnalysisDate", "ProjectKey", "RootComponentRef", "SnapshotId", "DeletedComponentsCount", }); - internal_static_ComponentLink_descriptor = - getDescriptor().getMessageTypes().get(1); - internal_static_ComponentLink_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_ComponentLink_descriptor, - new java.lang.String[] { "Type", "Href", }); - internal_static_Event_descriptor = - getDescriptor().getMessageTypes().get(2); - internal_static_Event_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_Event_descriptor, - new java.lang.String[] { "ComponentRef", "Name", "Description", "Category", "EventData", }); - internal_static_Component_descriptor = - getDescriptor().getMessageTypes().get(3); - internal_static_Component_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_Component_descriptor, - new java.lang.String[] { "Ref", "Path", "Name", "Type", "IsTest", "Language", "ChildRef", "Link", "Version", "Id", "SnapshotId", "Uuid", "Event", }); - internal_static_Measure_descriptor = - getDescriptor().getMessageTypes().get(4); - internal_static_Measure_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_Measure_descriptor, - new java.lang.String[] { "ValueType", "BooleanValue", "IntValue", "LongValue", "DoubleValue", "StringValue", "MetricKey", "Description", "RuleKey", "Severity", "AlertStatus", "AlertText", "VariationValue1", "VariationValue2", "VariationValue3", "VariationValue4", "VariationValue5", "Tendency", "CharactericId", }); - internal_static_Measures_descriptor = - getDescriptor().getMessageTypes().get(5); - internal_static_Measures_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_Measures_descriptor, - new java.lang.String[] { "ComponentRef", "Measure", }); - internal_static_Issue_descriptor = - getDescriptor().getMessageTypes().get(6); - internal_static_Issue_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_Issue_descriptor, - new java.lang.String[] { "RuleRepository", "RuleKey", "Line", "Msg", "Severity", "Tag", "EffortToFix", "IsNew", "Uuid", "DebtInMinutes", "Resolution", "Status", "Checksum", "ManualSeverity", "Reporter", "Assignee", "ActionPlanKey", "Attributes", "AuthorLogin", "CreationDate", "CloseDate", "UpdateDate", "SelectedAt", "DiffFields", "IsChanged", "MustSendNotification", }); - internal_static_Issues_descriptor = - getDescriptor().getMessageTypes().get(7); - internal_static_Issues_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_Issues_descriptor, - new java.lang.String[] { "ComponentRef", "Issue", "ComponentUuid", }); - org.sonar.batch.protocol.Constants.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/sonar-batch-protocol/src/main/gen-java/org/sonar/server/source/db/FileSourceDb.java b/sonar-batch-protocol/src/main/gen-java/org/sonar/server/source/db/FileSourceDb.java index 8dad4b4b2b6..6603bc8ef05 100644 --- a/sonar-batch-protocol/src/main/gen-java/org/sonar/server/source/db/FileSourceDb.java +++ b/sonar-batch-protocol/src/main/gen-java/org/sonar/server/source/db/FileSourceDb.java @@ -8,10 +8,10 @@ public final class FileSourceDb { public static void registerAllExtensions( com.google.protobuf.ExtensionRegistry registry) { } - public interface LineOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.sonar.server.source.db.Line) - com.google.protobuf.MessageOrBuilder { + public interface LineOrBuilder + extends com.google.protobuf.MessageOrBuilder { + // optional int32 line = 1; /** * <code>optional int32 line = 1;</code> */ @@ -21,6 +21,7 @@ public final class FileSourceDb { */ int getLine(); + // optional string source = 2; /** * <code>optional string source = 2;</code> */ @@ -35,6 +36,7 @@ public final class FileSourceDb { com.google.protobuf.ByteString getSourceBytes(); + // optional string scm_revision = 3; /** * <code>optional string scm_revision = 3;</code> * @@ -61,6 +63,7 @@ public final class FileSourceDb { com.google.protobuf.ByteString getScmRevisionBytes(); + // optional string scm_author = 4; /** * <code>optional string scm_author = 4;</code> */ @@ -75,6 +78,7 @@ public final class FileSourceDb { com.google.protobuf.ByteString getScmAuthorBytes(); + // optional int64 scm_date = 5; /** * <code>optional int64 scm_date = 5;</code> */ @@ -84,6 +88,7 @@ public final class FileSourceDb { */ long getScmDate(); + // optional int32 ut_line_hits = 6; /** * <code>optional int32 ut_line_hits = 6;</code> * @@ -101,6 +106,7 @@ public final class FileSourceDb { */ int getUtLineHits(); + // optional int32 ut_conditions = 7; /** * <code>optional int32 ut_conditions = 7;</code> */ @@ -110,6 +116,7 @@ public final class FileSourceDb { */ int getUtConditions(); + // optional int32 ut_covered_conditions = 8; /** * <code>optional int32 ut_covered_conditions = 8;</code> */ @@ -119,6 +126,7 @@ public final class FileSourceDb { */ int getUtCoveredConditions(); + // optional int32 it_line_hits = 9; /** * <code>optional int32 it_line_hits = 9;</code> * @@ -136,6 +144,7 @@ public final class FileSourceDb { */ int getItLineHits(); + // optional int32 it_conditions = 10; /** * <code>optional int32 it_conditions = 10;</code> */ @@ -145,6 +154,7 @@ public final class FileSourceDb { */ int getItConditions(); + // optional int32 it_covered_conditions = 11; /** * <code>optional int32 it_covered_conditions = 11;</code> */ @@ -154,6 +164,7 @@ public final class FileSourceDb { */ int getItCoveredConditions(); + // optional int32 overall_line_hits = 12; /** * <code>optional int32 overall_line_hits = 12;</code> * @@ -171,6 +182,7 @@ public final class FileSourceDb { */ int getOverallLineHits(); + // optional int32 overall_conditions = 13; /** * <code>optional int32 overall_conditions = 13;</code> */ @@ -180,6 +192,7 @@ public final class FileSourceDb { */ int getOverallConditions(); + // optional int32 overall_covered_conditions = 14; /** * <code>optional int32 overall_covered_conditions = 14;</code> */ @@ -189,6 +202,7 @@ public final class FileSourceDb { */ int getOverallCoveredConditions(); + // optional string highlighting = 15; /** * <code>optional string highlighting = 15;</code> */ @@ -203,6 +217,7 @@ public final class FileSourceDb { com.google.protobuf.ByteString getHighlightingBytes(); + // optional string symbols = 16; /** * <code>optional string symbols = 16;</code> */ @@ -217,6 +232,7 @@ public final class FileSourceDb { com.google.protobuf.ByteString getSymbolsBytes(); + // repeated int32 duplication = 17 [packed = true]; /** * <code>repeated int32 duplication = 17 [packed = true];</code> */ @@ -234,9 +250,8 @@ public final class FileSourceDb { * Protobuf type {@code org.sonar.server.source.db.Line} */ public static final class Line extends - com.google.protobuf.GeneratedMessage implements - // @@protoc_insertion_point(message_implements:org.sonar.server.source.db.Line) - LineOrBuilder { + com.google.protobuf.GeneratedMessage + implements LineOrBuilder { // Use Line.newBuilder() to construct. private Line(com.google.protobuf.GeneratedMessage.Builder<?> builder) { super(builder); @@ -288,21 +303,18 @@ public final class FileSourceDb { break; } case 18: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000002; - source_ = bs; + source_ = input.readBytes(); break; } case 26: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000004; - scmRevision_ = bs; + scmRevision_ = input.readBytes(); break; } case 34: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000008; - scmAuthor_ = bs; + scmAuthor_ = input.readBytes(); break; } case 40: { @@ -356,15 +368,13 @@ public final class FileSourceDb { break; } case 122: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00004000; - highlighting_ = bs; + highlighting_ = input.readBytes(); break; } case 130: { - com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00008000; - symbols_ = bs; + symbols_ = input.readBytes(); break; } case 136: { @@ -431,6 +441,7 @@ public final class FileSourceDb { } private int bitField0_; + // optional int32 line = 1; public static final int LINE_FIELD_NUMBER = 1; private int line_; /** @@ -446,6 +457,7 @@ public final class FileSourceDb { return line_; } + // optional string source = 2; public static final int SOURCE_FIELD_NUMBER = 2; private java.lang.Object source_; /** @@ -488,6 +500,7 @@ public final class FileSourceDb { } } + // optional string scm_revision = 3; public static final int SCM_REVISION_FIELD_NUMBER = 3; private java.lang.Object scmRevision_; /** @@ -542,6 +555,7 @@ public final class FileSourceDb { } } + // optional string scm_author = 4; public static final int SCM_AUTHOR_FIELD_NUMBER = 4; private java.lang.Object scmAuthor_; /** @@ -584,6 +598,7 @@ public final class FileSourceDb { } } + // optional int64 scm_date = 5; public static final int SCM_DATE_FIELD_NUMBER = 5; private long scmDate_; /** @@ -599,6 +614,7 @@ public final class FileSourceDb { return scmDate_; } + // optional int32 ut_line_hits = 6; public static final int UT_LINE_HITS_FIELD_NUMBER = 6; private int utLineHits_; /** @@ -622,6 +638,7 @@ public final class FileSourceDb { return utLineHits_; } + // optional int32 ut_conditions = 7; public static final int UT_CONDITIONS_FIELD_NUMBER = 7; private int utConditions_; /** @@ -637,6 +654,7 @@ public final class FileSourceDb { return utConditions_; } + // optional int32 ut_covered_conditions = 8; public static final int UT_COVERED_CONDITIONS_FIELD_NUMBER = 8; private int utCoveredConditions_; /** @@ -652,6 +670,7 @@ public final class FileSourceDb { return utCoveredConditions_; } + // optional int32 it_line_hits = 9; public static final int IT_LINE_HITS_FIELD_NUMBER = 9; private int itLineHits_; /** @@ -675,6 +694,7 @@ public final class FileSourceDb { return itLineHits_; } + // optional int32 it_conditions = 10; public static final int IT_CONDITIONS_FIELD_NUMBER = 10; private int itConditions_; /** @@ -690,6 +710,7 @@ public final class FileSourceDb { return itConditions_; } + // optional int32 it_covered_conditions = 11; public static final int IT_COVERED_CONDITIONS_FIELD_NUMBER = 11; private int itCoveredConditions_; /** @@ -705,6 +726,7 @@ public final class FileSourceDb { return itCoveredConditions_; } + // optional int32 overall_line_hits = 12; public static final int OVERALL_LINE_HITS_FIELD_NUMBER = 12; private int overallLineHits_; /** @@ -728,6 +750,7 @@ public final class FileSourceDb { return overallLineHits_; } + // optional int32 overall_conditions = 13; public static final int OVERALL_CONDITIONS_FIELD_NUMBER = 13; private int overallConditions_; /** @@ -743,6 +766,7 @@ public final class FileSourceDb { return overallConditions_; } + // optional int32 overall_covered_conditions = 14; public static final int OVERALL_COVERED_CONDITIONS_FIELD_NUMBER = 14; private int overallCoveredConditions_; /** @@ -758,6 +782,7 @@ public final class FileSourceDb { return overallCoveredConditions_; } + // optional string highlighting = 15; public static final int HIGHLIGHTING_FIELD_NUMBER = 15; private java.lang.Object highlighting_; /** @@ -800,6 +825,7 @@ public final class FileSourceDb { } } + // optional string symbols = 16; public static final int SYMBOLS_FIELD_NUMBER = 16; private java.lang.Object symbols_; /** @@ -842,6 +868,7 @@ public final class FileSourceDb { } } + // repeated int32 duplication = 17 [packed = true]; public static final int DUPLICATION_FIELD_NUMBER = 17; private java.util.List<java.lang.Integer> duplication_; /** @@ -887,8 +914,7 @@ public final class FileSourceDb { private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; + if (isInitialized != -1) return isInitialized == 1; memoizedIsInitialized = 1; return true; @@ -1121,9 +1147,8 @@ public final class FileSourceDb { * Protobuf type {@code org.sonar.server.source.db.Line} */ public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder<Builder> implements - // @@protoc_insertion_point(builder_implements:org.sonar.server.source.db.Line) - org.sonar.server.source.db.FileSourceDb.LineOrBuilder { + com.google.protobuf.GeneratedMessage.Builder<Builder> + implements org.sonar.server.source.db.FileSourceDb.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; @@ -1398,6 +1423,7 @@ public final class FileSourceDb { } private int bitField0_; + // optional int32 line = 1; private int line_ ; /** * <code>optional int32 line = 1;</code> @@ -1430,6 +1456,7 @@ public final class FileSourceDb { return this; } + // optional string source = 2; private java.lang.Object source_ = ""; /** * <code>optional string source = 2;</code> @@ -1443,12 +1470,9 @@ public final class FileSourceDb { public java.lang.String getSource() { java.lang.Object ref = source_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - source_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + source_ = s; return s; } else { return (java.lang.String) ref; @@ -1506,6 +1530,7 @@ public final class FileSourceDb { return this; } + // optional string scm_revision = 3; private java.lang.Object scmRevision_ = ""; /** * <code>optional string scm_revision = 3;</code> @@ -1527,12 +1552,9 @@ public final class FileSourceDb { public java.lang.String getScmRevision() { java.lang.Object ref = scmRevision_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - scmRevision_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + scmRevision_ = s; return s; } else { return (java.lang.String) ref; @@ -1606,6 +1628,7 @@ public final class FileSourceDb { return this; } + // optional string scm_author = 4; private java.lang.Object scmAuthor_ = ""; /** * <code>optional string scm_author = 4;</code> @@ -1619,12 +1642,9 @@ public final class FileSourceDb { public java.lang.String getScmAuthor() { java.lang.Object ref = scmAuthor_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - scmAuthor_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + scmAuthor_ = s; return s; } else { return (java.lang.String) ref; @@ -1682,6 +1702,7 @@ public final class FileSourceDb { return this; } + // optional int64 scm_date = 5; private long scmDate_ ; /** * <code>optional int64 scm_date = 5;</code> @@ -1714,6 +1735,7 @@ public final class FileSourceDb { return this; } + // optional int32 ut_line_hits = 6; private int utLineHits_ ; /** * <code>optional int32 ut_line_hits = 6;</code> @@ -1762,6 +1784,7 @@ public final class FileSourceDb { return this; } + // optional int32 ut_conditions = 7; private int utConditions_ ; /** * <code>optional int32 ut_conditions = 7;</code> @@ -1794,6 +1817,7 @@ public final class FileSourceDb { return this; } + // optional int32 ut_covered_conditions = 8; private int utCoveredConditions_ ; /** * <code>optional int32 ut_covered_conditions = 8;</code> @@ -1826,6 +1850,7 @@ public final class FileSourceDb { return this; } + // optional int32 it_line_hits = 9; private int itLineHits_ ; /** * <code>optional int32 it_line_hits = 9;</code> @@ -1874,6 +1899,7 @@ public final class FileSourceDb { return this; } + // optional int32 it_conditions = 10; private int itConditions_ ; /** * <code>optional int32 it_conditions = 10;</code> @@ -1906,6 +1932,7 @@ public final class FileSourceDb { return this; } + // optional int32 it_covered_conditions = 11; private int itCoveredConditions_ ; /** * <code>optional int32 it_covered_conditions = 11;</code> @@ -1938,6 +1965,7 @@ public final class FileSourceDb { return this; } + // optional int32 overall_line_hits = 12; private int overallLineHits_ ; /** * <code>optional int32 overall_line_hits = 12;</code> @@ -1986,6 +2014,7 @@ public final class FileSourceDb { return this; } + // optional int32 overall_conditions = 13; private int overallConditions_ ; /** * <code>optional int32 overall_conditions = 13;</code> @@ -2018,6 +2047,7 @@ public final class FileSourceDb { return this; } + // optional int32 overall_covered_conditions = 14; private int overallCoveredConditions_ ; /** * <code>optional int32 overall_covered_conditions = 14;</code> @@ -2050,6 +2080,7 @@ public final class FileSourceDb { return this; } + // optional string highlighting = 15; private java.lang.Object highlighting_ = ""; /** * <code>optional string highlighting = 15;</code> @@ -2063,12 +2094,9 @@ public final class FileSourceDb { public java.lang.String getHighlighting() { java.lang.Object ref = highlighting_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - highlighting_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + highlighting_ = s; return s; } else { return (java.lang.String) ref; @@ -2126,6 +2154,7 @@ public final class FileSourceDb { return this; } + // optional string symbols = 16; private java.lang.Object symbols_ = ""; /** * <code>optional string symbols = 16;</code> @@ -2139,12 +2168,9 @@ public final class FileSourceDb { public java.lang.String getSymbols() { java.lang.Object ref = symbols_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - symbols_ = s; - } + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + symbols_ = s; return s; } else { return (java.lang.String) ref; @@ -2202,6 +2228,7 @@ public final class FileSourceDb { return this; } + // repeated int32 duplication = 17 [packed = true]; private java.util.List<java.lang.Integer> duplication_ = java.util.Collections.emptyList(); private void ensureDuplicationIsMutable() { if (!((bitField0_ & 0x00010000) == 0x00010000)) { @@ -2253,8 +2280,7 @@ public final class FileSourceDb { public Builder addAllDuplication( java.lang.Iterable<? extends java.lang.Integer> values) { ensureDuplicationIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, duplication_); + super.addAll(values, duplication_); onChanged(); return this; } @@ -2279,10 +2305,10 @@ public final class FileSourceDb { // @@protoc_insertion_point(class_scope:org.sonar.server.source.db.Line) } - public interface DataOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.sonar.server.source.db.Data) - com.google.protobuf.MessageOrBuilder { + public interface DataOrBuilder + extends com.google.protobuf.MessageOrBuilder { + // repeated .org.sonar.server.source.db.Line lines = 1; /** * <code>repeated .org.sonar.server.source.db.Line lines = 1;</code> */ @@ -2311,9 +2337,8 @@ public final class FileSourceDb { * Protobuf type {@code org.sonar.server.source.db.Data} */ public static final class Data extends - com.google.protobuf.GeneratedMessage implements - // @@protoc_insertion_point(message_implements:org.sonar.server.source.db.Data) - DataOrBuilder { + com.google.protobuf.GeneratedMessage + implements DataOrBuilder { // Use Data.newBuilder() to construct. private Data(com.google.protobuf.GeneratedMessage.Builder<?> builder) { super(builder); @@ -2409,6 +2434,7 @@ public final class FileSourceDb { return PARSER; } + // repeated .org.sonar.server.source.db.Line lines = 1; public static final int LINES_FIELD_NUMBER = 1; private java.util.List<org.sonar.server.source.db.FileSourceDb.Line> lines_; /** @@ -2450,8 +2476,7 @@ public final class FileSourceDb { private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; + if (isInitialized != -1) return isInitialized == 1; memoizedIsInitialized = 1; return true; @@ -2558,9 +2583,8 @@ public final class FileSourceDb { * Protobuf type {@code org.sonar.server.source.db.Data} */ public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder<Builder> implements - // @@protoc_insertion_point(builder_implements:org.sonar.server.source.db.Data) - org.sonar.server.source.db.FileSourceDb.DataOrBuilder { + com.google.protobuf.GeneratedMessage.Builder<Builder> + implements org.sonar.server.source.db.FileSourceDb.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; @@ -2704,6 +2728,7 @@ public final class FileSourceDb { } private int bitField0_; + // repeated .org.sonar.server.source.db.Line lines = 1; private java.util.List<org.sonar.server.source.db.FileSourceDb.Line> lines_ = java.util.Collections.emptyList(); private void ensureLinesIsMutable() { @@ -2845,8 +2870,7 @@ public final class FileSourceDb { java.lang.Iterable<? extends org.sonar.server.source.db.FileSourceDb.Line> values) { if (linesBuilder_ == null) { ensureLinesIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, lines_); + super.addAll(values, lines_); onChanged(); } else { linesBuilder_.addAllMessages(values); @@ -2955,12 +2979,12 @@ public final class FileSourceDb { // @@protoc_insertion_point(class_scope:org.sonar.server.source.db.Data) } - private static final com.google.protobuf.Descriptors.Descriptor + private static com.google.protobuf.Descriptors.Descriptor internal_static_org_sonar_server_source_db_Line_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_sonar_server_source_db_Line_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor + private static com.google.protobuf.Descriptors.Descriptor internal_static_org_sonar_server_source_db_Data_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable @@ -2989,29 +3013,29 @@ public final class FileSourceDb { " .org.sonar.server.source.db.LineB\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; - return null; - } - }; + 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_Line_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_org_sonar_server_source_db_Line_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_sonar_server_source_db_Line_descriptor, + new java.lang.String[] { "Line", "Source", "ScmRevision", "ScmAuthor", "ScmDate", "UtLineHits", "UtConditions", "UtCoveredConditions", "ItLineHits", "ItConditions", "ItCoveredConditions", "OverallLineHits", "OverallConditions", "OverallCoveredConditions", "Highlighting", "Symbols", "Duplication", }); + internal_static_org_sonar_server_source_db_Data_descriptor = + getDescriptor().getMessageTypes().get(1); + internal_static_org_sonar_server_source_db_Data_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_sonar_server_source_db_Data_descriptor, + new java.lang.String[] { "Lines", }); + return null; + } + }; com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { }, assigner); - internal_static_org_sonar_server_source_db_Line_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_org_sonar_server_source_db_Line_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_sonar_server_source_db_Line_descriptor, - new java.lang.String[] { "Line", "Source", "ScmRevision", "ScmAuthor", "ScmDate", "UtLineHits", "UtConditions", "UtCoveredConditions", "ItLineHits", "ItConditions", "ItCoveredConditions", "OverallLineHits", "OverallConditions", "OverallCoveredConditions", "Highlighting", "Symbols", "Duplication", }); - internal_static_org_sonar_server_source_db_Data_descriptor = - getDescriptor().getMessageTypes().get(1); - internal_static_org_sonar_server_source_db_Data_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_sonar_server_source_db_Data_descriptor, - new java.lang.String[] { "Lines", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/sonar-batch-protocol/src/main/protobuf/batch_report.proto b/sonar-batch-protocol/src/main/protobuf/batch_report.proto index 0d4a34998cb..2f1600d908c 100644 --- a/sonar-batch-protocol/src/main/protobuf/batch_report.proto +++ b/sonar-batch-protocol/src/main/protobuf/batch_report.proto @@ -84,7 +84,7 @@ message Component { message Measure { optional MeasureValueType value_type = 1; - # all values may be unset for "new_xxx" measures (only variations are populated) + // all values may be unset for "new_xxx" measures (only variations are populated) optional bool boolean_value = 2; optional int32 int_value = 3; optional int64 long_value = 4; @@ -105,6 +105,7 @@ message Measure { optional double variation_value_5 = 18; optional int32 tendency = 19; optional int32 characteric_id = 20; + optional int32 person_id = 21; } message Measures { diff --git a/sonar-batch/src/main/java/org/sonar/batch/report/MeasuresPublisher.java b/sonar-batch/src/main/java/org/sonar/batch/report/MeasuresPublisher.java index c13e833b9e5..e7c524ff52d 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/report/MeasuresPublisher.java +++ b/sonar-batch/src/main/java/org/sonar/batch/report/MeasuresPublisher.java @@ -182,6 +182,10 @@ public class MeasuresPublisher implements ReportPublisher { if (charac != null) { builder.setCharactericId(charac.id()); } + Integer personId = measure.getPersonId(); + if (personId != null) { + builder.setPersonId(personId); + } return builder.build(); } diff --git a/sonar-batch/src/test/java/org/sonar/batch/report/MeasuresPublisherTest.java b/sonar-batch/src/test/java/org/sonar/batch/report/MeasuresPublisherTest.java index b63fc63ad27..29a75622c8f 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/report/MeasuresPublisherTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/report/MeasuresPublisherTest.java @@ -94,7 +94,8 @@ public class MeasuresPublisherTest { .setAlertStatus(Level.ERROR) .setAlertText("Foo") .setTendency(-1) - .setCharacteristic(mock(Characteristic.class)); + .setCharacteristic(mock(Characteristic.class)) + .setPersonId(2); // No value on new_xxx Measure measure2 = new Measure<>(CoreMetrics.NEW_BLOCKER_VIOLATIONS) .setVariation1(1.0) @@ -135,6 +136,7 @@ public class MeasuresPublisherTest { assertThat(componentMeasures.get(0).getDoubleValue()).isEqualTo(2.0); assertThat(componentMeasures.get(0).getAlertStatus()).isEqualTo("ERROR"); assertThat(componentMeasures.get(0).getAlertText()).isEqualTo("Foo"); + assertThat(componentMeasures.get(0).getPersonId()).isEqualTo(2); } diff --git a/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureMapper.xml b/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureMapper.xml index 57c42516632..954271c3bb6 100644 --- a/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureMapper.xml @@ -71,14 +71,14 @@ <insert id="insert" parameterType="Measure" useGeneratedKeys="false" keyColumn="id" keyProperty="id"> INSERT INTO project_measures ( value, metric_id, snapshot_id, rule_id, text_value, tendency, project_id, alert_status, alert_text, description, - rule_priority, characteristic_id, variation_value_1, variation_value_2, variation_value_3, variation_value_4, + rule_priority, characteristic_id, person_id, variation_value_1, variation_value_2, variation_value_3, variation_value_4, variation_value_5, measure_data) VALUES ( #{value, jdbcType=DOUBLE}, #{metricId, jdbcType=INTEGER}, #{snapshotId, jdbcType=INTEGER}, #{ruleId, jdbcType=INTEGER}, #{textValue, jdbcType=VARCHAR}, #{tendency, jdbcType=INTEGER}, #{projectId, jdbcType=INTEGER}, #{alertStatus, jdbcType=VARCHAR}, #{alertText, jdbcType=VARCHAR}, #{description, jdbcType=VARCHAR}, #{severityIndex, jdbcType=INTEGER}, #{characteristicId, jdbcType=INTEGER}, - #{variation1, jdbcType=DOUBLE}, #{variation2, jdbcType=DOUBLE}, #{variation3, jdbcType=DOUBLE}, + #{personId, jdbcType=INTEGER}, #{variation1, jdbcType=DOUBLE}, #{variation2, jdbcType=DOUBLE}, #{variation3, jdbcType=DOUBLE}, #{variation4, jdbcType=DOUBLE}, #{variation5, jdbcType=DOUBLE}, #{dataValue, jdbcType=BINARY} ) </insert> |