From e556427f59d55888b2c6c181620de7d767e3caf2 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Wed, 27 May 2015 09:45:46 +0200 Subject: SONAR-6589 Remove projectKey from ComputationContext --- .../sonar/batch/protocol/output/BatchReport.java | 60 ++++++++++++++++++++++ .../src/main/protobuf/batch_report.proto | 2 + 2 files changed, 62 insertions(+) (limited to 'sonar-batch-protocol/src') 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 c27bdc96ff1..b49fef42bef 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 @@ -23,14 +23,26 @@ public final class BatchReport { /** * optional string project_key = 2; + * + * 
+     * TODO should we keep this project_key here or not ? Because it's a duplication of Component.key
+     *
*/ boolean hasProjectKey(); /** * optional string project_key = 2; + * + * 
+     * TODO should we keep this project_key here or not ? Because it's a duplication of Component.key
+     *
*/ java.lang.String getProjectKey(); /** * optional string project_key = 2; + * + * 
+     * TODO should we keep this project_key here or not ? Because it's a duplication of Component.key
+     *
*/ com.google.protobuf.ByteString getProjectKeyBytes(); @@ -227,12 +239,20 @@ public final class BatchReport { private java.lang.Object projectKey_; /** * optional string project_key = 2; + * + * 
+     * TODO should we keep this project_key here or not ? Because it's a duplication of Component.key
+     *
*/ public boolean hasProjectKey() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** * optional string project_key = 2; + * + * 
+     * TODO should we keep this project_key here or not ? Because it's a duplication of Component.key
+     *
*/ public java.lang.String getProjectKey() { java.lang.Object ref = projectKey_; @@ -250,6 +270,10 @@ public final class BatchReport { } /** * optional string project_key = 2; + * + * 
+     * TODO should we keep this project_key here or not ? Because it's a duplication of Component.key
+     *
*/ public com.google.protobuf.ByteString getProjectKeyBytes() { @@ -713,12 +737,20 @@ public final class BatchReport { private java.lang.Object projectKey_ = ""; /** * optional string project_key = 2; + * + * 
+       * TODO should we keep this project_key here or not ? Because it's a duplication of Component.key
+       *
*/ public boolean hasProjectKey() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** * optional string project_key = 2; + * + * 
+       * TODO should we keep this project_key here or not ? Because it's a duplication of Component.key
+       *
*/ public java.lang.String getProjectKey() { java.lang.Object ref = projectKey_; @@ -736,6 +768,10 @@ public final class BatchReport { } /** * optional string project_key = 2; + * + * 
+       * TODO should we keep this project_key here or not ? Because it's a duplication of Component.key
+       *
*/ public com.google.protobuf.ByteString getProjectKeyBytes() { @@ -752,6 +788,10 @@ public final class BatchReport { } /** * optional string project_key = 2; + * + * 
+       * TODO should we keep this project_key here or not ? Because it's a duplication of Component.key
+       *
*/ public Builder setProjectKey( java.lang.String value) { @@ -765,6 +805,10 @@ public final class BatchReport { } /** * optional string project_key = 2; + * + * 
+       * TODO should we keep this project_key here or not ? Because it's a duplication of Component.key
+       *
*/ public Builder clearProjectKey() { bitField0_ = (bitField0_ & ~0x00000002); @@ -774,6 +818,10 @@ public final class BatchReport { } /** * optional string project_key = 2; + * + * 
+       * TODO should we keep this project_key here or not ? Because it's a duplication of Component.key
+       *
*/ public Builder setProjectKeyBytes( com.google.protobuf.ByteString value) { @@ -2652,6 +2700,7 @@ public final class BatchReport { * * 
      * Only available on PROJECT and MODULE types
+     * TODO rename this property -> batchKey ? moduleKey ?
      *
*/ boolean hasKey(); @@ -2660,6 +2709,7 @@ public final class BatchReport { * * 
      * Only available on PROJECT and MODULE types
+     * TODO rename this property -> batchKey ? moduleKey ?
      *
*/ java.lang.String getKey(); @@ -2668,6 +2718,7 @@ public final class BatchReport { * * 
      * Only available on PROJECT and MODULE types
+     * TODO rename this property -> batchKey ? moduleKey ?
      *
*/ com.google.protobuf.ByteString @@ -3252,6 +3303,7 @@ public final class BatchReport { * * 
      * Only available on PROJECT and MODULE types
+     * TODO rename this property -> batchKey ? moduleKey ?
      *
*/ public boolean hasKey() { @@ -3262,6 +3314,7 @@ public final class BatchReport { * * 
      * Only available on PROJECT and MODULE types
+     * TODO rename this property -> batchKey ? moduleKey ?
      *
*/ public java.lang.String getKey() { @@ -3283,6 +3336,7 @@ public final class BatchReport { * * 
      * Only available on PROJECT and MODULE types
+     * TODO rename this property -> batchKey ? moduleKey ?
      *
*/ public com.google.protobuf.ByteString @@ -4723,6 +4777,7 @@ public final class BatchReport { * * 
        * Only available on PROJECT and MODULE types
+       * TODO rename this property -> batchKey ? moduleKey ?
        *
*/ public boolean hasKey() { @@ -4733,6 +4788,7 @@ public final class BatchReport { * * 
        * Only available on PROJECT and MODULE types
+       * TODO rename this property -> batchKey ? moduleKey ?
        *
*/ public java.lang.String getKey() { @@ -4754,6 +4810,7 @@ public final class BatchReport { * * 
        * Only available on PROJECT and MODULE types
+       * TODO rename this property -> batchKey ? moduleKey ?
        *
*/ public com.google.protobuf.ByteString @@ -4774,6 +4831,7 @@ public final class BatchReport { * * 
        * Only available on PROJECT and MODULE types
+       * TODO rename this property -> batchKey ? moduleKey ?
        *
*/ public Builder setKey( @@ -4791,6 +4849,7 @@ public final class BatchReport { * * 
        * Only available on PROJECT and MODULE types
+       * TODO rename this property -> batchKey ? moduleKey ?
        *
*/ public Builder clearKey() { @@ -4804,6 +4863,7 @@ public final class BatchReport { * * 
        * Only available on PROJECT and MODULE types
+       * TODO rename this property -> batchKey ? moduleKey ?
        *
*/ public Builder setKeyBytes( diff --git a/sonar-batch-protocol/src/main/protobuf/batch_report.proto b/sonar-batch-protocol/src/main/protobuf/batch_report.proto index fa7801297ef..869573da18d 100644 --- a/sonar-batch-protocol/src/main/protobuf/batch_report.proto +++ b/sonar-batch-protocol/src/main/protobuf/batch_report.proto @@ -41,6 +41,7 @@ option optimize_for = SPEED; message Metadata { optional int64 analysis_date = 1; + // TODO should we keep this project_key here or not ? Because it's a duplication of Component.key optional string project_key = 2; optional string branch = 6; optional int32 root_component_ref = 3; @@ -76,6 +77,7 @@ message Component { // Only available on PROJECT and MODULE types optional string version = 9; // Only available on PROJECT and MODULE types + // TODO rename this property -> batchKey ? moduleKey ? optional string key = 10; // Only available on FILE type optional int32 lines = 11; -- cgit v1.2.3