Upgrade protobuf lib to 3.0.0-beta-1

3 files changed, 1587 insertions, 1636 deletions

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 33b9bbc4363..7eb449e1eaa 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
@@ -57,7 +57,9 @@ public final class Constants {
     public static final int BLOCKER_VALUE = 4;
 
 
-    public final int getNumber() { return value; }
+    public final int getNumber() {
+      return value;
+    }
 
     public static Severity valueOf(int value) {
       switch (value) {
@@ -158,7 +160,9 @@ public final class Constants {
     public static final int FILE_VALUE = 3;
 
 
-    public final int getNumber() { return value; }
+    public final int getNumber() {
+      return value;
+    }
 
     public static ComponentType valueOf(int value) {
       switch (value) {
@@ -266,7 +270,9 @@ public final class Constants {
     public static final int STRING_VALUE = 4;
 
 
-    public final int getNumber() { return value; }
+    public final int getNumber() {
+      return value;
+    }
 
     public static MeasureValueType valueOf(int value) {
       switch (value) {
@@ -355,7 +361,9 @@ public final class Constants {
     public static final int PROFILE_VALUE = 1;
 
 
-    public final int getNumber() { return value; }
+    public final int getNumber() {
+      return value;
+    }
 
     public static EventCategory valueOf(int value) {
       switch (value) {
@@ -461,7 +469,9 @@ public final class Constants {
     public static final int CI_VALUE = 4;
 
 
-    public final int getNumber() { return value; }
+    public final int getNumber() {
+      return value;
+    }
 
     public static ComponentLinkType valueOf(int value) {
       switch (value) {
@@ -602,7 +612,9 @@ public final class Constants {
     public static final int PREPROCESS_DIRECTIVE_VALUE = 8;
 
 
-    public final int getNumber() { return value; }
+    public final int getNumber() {
+      return value;
+    }
 
     public static HighlightingType valueOf(int value) {
       switch (value) {
@@ -707,7 +719,9 @@ public final class Constants {
     public static final int SKIPPED_VALUE = 4;
 
 
-    public final int getNumber() { return value; }
+    public final int getNumber() {
+      return value;
+    }
 
     public static TestStatus valueOf(int value) {
       switch (value) {
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 a0a3e900e68..87d2250eb70 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
@@ -191,37 +191,40 @@ public final class BatchInput {
   /**
    * Protobuf type {@code ServerIssue}
    */
-  public static final class ServerIssue extends
+  public  static final class ServerIssue extends
       com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:ServerIssue)
       ServerIssueOrBuilder {
     // Use ServerIssue.newBuilder() to construct.
-    private ServerIssue(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private ServerIssue(com.google.protobuf.GeneratedMessage.Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private ServerIssue(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final ServerIssue defaultInstance;
-    public static ServerIssue getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public ServerIssue getDefaultInstanceForType() {
-      return defaultInstance;
+    private ServerIssue() {
+      key_ = "";
+      moduleKey_ = "";
+      path_ = "";
+      ruleRepository_ = "";
+      ruleKey_ = "";
+      line_ = 0;
+      msg_ = "";
+      severity_ = 0;
+      manualSeverity_ = false;
+      resolution_ = "";
+      status_ = "";
+      checksum_ = "";
+      assigneeLogin_ = "";
+      creationDate_ = 0L;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private ServerIssue(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+      this();
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -288,7 +291,7 @@ public final class BatchInput {
                 unknownFields.mergeVarintField(8, rawValue);
               } else {
                 bitField0_ |= 0x00000080;
-                severity_ = value;
+                severity_ = rawValue;
               }
               break;
             }
@@ -329,10 +332,11 @@ public final class BatchInput {
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
+        throw new RuntimeException(e.setUnfinishedMessage(this));
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+        throw new RuntimeException(
+            new com.google.protobuf.InvalidProtocolBufferException(
+                e.getMessage()).setUnfinishedMessage(this));
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -350,24 +354,9 @@ public final class BatchInput {
               org.sonar.batch.protocol.input.BatchInput.ServerIssue.class, org.sonar.batch.protocol.input.BatchInput.ServerIssue.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<ServerIssue> PARSER =
-        new com.google.protobuf.AbstractParser<ServerIssue>() {
-      public ServerIssue parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ServerIssue(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<ServerIssue> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int KEY_FIELD_NUMBER = 1;
-    private java.lang.Object key_;
+    private volatile java.lang.Object key_;
     /**
      * <code>optional string key = 1;</code>
      */
@@ -409,7 +398,7 @@ public final class BatchInput {
     }
 
     public static final int MODULE_KEY_FIELD_NUMBER = 2;
-    private java.lang.Object moduleKey_;
+    private volatile java.lang.Object moduleKey_;
     /**
      * <code>optional string module_key = 2;</code>
      */
@@ -451,7 +440,7 @@ public final class BatchInput {
     }
 
     public static final int PATH_FIELD_NUMBER = 3;
-    private java.lang.Object path_;
+    private volatile java.lang.Object path_;
     /**
      * <code>optional string path = 3;</code>
      */
@@ -493,7 +482,7 @@ public final class BatchInput {
     }
 
     public static final int RULE_REPOSITORY_FIELD_NUMBER = 4;
-    private java.lang.Object ruleRepository_;
+    private volatile java.lang.Object ruleRepository_;
     /**
      * <code>optional string rule_repository = 4;</code>
      */
@@ -535,7 +524,7 @@ public final class BatchInput {
     }
 
     public static final int RULE_KEY_FIELD_NUMBER = 5;
-    private java.lang.Object ruleKey_;
+    private volatile java.lang.Object ruleKey_;
     /**
      * <code>optional string rule_key = 5;</code>
      */
@@ -592,7 +581,7 @@ public final class BatchInput {
     }
 
     public static final int MSG_FIELD_NUMBER = 7;
-    private java.lang.Object msg_;
+    private volatile java.lang.Object msg_;
     /**
      * <code>optional string msg = 7;</code>
      */
@@ -634,7 +623,7 @@ public final class BatchInput {
     }
 
     public static final int SEVERITY_FIELD_NUMBER = 8;
-    private org.sonar.batch.protocol.Constants.Severity severity_;
+    private int severity_;
     /**
      * <code>optional .Severity severity = 8;</code>
      */
@@ -645,7 +634,8 @@ public final class BatchInput {
      * <code>optional .Severity severity = 8;</code>
      */
     public org.sonar.batch.protocol.Constants.Severity getSeverity() {
-      return severity_;
+      org.sonar.batch.protocol.Constants.Severity result = org.sonar.batch.protocol.Constants.Severity.valueOf(severity_);
+      return result == null ? org.sonar.batch.protocol.Constants.Severity.INFO : result;
     }
 
     public static final int MANUAL_SEVERITY_FIELD_NUMBER = 9;
@@ -664,7 +654,7 @@ public final class BatchInput {
     }
 
     public static final int RESOLUTION_FIELD_NUMBER = 10;
-    private java.lang.Object resolution_;
+    private volatile java.lang.Object resolution_;
     /**
      * <code>optional string resolution = 10;</code>
      */
@@ -706,7 +696,7 @@ public final class BatchInput {
     }
 
     public static final int STATUS_FIELD_NUMBER = 11;
-    private java.lang.Object status_;
+    private volatile java.lang.Object status_;
     /**
      * <code>optional string status = 11;</code>
      */
@@ -748,7 +738,7 @@ public final class BatchInput {
     }
 
     public static final int CHECKSUM_FIELD_NUMBER = 12;
-    private java.lang.Object checksum_;
+    private volatile java.lang.Object checksum_;
     /**
      * <code>optional string checksum = 12;</code>
      */
@@ -790,7 +780,7 @@ public final class BatchInput {
     }
 
     public static final int ASSIGNEE_LOGIN_FIELD_NUMBER = 13;
-    private java.lang.Object assigneeLogin_;
+    private volatile java.lang.Object assigneeLogin_;
     /**
      * <code>optional string assignee_login = 13;</code>
      */
@@ -846,22 +836,6 @@ public final class BatchInput {
       return creationDate_;
     }
 
-    private void initFields() {
-      key_ = "";
-      moduleKey_ = "";
-      path_ = "";
-      ruleRepository_ = "";
-      ruleKey_ = "";
-      line_ = 0;
-      msg_ = "";
-      severity_ = org.sonar.batch.protocol.Constants.Severity.INFO;
-      manualSeverity_ = false;
-      resolution_ = "";
-      status_ = "";
-      checksum_ = "";
-      assigneeLogin_ = "";
-      creationDate_ = 0L;
-    }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -874,7 +848,6 @@ public final class BatchInput {
 
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeBytes(1, getKeyBytes());
       }
@@ -897,7 +870,7 @@ public final class BatchInput {
         output.writeBytes(7, getMsgBytes());
       }
       if (((bitField0_ & 0x00000080) == 0x00000080)) {
-        output.writeEnum(8, severity_.getNumber());
+        output.writeEnum(8, severity_);
       }
       if (((bitField0_ & 0x00000100) == 0x00000100)) {
         output.writeBool(9, manualSeverity_);
@@ -917,7 +890,7 @@ public final class BatchInput {
       if (((bitField0_ & 0x00002000) == 0x00002000)) {
         output.writeInt64(14, creationDate_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     private int memoizedSerializedSize = -1;
@@ -956,7 +929,7 @@ public final class BatchInput {
       }
       if (((bitField0_ & 0x00000080) == 0x00000080)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(8, severity_.getNumber());
+          .computeEnumSize(8, severity_);
       }
       if (((bitField0_ & 0x00000100) == 0x00000100)) {
         size += com.google.protobuf.CodedOutputStream
@@ -982,18 +955,12 @@ public final class BatchInput {
         size += com.google.protobuf.CodedOutputStream
           .computeInt64Size(14, creationDate_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSerializedSize = size;
       return size;
     }
 
     private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
     public static org.sonar.batch.protocol.input.BatchInput.ServerIssue parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -1047,12 +1014,17 @@ public final class BatchInput {
       return PARSER.parseFrom(input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.sonar.batch.protocol.input.BatchInput.ServerIssue prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
@@ -1093,10 +1065,6 @@ public final class BatchInput {
         if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
       public Builder clear() {
         super.clear();
         key_ = "";
@@ -1113,7 +1081,7 @@ public final class BatchInput {
         bitField0_ = (bitField0_ & ~0x00000020);
         msg_ = "";
         bitField0_ = (bitField0_ & ~0x00000040);
-        severity_ = org.sonar.batch.protocol.Constants.Severity.INFO;
+        severity_ = 0;
         bitField0_ = (bitField0_ & ~0x00000080);
         manualSeverity_ = false;
         bitField0_ = (bitField0_ & ~0x00000100);
@@ -1130,10 +1098,6 @@ public final class BatchInput {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.sonar.batch.protocol.input.BatchInput.internal_static_ServerIssue_descriptor;
@@ -1289,7 +1253,8 @@ public final class BatchInput {
         if (other.hasCreationDate()) {
           setCreationDate(other.getCreationDate());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
@@ -1804,7 +1769,7 @@ public final class BatchInput {
         return this;
       }
 
-      private org.sonar.batch.protocol.Constants.Severity severity_ = org.sonar.batch.protocol.Constants.Severity.INFO;
+      private int severity_ = 0;
       /**
        * <code>optional .Severity severity = 8;</code>
        */
@@ -1815,7 +1780,8 @@ public final class BatchInput {
        * <code>optional .Severity severity = 8;</code>
        */
       public org.sonar.batch.protocol.Constants.Severity getSeverity() {
-        return severity_;
+        org.sonar.batch.protocol.Constants.Severity result = org.sonar.batch.protocol.Constants.Severity.valueOf(severity_);
+        return result == null ? org.sonar.batch.protocol.Constants.Severity.INFO : result;
       }
       /**
        * <code>optional .Severity severity = 8;</code>
@@ -1825,7 +1791,7 @@ public final class BatchInput {
           throw new NullPointerException();
         }
         bitField0_ |= 0x00000080;
-        severity_ = value;
+        severity_ = value.getNumber();
         onChanged();
         return this;
       }
@@ -1834,7 +1800,7 @@ public final class BatchInput {
        */
       public Builder clearSeverity() {
         bitField0_ = (bitField0_ & ~0x00000080);
-        severity_ = org.sonar.batch.protocol.Constants.Severity.INFO;
+        severity_ = 0;
         onChanged();
         return this;
       }
@@ -2210,12 +2176,44 @@ public final class BatchInput {
       // @@protoc_insertion_point(builder_scope:ServerIssue)
     }
 
+    // @@protoc_insertion_point(class_scope:ServerIssue)
+    private static final org.sonar.batch.protocol.input.BatchInput.ServerIssue DEFAULT_INSTANCE;
     static {
-      defaultInstance = new ServerIssue(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.sonar.batch.protocol.input.BatchInput.ServerIssue();
+    }
+
+    public static org.sonar.batch.protocol.input.BatchInput.ServerIssue getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    public static final com.google.protobuf.Parser<ServerIssue> PARSER =
+        new com.google.protobuf.AbstractParser<ServerIssue>() {
+      public ServerIssue parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        try {
+          return new ServerIssue(input, extensionRegistry);
+        } catch (RuntimeException e) {
+          if (e.getCause() instanceof
+              com.google.protobuf.InvalidProtocolBufferException) {
+            throw (com.google.protobuf.InvalidProtocolBufferException)
+                e.getCause();
+          }
+          throw e;
+        }
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<ServerIssue> getParserForType() {
+      return PARSER;
+    }
+
+    public org.sonar.batch.protocol.input.BatchInput.ServerIssue getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:ServerIssue)
   }
 
   public interface UserOrBuilder extends
@@ -2253,37 +2251,28 @@ public final class BatchInput {
   /**
    * Protobuf type {@code User}
    */
-  public static final class User extends
+  public  static final class User extends
       com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:User)
       UserOrBuilder {
     // Use User.newBuilder() to construct.
-    private User(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private User(com.google.protobuf.GeneratedMessage.Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private User(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final User defaultInstance;
-    public static User getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public User getDefaultInstanceForType() {
-      return defaultInstance;
+    private User() {
+      login_ = "";
+      name_ = "";
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private User(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+      this();
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2317,10 +2306,11 @@ public final class BatchInput {
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
+        throw new RuntimeException(e.setUnfinishedMessage(this));
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+        throw new RuntimeException(
+            new com.google.protobuf.InvalidProtocolBufferException(
+                e.getMessage()).setUnfinishedMessage(this));
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -2338,24 +2328,9 @@ public final class BatchInput {
               org.sonar.batch.protocol.input.BatchInput.User.class, org.sonar.batch.protocol.input.BatchInput.User.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<User> PARSER =
-        new com.google.protobuf.AbstractParser<User>() {
-      public User parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new User(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<User> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int LOGIN_FIELD_NUMBER = 1;
-    private java.lang.Object login_;
+    private volatile java.lang.Object login_;
     /**
      * <code>optional string login = 1;</code>
      */
@@ -2397,7 +2372,7 @@ public final class BatchInput {
     }
 
     public static final int NAME_FIELD_NUMBER = 2;
-    private java.lang.Object name_;
+    private volatile java.lang.Object name_;
     /**
      * <code>optional string name = 2;</code>
      */
@@ -2438,10 +2413,6 @@ public final class BatchInput {
       }
     }
 
-    private void initFields() {
-      login_ = "";
-      name_ = "";
-    }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -2454,14 +2425,13 @@ public final class BatchInput {
 
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeBytes(1, getLoginBytes());
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         output.writeBytes(2, getNameBytes());
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     private int memoizedSerializedSize = -1;
@@ -2478,18 +2448,12 @@ public final class BatchInput {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(2, getNameBytes());
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSerializedSize = size;
       return size;
     }
 
     private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
     public static org.sonar.batch.protocol.input.BatchInput.User parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -2543,12 +2507,17 @@ public final class BatchInput {
       return PARSER.parseFrom(input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.sonar.batch.protocol.input.BatchInput.User prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
@@ -2589,10 +2558,6 @@ public final class BatchInput {
         if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
       public Builder clear() {
         super.clear();
         login_ = "";
@@ -2602,10 +2567,6 @@ public final class BatchInput {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.sonar.batch.protocol.input.BatchInput.internal_static_User_descriptor;
@@ -2661,7 +2622,8 @@ public final class BatchInput {
           name_ = other.name_;
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
@@ -2843,20 +2805,52 @@ public final class BatchInput {
       // @@protoc_insertion_point(builder_scope:User)
     }
 
+    // @@protoc_insertion_point(class_scope:User)
+    private static final org.sonar.batch.protocol.input.BatchInput.User DEFAULT_INSTANCE;
     static {
-      defaultInstance = new User(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.sonar.batch.protocol.input.BatchInput.User();
+    }
+
+    public static org.sonar.batch.protocol.input.BatchInput.User getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    public static final com.google.protobuf.Parser<User> PARSER =
+        new com.google.protobuf.AbstractParser<User>() {
+      public User parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        try {
+          return new User(input, extensionRegistry);
+        } catch (RuntimeException e) {
+          if (e.getCause() instanceof
+              com.google.protobuf.InvalidProtocolBufferException) {
+            throw (com.google.protobuf.InvalidProtocolBufferException)
+                e.getCause();
+          }
+          throw e;
+        }
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<User> getParserForType() {
+      return PARSER;
+    }
+
+    public org.sonar.batch.protocol.input.BatchInput.User getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:User)
   }
 
-  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
       internal_static_ServerIssue_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_User_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
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 bbb3ac4d3e7..f270f91192c 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
@@ -73,37 +73,30 @@ public final class BatchReport {
   /**
    * Protobuf type {@code Metadata}
    */
-  public static final class Metadata extends
+  public  static final class Metadata extends
       com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:Metadata)
       MetadataOrBuilder {
     // Use Metadata.newBuilder() to construct.
-    private Metadata(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private Metadata(com.google.protobuf.GeneratedMessage.Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private Metadata(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final Metadata defaultInstance;
-    public static Metadata getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public Metadata getDefaultInstanceForType() {
-      return defaultInstance;
+    private Metadata() {
+      analysisDate_ = 0L;
+      projectKey_ = "";
+      branch_ = "";
+      rootComponentRef_ = 0;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private Metadata(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+      this();
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -147,10 +140,11 @@ public final class BatchReport {
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
+        throw new RuntimeException(e.setUnfinishedMessage(this));
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+        throw new RuntimeException(
+            new com.google.protobuf.InvalidProtocolBufferException(
+                e.getMessage()).setUnfinishedMessage(this));
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -168,21 +162,6 @@ public final class BatchReport {
               org.sonar.batch.protocol.output.BatchReport.Metadata.class, org.sonar.batch.protocol.output.BatchReport.Metadata.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<Metadata> PARSER =
-        new com.google.protobuf.AbstractParser<Metadata>() {
-      public Metadata parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Metadata(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Metadata> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int ANALYSIS_DATE_FIELD_NUMBER = 1;
     private long analysisDate_;
@@ -200,7 +179,7 @@ public final class BatchReport {
     }
 
     public static final int PROJECT_KEY_FIELD_NUMBER = 2;
-    private java.lang.Object projectKey_;
+    private volatile java.lang.Object projectKey_;
     /**
      * <code>optional string project_key = 2;</code>
      *
@@ -254,7 +233,7 @@ public final class BatchReport {
     }
 
     public static final int BRANCH_FIELD_NUMBER = 3;
-    private java.lang.Object branch_;
+    private volatile java.lang.Object branch_;
     /**
      * <code>optional string branch = 3;</code>
      */
@@ -310,12 +289,6 @@ public final class BatchReport {
       return rootComponentRef_;
     }
 
-    private void initFields() {
-      analysisDate_ = 0L;
-      projectKey_ = "";
-      branch_ = "";
-      rootComponentRef_ = 0;
-    }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -328,7 +301,6 @@ public final class BatchReport {
 
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt64(1, analysisDate_);
       }
@@ -341,7 +313,7 @@ public final class BatchReport {
       if (((bitField0_ & 0x00000008) == 0x00000008)) {
         output.writeInt32(4, rootComponentRef_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     private int memoizedSerializedSize = -1;
@@ -366,18 +338,12 @@ public final class BatchReport {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(4, rootComponentRef_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSerializedSize = size;
       return size;
     }
 
     private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
     public static org.sonar.batch.protocol.output.BatchReport.Metadata parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -431,12 +397,17 @@ public final class BatchReport {
       return PARSER.parseFrom(input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.sonar.batch.protocol.output.BatchReport.Metadata prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
@@ -477,10 +448,6 @@ public final class BatchReport {
         if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
       public Builder clear() {
         super.clear();
         analysisDate_ = 0L;
@@ -494,10 +461,6 @@ public final class BatchReport {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.sonar.batch.protocol.output.BatchReport.internal_static_Metadata_descriptor;
@@ -567,7 +530,8 @@ public final class BatchReport {
         if (other.hasRootComponentRef()) {
           setRootComponentRef(other.getRootComponentRef());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
@@ -837,12 +801,44 @@ public final class BatchReport {
       // @@protoc_insertion_point(builder_scope:Metadata)
     }
 
+    // @@protoc_insertion_point(class_scope:Metadata)
+    private static final org.sonar.batch.protocol.output.BatchReport.Metadata DEFAULT_INSTANCE;
     static {
-      defaultInstance = new Metadata(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.sonar.batch.protocol.output.BatchReport.Metadata();
+    }
+
+    public static org.sonar.batch.protocol.output.BatchReport.Metadata getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    public static final com.google.protobuf.Parser<Metadata> PARSER =
+        new com.google.protobuf.AbstractParser<Metadata>() {
+      public Metadata parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        try {
+          return new Metadata(input, extensionRegistry);
+        } catch (RuntimeException e) {
+          if (e.getCause() instanceof
+              com.google.protobuf.InvalidProtocolBufferException) {
+            throw (com.google.protobuf.InvalidProtocolBufferException)
+                e.getCause();
+          }
+          throw e;
+        }
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<Metadata> getParserForType() {
+      return PARSER;
+    }
+
+    public org.sonar.batch.protocol.output.BatchReport.Metadata getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:Metadata)
   }
 
   public interface ActiveRuleOrBuilder extends
@@ -913,37 +909,30 @@ public final class BatchReport {
   /**
    * Protobuf type {@code ActiveRule}
    */
-  public static final class ActiveRule extends
+  public  static final class ActiveRule extends
       com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:ActiveRule)
       ActiveRuleOrBuilder {
     // Use ActiveRule.newBuilder() to construct.
-    private ActiveRule(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private ActiveRule(com.google.protobuf.GeneratedMessage.Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private ActiveRule(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final ActiveRule defaultInstance;
-    public static ActiveRule getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public ActiveRule getDefaultInstanceForType() {
-      return defaultInstance;
+    private ActiveRule() {
+      ruleRepository_ = "";
+      ruleKey_ = "";
+      severity_ = 0;
+      param_ = java.util.Collections.emptyList();
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private ActiveRule(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+      this();
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -981,7 +970,7 @@ public final class BatchReport {
                 unknownFields.mergeVarintField(3, rawValue);
               } else {
                 bitField0_ |= 0x00000004;
-                severity_ = value;
+                severity_ = rawValue;
               }
               break;
             }
@@ -996,10 +985,11 @@ public final class BatchReport {
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
+        throw new RuntimeException(e.setUnfinishedMessage(this));
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+        throw new RuntimeException(
+            new com.google.protobuf.InvalidProtocolBufferException(
+                e.getMessage()).setUnfinishedMessage(this));
       } finally {
         if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
           param_ = java.util.Collections.unmodifiableList(param_);
@@ -1020,21 +1010,6 @@ public final class BatchReport {
               org.sonar.batch.protocol.output.BatchReport.ActiveRule.class, org.sonar.batch.protocol.output.BatchReport.ActiveRule.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<ActiveRule> PARSER =
-        new com.google.protobuf.AbstractParser<ActiveRule>() {
-      public ActiveRule parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ActiveRule(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<ActiveRule> getParserForType() {
-      return PARSER;
-    }
-
     public interface ActiveRuleParamOrBuilder extends
         // @@protoc_insertion_point(interface_extends:ActiveRule.ActiveRuleParam)
         com.google.protobuf.MessageOrBuilder {
@@ -1074,37 +1049,28 @@ public final class BatchReport {
      * TODO replace by map
      * </pre>
      */
-    public static final class ActiveRuleParam extends
+    public  static final class ActiveRuleParam extends
         com.google.protobuf.GeneratedMessage implements
         // @@protoc_insertion_point(message_implements:ActiveRule.ActiveRuleParam)
         ActiveRuleParamOrBuilder {
       // Use ActiveRuleParam.newBuilder() to construct.
-      private ActiveRuleParam(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      private ActiveRuleParam(com.google.protobuf.GeneratedMessage.Builder builder) {
         super(builder);
-        this.unknownFields = builder.getUnknownFields();
-      }
-      private ActiveRuleParam(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-      private static final ActiveRuleParam defaultInstance;
-      public static ActiveRuleParam getDefaultInstance() {
-        return defaultInstance;
       }
-
-      public ActiveRuleParam getDefaultInstanceForType() {
-        return defaultInstance;
+      private ActiveRuleParam() {
+        key_ = "";
+        value_ = "";
       }
 
-      private final com.google.protobuf.UnknownFieldSet unknownFields;
       @java.lang.Override
       public final com.google.protobuf.UnknownFieldSet
-          getUnknownFields() {
+      getUnknownFields() {
         return this.unknownFields;
       }
       private ActiveRuleParam(
           com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        initFields();
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+        this();
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1138,10 +1104,11 @@ public final class BatchReport {
             }
           }
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
+          throw new RuntimeException(e.setUnfinishedMessage(this));
         } catch (java.io.IOException e) {
-          throw new com.google.protobuf.InvalidProtocolBufferException(
-              e.getMessage()).setUnfinishedMessage(this);
+          throw new RuntimeException(
+              new com.google.protobuf.InvalidProtocolBufferException(
+                  e.getMessage()).setUnfinishedMessage(this));
         } finally {
           this.unknownFields = unknownFields.build();
           makeExtensionsImmutable();
@@ -1159,24 +1126,9 @@ public final class BatchReport {
                 org.sonar.batch.protocol.output.BatchReport.ActiveRule.ActiveRuleParam.class, org.sonar.batch.protocol.output.BatchReport.ActiveRule.ActiveRuleParam.Builder.class);
       }
 
-      public static com.google.protobuf.Parser<ActiveRuleParam> PARSER =
-          new com.google.protobuf.AbstractParser<ActiveRuleParam>() {
-        public ActiveRuleParam parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ActiveRuleParam(input, extensionRegistry);
-        }
-      };
-
-      @java.lang.Override
-      public com.google.protobuf.Parser<ActiveRuleParam> getParserForType() {
-        return PARSER;
-      }
-
       private int bitField0_;
       public static final int KEY_FIELD_NUMBER = 1;
-      private java.lang.Object key_;
+      private volatile java.lang.Object key_;
       /**
        * <code>optional string key = 1;</code>
        */
@@ -1218,7 +1170,7 @@ public final class BatchReport {
       }
 
       public static final int VALUE_FIELD_NUMBER = 2;
-      private java.lang.Object value_;
+      private volatile java.lang.Object value_;
       /**
        * <code>optional string value = 2;</code>
        */
@@ -1259,10 +1211,6 @@ public final class BatchReport {
         }
       }
 
-      private void initFields() {
-        key_ = "";
-        value_ = "";
-      }
       private byte memoizedIsInitialized = -1;
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
@@ -1275,14 +1223,13 @@ public final class BatchReport {
 
       public void writeTo(com.google.protobuf.CodedOutputStream output)
                           throws java.io.IOException {
-        getSerializedSize();
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
           output.writeBytes(1, getKeyBytes());
         }
         if (((bitField0_ & 0x00000002) == 0x00000002)) {
           output.writeBytes(2, getValueBytes());
         }
-        getUnknownFields().writeTo(output);
+        unknownFields.writeTo(output);
       }
 
       private int memoizedSerializedSize = -1;
@@ -1299,18 +1246,12 @@ public final class BatchReport {
           size += com.google.protobuf.CodedOutputStream
             .computeBytesSize(2, getValueBytes());
         }
-        size += getUnknownFields().getSerializedSize();
+        size += unknownFields.getSerializedSize();
         memoizedSerializedSize = size;
         return size;
       }
 
       private static final long serialVersionUID = 0L;
-      @java.lang.Override
-      protected java.lang.Object writeReplace()
-          throws java.io.ObjectStreamException {
-        return super.writeReplace();
-      }
-
       public static org.sonar.batch.protocol.output.BatchReport.ActiveRule.ActiveRuleParam parseFrom(
           com.google.protobuf.ByteString data)
           throws com.google.protobuf.InvalidProtocolBufferException {
@@ -1364,12 +1305,17 @@ public final class BatchReport {
         return PARSER.parseFrom(input, extensionRegistry);
       }
 
-      public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
+      public static Builder newBuilder() {
+        return DEFAULT_INSTANCE.toBuilder();
+      }
       public static Builder newBuilder(org.sonar.batch.protocol.output.BatchReport.ActiveRule.ActiveRuleParam prototype) {
-        return newBuilder().mergeFrom(prototype);
+        return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+      }
+      public Builder toBuilder() {
+        return this == DEFAULT_INSTANCE
+            ? new Builder() : new Builder().mergeFrom(this);
       }
-      public Builder toBuilder() { return newBuilder(this); }
 
       @java.lang.Override
       protected Builder newBuilderForType(
@@ -1414,10 +1360,6 @@ public final class BatchReport {
           if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
           }
         }
-        private static Builder create() {
-          return new Builder();
-        }
-
         public Builder clear() {
           super.clear();
           key_ = "";
@@ -1427,10 +1369,6 @@ public final class BatchReport {
           return this;
         }
 
-        public Builder clone() {
-          return create().mergeFrom(buildPartial());
-        }
-
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
           return org.sonar.batch.protocol.output.BatchReport.internal_static_ActiveRule_ActiveRuleParam_descriptor;
@@ -1486,7 +1424,8 @@ public final class BatchReport {
             value_ = other.value_;
             onChanged();
           }
-          this.mergeUnknownFields(other.getUnknownFields());
+          this.mergeUnknownFields(other.unknownFields);
+          onChanged();
           return this;
         }
 
@@ -1668,17 +1607,49 @@ public final class BatchReport {
         // @@protoc_insertion_point(builder_scope:ActiveRule.ActiveRuleParam)
       }
 
+      // @@protoc_insertion_point(class_scope:ActiveRule.ActiveRuleParam)
+      private static final org.sonar.batch.protocol.output.BatchReport.ActiveRule.ActiveRuleParam DEFAULT_INSTANCE;
       static {
-        defaultInstance = new ActiveRuleParam(true);
-        defaultInstance.initFields();
+        DEFAULT_INSTANCE = new org.sonar.batch.protocol.output.BatchReport.ActiveRule.ActiveRuleParam();
+      }
+
+      public static org.sonar.batch.protocol.output.BatchReport.ActiveRule.ActiveRuleParam getDefaultInstance() {
+        return DEFAULT_INSTANCE;
+      }
+
+      public static final com.google.protobuf.Parser<ActiveRuleParam> PARSER =
+          new com.google.protobuf.AbstractParser<ActiveRuleParam>() {
+        public ActiveRuleParam parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          try {
+            return new ActiveRuleParam(input, extensionRegistry);
+          } catch (RuntimeException e) {
+            if (e.getCause() instanceof
+                com.google.protobuf.InvalidProtocolBufferException) {
+              throw (com.google.protobuf.InvalidProtocolBufferException)
+                  e.getCause();
+            }
+            throw e;
+          }
+        }
+      };
+
+      @java.lang.Override
+      public com.google.protobuf.Parser<ActiveRuleParam> getParserForType() {
+        return PARSER;
+      }
+
+      public org.sonar.batch.protocol.output.BatchReport.ActiveRule.ActiveRuleParam getDefaultInstanceForType() {
+        return DEFAULT_INSTANCE;
       }
 
-      // @@protoc_insertion_point(class_scope:ActiveRule.ActiveRuleParam)
     }
 
     private int bitField0_;
     public static final int RULE_REPOSITORY_FIELD_NUMBER = 1;
-    private java.lang.Object ruleRepository_;
+    private volatile java.lang.Object ruleRepository_;
     /**
      * <code>optional string rule_repository = 1;</code>
      */
@@ -1720,7 +1691,7 @@ public final class BatchReport {
     }
 
     public static final int RULE_KEY_FIELD_NUMBER = 2;
-    private java.lang.Object ruleKey_;
+    private volatile java.lang.Object ruleKey_;
     /**
      * <code>optional string rule_key = 2;</code>
      */
@@ -1762,7 +1733,7 @@ public final class BatchReport {
     }
 
     public static final int SEVERITY_FIELD_NUMBER = 3;
-    private org.sonar.batch.protocol.Constants.Severity severity_;
+    private int severity_;
     /**
      * <code>optional .Severity severity = 3;</code>
      */
@@ -1773,7 +1744,8 @@ public final class BatchReport {
      * <code>optional .Severity severity = 3;</code>
      */
     public org.sonar.batch.protocol.Constants.Severity getSeverity() {
-      return severity_;
+      org.sonar.batch.protocol.Constants.Severity result = org.sonar.batch.protocol.Constants.Severity.valueOf(severity_);
+      return result == null ? org.sonar.batch.protocol.Constants.Severity.INFO : result;
     }
 
     public static final int PARAM_FIELD_NUMBER = 4;
@@ -1811,12 +1783,6 @@ public final class BatchReport {
       return param_.get(index);
     }
 
-    private void initFields() {
-      ruleRepository_ = "";
-      ruleKey_ = "";
-      severity_ = org.sonar.batch.protocol.Constants.Severity.INFO;
-      param_ = java.util.Collections.emptyList();
-    }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -1829,7 +1795,6 @@ public final class BatchReport {
 
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeBytes(1, getRuleRepositoryBytes());
       }
@@ -1837,12 +1802,12 @@ public final class BatchReport {
         output.writeBytes(2, getRuleKeyBytes());
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeEnum(3, severity_.getNumber());
+        output.writeEnum(3, severity_);
       }
       for (int i = 0; i < param_.size(); i++) {
         output.writeMessage(4, param_.get(i));
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     private int memoizedSerializedSize = -1;
@@ -1861,24 +1826,18 @@ public final class BatchReport {
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(3, severity_.getNumber());
+          .computeEnumSize(3, severity_);
       }
       for (int i = 0; i < param_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(4, param_.get(i));
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSerializedSize = size;
       return size;
     }
 
     private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
     public static org.sonar.batch.protocol.output.BatchReport.ActiveRule parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -1932,12 +1891,17 @@ public final class BatchReport {
       return PARSER.parseFrom(input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.sonar.batch.protocol.output.BatchReport.ActiveRule prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
@@ -1979,17 +1943,13 @@ public final class BatchReport {
           getParamFieldBuilder();
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
       public Builder clear() {
         super.clear();
         ruleRepository_ = "";
         bitField0_ = (bitField0_ & ~0x00000001);
         ruleKey_ = "";
         bitField0_ = (bitField0_ & ~0x00000002);
-        severity_ = org.sonar.batch.protocol.Constants.Severity.INFO;
+        severity_ = 0;
         bitField0_ = (bitField0_ & ~0x00000004);
         if (paramBuilder_ == null) {
           param_ = java.util.Collections.emptyList();
@@ -2000,10 +1960,6 @@ public final class BatchReport {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.sonar.batch.protocol.output.BatchReport.internal_static_ActiveRule_descriptor;
@@ -2101,7 +2057,8 @@ public final class BatchReport {
             }
           }
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
@@ -2280,7 +2237,7 @@ public final class BatchReport {
         return this;
       }
 
-      private org.sonar.batch.protocol.Constants.Severity severity_ = org.sonar.batch.protocol.Constants.Severity.INFO;
+      private int severity_ = 0;
       /**
        * <code>optional .Severity severity = 3;</code>
        */
@@ -2291,7 +2248,8 @@ public final class BatchReport {
        * <code>optional .Severity severity = 3;</code>
        */
       public org.sonar.batch.protocol.Constants.Severity getSeverity() {
-        return severity_;
+        org.sonar.batch.protocol.Constants.Severity result = org.sonar.batch.protocol.Constants.Severity.valueOf(severity_);
+        return result == null ? org.sonar.batch.protocol.Constants.Severity.INFO : result;
       }
       /**
        * <code>optional .Severity severity = 3;</code>
@@ -2301,7 +2259,7 @@ public final class BatchReport {
           throw new NullPointerException();
         }
         bitField0_ |= 0x00000004;
-        severity_ = value;
+        severity_ = value.getNumber();
         onChanged();
         return this;
       }
@@ -2310,7 +2268,7 @@ public final class BatchReport {
        */
       public Builder clearSeverity() {
         bitField0_ = (bitField0_ & ~0x00000004);
-        severity_ = org.sonar.batch.protocol.Constants.Severity.INFO;
+        severity_ = 0;
         onChanged();
         return this;
       }
@@ -2558,12 +2516,44 @@ public final class BatchReport {
       // @@protoc_insertion_point(builder_scope:ActiveRule)
     }
 
+    // @@protoc_insertion_point(class_scope:ActiveRule)
+    private static final org.sonar.batch.protocol.output.BatchReport.ActiveRule DEFAULT_INSTANCE;
     static {
-      defaultInstance = new ActiveRule(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.sonar.batch.protocol.output.BatchReport.ActiveRule();
+    }
+
+    public static org.sonar.batch.protocol.output.BatchReport.ActiveRule getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    public static final com.google.protobuf.Parser<ActiveRule> PARSER =
+        new com.google.protobuf.AbstractParser<ActiveRule>() {
+      public ActiveRule parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        try {
+          return new ActiveRule(input, extensionRegistry);
+        } catch (RuntimeException e) {
+          if (e.getCause() instanceof
+              com.google.protobuf.InvalidProtocolBufferException) {
+            throw (com.google.protobuf.InvalidProtocolBufferException)
+                e.getCause();
+          }
+          throw e;
+        }
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<ActiveRule> getParserForType() {
+      return PARSER;
+    }
+
+    public org.sonar.batch.protocol.output.BatchReport.ActiveRule getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:ActiveRule)
   }
 
   public interface ComponentLinkOrBuilder extends
@@ -2596,37 +2586,28 @@ public final class BatchReport {
   /**
    * Protobuf type {@code ComponentLink}
    */
-  public static final class ComponentLink extends
+  public  static final class ComponentLink extends
       com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:ComponentLink)
       ComponentLinkOrBuilder {
     // Use ComponentLink.newBuilder() to construct.
-    private ComponentLink(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private ComponentLink(com.google.protobuf.GeneratedMessage.Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private ComponentLink(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final ComponentLink defaultInstance;
-    public static ComponentLink getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public ComponentLink getDefaultInstanceForType() {
-      return defaultInstance;
+    private ComponentLink() {
+      type_ = 0;
+      href_ = "";
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private ComponentLink(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+      this();
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2652,7 +2633,7 @@ public final class BatchReport {
                 unknownFields.mergeVarintField(1, rawValue);
               } else {
                 bitField0_ |= 0x00000001;
-                type_ = value;
+                type_ = rawValue;
               }
               break;
             }
@@ -2665,10 +2646,11 @@ public final class BatchReport {
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
+        throw new RuntimeException(e.setUnfinishedMessage(this));
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+        throw new RuntimeException(
+            new com.google.protobuf.InvalidProtocolBufferException(
+                e.getMessage()).setUnfinishedMessage(this));
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -2686,24 +2668,9 @@ public final class BatchReport {
               org.sonar.batch.protocol.output.BatchReport.ComponentLink.class, org.sonar.batch.protocol.output.BatchReport.ComponentLink.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<ComponentLink> PARSER =
-        new com.google.protobuf.AbstractParser<ComponentLink>() {
-      public ComponentLink parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ComponentLink(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<ComponentLink> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int TYPE_FIELD_NUMBER = 1;
-    private org.sonar.batch.protocol.Constants.ComponentLinkType type_;
+    private int type_;
     /**
      * <code>optional .ComponentLinkType type = 1;</code>
      */
@@ -2714,11 +2681,12 @@ public final class BatchReport {
      * <code>optional .ComponentLinkType type = 1;</code>
      */
     public org.sonar.batch.protocol.Constants.ComponentLinkType getType() {
-      return type_;
+      org.sonar.batch.protocol.Constants.ComponentLinkType result = org.sonar.batch.protocol.Constants.ComponentLinkType.valueOf(type_);
+      return result == null ? org.sonar.batch.protocol.Constants.ComponentLinkType.HOME : result;
     }
 
     public static final int HREF_FIELD_NUMBER = 2;
-    private java.lang.Object href_;
+    private volatile java.lang.Object href_;
     /**
      * <code>optional string href = 2;</code>
      */
@@ -2759,10 +2727,6 @@ public final class BatchReport {
       }
     }
 
-    private void initFields() {
-      type_ = org.sonar.batch.protocol.Constants.ComponentLinkType.HOME;
-      href_ = "";
-    }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -2775,14 +2739,13 @@ public final class BatchReport {
 
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeEnum(1, type_.getNumber());
+        output.writeEnum(1, type_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         output.writeBytes(2, getHrefBytes());
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     private int memoizedSerializedSize = -1;
@@ -2793,24 +2756,18 @@ public final class BatchReport {
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(1, type_.getNumber());
+          .computeEnumSize(1, type_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(2, getHrefBytes());
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSerializedSize = size;
       return size;
     }
 
     private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
     public static org.sonar.batch.protocol.output.BatchReport.ComponentLink parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -2864,12 +2821,17 @@ public final class BatchReport {
       return PARSER.parseFrom(input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.sonar.batch.protocol.output.BatchReport.ComponentLink prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
@@ -2910,23 +2872,15 @@ public final class BatchReport {
         if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
       public Builder clear() {
         super.clear();
-        type_ = org.sonar.batch.protocol.Constants.ComponentLinkType.HOME;
+        type_ = 0;
         bitField0_ = (bitField0_ & ~0x00000001);
         href_ = "";
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.sonar.batch.protocol.output.BatchReport.internal_static_ComponentLink_descriptor;
@@ -2980,7 +2934,8 @@ public final class BatchReport {
           href_ = other.href_;
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
@@ -3007,7 +2962,7 @@ public final class BatchReport {
       }
       private int bitField0_;
 
-      private org.sonar.batch.protocol.Constants.ComponentLinkType type_ = org.sonar.batch.protocol.Constants.ComponentLinkType.HOME;
+      private int type_ = 0;
       /**
        * <code>optional .ComponentLinkType type = 1;</code>
        */
@@ -3018,7 +2973,8 @@ public final class BatchReport {
        * <code>optional .ComponentLinkType type = 1;</code>
        */
       public org.sonar.batch.protocol.Constants.ComponentLinkType getType() {
-        return type_;
+        org.sonar.batch.protocol.Constants.ComponentLinkType result = org.sonar.batch.protocol.Constants.ComponentLinkType.valueOf(type_);
+        return result == null ? org.sonar.batch.protocol.Constants.ComponentLinkType.HOME : result;
       }
       /**
        * <code>optional .ComponentLinkType type = 1;</code>
@@ -3028,7 +2984,7 @@ public final class BatchReport {
           throw new NullPointerException();
         }
         bitField0_ |= 0x00000001;
-        type_ = value;
+        type_ = value.getNumber();
         onChanged();
         return this;
       }
@@ -3037,7 +2993,7 @@ public final class BatchReport {
        */
       public Builder clearType() {
         bitField0_ = (bitField0_ & ~0x00000001);
-        type_ = org.sonar.batch.protocol.Constants.ComponentLinkType.HOME;
+        type_ = 0;
         onChanged();
         return this;
       }
@@ -3121,12 +3077,44 @@ public final class BatchReport {
       // @@protoc_insertion_point(builder_scope:ComponentLink)
     }
 
+    // @@protoc_insertion_point(class_scope:ComponentLink)
+    private static final org.sonar.batch.protocol.output.BatchReport.ComponentLink DEFAULT_INSTANCE;
     static {
-      defaultInstance = new ComponentLink(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.sonar.batch.protocol.output.BatchReport.ComponentLink();
+    }
+
+    public static org.sonar.batch.protocol.output.BatchReport.ComponentLink getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    public static final com.google.protobuf.Parser<ComponentLink> PARSER =
+        new com.google.protobuf.AbstractParser<ComponentLink>() {
+      public ComponentLink parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        try {
+          return new ComponentLink(input, extensionRegistry);
+        } catch (RuntimeException e) {
+          if (e.getCause() instanceof
+              com.google.protobuf.InvalidProtocolBufferException) {
+            throw (com.google.protobuf.InvalidProtocolBufferException)
+                e.getCause();
+          }
+          throw e;
+        }
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<ComponentLink> getParserForType() {
+      return PARSER;
+    }
+
+    public org.sonar.batch.protocol.output.BatchReport.ComponentLink getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:ComponentLink)
   }
 
   public interface ComponentOrBuilder extends
@@ -3340,37 +3328,38 @@ public final class BatchReport {
   /**
    * Protobuf type {@code Component}
    */
-  public static final class Component extends
+  public  static final class Component extends
       com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:Component)
       ComponentOrBuilder {
     // Use Component.newBuilder() to construct.
-    private Component(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private Component(com.google.protobuf.GeneratedMessage.Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private Component(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final Component defaultInstance;
-    public static Component getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public Component getDefaultInstanceForType() {
-      return defaultInstance;
+    private Component() {
+      ref_ = 0;
+      path_ = "";
+      name_ = "";
+      type_ = 0;
+      isTest_ = false;
+      language_ = "";
+      childRef_ = java.util.Collections.emptyList();
+      link_ = java.util.Collections.emptyList();
+      version_ = "";
+      key_ = "";
+      lines_ = 0;
+      description_ = "";
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private Component(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+      this();
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3413,7 +3402,7 @@ public final class BatchReport {
                 unknownFields.mergeVarintField(4, rawValue);
               } else {
                 bitField0_ |= 0x00000008;
-                type_ = value;
+                type_ = rawValue;
               }
               break;
             }
@@ -3483,10 +3472,11 @@ public final class BatchReport {
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
+        throw new RuntimeException(e.setUnfinishedMessage(this));
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+        throw new RuntimeException(
+            new com.google.protobuf.InvalidProtocolBufferException(
+                e.getMessage()).setUnfinishedMessage(this));
       } finally {
         if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
           childRef_ = java.util.Collections.unmodifiableList(childRef_);
@@ -3510,21 +3500,6 @@ public final class BatchReport {
               org.sonar.batch.protocol.output.BatchReport.Component.class, org.sonar.batch.protocol.output.BatchReport.Component.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<Component> PARSER =
-        new com.google.protobuf.AbstractParser<Component>() {
-      public Component parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Component(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Component> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int REF_FIELD_NUMBER = 1;
     private int ref_;
@@ -3542,7 +3517,7 @@ public final class BatchReport {
     }
 
     public static final int PATH_FIELD_NUMBER = 2;
-    private java.lang.Object path_;
+    private volatile java.lang.Object path_;
     /**
      * <code>optional string path = 2;</code>
      */
@@ -3584,7 +3559,7 @@ public final class BatchReport {
     }
 
     public static final int NAME_FIELD_NUMBER = 3;
-    private java.lang.Object name_;
+    private volatile java.lang.Object name_;
     /**
      * <code>optional string name = 3;</code>
      */
@@ -3626,7 +3601,7 @@ public final class BatchReport {
     }
 
     public static final int TYPE_FIELD_NUMBER = 4;
-    private org.sonar.batch.protocol.Constants.ComponentType type_;
+    private int type_;
     /**
      * <code>optional .ComponentType type = 4;</code>
      */
@@ -3637,7 +3612,8 @@ public final class BatchReport {
      * <code>optional .ComponentType type = 4;</code>
      */
     public org.sonar.batch.protocol.Constants.ComponentType getType() {
-      return type_;
+      org.sonar.batch.protocol.Constants.ComponentType result = org.sonar.batch.protocol.Constants.ComponentType.valueOf(type_);
+      return result == null ? org.sonar.batch.protocol.Constants.ComponentType.PROJECT : result;
     }
 
     public static final int IS_TEST_FIELD_NUMBER = 5;
@@ -3656,7 +3632,7 @@ public final class BatchReport {
     }
 
     public static final int LANGUAGE_FIELD_NUMBER = 6;
-    private java.lang.Object language_;
+    private volatile java.lang.Object language_;
     /**
      * <code>optional string language = 6;</code>
      */
@@ -3756,7 +3732,7 @@ public final class BatchReport {
     }
 
     public static final int VERSION_FIELD_NUMBER = 9;
-    private java.lang.Object version_;
+    private volatile java.lang.Object version_;
     /**
      * <code>optional string version = 9;</code>
      *
@@ -3810,7 +3786,7 @@ public final class BatchReport {
     }
 
     public static final int KEY_FIELD_NUMBER = 10;
-    private java.lang.Object key_;
+    private volatile java.lang.Object key_;
     /**
      * <code>optional string key = 10;</code>
      *
@@ -3890,7 +3866,7 @@ public final class BatchReport {
     }
 
     public static final int DESCRIPTION_FIELD_NUMBER = 12;
-    private java.lang.Object description_;
+    private volatile java.lang.Object description_;
     /**
      * <code>optional string description = 12;</code>
      *
@@ -3943,20 +3919,6 @@ public final class BatchReport {
       }
     }
 
-    private void initFields() {
-      ref_ = 0;
-      path_ = "";
-      name_ = "";
-      type_ = org.sonar.batch.protocol.Constants.ComponentType.PROJECT;
-      isTest_ = false;
-      language_ = "";
-      childRef_ = java.util.Collections.emptyList();
-      link_ = java.util.Collections.emptyList();
-      version_ = "";
-      key_ = "";
-      lines_ = 0;
-      description_ = "";
-    }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -3980,7 +3942,7 @@ public final class BatchReport {
         output.writeBytes(3, getNameBytes());
       }
       if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        output.writeEnum(4, type_.getNumber());
+        output.writeEnum(4, type_);
       }
       if (((bitField0_ & 0x00000010) == 0x00000010)) {
         output.writeBool(5, isTest_);
@@ -4010,7 +3972,7 @@ public final class BatchReport {
       if (((bitField0_ & 0x00000200) == 0x00000200)) {
         output.writeBytes(12, getDescriptionBytes());
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     private int memoizedSerializedSize = -1;
@@ -4033,7 +3995,7 @@ public final class BatchReport {
       }
       if (((bitField0_ & 0x00000008) == 0x00000008)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(4, type_.getNumber());
+          .computeEnumSize(4, type_);
       }
       if (((bitField0_ & 0x00000010) == 0x00000010)) {
         size += com.google.protobuf.CodedOutputStream
@@ -4077,18 +4039,12 @@ public final class BatchReport {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(12, getDescriptionBytes());
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSerializedSize = size;
       return size;
     }
 
     private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
     public static org.sonar.batch.protocol.output.BatchReport.Component parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -4142,12 +4098,17 @@ public final class BatchReport {
       return PARSER.parseFrom(input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.sonar.batch.protocol.output.BatchReport.Component prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
@@ -4189,10 +4150,6 @@ public final class BatchReport {
           getLinkFieldBuilder();
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
       public Builder clear() {
         super.clear();
         ref_ = 0;
@@ -4201,7 +4158,7 @@ public final class BatchReport {
         bitField0_ = (bitField0_ & ~0x00000002);
         name_ = "";
         bitField0_ = (bitField0_ & ~0x00000004);
-        type_ = org.sonar.batch.protocol.Constants.ComponentType.PROJECT;
+        type_ = 0;
         bitField0_ = (bitField0_ & ~0x00000008);
         isTest_ = false;
         bitField0_ = (bitField0_ & ~0x00000010);
@@ -4226,10 +4183,6 @@ public final class BatchReport {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.sonar.batch.protocol.output.BatchReport.internal_static_Component_descriptor;
@@ -4399,7 +4352,8 @@ public final class BatchReport {
           description_ = other.description_;
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
@@ -4610,7 +4564,7 @@ public final class BatchReport {
         return this;
       }
 
-      private org.sonar.batch.protocol.Constants.ComponentType type_ = org.sonar.batch.protocol.Constants.ComponentType.PROJECT;
+      private int type_ = 0;
       /**
        * <code>optional .ComponentType type = 4;</code>
        */
@@ -4621,7 +4575,8 @@ public final class BatchReport {
        * <code>optional .ComponentType type = 4;</code>
        */
       public org.sonar.batch.protocol.Constants.ComponentType getType() {
-        return type_;
+        org.sonar.batch.protocol.Constants.ComponentType result = org.sonar.batch.protocol.Constants.ComponentType.valueOf(type_);
+        return result == null ? org.sonar.batch.protocol.Constants.ComponentType.PROJECT : result;
       }
       /**
        * <code>optional .ComponentType type = 4;</code>
@@ -4631,7 +4586,7 @@ public final class BatchReport {
           throw new NullPointerException();
         }
         bitField0_ |= 0x00000008;
-        type_ = value;
+        type_ = value.getNumber();
         onChanged();
         return this;
       }
@@ -4640,7 +4595,7 @@ public final class BatchReport {
        */
       public Builder clearType() {
         bitField0_ = (bitField0_ & ~0x00000008);
-        type_ = org.sonar.batch.protocol.Constants.ComponentType.PROJECT;
+        type_ = 0;
         onChanged();
         return this;
       }
@@ -5416,12 +5371,44 @@ public final class BatchReport {
       // @@protoc_insertion_point(builder_scope:Component)
     }
 
+    // @@protoc_insertion_point(class_scope:Component)
+    private static final org.sonar.batch.protocol.output.BatchReport.Component DEFAULT_INSTANCE;
     static {
-      defaultInstance = new Component(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.sonar.batch.protocol.output.BatchReport.Component();
+    }
+
+    public static org.sonar.batch.protocol.output.BatchReport.Component getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    public static final com.google.protobuf.Parser<Component> PARSER =
+        new com.google.protobuf.AbstractParser<Component>() {
+      public Component parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        try {
+          return new Component(input, extensionRegistry);
+        } catch (RuntimeException e) {
+          if (e.getCause() instanceof
+              com.google.protobuf.InvalidProtocolBufferException) {
+            throw (com.google.protobuf.InvalidProtocolBufferException)
+                e.getCause();
+          }
+          throw e;
+        }
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<Component> getParserForType() {
+      return PARSER;
+    }
+
+    public org.sonar.batch.protocol.output.BatchReport.Component getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:Component)
   }
 
   public interface MeasureOrBuilder extends
@@ -5512,37 +5499,33 @@ public final class BatchReport {
   /**
    * Protobuf type {@code Measure}
    */
-  public static final class Measure extends
+  public  static final class Measure extends
       com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:Measure)
       MeasureOrBuilder {
     // Use Measure.newBuilder() to construct.
-    private Measure(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private Measure(com.google.protobuf.GeneratedMessage.Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private Measure(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final Measure defaultInstance;
-    public static Measure getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public Measure getDefaultInstanceForType() {
-      return defaultInstance;
+    private Measure() {
+      valueType_ = 0;
+      booleanValue_ = false;
+      intValue_ = 0;
+      longValue_ = 0L;
+      doubleValue_ = 0D;
+      stringValue_ = "";
+      metricKey_ = "";
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private Measure(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+      this();
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -5568,7 +5551,7 @@ public final class BatchReport {
                 unknownFields.mergeVarintField(1, rawValue);
               } else {
                 bitField0_ |= 0x00000001;
-                valueType_ = value;
+                valueType_ = rawValue;
               }
               break;
             }
@@ -5607,10 +5590,11 @@ public final class BatchReport {
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
+        throw new RuntimeException(e.setUnfinishedMessage(this));
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+        throw new RuntimeException(
+            new com.google.protobuf.InvalidProtocolBufferException(
+                e.getMessage()).setUnfinishedMessage(this));
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -5628,24 +5612,9 @@ public final class BatchReport {
               org.sonar.batch.protocol.output.BatchReport.Measure.class, org.sonar.batch.protocol.output.BatchReport.Measure.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<Measure> PARSER =
-        new com.google.protobuf.AbstractParser<Measure>() {
-      public Measure parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Measure(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Measure> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int VALUE_TYPE_FIELD_NUMBER = 1;
-    private org.sonar.batch.protocol.Constants.MeasureValueType valueType_;
+    private int valueType_;
     /**
      * <code>optional .MeasureValueType value_type = 1;</code>
      */
@@ -5656,7 +5625,8 @@ public final class BatchReport {
      * <code>optional .MeasureValueType value_type = 1;</code>
      */
     public org.sonar.batch.protocol.Constants.MeasureValueType getValueType() {
-      return valueType_;
+      org.sonar.batch.protocol.Constants.MeasureValueType result = org.sonar.batch.protocol.Constants.MeasureValueType.valueOf(valueType_);
+      return result == null ? org.sonar.batch.protocol.Constants.MeasureValueType.INT : result;
     }
 
     public static final int BOOLEAN_VALUE_FIELD_NUMBER = 2;
@@ -5728,7 +5698,7 @@ public final class BatchReport {
     }
 
     public static final int STRING_VALUE_FIELD_NUMBER = 6;
-    private java.lang.Object stringValue_;
+    private volatile java.lang.Object stringValue_;
     /**
      * <code>optional string string_value = 6;</code>
      */
@@ -5770,7 +5740,7 @@ public final class BatchReport {
     }
 
     public static final int METRIC_KEY_FIELD_NUMBER = 7;
-    private java.lang.Object metricKey_;
+    private volatile java.lang.Object metricKey_;
     /**
      * <code>optional string metric_key = 7;</code>
      */
@@ -5811,15 +5781,6 @@ public final class BatchReport {
       }
     }
 
-    private void initFields() {
-      valueType_ = org.sonar.batch.protocol.Constants.MeasureValueType.INT;
-      booleanValue_ = false;
-      intValue_ = 0;
-      longValue_ = 0L;
-      doubleValue_ = 0D;
-      stringValue_ = "";
-      metricKey_ = "";
-    }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -5832,9 +5793,8 @@ public final class BatchReport {
 
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeEnum(1, valueType_.getNumber());
+        output.writeEnum(1, valueType_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         output.writeBool(2, booleanValue_);
@@ -5854,7 +5814,7 @@ public final class BatchReport {
       if (((bitField0_ & 0x00000040) == 0x00000040)) {
         output.writeBytes(7, getMetricKeyBytes());
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     private int memoizedSerializedSize = -1;
@@ -5865,7 +5825,7 @@ public final class BatchReport {
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(1, valueType_.getNumber());
+          .computeEnumSize(1, valueType_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
@@ -5891,18 +5851,12 @@ public final class BatchReport {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(7, getMetricKeyBytes());
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSerializedSize = size;
       return size;
     }
 
     private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
     public static org.sonar.batch.protocol.output.BatchReport.Measure parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -5956,12 +5910,17 @@ public final class BatchReport {
       return PARSER.parseFrom(input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.sonar.batch.protocol.output.BatchReport.Measure prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
@@ -6002,13 +5961,9 @@ public final class BatchReport {
         if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
       public Builder clear() {
         super.clear();
-        valueType_ = org.sonar.batch.protocol.Constants.MeasureValueType.INT;
+        valueType_ = 0;
         bitField0_ = (bitField0_ & ~0x00000001);
         booleanValue_ = false;
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -6025,10 +5980,6 @@ public final class BatchReport {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.sonar.batch.protocol.output.BatchReport.internal_static_Measure_descriptor;
@@ -6119,7 +6070,8 @@ public final class BatchReport {
           metricKey_ = other.metricKey_;
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
@@ -6146,7 +6098,7 @@ public final class BatchReport {
       }
       private int bitField0_;
 
-      private org.sonar.batch.protocol.Constants.MeasureValueType valueType_ = org.sonar.batch.protocol.Constants.MeasureValueType.INT;
+      private int valueType_ = 0;
       /**
        * <code>optional .MeasureValueType value_type = 1;</code>
        */
@@ -6157,7 +6109,8 @@ public final class BatchReport {
        * <code>optional .MeasureValueType value_type = 1;</code>
        */
       public org.sonar.batch.protocol.Constants.MeasureValueType getValueType() {
-        return valueType_;
+        org.sonar.batch.protocol.Constants.MeasureValueType result = org.sonar.batch.protocol.Constants.MeasureValueType.valueOf(valueType_);
+        return result == null ? org.sonar.batch.protocol.Constants.MeasureValueType.INT : result;
       }
       /**
        * <code>optional .MeasureValueType value_type = 1;</code>
@@ -6167,7 +6120,7 @@ public final class BatchReport {
           throw new NullPointerException();
         }
         bitField0_ |= 0x00000001;
-        valueType_ = value;
+        valueType_ = value.getNumber();
         onChanged();
         return this;
       }
@@ -6176,7 +6129,7 @@ public final class BatchReport {
        */
       public Builder clearValueType() {
         bitField0_ = (bitField0_ & ~0x00000001);
-        valueType_ = org.sonar.batch.protocol.Constants.MeasureValueType.INT;
+        valueType_ = 0;
         onChanged();
         return this;
       }
@@ -6480,12 +6433,44 @@ public final class BatchReport {
       // @@protoc_insertion_point(builder_scope:Measure)
     }
 
+    // @@protoc_insertion_point(class_scope:Measure)
+    private static final org.sonar.batch.protocol.output.BatchReport.Measure DEFAULT_INSTANCE;
     static {
-      defaultInstance = new Measure(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.sonar.batch.protocol.output.BatchReport.Measure();
+    }
+
+    public static org.sonar.batch.protocol.output.BatchReport.Measure getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    public static final com.google.protobuf.Parser<Measure> PARSER =
+        new com.google.protobuf.AbstractParser<Measure>() {
+      public Measure parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        try {
+          return new Measure(input, extensionRegistry);
+        } catch (RuntimeException e) {
+          if (e.getCause() instanceof
+              com.google.protobuf.InvalidProtocolBufferException) {
+            throw (com.google.protobuf.InvalidProtocolBufferException)
+                e.getCause();
+          }
+          throw e;
+        }
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<Measure> getParserForType() {
+      return PARSER;
+    }
+
+    public org.sonar.batch.protocol.output.BatchReport.Measure getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:Measure)
   }
 
   public interface IssueOrBuilder extends
@@ -6637,37 +6622,34 @@ public final class BatchReport {
   /**
    * Protobuf type {@code Issue}
    */
-  public static final class Issue extends
+  public  static final class Issue extends
       com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:Issue)
       IssueOrBuilder {
     // Use Issue.newBuilder() to construct.
-    private Issue(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private Issue(com.google.protobuf.GeneratedMessage.Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private Issue(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final Issue defaultInstance;
-    public static Issue getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public Issue getDefaultInstanceForType() {
-      return defaultInstance;
+    private Issue() {
+      ruleRepository_ = "";
+      ruleKey_ = "";
+      line_ = 0;
+      msg_ = "";
+      severity_ = 0;
+      effortToFix_ = 0D;
+      attributes_ = "";
+      flow_ = java.util.Collections.emptyList();
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private Issue(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+      this();
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -6716,7 +6698,7 @@ public final class BatchReport {
                 unknownFields.mergeVarintField(5, rawValue);
               } else {
                 bitField0_ |= 0x00000010;
-                severity_ = value;
+                severity_ = rawValue;
               }
               break;
             }
@@ -6755,10 +6737,11 @@ public final class BatchReport {
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
+        throw new RuntimeException(e.setUnfinishedMessage(this));
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+        throw new RuntimeException(
+            new com.google.protobuf.InvalidProtocolBufferException(
+                e.getMessage()).setUnfinishedMessage(this));
       } finally {
         if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
           flow_ = java.util.Collections.unmodifiableList(flow_);
@@ -6779,24 +6762,9 @@ public final class BatchReport {
               org.sonar.batch.protocol.output.BatchReport.Issue.class, org.sonar.batch.protocol.output.BatchReport.Issue.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<Issue> PARSER =
-        new com.google.protobuf.AbstractParser<Issue>() {
-      public Issue parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Issue(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Issue> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int RULE_REPOSITORY_FIELD_NUMBER = 1;
-    private java.lang.Object ruleRepository_;
+    private volatile java.lang.Object ruleRepository_;
     /**
      * <code>optional string rule_repository = 1;</code>
      */
@@ -6838,7 +6806,7 @@ public final class BatchReport {
     }
 
     public static final int RULE_KEY_FIELD_NUMBER = 2;
-    private java.lang.Object ruleKey_;
+    private volatile java.lang.Object ruleKey_;
     /**
      * <code>optional string rule_key = 2;</code>
      */
@@ -6905,7 +6873,7 @@ public final class BatchReport {
     }
 
     public static final int MSG_FIELD_NUMBER = 4;
-    private java.lang.Object msg_;
+    private volatile java.lang.Object msg_;
     /**
      * <code>optional string msg = 4;</code>
      */
@@ -6947,7 +6915,7 @@ public final class BatchReport {
     }
 
     public static final int SEVERITY_FIELD_NUMBER = 5;
-    private org.sonar.batch.protocol.Constants.Severity severity_;
+    private int severity_;
     /**
      * <code>optional .Severity severity = 5;</code>
      */
@@ -6958,7 +6926,8 @@ public final class BatchReport {
      * <code>optional .Severity severity = 5;</code>
      */
     public org.sonar.batch.protocol.Constants.Severity getSeverity() {
-      return severity_;
+      org.sonar.batch.protocol.Constants.Severity result = org.sonar.batch.protocol.Constants.Severity.valueOf(severity_);
+      return result == null ? org.sonar.batch.protocol.Constants.Severity.INFO : result;
     }
 
     public static final int EFFORT_TO_FIX_FIELD_NUMBER = 6;
@@ -6977,7 +6946,7 @@ public final class BatchReport {
     }
 
     public static final int ATTRIBUTES_FIELD_NUMBER = 7;
-    private java.lang.Object attributes_;
+    private volatile java.lang.Object attributes_;
     /**
      * <code>optional string attributes = 7;</code>
      */
@@ -7038,7 +7007,7 @@ public final class BatchReport {
      * </pre>
      */
     public org.sonar.batch.protocol.output.BatchReport.TextRange getTextRange() {
-      return textRange_;
+      return textRange_ == null ? org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance() : textRange_;
     }
     /**
      * <code>optional .TextRange text_range = 9;</code>
@@ -7048,7 +7017,7 @@ public final class BatchReport {
      * </pre>
      */
     public org.sonar.batch.protocol.output.BatchReport.TextRangeOrBuilder getTextRangeOrBuilder() {
-      return textRange_;
+      return textRange_ == null ? org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance() : textRange_;
     }
 
     public static final int FLOW_FIELD_NUMBER = 10;
@@ -7086,17 +7055,6 @@ public final class BatchReport {
       return flow_.get(index);
     }
 
-    private void initFields() {
-      ruleRepository_ = "";
-      ruleKey_ = "";
-      line_ = 0;
-      msg_ = "";
-      severity_ = org.sonar.batch.protocol.Constants.Severity.INFO;
-      effortToFix_ = 0D;
-      attributes_ = "";
-      textRange_ = org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance();
-      flow_ = java.util.Collections.emptyList();
-    }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -7109,7 +7067,6 @@ public final class BatchReport {
 
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeBytes(1, getRuleRepositoryBytes());
       }
@@ -7123,7 +7080,7 @@ public final class BatchReport {
         output.writeBytes(4, getMsgBytes());
       }
       if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        output.writeEnum(5, severity_.getNumber());
+        output.writeEnum(5, severity_);
       }
       if (((bitField0_ & 0x00000020) == 0x00000020)) {
         output.writeDouble(6, effortToFix_);
@@ -7132,12 +7089,12 @@ public final class BatchReport {
         output.writeBytes(7, getAttributesBytes());
       }
       if (((bitField0_ & 0x00000080) == 0x00000080)) {
-        output.writeMessage(9, textRange_);
+        output.writeMessage(9, getTextRange());
       }
       for (int i = 0; i < flow_.size(); i++) {
         output.writeMessage(10, flow_.get(i));
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     private int memoizedSerializedSize = -1;
@@ -7164,7 +7121,7 @@ public final class BatchReport {
       }
       if (((bitField0_ & 0x00000010) == 0x00000010)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(5, severity_.getNumber());
+          .computeEnumSize(5, severity_);
       }
       if (((bitField0_ & 0x00000020) == 0x00000020)) {
         size += com.google.protobuf.CodedOutputStream
@@ -7176,24 +7133,18 @@ public final class BatchReport {
       }
       if (((bitField0_ & 0x00000080) == 0x00000080)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, textRange_);
+          .computeMessageSize(9, getTextRange());
       }
       for (int i = 0; i < flow_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(10, flow_.get(i));
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSerializedSize = size;
       return size;
     }
 
     private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
     public static org.sonar.batch.protocol.output.BatchReport.Issue parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -7247,12 +7198,17 @@ public final class BatchReport {
       return PARSER.parseFrom(input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.sonar.batch.protocol.output.BatchReport.Issue prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
@@ -7295,10 +7251,6 @@ public final class BatchReport {
           getFlowFieldBuilder();
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
       public Builder clear() {
         super.clear();
         ruleRepository_ = "";
@@ -7309,14 +7261,14 @@ public final class BatchReport {
         bitField0_ = (bitField0_ & ~0x00000004);
         msg_ = "";
         bitField0_ = (bitField0_ & ~0x00000008);
-        severity_ = org.sonar.batch.protocol.Constants.Severity.INFO;
+        severity_ = 0;
         bitField0_ = (bitField0_ & ~0x00000010);
         effortToFix_ = 0D;
         bitField0_ = (bitField0_ & ~0x00000020);
         attributes_ = "";
         bitField0_ = (bitField0_ & ~0x00000040);
         if (textRangeBuilder_ == null) {
-          textRange_ = org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance();
+          textRange_ = null;
         } else {
           textRangeBuilder_.clear();
         }
@@ -7330,10 +7282,6 @@ public final class BatchReport {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.sonar.batch.protocol.output.BatchReport.internal_static_Issue_descriptor;
@@ -7474,7 +7422,8 @@ public final class BatchReport {
             }
           }
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
@@ -7781,7 +7730,7 @@ public final class BatchReport {
         return this;
       }
 
-      private org.sonar.batch.protocol.Constants.Severity severity_ = org.sonar.batch.protocol.Constants.Severity.INFO;
+      private int severity_ = 0;
       /**
        * <code>optional .Severity severity = 5;</code>
        */
@@ -7792,7 +7741,8 @@ public final class BatchReport {
        * <code>optional .Severity severity = 5;</code>
        */
       public org.sonar.batch.protocol.Constants.Severity getSeverity() {
-        return severity_;
+        org.sonar.batch.protocol.Constants.Severity result = org.sonar.batch.protocol.Constants.Severity.valueOf(severity_);
+        return result == null ? org.sonar.batch.protocol.Constants.Severity.INFO : result;
       }
       /**
        * <code>optional .Severity severity = 5;</code>
@@ -7802,7 +7752,7 @@ public final class BatchReport {
           throw new NullPointerException();
         }
         bitField0_ |= 0x00000010;
-        severity_ = value;
+        severity_ = value.getNumber();
         onChanged();
         return this;
       }
@@ -7811,7 +7761,7 @@ public final class BatchReport {
        */
       public Builder clearSeverity() {
         bitField0_ = (bitField0_ & ~0x00000010);
-        severity_ = org.sonar.batch.protocol.Constants.Severity.INFO;
+        severity_ = 0;
         onChanged();
         return this;
       }
@@ -7924,7 +7874,7 @@ public final class BatchReport {
         return this;
       }
 
-      private org.sonar.batch.protocol.output.BatchReport.TextRange textRange_ = org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance();
+      private org.sonar.batch.protocol.output.BatchReport.TextRange textRange_ = null;
       private com.google.protobuf.SingleFieldBuilder<
           org.sonar.batch.protocol.output.BatchReport.TextRange, org.sonar.batch.protocol.output.BatchReport.TextRange.Builder, org.sonar.batch.protocol.output.BatchReport.TextRangeOrBuilder> textRangeBuilder_;
       /**
@@ -7946,7 +7896,7 @@ public final class BatchReport {
        */
       public org.sonar.batch.protocol.output.BatchReport.TextRange getTextRange() {
         if (textRangeBuilder_ == null) {
-          return textRange_;
+          return textRange_ == null ? org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance() : textRange_;
         } else {
           return textRangeBuilder_.getMessage();
         }
@@ -7999,6 +7949,7 @@ public final class BatchReport {
       public Builder mergeTextRange(org.sonar.batch.protocol.output.BatchReport.TextRange value) {
         if (textRangeBuilder_ == null) {
           if (((bitField0_ & 0x00000080) == 0x00000080) &&
+              textRange_ != null &&
               textRange_ != org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance()) {
             textRange_ =
               org.sonar.batch.protocol.output.BatchReport.TextRange.newBuilder(textRange_).mergeFrom(value).buildPartial();
@@ -8021,7 +7972,7 @@ public final class BatchReport {
        */
       public Builder clearTextRange() {
         if (textRangeBuilder_ == null) {
-          textRange_ = org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance();
+          textRange_ = null;
           onChanged();
         } else {
           textRangeBuilder_.clear();
@@ -8052,7 +8003,8 @@ public final class BatchReport {
         if (textRangeBuilder_ != null) {
           return textRangeBuilder_.getMessageOrBuilder();
         } else {
-          return textRange_;
+          return textRange_ == null ?
+              org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance() : textRange_;
         }
       }
       /**
@@ -8319,12 +8271,44 @@ public final class BatchReport {
       // @@protoc_insertion_point(builder_scope:Issue)
     }
 
+    // @@protoc_insertion_point(class_scope:Issue)
+    private static final org.sonar.batch.protocol.output.BatchReport.Issue DEFAULT_INSTANCE;
     static {
-      defaultInstance = new Issue(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.sonar.batch.protocol.output.BatchReport.Issue();
+    }
+
+    public static org.sonar.batch.protocol.output.BatchReport.Issue getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    public static final com.google.protobuf.Parser<Issue> PARSER =
+        new com.google.protobuf.AbstractParser<Issue>() {
+      public Issue parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        try {
+          return new Issue(input, extensionRegistry);
+        } catch (RuntimeException e) {
+          if (e.getCause() instanceof
+              com.google.protobuf.InvalidProtocolBufferException) {
+            throw (com.google.protobuf.InvalidProtocolBufferException)
+                e.getCause();
+          }
+          throw e;
+        }
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<Issue> getParserForType() {
+      return PARSER;
+    }
+
+    public org.sonar.batch.protocol.output.BatchReport.Issue getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:Issue)
   }
 
   public interface IssueLocationOrBuilder extends
@@ -8382,37 +8366,28 @@ public final class BatchReport {
   /**
    * Protobuf type {@code IssueLocation}
    */
-  public static final class IssueLocation extends
+  public  static final class IssueLocation extends
       com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:IssueLocation)
       IssueLocationOrBuilder {
     // Use IssueLocation.newBuilder() to construct.
-    private IssueLocation(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private IssueLocation(com.google.protobuf.GeneratedMessage.Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private IssueLocation(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final IssueLocation defaultInstance;
-    public static IssueLocation getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public IssueLocation getDefaultInstanceForType() {
-      return defaultInstance;
+    private IssueLocation() {
+      componentRef_ = 0;
+      msg_ = "";
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private IssueLocation(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+      this();
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -8458,10 +8433,11 @@ public final class BatchReport {
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
+        throw new RuntimeException(e.setUnfinishedMessage(this));
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+        throw new RuntimeException(
+            new com.google.protobuf.InvalidProtocolBufferException(
+                e.getMessage()).setUnfinishedMessage(this));
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -8479,21 +8455,6 @@ public final class BatchReport {
               org.sonar.batch.protocol.output.BatchReport.IssueLocation.class, org.sonar.batch.protocol.output.BatchReport.IssueLocation.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<IssueLocation> PARSER =
-        new com.google.protobuf.AbstractParser<IssueLocation>() {
-      public IssueLocation parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new IssueLocation(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<IssueLocation> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int COMPONENT_REF_FIELD_NUMBER = 1;
     private int componentRef_;
@@ -8530,7 +8491,7 @@ public final class BatchReport {
      * </pre>
      */
     public org.sonar.batch.protocol.output.BatchReport.TextRange getTextRange() {
-      return textRange_;
+      return textRange_ == null ? org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance() : textRange_;
     }
     /**
      * <code>optional .TextRange text_range = 2;</code>
@@ -8540,11 +8501,11 @@ public final class BatchReport {
      * </pre>
      */
     public org.sonar.batch.protocol.output.BatchReport.TextRangeOrBuilder getTextRangeOrBuilder() {
-      return textRange_;
+      return textRange_ == null ? org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance() : textRange_;
     }
 
     public static final int MSG_FIELD_NUMBER = 3;
-    private java.lang.Object msg_;
+    private volatile java.lang.Object msg_;
     /**
      * <code>optional string msg = 3;</code>
      */
@@ -8585,11 +8546,6 @@ public final class BatchReport {
       }
     }
 
-    private void initFields() {
-      componentRef_ = 0;
-      textRange_ = org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance();
-      msg_ = "";
-    }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -8602,17 +8558,16 @@ public final class BatchReport {
 
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt32(1, componentRef_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeMessage(2, textRange_);
+        output.writeMessage(2, getTextRange());
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         output.writeBytes(3, getMsgBytes());
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     private int memoizedSerializedSize = -1;
@@ -8627,24 +8582,18 @@ public final class BatchReport {
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, textRange_);
+          .computeMessageSize(2, getTextRange());
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(3, getMsgBytes());
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSerializedSize = size;
       return size;
     }
 
     private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
     public static org.sonar.batch.protocol.output.BatchReport.IssueLocation parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -8698,12 +8647,17 @@ public final class BatchReport {
       return PARSER.parseFrom(input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.sonar.batch.protocol.output.BatchReport.IssueLocation prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
@@ -8745,16 +8699,12 @@ public final class BatchReport {
           getTextRangeFieldBuilder();
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
       public Builder clear() {
         super.clear();
         componentRef_ = 0;
         bitField0_ = (bitField0_ & ~0x00000001);
         if (textRangeBuilder_ == null) {
-          textRange_ = org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance();
+          textRange_ = null;
         } else {
           textRangeBuilder_.clear();
         }
@@ -8764,10 +8714,6 @@ public final class BatchReport {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.sonar.batch.protocol.output.BatchReport.internal_static_IssueLocation_descriptor;
@@ -8832,7 +8778,8 @@ public final class BatchReport {
           msg_ = other.msg_;
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
@@ -8891,7 +8838,7 @@ public final class BatchReport {
         return this;
       }
 
-      private org.sonar.batch.protocol.output.BatchReport.TextRange textRange_ = org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance();
+      private org.sonar.batch.protocol.output.BatchReport.TextRange textRange_ = null;
       private com.google.protobuf.SingleFieldBuilder<
           org.sonar.batch.protocol.output.BatchReport.TextRange, org.sonar.batch.protocol.output.BatchReport.TextRange.Builder, org.sonar.batch.protocol.output.BatchReport.TextRangeOrBuilder> textRangeBuilder_;
       /**
@@ -8913,7 +8860,7 @@ public final class BatchReport {
        */
       public org.sonar.batch.protocol.output.BatchReport.TextRange getTextRange() {
         if (textRangeBuilder_ == null) {
-          return textRange_;
+          return textRange_ == null ? org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance() : textRange_;
         } else {
           return textRangeBuilder_.getMessage();
         }
@@ -8966,6 +8913,7 @@ public final class BatchReport {
       public Builder mergeTextRange(org.sonar.batch.protocol.output.BatchReport.TextRange value) {
         if (textRangeBuilder_ == null) {
           if (((bitField0_ & 0x00000002) == 0x00000002) &&
+              textRange_ != null &&
               textRange_ != org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance()) {
             textRange_ =
               org.sonar.batch.protocol.output.BatchReport.TextRange.newBuilder(textRange_).mergeFrom(value).buildPartial();
@@ -8988,7 +8936,7 @@ public final class BatchReport {
        */
       public Builder clearTextRange() {
         if (textRangeBuilder_ == null) {
-          textRange_ = org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance();
+          textRange_ = null;
           onChanged();
         } else {
           textRangeBuilder_.clear();
@@ -9019,7 +8967,8 @@ public final class BatchReport {
         if (textRangeBuilder_ != null) {
           return textRangeBuilder_.getMessageOrBuilder();
         } else {
-          return textRange_;
+          return textRange_ == null ?
+              org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance() : textRange_;
         }
       }
       /**
@@ -9122,12 +9071,44 @@ public final class BatchReport {
       // @@protoc_insertion_point(builder_scope:IssueLocation)
     }
 
+    // @@protoc_insertion_point(class_scope:IssueLocation)
+    private static final org.sonar.batch.protocol.output.BatchReport.IssueLocation DEFAULT_INSTANCE;
     static {
-      defaultInstance = new IssueLocation(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.sonar.batch.protocol.output.BatchReport.IssueLocation();
+    }
+
+    public static org.sonar.batch.protocol.output.BatchReport.IssueLocation getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    public static final com.google.protobuf.Parser<IssueLocation> PARSER =
+        new com.google.protobuf.AbstractParser<IssueLocation>() {
+      public IssueLocation parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        try {
+          return new IssueLocation(input, extensionRegistry);
+        } catch (RuntimeException e) {
+          if (e.getCause() instanceof
+              com.google.protobuf.InvalidProtocolBufferException) {
+            throw (com.google.protobuf.InvalidProtocolBufferException)
+                e.getCause();
+          }
+          throw e;
+        }
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<IssueLocation> getParserForType() {
+      return PARSER;
+    }
+
+    public org.sonar.batch.protocol.output.BatchReport.IssueLocation getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:IssueLocation)
   }
 
   public interface FlowOrBuilder extends
@@ -9161,37 +9142,27 @@ public final class BatchReport {
   /**
    * Protobuf type {@code Flow}
    */
-  public static final class Flow extends
+  public  static final class Flow extends
       com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:Flow)
       FlowOrBuilder {
     // Use Flow.newBuilder() to construct.
-    private Flow(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private Flow(com.google.protobuf.GeneratedMessage.Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private Flow(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final Flow defaultInstance;
-    public static Flow getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public Flow getDefaultInstanceForType() {
-      return defaultInstance;
+    private Flow() {
+      location_ = java.util.Collections.emptyList();
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private Flow(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+      this();
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -9221,10 +9192,11 @@ public final class BatchReport {
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
+        throw new RuntimeException(e.setUnfinishedMessage(this));
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+        throw new RuntimeException(
+            new com.google.protobuf.InvalidProtocolBufferException(
+                e.getMessage()).setUnfinishedMessage(this));
       } finally {
         if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
           location_ = java.util.Collections.unmodifiableList(location_);
@@ -9245,21 +9217,6 @@ public final class BatchReport {
               org.sonar.batch.protocol.output.BatchReport.Flow.class, org.sonar.batch.protocol.output.BatchReport.Flow.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<Flow> PARSER =
-        new com.google.protobuf.AbstractParser<Flow>() {
-      public Flow parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Flow(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Flow> getParserForType() {
-      return PARSER;
-    }
-
     public static final int LOCATION_FIELD_NUMBER = 1;
     private java.util.List<org.sonar.batch.protocol.output.BatchReport.IssueLocation> location_;
     /**
@@ -9295,9 +9252,6 @@ public final class BatchReport {
       return location_.get(index);
     }
 
-    private void initFields() {
-      location_ = java.util.Collections.emptyList();
-    }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -9310,11 +9264,10 @@ public final class BatchReport {
 
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       for (int i = 0; i < location_.size(); i++) {
         output.writeMessage(1, location_.get(i));
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     private int memoizedSerializedSize = -1;
@@ -9327,18 +9280,12 @@ public final class BatchReport {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(1, location_.get(i));
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSerializedSize = size;
       return size;
     }
 
     private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
     public static org.sonar.batch.protocol.output.BatchReport.Flow parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -9392,12 +9339,17 @@ public final class BatchReport {
       return PARSER.parseFrom(input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.sonar.batch.protocol.output.BatchReport.Flow prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
@@ -9439,10 +9391,6 @@ public final class BatchReport {
           getLocationFieldBuilder();
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
       public Builder clear() {
         super.clear();
         if (locationBuilder_ == null) {
@@ -9454,10 +9402,6 @@ public final class BatchReport {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.sonar.batch.protocol.output.BatchReport.internal_static_Flow_descriptor;
@@ -9528,7 +9472,8 @@ public final class BatchReport {
             }
           }
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
@@ -9798,12 +9743,44 @@ public final class BatchReport {
       // @@protoc_insertion_point(builder_scope:Flow)
     }
 
+    // @@protoc_insertion_point(class_scope:Flow)
+    private static final org.sonar.batch.protocol.output.BatchReport.Flow DEFAULT_INSTANCE;
     static {
-      defaultInstance = new Flow(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.sonar.batch.protocol.output.BatchReport.Flow();
+    }
+
+    public static org.sonar.batch.protocol.output.BatchReport.Flow getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    public static final com.google.protobuf.Parser<Flow> PARSER =
+        new com.google.protobuf.AbstractParser<Flow>() {
+      public Flow parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        try {
+          return new Flow(input, extensionRegistry);
+        } catch (RuntimeException e) {
+          if (e.getCause() instanceof
+              com.google.protobuf.InvalidProtocolBufferException) {
+            throw (com.google.protobuf.InvalidProtocolBufferException)
+                e.getCause();
+          }
+          throw e;
+        }
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<Flow> getParserForType() {
+      return PARSER;
+    }
+
+    public org.sonar.batch.protocol.output.BatchReport.Flow getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:Flow)
   }
 
   public interface ChangesetsOrBuilder extends
@@ -9871,37 +9848,29 @@ public final class BatchReport {
   /**
    * Protobuf type {@code Changesets}
    */
-  public static final class Changesets extends
+  public  static final class Changesets extends
       com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:Changesets)
       ChangesetsOrBuilder {
     // Use Changesets.newBuilder() to construct.
-    private Changesets(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private Changesets(com.google.protobuf.GeneratedMessage.Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private Changesets(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final Changesets defaultInstance;
-    public static Changesets getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public Changesets getDefaultInstanceForType() {
-      return defaultInstance;
+    private Changesets() {
+      componentRef_ = 0;
+      changeset_ = java.util.Collections.emptyList();
+      changesetIndexByLine_ = java.util.Collections.emptyList();
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private Changesets(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+      this();
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -9957,10 +9926,11 @@ public final class BatchReport {
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
+        throw new RuntimeException(e.setUnfinishedMessage(this));
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+        throw new RuntimeException(
+            new com.google.protobuf.InvalidProtocolBufferException(
+                e.getMessage()).setUnfinishedMessage(this));
       } finally {
         if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
           changeset_ = java.util.Collections.unmodifiableList(changeset_);
@@ -9984,21 +9954,6 @@ public final class BatchReport {
               org.sonar.batch.protocol.output.BatchReport.Changesets.class, org.sonar.batch.protocol.output.BatchReport.Changesets.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<Changesets> PARSER =
-        new com.google.protobuf.AbstractParser<Changesets>() {
-      public Changesets parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Changesets(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Changesets> getParserForType() {
-      return PARSER;
-    }
-
     public interface ChangesetOrBuilder extends
         // @@protoc_insertion_point(interface_extends:Changesets.Changeset)
         com.google.protobuf.MessageOrBuilder {
@@ -10043,37 +9998,29 @@ public final class BatchReport {
     /**
      * Protobuf type {@code Changesets.Changeset}
      */
-    public static final class Changeset extends
+    public  static final class Changeset extends
         com.google.protobuf.GeneratedMessage implements
         // @@protoc_insertion_point(message_implements:Changesets.Changeset)
         ChangesetOrBuilder {
       // Use Changeset.newBuilder() to construct.
-      private Changeset(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      private Changeset(com.google.protobuf.GeneratedMessage.Builder builder) {
         super(builder);
-        this.unknownFields = builder.getUnknownFields();
-      }
-      private Changeset(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-      private static final Changeset defaultInstance;
-      public static Changeset getDefaultInstance() {
-        return defaultInstance;
       }
-
-      public Changeset getDefaultInstanceForType() {
-        return defaultInstance;
+      private Changeset() {
+        revision_ = "";
+        author_ = "";
+        date_ = 0L;
       }
 
-      private final com.google.protobuf.UnknownFieldSet unknownFields;
       @java.lang.Override
       public final com.google.protobuf.UnknownFieldSet
-          getUnknownFields() {
+      getUnknownFields() {
         return this.unknownFields;
       }
       private Changeset(
           com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        initFields();
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+        this();
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -10112,10 +10059,11 @@ public final class BatchReport {
             }
           }
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
+          throw new RuntimeException(e.setUnfinishedMessage(this));
         } catch (java.io.IOException e) {
-          throw new com.google.protobuf.InvalidProtocolBufferException(
-              e.getMessage()).setUnfinishedMessage(this);
+          throw new RuntimeException(
+              new com.google.protobuf.InvalidProtocolBufferException(
+                  e.getMessage()).setUnfinishedMessage(this));
         } finally {
           this.unknownFields = unknownFields.build();
           makeExtensionsImmutable();
@@ -10133,24 +10081,9 @@ public final class BatchReport {
                 org.sonar.batch.protocol.output.BatchReport.Changesets.Changeset.class, org.sonar.batch.protocol.output.BatchReport.Changesets.Changeset.Builder.class);
       }
 
-      public static com.google.protobuf.Parser<Changeset> PARSER =
-          new com.google.protobuf.AbstractParser<Changeset>() {
-        public Changeset parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Changeset(input, extensionRegistry);
-        }
-      };
-
-      @java.lang.Override
-      public com.google.protobuf.Parser<Changeset> getParserForType() {
-        return PARSER;
-      }
-
       private int bitField0_;
       public static final int REVISION_FIELD_NUMBER = 1;
-      private java.lang.Object revision_;
+      private volatile java.lang.Object revision_;
       /**
        * <code>optional string revision = 1;</code>
        */
@@ -10192,7 +10125,7 @@ public final class BatchReport {
       }
 
       public static final int AUTHOR_FIELD_NUMBER = 2;
-      private java.lang.Object author_;
+      private volatile java.lang.Object author_;
       /**
        * <code>optional string author = 2;</code>
        */
@@ -10248,11 +10181,6 @@ public final class BatchReport {
         return date_;
       }
 
-      private void initFields() {
-        revision_ = "";
-        author_ = "";
-        date_ = 0L;
-      }
       private byte memoizedIsInitialized = -1;
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
@@ -10265,7 +10193,6 @@ public final class BatchReport {
 
       public void writeTo(com.google.protobuf.CodedOutputStream output)
                           throws java.io.IOException {
-        getSerializedSize();
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
           output.writeBytes(1, getRevisionBytes());
         }
@@ -10275,7 +10202,7 @@ public final class BatchReport {
         if (((bitField0_ & 0x00000004) == 0x00000004)) {
           output.writeInt64(3, date_);
         }
-        getUnknownFields().writeTo(output);
+        unknownFields.writeTo(output);
       }
 
       private int memoizedSerializedSize = -1;
@@ -10296,18 +10223,12 @@ public final class BatchReport {
           size += com.google.protobuf.CodedOutputStream
             .computeInt64Size(3, date_);
         }
-        size += getUnknownFields().getSerializedSize();
+        size += unknownFields.getSerializedSize();
         memoizedSerializedSize = size;
         return size;
       }
 
       private static final long serialVersionUID = 0L;
-      @java.lang.Override
-      protected java.lang.Object writeReplace()
-          throws java.io.ObjectStreamException {
-        return super.writeReplace();
-      }
-
       public static org.sonar.batch.protocol.output.BatchReport.Changesets.Changeset parseFrom(
           com.google.protobuf.ByteString data)
           throws com.google.protobuf.InvalidProtocolBufferException {
@@ -10361,12 +10282,17 @@ public final class BatchReport {
         return PARSER.parseFrom(input, extensionRegistry);
       }
 
-      public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
+      public static Builder newBuilder() {
+        return DEFAULT_INSTANCE.toBuilder();
+      }
       public static Builder newBuilder(org.sonar.batch.protocol.output.BatchReport.Changesets.Changeset prototype) {
-        return newBuilder().mergeFrom(prototype);
+        return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+      }
+      public Builder toBuilder() {
+        return this == DEFAULT_INSTANCE
+            ? new Builder() : new Builder().mergeFrom(this);
       }
-      public Builder toBuilder() { return newBuilder(this); }
 
       @java.lang.Override
       protected Builder newBuilderForType(
@@ -10407,10 +10333,6 @@ public final class BatchReport {
           if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
           }
         }
-        private static Builder create() {
-          return new Builder();
-        }
-
         public Builder clear() {
           super.clear();
           revision_ = "";
@@ -10422,10 +10344,6 @@ public final class BatchReport {
           return this;
         }
 
-        public Builder clone() {
-          return create().mergeFrom(buildPartial());
-        }
-
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
           return org.sonar.batch.protocol.output.BatchReport.internal_static_Changesets_Changeset_descriptor;
@@ -10488,7 +10406,8 @@ public final class BatchReport {
           if (other.hasDate()) {
             setDate(other.getDate());
           }
-          this.mergeUnknownFields(other.getUnknownFields());
+          this.mergeUnknownFields(other.unknownFields);
+          onChanged();
           return this;
         }
 
@@ -10702,12 +10621,44 @@ public final class BatchReport {
         // @@protoc_insertion_point(builder_scope:Changesets.Changeset)
       }
 
+      // @@protoc_insertion_point(class_scope:Changesets.Changeset)
+      private static final org.sonar.batch.protocol.output.BatchReport.Changesets.Changeset DEFAULT_INSTANCE;
       static {
-        defaultInstance = new Changeset(true);
-        defaultInstance.initFields();
+        DEFAULT_INSTANCE = new org.sonar.batch.protocol.output.BatchReport.Changesets.Changeset();
+      }
+
+      public static org.sonar.batch.protocol.output.BatchReport.Changesets.Changeset getDefaultInstance() {
+        return DEFAULT_INSTANCE;
+      }
+
+      public static final com.google.protobuf.Parser<Changeset> PARSER =
+          new com.google.protobuf.AbstractParser<Changeset>() {
+        public Changeset parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          try {
+            return new Changeset(input, extensionRegistry);
+          } catch (RuntimeException e) {
+            if (e.getCause() instanceof
+                com.google.protobuf.InvalidProtocolBufferException) {
+              throw (com.google.protobuf.InvalidProtocolBufferException)
+                  e.getCause();
+            }
+            throw e;
+          }
+        }
+      };
+
+      @java.lang.Override
+      public com.google.protobuf.Parser<Changeset> getParserForType() {
+        return PARSER;
+      }
+
+      public org.sonar.batch.protocol.output.BatchReport.Changesets.Changeset getDefaultInstanceForType() {
+        return DEFAULT_INSTANCE;
       }
 
-      // @@protoc_insertion_point(class_scope:Changesets.Changeset)
     }
 
     private int bitField0_;
@@ -10796,11 +10747,6 @@ public final class BatchReport {
     }
     private int changesetIndexByLineMemoizedSerializedSize = -1;
 
-    private void initFields() {
-      componentRef_ = 0;
-      changeset_ = java.util.Collections.emptyList();
-      changesetIndexByLine_ = java.util.Collections.emptyList();
-    }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -10827,7 +10773,7 @@ public final class BatchReport {
       for (int i = 0; i < changesetIndexByLine_.size(); i++) {
         output.writeInt32NoTag(changesetIndexByLine_.get(i));
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     private int memoizedSerializedSize = -1;
@@ -10858,18 +10804,12 @@ public final class BatchReport {
         }
         changesetIndexByLineMemoizedSerializedSize = dataSize;
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSerializedSize = size;
       return size;
     }
 
     private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
     public static org.sonar.batch.protocol.output.BatchReport.Changesets parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -10923,12 +10863,17 @@ public final class BatchReport {
       return PARSER.parseFrom(input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.sonar.batch.protocol.output.BatchReport.Changesets prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
@@ -10970,10 +10915,6 @@ public final class BatchReport {
           getChangesetFieldBuilder();
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
       public Builder clear() {
         super.clear();
         componentRef_ = 0;
@@ -10989,10 +10930,6 @@ public final class BatchReport {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.sonar.batch.protocol.output.BatchReport.internal_static_Changesets_descriptor;
@@ -11087,7 +11024,8 @@ public final class BatchReport {
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
@@ -11483,12 +11421,44 @@ public final class BatchReport {
       // @@protoc_insertion_point(builder_scope:Changesets)
     }
 
+    // @@protoc_insertion_point(class_scope:Changesets)
+    private static final org.sonar.batch.protocol.output.BatchReport.Changesets DEFAULT_INSTANCE;
     static {
-      defaultInstance = new Changesets(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.sonar.batch.protocol.output.BatchReport.Changesets();
+    }
+
+    public static org.sonar.batch.protocol.output.BatchReport.Changesets getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    public static final com.google.protobuf.Parser<Changesets> PARSER =
+        new com.google.protobuf.AbstractParser<Changesets>() {
+      public Changesets parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        try {
+          return new Changesets(input, extensionRegistry);
+        } catch (RuntimeException e) {
+          if (e.getCause() instanceof
+              com.google.protobuf.InvalidProtocolBufferException) {
+            throw (com.google.protobuf.InvalidProtocolBufferException)
+                e.getCause();
+          }
+          throw e;
+        }
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<Changesets> getParserForType() {
+      return PARSER;
+    }
+
+    public org.sonar.batch.protocol.output.BatchReport.Changesets getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:Changesets)
   }
 
   public interface DuplicateOrBuilder extends
@@ -11554,37 +11524,28 @@ public final class BatchReport {
   /**
    * Protobuf type {@code Duplicate}
    */
-  public static final class Duplicate extends
+  public  static final class Duplicate extends
       com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:Duplicate)
       DuplicateOrBuilder {
     // Use Duplicate.newBuilder() to construct.
-    private Duplicate(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private Duplicate(com.google.protobuf.GeneratedMessage.Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private Duplicate(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final Duplicate defaultInstance;
-    public static Duplicate getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public Duplicate getDefaultInstanceForType() {
-      return defaultInstance;
+    private Duplicate() {
+      otherFileRef_ = 0;
+      otherFileKey_ = "";
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private Duplicate(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+      this();
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -11630,10 +11591,11 @@ public final class BatchReport {
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
+        throw new RuntimeException(e.setUnfinishedMessage(this));
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+        throw new RuntimeException(
+            new com.google.protobuf.InvalidProtocolBufferException(
+                e.getMessage()).setUnfinishedMessage(this));
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -11651,21 +11613,6 @@ public final class BatchReport {
               org.sonar.batch.protocol.output.BatchReport.Duplicate.class, org.sonar.batch.protocol.output.BatchReport.Duplicate.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<Duplicate> PARSER =
-        new com.google.protobuf.AbstractParser<Duplicate>() {
-      public Duplicate parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Duplicate(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Duplicate> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int OTHER_FILE_REF_FIELD_NUMBER = 1;
     private int otherFileRef_;
@@ -11702,17 +11649,17 @@ public final class BatchReport {
      * <code>optional .TextRange range = 2;</code>
      */
     public org.sonar.batch.protocol.output.BatchReport.TextRange getRange() {
-      return range_;
+      return range_ == null ? org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance() : range_;
     }
     /**
      * <code>optional .TextRange range = 2;</code>
      */
     public org.sonar.batch.protocol.output.BatchReport.TextRangeOrBuilder getRangeOrBuilder() {
-      return range_;
+      return range_ == null ? org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance() : range_;
     }
 
     public static final int OTHER_FILE_KEY_FIELD_NUMBER = 3;
-    private java.lang.Object otherFileKey_;
+    private volatile java.lang.Object otherFileKey_;
     /**
      * <code>optional string other_file_key = 3;</code>
      *
@@ -11765,11 +11712,6 @@ public final class BatchReport {
       }
     }
 
-    private void initFields() {
-      otherFileRef_ = 0;
-      range_ = org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance();
-      otherFileKey_ = "";
-    }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -11782,17 +11724,16 @@ public final class BatchReport {
 
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt32(1, otherFileRef_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeMessage(2, range_);
+        output.writeMessage(2, getRange());
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         output.writeBytes(3, getOtherFileKeyBytes());
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     private int memoizedSerializedSize = -1;
@@ -11807,24 +11748,18 @@ public final class BatchReport {
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, range_);
+          .computeMessageSize(2, getRange());
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(3, getOtherFileKeyBytes());
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSerializedSize = size;
       return size;
     }
 
     private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
     public static org.sonar.batch.protocol.output.BatchReport.Duplicate parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -11878,12 +11813,17 @@ public final class BatchReport {
       return PARSER.parseFrom(input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.sonar.batch.protocol.output.BatchReport.Duplicate prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
@@ -11925,16 +11865,12 @@ public final class BatchReport {
           getRangeFieldBuilder();
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
       public Builder clear() {
         super.clear();
         otherFileRef_ = 0;
         bitField0_ = (bitField0_ & ~0x00000001);
         if (rangeBuilder_ == null) {
-          range_ = org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance();
+          range_ = null;
         } else {
           rangeBuilder_.clear();
         }
@@ -11944,10 +11880,6 @@ public final class BatchReport {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.sonar.batch.protocol.output.BatchReport.internal_static_Duplicate_descriptor;
@@ -12012,7 +11944,8 @@ public final class BatchReport {
           otherFileKey_ = other.otherFileKey_;
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
@@ -12087,7 +12020,7 @@ public final class BatchReport {
         return this;
       }
 
-      private org.sonar.batch.protocol.output.BatchReport.TextRange range_ = org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance();
+      private org.sonar.batch.protocol.output.BatchReport.TextRange range_ = null;
       private com.google.protobuf.SingleFieldBuilder<
           org.sonar.batch.protocol.output.BatchReport.TextRange, org.sonar.batch.protocol.output.BatchReport.TextRange.Builder, org.sonar.batch.protocol.output.BatchReport.TextRangeOrBuilder> rangeBuilder_;
       /**
@@ -12101,7 +12034,7 @@ public final class BatchReport {
        */
       public org.sonar.batch.protocol.output.BatchReport.TextRange getRange() {
         if (rangeBuilder_ == null) {
-          return range_;
+          return range_ == null ? org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance() : range_;
         } else {
           return rangeBuilder_.getMessage();
         }
@@ -12142,6 +12075,7 @@ public final class BatchReport {
       public Builder mergeRange(org.sonar.batch.protocol.output.BatchReport.TextRange value) {
         if (rangeBuilder_ == null) {
           if (((bitField0_ & 0x00000002) == 0x00000002) &&
+              range_ != null &&
               range_ != org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance()) {
             range_ =
               org.sonar.batch.protocol.output.BatchReport.TextRange.newBuilder(range_).mergeFrom(value).buildPartial();
@@ -12160,7 +12094,7 @@ public final class BatchReport {
        */
       public Builder clearRange() {
         if (rangeBuilder_ == null) {
-          range_ = org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance();
+          range_ = null;
           onChanged();
         } else {
           rangeBuilder_.clear();
@@ -12183,7 +12117,8 @@ public final class BatchReport {
         if (rangeBuilder_ != null) {
           return rangeBuilder_.getMessageOrBuilder();
         } else {
-          return range_;
+          return range_ == null ?
+              org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance() : range_;
         }
       }
       /**
@@ -12306,12 +12241,44 @@ public final class BatchReport {
       // @@protoc_insertion_point(builder_scope:Duplicate)
     }
 
+    // @@protoc_insertion_point(class_scope:Duplicate)
+    private static final org.sonar.batch.protocol.output.BatchReport.Duplicate DEFAULT_INSTANCE;
     static {
-      defaultInstance = new Duplicate(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.sonar.batch.protocol.output.BatchReport.Duplicate();
+    }
+
+    public static org.sonar.batch.protocol.output.BatchReport.Duplicate getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    public static final com.google.protobuf.Parser<Duplicate> PARSER =
+        new com.google.protobuf.AbstractParser<Duplicate>() {
+      public Duplicate parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        try {
+          return new Duplicate(input, extensionRegistry);
+        } catch (RuntimeException e) {
+          if (e.getCause() instanceof
+              com.google.protobuf.InvalidProtocolBufferException) {
+            throw (com.google.protobuf.InvalidProtocolBufferException)
+                e.getCause();
+          }
+          throw e;
+        }
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<Duplicate> getParserForType() {
+      return PARSER;
+    }
+
+    public org.sonar.batch.protocol.output.BatchReport.Duplicate getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:Duplicate)
   }
 
   public interface DuplicationOrBuilder extends
@@ -12370,37 +12337,27 @@ public final class BatchReport {
   /**
    * Protobuf type {@code Duplication}
    */
-  public static final class Duplication extends
+  public  static final class Duplication extends
       com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:Duplication)
       DuplicationOrBuilder {
     // Use Duplication.newBuilder() to construct.
-    private Duplication(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private Duplication(com.google.protobuf.GeneratedMessage.Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private Duplication(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final Duplication defaultInstance;
-    public static Duplication getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public Duplication getDefaultInstanceForType() {
-      return defaultInstance;
+    private Duplication() {
+      duplicate_ = java.util.Collections.emptyList();
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private Duplication(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+      this();
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -12443,10 +12400,11 @@ public final class BatchReport {
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
+        throw new RuntimeException(e.setUnfinishedMessage(this));
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+        throw new RuntimeException(
+            new com.google.protobuf.InvalidProtocolBufferException(
+                e.getMessage()).setUnfinishedMessage(this));
       } finally {
         if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
           duplicate_ = java.util.Collections.unmodifiableList(duplicate_);
@@ -12467,21 +12425,6 @@ public final class BatchReport {
               org.sonar.batch.protocol.output.BatchReport.Duplication.class, org.sonar.batch.protocol.output.BatchReport.Duplication.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<Duplication> PARSER =
-        new com.google.protobuf.AbstractParser<Duplication>() {
-      public Duplication parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Duplication(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Duplication> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int ORIGIN_POSITION_FIELD_NUMBER = 1;
     private org.sonar.batch.protocol.output.BatchReport.TextRange originPosition_;
@@ -12503,7 +12446,7 @@ public final class BatchReport {
      * </pre>
      */
     public org.sonar.batch.protocol.output.BatchReport.TextRange getOriginPosition() {
-      return originPosition_;
+      return originPosition_ == null ? org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance() : originPosition_;
     }
     /**
      * <code>optional .TextRange origin_position = 1;</code>
@@ -12513,7 +12456,7 @@ public final class BatchReport {
      * </pre>
      */
     public org.sonar.batch.protocol.output.BatchReport.TextRangeOrBuilder getOriginPositionOrBuilder() {
-      return originPosition_;
+      return originPosition_ == null ? org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance() : originPosition_;
     }
 
     public static final int DUPLICATE_FIELD_NUMBER = 2;
@@ -12551,10 +12494,6 @@ public final class BatchReport {
       return duplicate_.get(index);
     }
 
-    private void initFields() {
-      originPosition_ = org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance();
-      duplicate_ = java.util.Collections.emptyList();
-    }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -12567,14 +12506,13 @@ public final class BatchReport {
 
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeMessage(1, originPosition_);
+        output.writeMessage(1, getOriginPosition());
       }
       for (int i = 0; i < duplicate_.size(); i++) {
         output.writeMessage(2, duplicate_.get(i));
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     private int memoizedSerializedSize = -1;
@@ -12585,24 +12523,18 @@ public final class BatchReport {
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, originPosition_);
+          .computeMessageSize(1, getOriginPosition());
       }
       for (int i = 0; i < duplicate_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(2, duplicate_.get(i));
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSerializedSize = size;
       return size;
     }
 
     private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
     public static org.sonar.batch.protocol.output.BatchReport.Duplication parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -12656,12 +12588,17 @@ public final class BatchReport {
       return PARSER.parseFrom(input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.sonar.batch.protocol.output.BatchReport.Duplication prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
@@ -12704,14 +12641,10 @@ public final class BatchReport {
           getDuplicateFieldBuilder();
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
       public Builder clear() {
         super.clear();
         if (originPositionBuilder_ == null) {
-          originPosition_ = org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance();
+          originPosition_ = null;
         } else {
           originPositionBuilder_.clear();
         }
@@ -12725,10 +12658,6 @@ public final class BatchReport {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.sonar.batch.protocol.output.BatchReport.internal_static_Duplication_descriptor;
@@ -12812,7 +12741,8 @@ public final class BatchReport {
             }
           }
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
@@ -12839,7 +12769,7 @@ public final class BatchReport {
       }
       private int bitField0_;
 
-      private org.sonar.batch.protocol.output.BatchReport.TextRange originPosition_ = org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance();
+      private org.sonar.batch.protocol.output.BatchReport.TextRange originPosition_ = null;
       private com.google.protobuf.SingleFieldBuilder<
           org.sonar.batch.protocol.output.BatchReport.TextRange, org.sonar.batch.protocol.output.BatchReport.TextRange.Builder, org.sonar.batch.protocol.output.BatchReport.TextRangeOrBuilder> originPositionBuilder_;
       /**
@@ -12861,7 +12791,7 @@ public final class BatchReport {
        */
       public org.sonar.batch.protocol.output.BatchReport.TextRange getOriginPosition() {
         if (originPositionBuilder_ == null) {
-          return originPosition_;
+          return originPosition_ == null ? org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance() : originPosition_;
         } else {
           return originPositionBuilder_.getMessage();
         }
@@ -12914,6 +12844,7 @@ public final class BatchReport {
       public Builder mergeOriginPosition(org.sonar.batch.protocol.output.BatchReport.TextRange value) {
         if (originPositionBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
+              originPosition_ != null &&
               originPosition_ != org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance()) {
             originPosition_ =
               org.sonar.batch.protocol.output.BatchReport.TextRange.newBuilder(originPosition_).mergeFrom(value).buildPartial();
@@ -12936,7 +12867,7 @@ public final class BatchReport {
        */
       public Builder clearOriginPosition() {
         if (originPositionBuilder_ == null) {
-          originPosition_ = org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance();
+          originPosition_ = null;
           onChanged();
         } else {
           originPositionBuilder_.clear();
@@ -12967,7 +12898,8 @@ public final class BatchReport {
         if (originPositionBuilder_ != null) {
           return originPositionBuilder_.getMessageOrBuilder();
         } else {
-          return originPosition_;
+          return originPosition_ == null ?
+              org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance() : originPosition_;
         }
       }
       /**
@@ -13234,12 +13166,44 @@ public final class BatchReport {
       // @@protoc_insertion_point(builder_scope:Duplication)
     }
 
+    // @@protoc_insertion_point(class_scope:Duplication)
+    private static final org.sonar.batch.protocol.output.BatchReport.Duplication DEFAULT_INSTANCE;
     static {
-      defaultInstance = new Duplication(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.sonar.batch.protocol.output.BatchReport.Duplication();
+    }
+
+    public static org.sonar.batch.protocol.output.BatchReport.Duplication getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    public static final com.google.protobuf.Parser<Duplication> PARSER =
+        new com.google.protobuf.AbstractParser<Duplication>() {
+      public Duplication parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        try {
+          return new Duplication(input, extensionRegistry);
+        } catch (RuntimeException e) {
+          if (e.getCause() instanceof
+              com.google.protobuf.InvalidProtocolBufferException) {
+            throw (com.google.protobuf.InvalidProtocolBufferException)
+                e.getCause();
+          }
+          throw e;
+        }
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<Duplication> getParserForType() {
+      return PARSER;
+    }
+
+    public org.sonar.batch.protocol.output.BatchReport.Duplication getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:Duplication)
   }
 
   public interface TextRangeOrBuilder extends
@@ -13321,37 +13285,30 @@ public final class BatchReport {
    * Lines start at 1 and line offsets start at 0
    * </pre>
    */
-  public static final class TextRange extends
+  public  static final class TextRange extends
       com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:TextRange)
       TextRangeOrBuilder {
     // Use TextRange.newBuilder() to construct.
-    private TextRange(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private TextRange(com.google.protobuf.GeneratedMessage.Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private TextRange(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final TextRange defaultInstance;
-    public static TextRange getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public TextRange getDefaultInstanceForType() {
-      return defaultInstance;
+    private TextRange() {
+      startLine_ = 0;
+      endLine_ = 0;
+      startOffset_ = 0;
+      endOffset_ = 0;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private TextRange(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+      this();
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -13393,10 +13350,11 @@ public final class BatchReport {
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
+        throw new RuntimeException(e.setUnfinishedMessage(this));
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+        throw new RuntimeException(
+            new com.google.protobuf.InvalidProtocolBufferException(
+                e.getMessage()).setUnfinishedMessage(this));
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -13414,21 +13372,6 @@ public final class BatchReport {
               org.sonar.batch.protocol.output.BatchReport.TextRange.class, org.sonar.batch.protocol.output.BatchReport.TextRange.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<TextRange> PARSER =
-        new com.google.protobuf.AbstractParser<TextRange>() {
-      public TextRange parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TextRange(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<TextRange> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int START_LINE_FIELD_NUMBER = 1;
     private int startLine_;
@@ -13522,12 +13465,6 @@ public final class BatchReport {
       return endOffset_;
     }
 
-    private void initFields() {
-      startLine_ = 0;
-      endLine_ = 0;
-      startOffset_ = 0;
-      endOffset_ = 0;
-    }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -13540,7 +13477,6 @@ public final class BatchReport {
 
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt32(1, startLine_);
       }
@@ -13553,7 +13489,7 @@ public final class BatchReport {
       if (((bitField0_ & 0x00000008) == 0x00000008)) {
         output.writeInt32(4, endOffset_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     private int memoizedSerializedSize = -1;
@@ -13578,18 +13514,12 @@ public final class BatchReport {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(4, endOffset_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSerializedSize = size;
       return size;
     }
 
     private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
     public static org.sonar.batch.protocol.output.BatchReport.TextRange parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -13643,12 +13573,17 @@ public final class BatchReport {
       return PARSER.parseFrom(input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.sonar.batch.protocol.output.BatchReport.TextRange prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
@@ -13693,10 +13628,6 @@ public final class BatchReport {
         if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
       public Builder clear() {
         super.clear();
         startLine_ = 0;
@@ -13710,10 +13641,6 @@ public final class BatchReport {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.sonar.batch.protocol.output.BatchReport.internal_static_TextRange_descriptor;
@@ -13779,7 +13706,8 @@ public final class BatchReport {
         if (other.hasEndOffset()) {
           setEndOffset(other.getEndOffset());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
@@ -14001,12 +13929,44 @@ public final class BatchReport {
       // @@protoc_insertion_point(builder_scope:TextRange)
     }
 
+    // @@protoc_insertion_point(class_scope:TextRange)
+    private static final org.sonar.batch.protocol.output.BatchReport.TextRange DEFAULT_INSTANCE;
     static {
-      defaultInstance = new TextRange(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.sonar.batch.protocol.output.BatchReport.TextRange();
+    }
+
+    public static org.sonar.batch.protocol.output.BatchReport.TextRange getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    public static final com.google.protobuf.Parser<TextRange> PARSER =
+        new com.google.protobuf.AbstractParser<TextRange>() {
+      public TextRange parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        try {
+          return new TextRange(input, extensionRegistry);
+        } catch (RuntimeException e) {
+          if (e.getCause() instanceof
+              com.google.protobuf.InvalidProtocolBufferException) {
+            throw (com.google.protobuf.InvalidProtocolBufferException)
+                e.getCause();
+          }
+          throw e;
+        }
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<TextRange> getParserForType() {
+      return PARSER;
+    }
+
+    public org.sonar.batch.protocol.output.BatchReport.TextRange getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:TextRange)
   }
 
   public interface SymbolOrBuilder extends
@@ -14053,37 +14013,27 @@ public final class BatchReport {
   /**
    * Protobuf type {@code Symbol}
    */
-  public static final class Symbol extends
+  public  static final class Symbol extends
       com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:Symbol)
       SymbolOrBuilder {
     // Use Symbol.newBuilder() to construct.
-    private Symbol(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private Symbol(com.google.protobuf.GeneratedMessage.Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private Symbol(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final Symbol defaultInstance;
-    public static Symbol getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public Symbol getDefaultInstanceForType() {
-      return defaultInstance;
+    private Symbol() {
+      reference_ = java.util.Collections.emptyList();
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private Symbol(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+      this();
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -14126,10 +14076,11 @@ public final class BatchReport {
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
+        throw new RuntimeException(e.setUnfinishedMessage(this));
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+        throw new RuntimeException(
+            new com.google.protobuf.InvalidProtocolBufferException(
+                e.getMessage()).setUnfinishedMessage(this));
       } finally {
         if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
           reference_ = java.util.Collections.unmodifiableList(reference_);
@@ -14150,21 +14101,6 @@ public final class BatchReport {
               org.sonar.batch.protocol.output.BatchReport.Symbol.class, org.sonar.batch.protocol.output.BatchReport.Symbol.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<Symbol> PARSER =
-        new com.google.protobuf.AbstractParser<Symbol>() {
-      public Symbol parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Symbol(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Symbol> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int DECLARATION_FIELD_NUMBER = 1;
     private org.sonar.batch.protocol.output.BatchReport.TextRange declaration_;
@@ -14178,13 +14114,13 @@ public final class BatchReport {
      * <code>optional .TextRange declaration = 1;</code>
      */
     public org.sonar.batch.protocol.output.BatchReport.TextRange getDeclaration() {
-      return declaration_;
+      return declaration_ == null ? org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance() : declaration_;
     }
     /**
      * <code>optional .TextRange declaration = 1;</code>
      */
     public org.sonar.batch.protocol.output.BatchReport.TextRangeOrBuilder getDeclarationOrBuilder() {
-      return declaration_;
+      return declaration_ == null ? org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance() : declaration_;
     }
 
     public static final int REFERENCE_FIELD_NUMBER = 2;
@@ -14222,10 +14158,6 @@ public final class BatchReport {
       return reference_.get(index);
     }
 
-    private void initFields() {
-      declaration_ = org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance();
-      reference_ = java.util.Collections.emptyList();
-    }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -14238,14 +14170,13 @@ public final class BatchReport {
 
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeMessage(1, declaration_);
+        output.writeMessage(1, getDeclaration());
       }
       for (int i = 0; i < reference_.size(); i++) {
         output.writeMessage(2, reference_.get(i));
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     private int memoizedSerializedSize = -1;
@@ -14256,24 +14187,18 @@ public final class BatchReport {
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, declaration_);
+          .computeMessageSize(1, getDeclaration());
       }
       for (int i = 0; i < reference_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(2, reference_.get(i));
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSerializedSize = size;
       return size;
     }
 
     private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
     public static org.sonar.batch.protocol.output.BatchReport.Symbol parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -14327,12 +14252,17 @@ public final class BatchReport {
       return PARSER.parseFrom(input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.sonar.batch.protocol.output.BatchReport.Symbol prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
@@ -14375,14 +14305,10 @@ public final class BatchReport {
           getReferenceFieldBuilder();
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
       public Builder clear() {
         super.clear();
         if (declarationBuilder_ == null) {
-          declaration_ = org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance();
+          declaration_ = null;
         } else {
           declarationBuilder_.clear();
         }
@@ -14396,10 +14322,6 @@ public final class BatchReport {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.sonar.batch.protocol.output.BatchReport.internal_static_Symbol_descriptor;
@@ -14483,7 +14405,8 @@ public final class BatchReport {
             }
           }
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
@@ -14510,7 +14433,7 @@ public final class BatchReport {
       }
       private int bitField0_;
 
-      private org.sonar.batch.protocol.output.BatchReport.TextRange declaration_ = org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance();
+      private org.sonar.batch.protocol.output.BatchReport.TextRange declaration_ = null;
       private com.google.protobuf.SingleFieldBuilder<
           org.sonar.batch.protocol.output.BatchReport.TextRange, org.sonar.batch.protocol.output.BatchReport.TextRange.Builder, org.sonar.batch.protocol.output.BatchReport.TextRangeOrBuilder> declarationBuilder_;
       /**
@@ -14524,7 +14447,7 @@ public final class BatchReport {
        */
       public org.sonar.batch.protocol.output.BatchReport.TextRange getDeclaration() {
         if (declarationBuilder_ == null) {
-          return declaration_;
+          return declaration_ == null ? org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance() : declaration_;
         } else {
           return declarationBuilder_.getMessage();
         }
@@ -14565,6 +14488,7 @@ public final class BatchReport {
       public Builder mergeDeclaration(org.sonar.batch.protocol.output.BatchReport.TextRange value) {
         if (declarationBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
+              declaration_ != null &&
               declaration_ != org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance()) {
             declaration_ =
               org.sonar.batch.protocol.output.BatchReport.TextRange.newBuilder(declaration_).mergeFrom(value).buildPartial();
@@ -14583,7 +14507,7 @@ public final class BatchReport {
        */
       public Builder clearDeclaration() {
         if (declarationBuilder_ == null) {
-          declaration_ = org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance();
+          declaration_ = null;
           onChanged();
         } else {
           declarationBuilder_.clear();
@@ -14606,7 +14530,8 @@ public final class BatchReport {
         if (declarationBuilder_ != null) {
           return declarationBuilder_.getMessageOrBuilder();
         } else {
-          return declaration_;
+          return declaration_ == null ?
+              org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance() : declaration_;
         }
       }
       /**
@@ -14869,12 +14794,44 @@ public final class BatchReport {
       // @@protoc_insertion_point(builder_scope:Symbol)
     }
 
+    // @@protoc_insertion_point(class_scope:Symbol)
+    private static final org.sonar.batch.protocol.output.BatchReport.Symbol DEFAULT_INSTANCE;
     static {
-      defaultInstance = new Symbol(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.sonar.batch.protocol.output.BatchReport.Symbol();
+    }
+
+    public static org.sonar.batch.protocol.output.BatchReport.Symbol getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    public static final com.google.protobuf.Parser<Symbol> PARSER =
+        new com.google.protobuf.AbstractParser<Symbol>() {
+      public Symbol parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        try {
+          return new Symbol(input, extensionRegistry);
+        } catch (RuntimeException e) {
+          if (e.getCause() instanceof
+              com.google.protobuf.InvalidProtocolBufferException) {
+            throw (com.google.protobuf.InvalidProtocolBufferException)
+                e.getCause();
+          }
+          throw e;
+        }
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<Symbol> getParserForType() {
+      return PARSER;
+    }
+
+    public org.sonar.batch.protocol.output.BatchReport.Symbol getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:Symbol)
   }
 
   public interface CoverageOrBuilder extends
@@ -15000,37 +14957,33 @@ public final class BatchReport {
    * TODO rename it LineCoverage ?
    * </pre>
    */
-  public static final class Coverage extends
+  public  static final class Coverage extends
       com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:Coverage)
       CoverageOrBuilder {
     // Use Coverage.newBuilder() to construct.
-    private Coverage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private Coverage(com.google.protobuf.GeneratedMessage.Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private Coverage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final Coverage defaultInstance;
-    public static Coverage getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public Coverage getDefaultInstanceForType() {
-      return defaultInstance;
+    private Coverage() {
+      line_ = 0;
+      conditions_ = 0;
+      utHits_ = false;
+      itHits_ = false;
+      utCoveredConditions_ = 0;
+      itCoveredConditions_ = 0;
+      overallCoveredConditions_ = 0;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private Coverage(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+      this();
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -15087,10 +15040,11 @@ public final class BatchReport {
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
+        throw new RuntimeException(e.setUnfinishedMessage(this));
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+        throw new RuntimeException(
+            new com.google.protobuf.InvalidProtocolBufferException(
+                e.getMessage()).setUnfinishedMessage(this));
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -15108,21 +15062,6 @@ public final class BatchReport {
               org.sonar.batch.protocol.output.BatchReport.Coverage.class, org.sonar.batch.protocol.output.BatchReport.Coverage.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<Coverage> PARSER =
-        new com.google.protobuf.AbstractParser<Coverage>() {
-      public Coverage parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Coverage(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Coverage> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int LINE_FIELD_NUMBER = 1;
     private int line_;
@@ -15277,15 +15216,6 @@ public final class BatchReport {
       return overallCoveredConditions_;
     }
 
-    private void initFields() {
-      line_ = 0;
-      conditions_ = 0;
-      utHits_ = false;
-      itHits_ = false;
-      utCoveredConditions_ = 0;
-      itCoveredConditions_ = 0;
-      overallCoveredConditions_ = 0;
-    }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -15298,7 +15228,6 @@ public final class BatchReport {
 
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt32(1, line_);
       }
@@ -15320,7 +15249,7 @@ public final class BatchReport {
       if (((bitField0_ & 0x00000040) == 0x00000040)) {
         output.writeInt32(7, overallCoveredConditions_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     private int memoizedSerializedSize = -1;
@@ -15357,18 +15286,12 @@ public final class BatchReport {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(7, overallCoveredConditions_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSerializedSize = size;
       return size;
     }
 
     private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
     public static org.sonar.batch.protocol.output.BatchReport.Coverage parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -15422,12 +15345,17 @@ public final class BatchReport {
       return PARSER.parseFrom(input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.sonar.batch.protocol.output.BatchReport.Coverage prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
@@ -15473,10 +15401,6 @@ public final class BatchReport {
         if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
       public Builder clear() {
         super.clear();
         line_ = 0;
@@ -15496,10 +15420,6 @@ public final class BatchReport {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.sonar.batch.protocol.output.BatchReport.internal_static_Coverage_descriptor;
@@ -15586,7 +15506,8 @@ public final class BatchReport {
         if (other.hasOverallCoveredConditions()) {
           setOverallCoveredConditions(other.getOverallCoveredConditions());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
@@ -15936,12 +15857,44 @@ public final class BatchReport {
       // @@protoc_insertion_point(builder_scope:Coverage)
     }
 
+    // @@protoc_insertion_point(class_scope:Coverage)
+    private static final org.sonar.batch.protocol.output.BatchReport.Coverage DEFAULT_INSTANCE;
     static {
-      defaultInstance = new Coverage(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.sonar.batch.protocol.output.BatchReport.Coverage();
+    }
+
+    public static org.sonar.batch.protocol.output.BatchReport.Coverage getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    public static final com.google.protobuf.Parser<Coverage> PARSER =
+        new com.google.protobuf.AbstractParser<Coverage>() {
+      public Coverage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        try {
+          return new Coverage(input, extensionRegistry);
+        } catch (RuntimeException e) {
+          if (e.getCause() instanceof
+              com.google.protobuf.InvalidProtocolBufferException) {
+            throw (com.google.protobuf.InvalidProtocolBufferException)
+                e.getCause();
+          }
+          throw e;
+        }
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<Coverage> getParserForType() {
+      return PARSER;
+    }
+
+    public org.sonar.batch.protocol.output.BatchReport.Coverage getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:Coverage)
   }
 
   public interface SyntaxHighlightingOrBuilder extends
@@ -15978,37 +15931,27 @@ public final class BatchReport {
    * TODO rename it SyntaxHighlightingRule ?
    * </pre>
    */
-  public static final class SyntaxHighlighting extends
+  public  static final class SyntaxHighlighting extends
       com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:SyntaxHighlighting)
       SyntaxHighlightingOrBuilder {
     // Use SyntaxHighlighting.newBuilder() to construct.
-    private SyntaxHighlighting(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private SyntaxHighlighting(com.google.protobuf.GeneratedMessage.Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private SyntaxHighlighting(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final SyntaxHighlighting defaultInstance;
-    public static SyntaxHighlighting getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public SyntaxHighlighting getDefaultInstanceForType() {
-      return defaultInstance;
+    private SyntaxHighlighting() {
+      type_ = 0;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private SyntaxHighlighting(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+      this();
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -16047,17 +15990,18 @@ public final class BatchReport {
                 unknownFields.mergeVarintField(2, rawValue);
               } else {
                 bitField0_ |= 0x00000002;
-                type_ = value;
+                type_ = rawValue;
               }
               break;
             }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
+        throw new RuntimeException(e.setUnfinishedMessage(this));
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+        throw new RuntimeException(
+            new com.google.protobuf.InvalidProtocolBufferException(
+                e.getMessage()).setUnfinishedMessage(this));
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -16075,21 +16019,6 @@ public final class BatchReport {
               org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.class, org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<SyntaxHighlighting> PARSER =
-        new com.google.protobuf.AbstractParser<SyntaxHighlighting>() {
-      public SyntaxHighlighting parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new SyntaxHighlighting(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<SyntaxHighlighting> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int RANGE_FIELD_NUMBER = 1;
     private org.sonar.batch.protocol.output.BatchReport.TextRange range_;
@@ -16103,17 +16032,17 @@ public final class BatchReport {
      * <code>optional .TextRange range = 1;</code>
      */
     public org.sonar.batch.protocol.output.BatchReport.TextRange getRange() {
-      return range_;
+      return range_ == null ? org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance() : range_;
     }
     /**
      * <code>optional .TextRange range = 1;</code>
      */
     public org.sonar.batch.protocol.output.BatchReport.TextRangeOrBuilder getRangeOrBuilder() {
-      return range_;
+      return range_ == null ? org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance() : range_;
     }
 
     public static final int TYPE_FIELD_NUMBER = 2;
-    private org.sonar.batch.protocol.Constants.HighlightingType type_;
+    private int type_;
     /**
      * <code>optional .HighlightingType type = 2;</code>
      */
@@ -16124,13 +16053,10 @@ public final class BatchReport {
      * <code>optional .HighlightingType type = 2;</code>
      */
     public org.sonar.batch.protocol.Constants.HighlightingType getType() {
-      return type_;
+      org.sonar.batch.protocol.Constants.HighlightingType result = org.sonar.batch.protocol.Constants.HighlightingType.valueOf(type_);
+      return result == null ? org.sonar.batch.protocol.Constants.HighlightingType.ANNOTATION : result;
     }
 
-    private void initFields() {
-      range_ = org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance();
-      type_ = org.sonar.batch.protocol.Constants.HighlightingType.ANNOTATION;
-    }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -16143,14 +16069,13 @@ public final class BatchReport {
 
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeMessage(1, range_);
+        output.writeMessage(1, getRange());
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeEnum(2, type_.getNumber());
+        output.writeEnum(2, type_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     private int memoizedSerializedSize = -1;
@@ -16161,24 +16086,18 @@ public final class BatchReport {
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, range_);
+          .computeMessageSize(1, getRange());
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(2, type_.getNumber());
+          .computeEnumSize(2, type_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSerializedSize = size;
       return size;
     }
 
     private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
     public static org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -16232,12 +16151,17 @@ public final class BatchReport {
       return PARSER.parseFrom(input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
@@ -16284,27 +16208,19 @@ public final class BatchReport {
           getRangeFieldBuilder();
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
       public Builder clear() {
         super.clear();
         if (rangeBuilder_ == null) {
-          range_ = org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance();
+          range_ = null;
         } else {
           rangeBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000001);
-        type_ = org.sonar.batch.protocol.Constants.HighlightingType.ANNOTATION;
+        type_ = 0;
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.sonar.batch.protocol.output.BatchReport.internal_static_SyntaxHighlighting_descriptor;
@@ -16360,7 +16276,8 @@ public final class BatchReport {
         if (other.hasType()) {
           setType(other.getType());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
@@ -16387,7 +16304,7 @@ public final class BatchReport {
       }
       private int bitField0_;
 
-      private org.sonar.batch.protocol.output.BatchReport.TextRange range_ = org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance();
+      private org.sonar.batch.protocol.output.BatchReport.TextRange range_ = null;
       private com.google.protobuf.SingleFieldBuilder<
           org.sonar.batch.protocol.output.BatchReport.TextRange, org.sonar.batch.protocol.output.BatchReport.TextRange.Builder, org.sonar.batch.protocol.output.BatchReport.TextRangeOrBuilder> rangeBuilder_;
       /**
@@ -16401,7 +16318,7 @@ public final class BatchReport {
        */
       public org.sonar.batch.protocol.output.BatchReport.TextRange getRange() {
         if (rangeBuilder_ == null) {
-          return range_;
+          return range_ == null ? org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance() : range_;
         } else {
           return rangeBuilder_.getMessage();
         }
@@ -16442,6 +16359,7 @@ public final class BatchReport {
       public Builder mergeRange(org.sonar.batch.protocol.output.BatchReport.TextRange value) {
         if (rangeBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
+              range_ != null &&
               range_ != org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance()) {
             range_ =
               org.sonar.batch.protocol.output.BatchReport.TextRange.newBuilder(range_).mergeFrom(value).buildPartial();
@@ -16460,7 +16378,7 @@ public final class BatchReport {
        */
       public Builder clearRange() {
         if (rangeBuilder_ == null) {
-          range_ = org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance();
+          range_ = null;
           onChanged();
         } else {
           rangeBuilder_.clear();
@@ -16483,7 +16401,8 @@ public final class BatchReport {
         if (rangeBuilder_ != null) {
           return rangeBuilder_.getMessageOrBuilder();
         } else {
-          return range_;
+          return range_ == null ?
+              org.sonar.batch.protocol.output.BatchReport.TextRange.getDefaultInstance() : range_;
         }
       }
       /**
@@ -16503,7 +16422,7 @@ public final class BatchReport {
         return rangeBuilder_;
       }
 
-      private org.sonar.batch.protocol.Constants.HighlightingType type_ = org.sonar.batch.protocol.Constants.HighlightingType.ANNOTATION;
+      private int type_ = 0;
       /**
        * <code>optional .HighlightingType type = 2;</code>
        */
@@ -16514,7 +16433,8 @@ public final class BatchReport {
        * <code>optional .HighlightingType type = 2;</code>
        */
       public org.sonar.batch.protocol.Constants.HighlightingType getType() {
-        return type_;
+        org.sonar.batch.protocol.Constants.HighlightingType result = org.sonar.batch.protocol.Constants.HighlightingType.valueOf(type_);
+        return result == null ? org.sonar.batch.protocol.Constants.HighlightingType.ANNOTATION : result;
       }
       /**
        * <code>optional .HighlightingType type = 2;</code>
@@ -16524,7 +16444,7 @@ public final class BatchReport {
           throw new NullPointerException();
         }
         bitField0_ |= 0x00000002;
-        type_ = value;
+        type_ = value.getNumber();
         onChanged();
         return this;
       }
@@ -16533,7 +16453,7 @@ public final class BatchReport {
        */
       public Builder clearType() {
         bitField0_ = (bitField0_ & ~0x00000002);
-        type_ = org.sonar.batch.protocol.Constants.HighlightingType.ANNOTATION;
+        type_ = 0;
         onChanged();
         return this;
       }
@@ -16541,12 +16461,44 @@ public final class BatchReport {
       // @@protoc_insertion_point(builder_scope:SyntaxHighlighting)
     }
 
+    // @@protoc_insertion_point(class_scope:SyntaxHighlighting)
+    private static final org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting DEFAULT_INSTANCE;
     static {
-      defaultInstance = new SyntaxHighlighting(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting();
+    }
+
+    public static org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    public static final com.google.protobuf.Parser<SyntaxHighlighting> PARSER =
+        new com.google.protobuf.AbstractParser<SyntaxHighlighting>() {
+      public SyntaxHighlighting parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        try {
+          return new SyntaxHighlighting(input, extensionRegistry);
+        } catch (RuntimeException e) {
+          if (e.getCause() instanceof
+              com.google.protobuf.InvalidProtocolBufferException) {
+            throw (com.google.protobuf.InvalidProtocolBufferException)
+                e.getCause();
+          }
+          throw e;
+        }
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<SyntaxHighlighting> getParserForType() {
+      return PARSER;
+    }
+
+    public org.sonar.batch.protocol.output.BatchReport.SyntaxHighlighting getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:SyntaxHighlighting)
   }
 
   public interface TestOrBuilder extends
@@ -16616,37 +16568,31 @@ public final class BatchReport {
   /**
    * Protobuf type {@code Test}
    */
-  public static final class Test extends
+  public  static final class Test extends
       com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:Test)
       TestOrBuilder {
     // Use Test.newBuilder() to construct.
-    private Test(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private Test(com.google.protobuf.GeneratedMessage.Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private Test(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final Test defaultInstance;
-    public static Test getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public Test getDefaultInstanceForType() {
-      return defaultInstance;
+    private Test() {
+      name_ = "";
+      status_ = 1;
+      durationInMs_ = 0L;
+      stacktrace_ = "";
+      msg_ = "";
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private Test(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+      this();
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -16678,7 +16624,7 @@ public final class BatchReport {
                 unknownFields.mergeVarintField(2, rawValue);
               } else {
                 bitField0_ |= 0x00000002;
-                status_ = value;
+                status_ = rawValue;
               }
               break;
             }
@@ -16702,10 +16648,11 @@ public final class BatchReport {
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
+        throw new RuntimeException(e.setUnfinishedMessage(this));
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+        throw new RuntimeException(
+            new com.google.protobuf.InvalidProtocolBufferException(
+                e.getMessage()).setUnfinishedMessage(this));
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -16723,24 +16670,9 @@ public final class BatchReport {
               org.sonar.batch.protocol.output.BatchReport.Test.class, org.sonar.batch.protocol.output.BatchReport.Test.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<Test> PARSER =
-        new com.google.protobuf.AbstractParser<Test>() {
-      public Test parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Test(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Test> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int NAME_FIELD_NUMBER = 1;
-    private java.lang.Object name_;
+    private volatile java.lang.Object name_;
     /**
      * <code>optional string name = 1;</code>
      */
@@ -16782,7 +16714,7 @@ public final class BatchReport {
     }
 
     public static final int STATUS_FIELD_NUMBER = 2;
-    private org.sonar.batch.protocol.Constants.TestStatus status_;
+    private int status_;
     /**
      * <code>optional .TestStatus status = 2;</code>
      */
@@ -16793,7 +16725,8 @@ public final class BatchReport {
      * <code>optional .TestStatus status = 2;</code>
      */
     public org.sonar.batch.protocol.Constants.TestStatus getStatus() {
-      return status_;
+      org.sonar.batch.protocol.Constants.TestStatus result = org.sonar.batch.protocol.Constants.TestStatus.valueOf(status_);
+      return result == null ? org.sonar.batch.protocol.Constants.TestStatus.OK : result;
     }
 
     public static final int DURATION_IN_MS_FIELD_NUMBER = 3;
@@ -16812,7 +16745,7 @@ public final class BatchReport {
     }
 
     public static final int STACKTRACE_FIELD_NUMBER = 4;
-    private java.lang.Object stacktrace_;
+    private volatile java.lang.Object stacktrace_;
     /**
      * <code>optional string stacktrace = 4;</code>
      */
@@ -16854,7 +16787,7 @@ public final class BatchReport {
     }
 
     public static final int MSG_FIELD_NUMBER = 5;
-    private java.lang.Object msg_;
+    private volatile java.lang.Object msg_;
     /**
      * <code>optional string msg = 5;</code>
      */
@@ -16895,13 +16828,6 @@ public final class BatchReport {
       }
     }
 
-    private void initFields() {
-      name_ = "";
-      status_ = org.sonar.batch.protocol.Constants.TestStatus.OK;
-      durationInMs_ = 0L;
-      stacktrace_ = "";
-      msg_ = "";
-    }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -16914,12 +16840,11 @@ public final class BatchReport {
 
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeBytes(1, getNameBytes());
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeEnum(2, status_.getNumber());
+        output.writeEnum(2, status_);
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         output.writeInt64(3, durationInMs_);
@@ -16930,7 +16855,7 @@ public final class BatchReport {
       if (((bitField0_ & 0x00000010) == 0x00000010)) {
         output.writeBytes(5, getMsgBytes());
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     private int memoizedSerializedSize = -1;
@@ -16945,7 +16870,7 @@ public final class BatchReport {
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(2, status_.getNumber());
+          .computeEnumSize(2, status_);
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         size += com.google.protobuf.CodedOutputStream
@@ -16959,18 +16884,12 @@ public final class BatchReport {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(5, getMsgBytes());
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSerializedSize = size;
       return size;
     }
 
     private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
     public static org.sonar.batch.protocol.output.BatchReport.Test parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -17024,12 +16943,17 @@ public final class BatchReport {
       return PARSER.parseFrom(input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.sonar.batch.protocol.output.BatchReport.Test prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
@@ -17070,15 +16994,11 @@ public final class BatchReport {
         if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
       public Builder clear() {
         super.clear();
         name_ = "";
         bitField0_ = (bitField0_ & ~0x00000001);
-        status_ = org.sonar.batch.protocol.Constants.TestStatus.OK;
+        status_ = 1;
         bitField0_ = (bitField0_ & ~0x00000002);
         durationInMs_ = 0L;
         bitField0_ = (bitField0_ & ~0x00000004);
@@ -17089,10 +17009,6 @@ public final class BatchReport {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.sonar.batch.protocol.output.BatchReport.internal_static_Test_descriptor;
@@ -17171,7 +17087,8 @@ public final class BatchReport {
           msg_ = other.msg_;
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
@@ -17274,7 +17191,7 @@ public final class BatchReport {
         return this;
       }
 
-      private org.sonar.batch.protocol.Constants.TestStatus status_ = org.sonar.batch.protocol.Constants.TestStatus.OK;
+      private int status_ = 1;
       /**
        * <code>optional .TestStatus status = 2;</code>
        */
@@ -17285,7 +17202,8 @@ public final class BatchReport {
        * <code>optional .TestStatus status = 2;</code>
        */
       public org.sonar.batch.protocol.Constants.TestStatus getStatus() {
-        return status_;
+        org.sonar.batch.protocol.Constants.TestStatus result = org.sonar.batch.protocol.Constants.TestStatus.valueOf(status_);
+        return result == null ? org.sonar.batch.protocol.Constants.TestStatus.OK : result;
       }
       /**
        * <code>optional .TestStatus status = 2;</code>
@@ -17295,7 +17213,7 @@ public final class BatchReport {
           throw new NullPointerException();
         }
         bitField0_ |= 0x00000002;
-        status_ = value;
+        status_ = value.getNumber();
         onChanged();
         return this;
       }
@@ -17304,7 +17222,7 @@ public final class BatchReport {
        */
       public Builder clearStatus() {
         bitField0_ = (bitField0_ & ~0x00000002);
-        status_ = org.sonar.batch.protocol.Constants.TestStatus.OK;
+        status_ = 1;
         onChanged();
         return this;
       }
@@ -17496,12 +17414,44 @@ public final class BatchReport {
       // @@protoc_insertion_point(builder_scope:Test)
     }
 
+    // @@protoc_insertion_point(class_scope:Test)
+    private static final org.sonar.batch.protocol.output.BatchReport.Test DEFAULT_INSTANCE;
     static {
-      defaultInstance = new Test(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.sonar.batch.protocol.output.BatchReport.Test();
+    }
+
+    public static org.sonar.batch.protocol.output.BatchReport.Test getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    public static final com.google.protobuf.Parser<Test> PARSER =
+        new com.google.protobuf.AbstractParser<Test>() {
+      public Test parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        try {
+          return new Test(input, extensionRegistry);
+        } catch (RuntimeException e) {
+          if (e.getCause() instanceof
+              com.google.protobuf.InvalidProtocolBufferException) {
+            throw (com.google.protobuf.InvalidProtocolBufferException)
+                e.getCause();
+          }
+          throw e;
+        }
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<Test> getParserForType() {
+      return PARSER;
+    }
+
+    public org.sonar.batch.protocol.output.BatchReport.Test getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:Test)
   }
 
   public interface CoverageDetailOrBuilder extends
@@ -17549,37 +17499,28 @@ public final class BatchReport {
   /**
    * Protobuf type {@code CoverageDetail}
    */
-  public static final class CoverageDetail extends
+  public  static final class CoverageDetail extends
       com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:CoverageDetail)
       CoverageDetailOrBuilder {
     // Use CoverageDetail.newBuilder() to construct.
-    private CoverageDetail(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private CoverageDetail(com.google.protobuf.GeneratedMessage.Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private CoverageDetail(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final CoverageDetail defaultInstance;
-    public static CoverageDetail getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public CoverageDetail getDefaultInstanceForType() {
-      return defaultInstance;
+    private CoverageDetail() {
+      testName_ = "";
+      coveredFile_ = java.util.Collections.emptyList();
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private CoverageDetail(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+      this();
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -17615,10 +17556,11 @@ public final class BatchReport {
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
+        throw new RuntimeException(e.setUnfinishedMessage(this));
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+        throw new RuntimeException(
+            new com.google.protobuf.InvalidProtocolBufferException(
+                e.getMessage()).setUnfinishedMessage(this));
       } finally {
         if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
           coveredFile_ = java.util.Collections.unmodifiableList(coveredFile_);
@@ -17639,21 +17581,6 @@ public final class BatchReport {
               org.sonar.batch.protocol.output.BatchReport.CoverageDetail.class, org.sonar.batch.protocol.output.BatchReport.CoverageDetail.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<CoverageDetail> PARSER =
-        new com.google.protobuf.AbstractParser<CoverageDetail>() {
-      public CoverageDetail parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new CoverageDetail(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<CoverageDetail> getParserForType() {
-      return PARSER;
-    }
-
     public interface CoveredFileOrBuilder extends
         // @@protoc_insertion_point(interface_extends:CoverageDetail.CoveredFile)
         com.google.protobuf.MessageOrBuilder {
@@ -17683,37 +17610,28 @@ public final class BatchReport {
     /**
      * Protobuf type {@code CoverageDetail.CoveredFile}
      */
-    public static final class CoveredFile extends
+    public  static final class CoveredFile extends
         com.google.protobuf.GeneratedMessage implements
         // @@protoc_insertion_point(message_implements:CoverageDetail.CoveredFile)
         CoveredFileOrBuilder {
       // Use CoveredFile.newBuilder() to construct.
-      private CoveredFile(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      private CoveredFile(com.google.protobuf.GeneratedMessage.Builder builder) {
         super(builder);
-        this.unknownFields = builder.getUnknownFields();
       }
-      private CoveredFile(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-      private static final CoveredFile defaultInstance;
-      public static CoveredFile getDefaultInstance() {
-        return defaultInstance;
-      }
-
-      public CoveredFile getDefaultInstanceForType() {
-        return defaultInstance;
+      private CoveredFile() {
+        fileRef_ = 0;
+        coveredLine_ = java.util.Collections.emptyList();
       }
 
-      private final com.google.protobuf.UnknownFieldSet unknownFields;
       @java.lang.Override
       public final com.google.protobuf.UnknownFieldSet
-          getUnknownFields() {
+      getUnknownFields() {
         return this.unknownFields;
       }
       private CoveredFile(
           com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        initFields();
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
+        this();
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -17761,10 +17679,11 @@ public final class BatchReport {
             }
           }
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
+          throw new RuntimeException(e.setUnfinishedMessage(this));
         } catch (java.io.IOException e) {
-          throw new com.google.protobuf.InvalidProtocolBufferException(
-              e.getMessage()).setUnfinishedMessage(this);
+          throw new RuntimeException(
+              new com.google.protobuf.InvalidProtocolBufferException(
+                  e.getMessage()).setUnfinishedMessage(this));
         } finally {
           if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
             coveredLine_ = java.util.Collections.unmodifiableList(coveredLine_);
@@ -17785,21 +17704,6 @@ public final class BatchReport {
                 org.sonar.batch.protocol.output.BatchReport.CoverageDetail.CoveredFile.class, org.sonar.batch.protocol.output.BatchReport.CoverageDetail.CoveredFile.Builder.class);
       }
 
-      public static com.google.protobuf.Parser<CoveredFile> PARSER =
-          new com.google.protobuf.AbstractParser<CoveredFile>() {
-        public CoveredFile parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new CoveredFile(input, extensionRegistry);
-        }
-      };
-
-      @java.lang.Override
-      public com.google.protobuf.Parser<CoveredFile> getParserForType() {
-        return PARSER;
-      }
-
       private int bitField0_;
       public static final int FILE_REF_FIELD_NUMBER = 1;
       private int fileRef_;
@@ -17839,10 +17743,6 @@ public final class BatchReport {
       }
       private int coveredLineMemoizedSerializedSize = -1;
 
-      private void initFields() {
-        fileRef_ = 0;
-        coveredLine_ = java.util.Collections.emptyList();
-      }
       private byte memoizedIsInitialized = -1;
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
@@ -17866,7 +17766,7 @@ public final class BatchReport {
         for (int i = 0; i < coveredLine_.size(); i++) {
           output.writeInt32NoTag(coveredLine_.get(i));
         }
-        getUnknownFields().writeTo(output);
+        unknownFields.writeTo(output);
       }
 
       private int memoizedSerializedSize = -1;
@@ -17893,18 +17793,12 @@ public final class BatchReport {
           }
           coveredLineMemoizedSerializedSize = dataSize;
         }
-        size += getUnknownFields().getSerializedSize();
+        size += unknownFields.getSerializedSize();
         memoizedSerializedSize = size;
         return size;
       }
 
       private static final long serialVersionUID = 0L;
-      @java.lang.Override
-      protected java.lang.Object writeReplace()
-          throws java.io.ObjectStreamException {
-        return super.writeReplace();
-      }
-
       public static org.sonar.batch.protocol.output.BatchReport.CoverageDetail.CoveredFile parseFrom(
           com.google.protobuf.ByteString data)
           throws com.google.protobuf.InvalidProtocolBufferException {
@@ -17958,12 +17852,17 @@ public final class BatchReport {
         return PARSER.parseFrom(input, extensionRegistry);
       }
 
-      public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
+      public static Builder newBuilder() {
+        return DEFAULT_INSTANCE.toBuilder();
+      }
       public static Builder newBuilder(org.sonar.batch.protocol.output.BatchReport.CoverageDetail.CoveredFile prototype) {
-        return newBuilder().mergeFrom(prototype);
+        return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+      }
+      public Builder toBuilder() {
+        return this == DEFAULT_INSTANCE
+            ? new Builder() : new Builder().mergeFrom(this);
       }
-      public Builder toBuilder() { return newBuilder(this); }
 
       @java.lang.Override
       protected Builder newBuilderForType(
@@ -18004,10 +17903,6 @@ public final class BatchReport {
           if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
           }
         }
-        private static Builder create() {
-          return new Builder();
-        }
-
         public Builder clear() {
           super.clear();
           fileRef_ = 0;
@@ -18017,10 +17912,6 @@ public final class BatchReport {
           return this;
         }
 
-        public Builder clone() {
-          return create().mergeFrom(buildPartial());
-        }
-
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
           return org.sonar.batch.protocol.output.BatchReport.internal_static_CoverageDetail_CoveredFile_descriptor;
@@ -18080,7 +17971,8 @@ public final class BatchReport {
             }
             onChanged();
           }
-          this.mergeUnknownFields(other.getUnknownFields());
+          this.mergeUnknownFields(other.unknownFields);
+          onChanged();
           return this;
         }
 
@@ -18208,17 +18100,49 @@ public final class BatchReport {
         // @@protoc_insertion_point(builder_scope:CoverageDetail.CoveredFile)
       }
 
+      // @@protoc_insertion_point(class_scope:CoverageDetail.CoveredFile)
+      private static final org.sonar.batch.protocol.output.BatchReport.CoverageDetail.CoveredFile DEFAULT_INSTANCE;
       static {
-        defaultInstance = new CoveredFile(true);
-        defaultInstance.initFields();
+        DEFAULT_INSTANCE = new org.sonar.batch.protocol.output.BatchReport.CoverageDetail.CoveredFile();
+      }
+
+      public static org.sonar.batch.protocol.output.BatchReport.CoverageDetail.CoveredFile getDefaultInstance() {
+        return DEFAULT_INSTANCE;
+      }
+
+      public static final com.google.protobuf.Parser<CoveredFile> PARSER =
+          new com.google.protobuf.AbstractParser<CoveredFile>() {
+        public CoveredFile parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          try {
+            return new CoveredFile(input, extensionRegistry);
+          } catch (RuntimeException e) {
+            if (e.getCause() instanceof
+                com.google.protobuf.InvalidProtocolBufferException) {
+              throw (com.google.protobuf.InvalidProtocolBufferException)
+                  e.getCause();
+            }
+            throw e;
+          }
+        }
+      };
+
+      @java.lang.Override
+      public com.google.protobuf.Parser<CoveredFile> getParserForType() {
+        return PARSER;
+      }
+
+      public org.sonar.batch.protocol.output.BatchReport.CoverageDetail.CoveredFile getDefaultInstanceForType() {
+        return DEFAULT_INSTANCE;
       }
 
-      // @@protoc_insertion_point(class_scope:CoverageDetail.CoveredFile)
     }
 
     private int bitField0_;
     public static final int TEST_NAME_FIELD_NUMBER = 1;
-    private java.lang.Object testName_;
+    private volatile java.lang.Object testName_;
     /**
      * <code>optional string test_name = 1;</code>
      */
@@ -18294,10 +18218,6 @@ public final class BatchReport {
       return coveredFile_.get(index);
     }
 
-    private void initFields() {
-      testName_ = "";
-      coveredFile_ = java.util.Collections.emptyList();
-    }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -18310,14 +18230,13 @@ public final class BatchReport {
 
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeBytes(1, getTestNameBytes());
       }
       for (int i = 0; i < coveredFile_.size(); i++) {
         output.writeMessage(2, coveredFile_.get(i));
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     private int memoizedSerializedSize = -1;
@@ -18334,18 +18253,12 @@ public final class BatchReport {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(2, coveredFile_.get(i));
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSerializedSize = size;
       return size;
     }
 
     private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
     public static org.sonar.batch.protocol.output.BatchReport.CoverageDetail parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -18399,12 +18312,17 @@ public final class BatchReport {
       return PARSER.parseFrom(input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.sonar.batch.protocol.output.BatchReport.CoverageDetail prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
@@ -18446,10 +18364,6 @@ public final class BatchReport {
           getCoveredFileFieldBuilder();
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
       public Builder clear() {
         super.clear();
         testName_ = "";
@@ -18463,10 +18377,6 @@ public final class BatchReport {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.sonar.batch.protocol.output.BatchReport.internal_static_CoverageDetail_descriptor;
@@ -18548,7 +18458,8 @@ public final class BatchReport {
             }
           }
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
@@ -18894,110 +18805,142 @@ public final class BatchReport {
       // @@protoc_insertion_point(builder_scope:CoverageDetail)
     }
 
+    // @@protoc_insertion_point(class_scope:CoverageDetail)
+    private static final org.sonar.batch.protocol.output.BatchReport.CoverageDetail DEFAULT_INSTANCE;
     static {
-      defaultInstance = new CoverageDetail(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.sonar.batch.protocol.output.BatchReport.CoverageDetail();
+    }
+
+    public static org.sonar.batch.protocol.output.BatchReport.CoverageDetail getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    public static final com.google.protobuf.Parser<CoverageDetail> PARSER =
+        new com.google.protobuf.AbstractParser<CoverageDetail>() {
+      public CoverageDetail parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        try {
+          return new CoverageDetail(input, extensionRegistry);
+        } catch (RuntimeException e) {
+          if (e.getCause() instanceof
+              com.google.protobuf.InvalidProtocolBufferException) {
+            throw (com.google.protobuf.InvalidProtocolBufferException)
+                e.getCause();
+          }
+          throw e;
+        }
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<CoverageDetail> getParserForType() {
+      return PARSER;
+    }
+
+    public org.sonar.batch.protocol.output.BatchReport.CoverageDetail getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:CoverageDetail)
   }
 
-  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_ActiveRule_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_ActiveRule_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_ActiveRule_ActiveRuleParam_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_ActiveRule_ActiveRuleParam_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_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_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_IssueLocation_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_IssueLocation_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_Flow_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_Flow_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_Changesets_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_Changesets_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_Changesets_Changeset_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_Changesets_Changeset_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_Duplicate_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_Duplicate_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_Duplication_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_Duplication_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_TextRange_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_TextRange_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_Symbol_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_Symbol_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_Coverage_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_Coverage_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_SyntaxHighlighting_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_SyntaxHighlighting_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_Test_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_Test_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_CoverageDetail_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_CoverageDetail_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_CoverageDetail_CoveredFile_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable