You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2013/04/11 05:51:48 UTC

svn commit: r1466759 [5/41] - in /hbase/trunk: ./ hbase-client/src/main/java/org/apache/hadoop/hbase/ hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ hbase-protocol/s...

Modified: hbase/trunk/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AuthenticationProtos.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AuthenticationProtos.java?rev=1466759&r1=1466758&r2=1466759&view=diff
==============================================================================
--- hbase/trunk/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AuthenticationProtos.java (original)
+++ hbase/trunk/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AuthenticationProtos.java Thu Apr 11 03:51:47 2013
@@ -10,191 +10,78 @@ public final class AuthenticationProtos 
   }
   public interface AuthenticationKeyOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
-
+    
     // required int32 id = 1;
-    /**
-     * <code>required int32 id = 1;</code>
-     */
     boolean hasId();
-    /**
-     * <code>required int32 id = 1;</code>
-     */
     int getId();
-
+    
     // required int64 expirationDate = 2;
-    /**
-     * <code>required int64 expirationDate = 2;</code>
-     */
     boolean hasExpirationDate();
-    /**
-     * <code>required int64 expirationDate = 2;</code>
-     */
     long getExpirationDate();
-
+    
     // required bytes key = 3;
-    /**
-     * <code>required bytes key = 3;</code>
-     */
     boolean hasKey();
-    /**
-     * <code>required bytes key = 3;</code>
-     */
     com.google.protobuf.ByteString getKey();
   }
-  /**
-   * Protobuf type {@code AuthenticationKey}
-   */
   public static final class AuthenticationKey extends
       com.google.protobuf.GeneratedMessage
       implements AuthenticationKeyOrBuilder {
     // Use AuthenticationKey.newBuilder() to construct.
-    private AuthenticationKey(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private AuthenticationKey(Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private AuthenticationKey(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
+    private AuthenticationKey(boolean noInit) {}
+    
     private static final AuthenticationKey defaultInstance;
     public static AuthenticationKey getDefaultInstance() {
       return defaultInstance;
     }
-
+    
     public AuthenticationKey getDefaultInstanceForType() {
       return defaultInstance;
     }
-
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
-      return this.unknownFields;
-    }
-    private AuthenticationKey(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 8: {
-              bitField0_ |= 0x00000001;
-              id_ = input.readInt32();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              expirationDate_ = input.readInt64();
-              break;
-            }
-            case 26: {
-              bitField0_ |= 0x00000004;
-              key_ = input.readBytes();
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
+    
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_AuthenticationKey_descriptor;
     }
-
+    
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_AuthenticationKey_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey.class, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey.Builder.class);
-    }
-
-    public static com.google.protobuf.Parser<AuthenticationKey> PARSER =
-        new com.google.protobuf.AbstractParser<AuthenticationKey>() {
-      public AuthenticationKey parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new AuthenticationKey(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<AuthenticationKey> getParserForType() {
-      return PARSER;
+      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_AuthenticationKey_fieldAccessorTable;
     }
-
+    
     private int bitField0_;
     // required int32 id = 1;
     public static final int ID_FIELD_NUMBER = 1;
     private int id_;
-    /**
-     * <code>required int32 id = 1;</code>
-     */
     public boolean hasId() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
-    /**
-     * <code>required int32 id = 1;</code>
-     */
     public int getId() {
       return id_;
     }
-
+    
     // required int64 expirationDate = 2;
     public static final int EXPIRATIONDATE_FIELD_NUMBER = 2;
     private long expirationDate_;
-    /**
-     * <code>required int64 expirationDate = 2;</code>
-     */
     public boolean hasExpirationDate() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
-    /**
-     * <code>required int64 expirationDate = 2;</code>
-     */
     public long getExpirationDate() {
       return expirationDate_;
     }
-
+    
     // required bytes key = 3;
     public static final int KEY_FIELD_NUMBER = 3;
     private com.google.protobuf.ByteString key_;
-    /**
-     * <code>required bytes key = 3;</code>
-     */
     public boolean hasKey() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
-    /**
-     * <code>required bytes key = 3;</code>
-     */
     public com.google.protobuf.ByteString getKey() {
       return key_;
     }
-
+    
     private void initFields() {
       id_ = 0;
       expirationDate_ = 0L;
@@ -204,7 +91,7 @@ public final class AuthenticationProtos 
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-
+      
       if (!hasId()) {
         memoizedIsInitialized = 0;
         return false;
@@ -220,7 +107,7 @@ public final class AuthenticationProtos 
       memoizedIsInitialized = 1;
       return true;
     }
-
+    
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
@@ -235,12 +122,12 @@ public final class AuthenticationProtos 
       }
       getUnknownFields().writeTo(output);
     }
-
+    
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-
+    
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
@@ -258,14 +145,14 @@ public final class AuthenticationProtos 
       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();
     }
-
+    
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -275,7 +162,7 @@ public final class AuthenticationProtos 
         return super.equals(obj);
       }
       org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey other = (org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey) obj;
-
+      
       boolean result = true;
       result = result && (hasId() == other.hasId());
       if (hasId()) {
@@ -296,13 +183,9 @@ public final class AuthenticationProtos 
           getUnknownFields().equals(other.getUnknownFields());
       return result;
     }
-
-    private int memoizedHashCode = 0;
+    
     @java.lang.Override
     public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
       int hash = 41;
       hash = (19 * hash) + getDescriptorForType().hashCode();
       if (hasId()) {
@@ -318,79 +201,89 @@ public final class AuthenticationProtos 
         hash = (53 * hash) + getKey().hashCode();
       }
       hash = (29 * hash) + getUnknownFields().hashCode();
-      memoizedHashCode = hash;
       return hash;
     }
-
+    
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
+      return newBuilder().mergeFrom(data).buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
+      return newBuilder().mergeFrom(data, extensionRegistry)
+               .buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
+      return newBuilder().mergeFrom(data).buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
+      return newBuilder().mergeFrom(data, extensionRegistry)
+               .buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return newBuilder().mergeFrom(input).buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return newBuilder().mergeFrom(input, extensionRegistry)
+               .buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      Builder builder = newBuilder();
+      if (builder.mergeDelimitedFrom(input)) {
+        return builder.buildParsed();
+      } else {
+        return null;
+      }
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      Builder builder = newBuilder();
+      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
+        return builder.buildParsed();
+      } else {
+        return null;
+      }
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return newBuilder().mergeFrom(input).buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return newBuilder().mergeFrom(input, extensionRegistry)
+               .buildParsed();
     }
-
+    
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
-
+    
     @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
-    /**
-     * Protobuf type {@code AuthenticationKey}
-     */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKeyOrBuilder {
@@ -398,21 +291,18 @@ public final class AuthenticationProtos 
           getDescriptor() {
         return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_AuthenticationKey_descriptor;
       }
-
+      
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_AuthenticationKey_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey.class, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey.Builder.class);
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_AuthenticationKey_fieldAccessorTable;
       }
-
+      
       // Construct using org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      
+      private Builder(BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -423,7 +313,7 @@ public final class AuthenticationProtos 
       private static Builder create() {
         return new Builder();
       }
-
+      
       public Builder clear() {
         super.clear();
         id_ = 0;
@@ -434,20 +324,20 @@ public final class AuthenticationProtos 
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
-
+      
       public Builder clone() {
         return create().mergeFrom(buildPartial());
       }
-
+      
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_AuthenticationKey_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey.getDescriptor();
       }
-
+      
       public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey getDefaultInstanceForType() {
         return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey.getDefaultInstance();
       }
-
+      
       public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey build() {
         org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey result = buildPartial();
         if (!result.isInitialized()) {
@@ -455,7 +345,17 @@ public final class AuthenticationProtos 
         }
         return result;
       }
-
+      
+      private org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey buildParsed()
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(
+            result).asInvalidProtocolBufferException();
+        }
+        return result;
+      }
+      
       public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey buildPartial() {
         org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey result = new org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey(this);
         int from_bitField0_ = bitField0_;
@@ -476,7 +376,7 @@ public final class AuthenticationProtos 
         onBuilt();
         return result;
       }
-
+      
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey) {
           return mergeFrom((org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey)other);
@@ -485,7 +385,7 @@ public final class AuthenticationProtos 
           return this;
         }
       }
-
+      
       public Builder mergeFrom(org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey other) {
         if (other == org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey.getDefaultInstance()) return this;
         if (other.hasId()) {
@@ -500,7 +400,7 @@ public final class AuthenticationProtos 
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
-
+      
       public final boolean isInitialized() {
         if (!hasId()) {
           
@@ -516,109 +416,101 @@ public final class AuthenticationProtos 
         }
         return true;
       }
-
+      
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey) e.getUnfinishedMessage();
-          throw e;
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
+        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder(
+            this.getUnknownFields());
+        while (true) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              this.setUnknownFields(unknownFields.build());
+              onChanged();
+              return this;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                this.setUnknownFields(unknownFields.build());
+                onChanged();
+                return this;
+              }
+              break;
+            }
+            case 8: {
+              bitField0_ |= 0x00000001;
+              id_ = input.readInt32();
+              break;
+            }
+            case 16: {
+              bitField0_ |= 0x00000002;
+              expirationDate_ = input.readInt64();
+              break;
+            }
+            case 26: {
+              bitField0_ |= 0x00000004;
+              key_ = input.readBytes();
+              break;
+            }
           }
         }
-        return this;
       }
+      
       private int bitField0_;
-
+      
       // required int32 id = 1;
       private int id_ ;
-      /**
-       * <code>required int32 id = 1;</code>
-       */
       public boolean hasId() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
-      /**
-       * <code>required int32 id = 1;</code>
-       */
       public int getId() {
         return id_;
       }
-      /**
-       * <code>required int32 id = 1;</code>
-       */
       public Builder setId(int value) {
         bitField0_ |= 0x00000001;
         id_ = value;
         onChanged();
         return this;
       }
-      /**
-       * <code>required int32 id = 1;</code>
-       */
       public Builder clearId() {
         bitField0_ = (bitField0_ & ~0x00000001);
         id_ = 0;
         onChanged();
         return this;
       }
-
+      
       // required int64 expirationDate = 2;
       private long expirationDate_ ;
-      /**
-       * <code>required int64 expirationDate = 2;</code>
-       */
       public boolean hasExpirationDate() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
-      /**
-       * <code>required int64 expirationDate = 2;</code>
-       */
       public long getExpirationDate() {
         return expirationDate_;
       }
-      /**
-       * <code>required int64 expirationDate = 2;</code>
-       */
       public Builder setExpirationDate(long value) {
         bitField0_ |= 0x00000002;
         expirationDate_ = value;
         onChanged();
         return this;
       }
-      /**
-       * <code>required int64 expirationDate = 2;</code>
-       */
       public Builder clearExpirationDate() {
         bitField0_ = (bitField0_ & ~0x00000002);
         expirationDate_ = 0L;
         onChanged();
         return this;
       }
-
+      
       // required bytes key = 3;
       private com.google.protobuf.ByteString key_ = com.google.protobuf.ByteString.EMPTY;
-      /**
-       * <code>required bytes key = 3;</code>
-       */
       public boolean hasKey() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
-      /**
-       * <code>required bytes key = 3;</code>
-       */
       public com.google.protobuf.ByteString getKey() {
         return key_;
       }
-      /**
-       * <code>required bytes key = 3;</code>
-       */
       public Builder setKey(com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
@@ -628,242 +520,96 @@ public final class AuthenticationProtos 
         onChanged();
         return this;
       }
-      /**
-       * <code>required bytes key = 3;</code>
-       */
       public Builder clearKey() {
         bitField0_ = (bitField0_ & ~0x00000004);
         key_ = getDefaultInstance().getKey();
         onChanged();
         return this;
       }
-
+      
       // @@protoc_insertion_point(builder_scope:AuthenticationKey)
     }
-
+    
     static {
       defaultInstance = new AuthenticationKey(true);
       defaultInstance.initFields();
     }
-
+    
     // @@protoc_insertion_point(class_scope:AuthenticationKey)
   }
-
+  
   public interface TokenIdentifierOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
-
+    
     // required .TokenIdentifier.Kind kind = 1;
-    /**
-     * <code>required .TokenIdentifier.Kind kind = 1;</code>
-     */
     boolean hasKind();
-    /**
-     * <code>required .TokenIdentifier.Kind kind = 1;</code>
-     */
     org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Kind getKind();
-
+    
     // required bytes username = 2;
-    /**
-     * <code>required bytes username = 2;</code>
-     */
     boolean hasUsername();
-    /**
-     * <code>required bytes username = 2;</code>
-     */
     com.google.protobuf.ByteString getUsername();
-
+    
     // required int32 keyId = 3;
-    /**
-     * <code>required int32 keyId = 3;</code>
-     */
     boolean hasKeyId();
-    /**
-     * <code>required int32 keyId = 3;</code>
-     */
     int getKeyId();
-
+    
     // optional int64 issueDate = 4;
-    /**
-     * <code>optional int64 issueDate = 4;</code>
-     */
     boolean hasIssueDate();
-    /**
-     * <code>optional int64 issueDate = 4;</code>
-     */
     long getIssueDate();
-
+    
     // optional int64 expirationDate = 5;
-    /**
-     * <code>optional int64 expirationDate = 5;</code>
-     */
     boolean hasExpirationDate();
-    /**
-     * <code>optional int64 expirationDate = 5;</code>
-     */
     long getExpirationDate();
-
+    
     // optional int64 sequenceNumber = 6;
-    /**
-     * <code>optional int64 sequenceNumber = 6;</code>
-     */
     boolean hasSequenceNumber();
-    /**
-     * <code>optional int64 sequenceNumber = 6;</code>
-     */
     long getSequenceNumber();
   }
-  /**
-   * Protobuf type {@code TokenIdentifier}
-   */
   public static final class TokenIdentifier extends
       com.google.protobuf.GeneratedMessage
       implements TokenIdentifierOrBuilder {
     // Use TokenIdentifier.newBuilder() to construct.
-    private TokenIdentifier(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private TokenIdentifier(Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private TokenIdentifier(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
+    private TokenIdentifier(boolean noInit) {}
+    
     private static final TokenIdentifier defaultInstance;
     public static TokenIdentifier getDefaultInstance() {
       return defaultInstance;
     }
-
+    
     public TokenIdentifier getDefaultInstanceForType() {
       return defaultInstance;
     }
-
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
-      return this.unknownFields;
-    }
-    private TokenIdentifier(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 8: {
-              int rawValue = input.readEnum();
-              org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Kind value = org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Kind.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(1, rawValue);
-              } else {
-                bitField0_ |= 0x00000001;
-                kind_ = value;
-              }
-              break;
-            }
-            case 18: {
-              bitField0_ |= 0x00000002;
-              username_ = input.readBytes();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              keyId_ = input.readInt32();
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000008;
-              issueDate_ = input.readInt64();
-              break;
-            }
-            case 40: {
-              bitField0_ |= 0x00000010;
-              expirationDate_ = input.readInt64();
-              break;
-            }
-            case 48: {
-              bitField0_ |= 0x00000020;
-              sequenceNumber_ = input.readInt64();
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
+    
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_TokenIdentifier_descriptor;
     }
-
+    
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_TokenIdentifier_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.class, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Builder.class);
-    }
-
-    public static com.google.protobuf.Parser<TokenIdentifier> PARSER =
-        new com.google.protobuf.AbstractParser<TokenIdentifier>() {
-      public TokenIdentifier parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TokenIdentifier(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<TokenIdentifier> getParserForType() {
-      return PARSER;
+      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_TokenIdentifier_fieldAccessorTable;
     }
-
-    /**
-     * Protobuf enum {@code TokenIdentifier.Kind}
-     */
+    
     public enum Kind
         implements com.google.protobuf.ProtocolMessageEnum {
-      /**
-       * <code>HBASE_AUTH_TOKEN = 0;</code>
-       */
       HBASE_AUTH_TOKEN(0, 0),
       ;
-
-      /**
-       * <code>HBASE_AUTH_TOKEN = 0;</code>
-       */
+      
       public static final int HBASE_AUTH_TOKEN_VALUE = 0;
-
-
+      
+      
       public final int getNumber() { return value; }
-
+      
       public static Kind valueOf(int value) {
         switch (value) {
           case 0: return HBASE_AUTH_TOKEN;
           default: return null;
         }
       }
-
+      
       public static com.google.protobuf.Internal.EnumLiteMap<Kind>
           internalGetValueMap() {
         return internalValueMap;
@@ -875,7 +621,7 @@ public final class AuthenticationProtos 
                 return Kind.valueOf(number);
               }
             };
-
+      
       public final com.google.protobuf.Descriptors.EnumValueDescriptor
           getValueDescriptor() {
         return getDescriptor().getValues().get(index);
@@ -888,9 +634,11 @@ public final class AuthenticationProtos 
           getDescriptor() {
         return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.getDescriptor().getEnumTypes().get(0);
       }
-
-      private static final Kind[] VALUES = values();
-
+      
+      private static final Kind[] VALUES = {
+        HBASE_AUTH_TOKEN, 
+      };
+      
       public static Kind valueOf(
           com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
         if (desc.getType() != getDescriptor()) {
@@ -899,115 +647,79 @@ public final class AuthenticationProtos 
         }
         return VALUES[desc.getIndex()];
       }
-
+      
       private final int index;
       private final int value;
-
+      
       private Kind(int index, int value) {
         this.index = index;
         this.value = value;
       }
-
+      
       // @@protoc_insertion_point(enum_scope:TokenIdentifier.Kind)
     }
-
+    
     private int bitField0_;
     // required .TokenIdentifier.Kind kind = 1;
     public static final int KIND_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Kind kind_;
-    /**
-     * <code>required .TokenIdentifier.Kind kind = 1;</code>
-     */
     public boolean hasKind() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
-    /**
-     * <code>required .TokenIdentifier.Kind kind = 1;</code>
-     */
     public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Kind getKind() {
       return kind_;
     }
-
+    
     // required bytes username = 2;
     public static final int USERNAME_FIELD_NUMBER = 2;
     private com.google.protobuf.ByteString username_;
-    /**
-     * <code>required bytes username = 2;</code>
-     */
     public boolean hasUsername() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
-    /**
-     * <code>required bytes username = 2;</code>
-     */
     public com.google.protobuf.ByteString getUsername() {
       return username_;
     }
-
+    
     // required int32 keyId = 3;
     public static final int KEYID_FIELD_NUMBER = 3;
     private int keyId_;
-    /**
-     * <code>required int32 keyId = 3;</code>
-     */
     public boolean hasKeyId() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
-    /**
-     * <code>required int32 keyId = 3;</code>
-     */
     public int getKeyId() {
       return keyId_;
     }
-
+    
     // optional int64 issueDate = 4;
     public static final int ISSUEDATE_FIELD_NUMBER = 4;
     private long issueDate_;
-    /**
-     * <code>optional int64 issueDate = 4;</code>
-     */
     public boolean hasIssueDate() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
-    /**
-     * <code>optional int64 issueDate = 4;</code>
-     */
     public long getIssueDate() {
       return issueDate_;
     }
-
+    
     // optional int64 expirationDate = 5;
     public static final int EXPIRATIONDATE_FIELD_NUMBER = 5;
     private long expirationDate_;
-    /**
-     * <code>optional int64 expirationDate = 5;</code>
-     */
     public boolean hasExpirationDate() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
-    /**
-     * <code>optional int64 expirationDate = 5;</code>
-     */
     public long getExpirationDate() {
       return expirationDate_;
     }
-
+    
     // optional int64 sequenceNumber = 6;
     public static final int SEQUENCENUMBER_FIELD_NUMBER = 6;
     private long sequenceNumber_;
-    /**
-     * <code>optional int64 sequenceNumber = 6;</code>
-     */
     public boolean hasSequenceNumber() {
       return ((bitField0_ & 0x00000020) == 0x00000020);
     }
-    /**
-     * <code>optional int64 sequenceNumber = 6;</code>
-     */
     public long getSequenceNumber() {
       return sequenceNumber_;
     }
-
+    
     private void initFields() {
       kind_ = org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Kind.HBASE_AUTH_TOKEN;
       username_ = com.google.protobuf.ByteString.EMPTY;
@@ -1020,7 +732,7 @@ public final class AuthenticationProtos 
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-
+      
       if (!hasKind()) {
         memoizedIsInitialized = 0;
         return false;
@@ -1036,7 +748,7 @@ public final class AuthenticationProtos 
       memoizedIsInitialized = 1;
       return true;
     }
-
+    
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
@@ -1060,12 +772,12 @@ public final class AuthenticationProtos 
       }
       getUnknownFields().writeTo(output);
     }
-
+    
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-
+    
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
@@ -1095,14 +807,14 @@ public final class AuthenticationProtos 
       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();
     }
-
+    
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -1112,7 +824,7 @@ public final class AuthenticationProtos 
         return super.equals(obj);
       }
       org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier other = (org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier) obj;
-
+      
       boolean result = true;
       result = result && (hasKind() == other.hasKind());
       if (hasKind()) {
@@ -1148,13 +860,9 @@ public final class AuthenticationProtos 
           getUnknownFields().equals(other.getUnknownFields());
       return result;
     }
-
-    private int memoizedHashCode = 0;
+    
     @java.lang.Override
     public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
       int hash = 41;
       hash = (19 * hash) + getDescriptorForType().hashCode();
       if (hasKind()) {
@@ -1182,79 +890,89 @@ public final class AuthenticationProtos 
         hash = (53 * hash) + hashLong(getSequenceNumber());
       }
       hash = (29 * hash) + getUnknownFields().hashCode();
-      memoizedHashCode = hash;
       return hash;
     }
-
+    
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
+      return newBuilder().mergeFrom(data).buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
+      return newBuilder().mergeFrom(data, extensionRegistry)
+               .buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
+      return newBuilder().mergeFrom(data).buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
+      return newBuilder().mergeFrom(data, extensionRegistry)
+               .buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return newBuilder().mergeFrom(input).buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return newBuilder().mergeFrom(input, extensionRegistry)
+               .buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      Builder builder = newBuilder();
+      if (builder.mergeDelimitedFrom(input)) {
+        return builder.buildParsed();
+      } else {
+        return null;
+      }
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      Builder builder = newBuilder();
+      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
+        return builder.buildParsed();
+      } else {
+        return null;
+      }
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return newBuilder().mergeFrom(input).buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return newBuilder().mergeFrom(input, extensionRegistry)
+               .buildParsed();
     }
-
+    
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
-
+    
     @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
-    /**
-     * Protobuf type {@code TokenIdentifier}
-     */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifierOrBuilder {
@@ -1262,21 +980,18 @@ public final class AuthenticationProtos 
           getDescriptor() {
         return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_TokenIdentifier_descriptor;
       }
-
+      
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_TokenIdentifier_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.class, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Builder.class);
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_TokenIdentifier_fieldAccessorTable;
       }
-
+      
       // Construct using org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      
+      private Builder(BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -1287,7 +1002,7 @@ public final class AuthenticationProtos 
       private static Builder create() {
         return new Builder();
       }
-
+      
       public Builder clear() {
         super.clear();
         kind_ = org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Kind.HBASE_AUTH_TOKEN;
@@ -1304,20 +1019,20 @@ public final class AuthenticationProtos 
         bitField0_ = (bitField0_ & ~0x00000020);
         return this;
       }
-
+      
       public Builder clone() {
         return create().mergeFrom(buildPartial());
       }
-
+      
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_TokenIdentifier_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.getDescriptor();
       }
-
+      
       public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier getDefaultInstanceForType() {
         return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.getDefaultInstance();
       }
-
+      
       public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier build() {
         org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier result = buildPartial();
         if (!result.isInitialized()) {
@@ -1325,7 +1040,17 @@ public final class AuthenticationProtos 
         }
         return result;
       }
-
+      
+      private org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier buildParsed()
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(
+            result).asInvalidProtocolBufferException();
+        }
+        return result;
+      }
+      
       public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier buildPartial() {
         org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier result = new org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier(this);
         int from_bitField0_ = bitField0_;
@@ -1358,7 +1083,7 @@ public final class AuthenticationProtos 
         onBuilt();
         return result;
       }
-
+      
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier) {
           return mergeFrom((org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier)other);
@@ -1367,7 +1092,7 @@ public final class AuthenticationProtos 
           return this;
         }
       }
-
+      
       public Builder mergeFrom(org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier other) {
         if (other == org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.getDefaultInstance()) return this;
         if (other.hasKind()) {
@@ -1391,7 +1116,7 @@ public final class AuthenticationProtos 
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
-
+      
       public final boolean isInitialized() {
         if (!hasKind()) {
           
@@ -1407,43 +1132,80 @@ public final class AuthenticationProtos 
         }
         return true;
       }
-
+      
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier) e.getUnfinishedMessage();
-          throw e;
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
+        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder(
+            this.getUnknownFields());
+        while (true) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              this.setUnknownFields(unknownFields.build());
+              onChanged();
+              return this;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                this.setUnknownFields(unknownFields.build());
+                onChanged();
+                return this;
+              }
+              break;
+            }
+            case 8: {
+              int rawValue = input.readEnum();
+              org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Kind value = org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Kind.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(1, rawValue);
+              } else {
+                bitField0_ |= 0x00000001;
+                kind_ = value;
+              }
+              break;
+            }
+            case 18: {
+              bitField0_ |= 0x00000002;
+              username_ = input.readBytes();
+              break;
+            }
+            case 24: {
+              bitField0_ |= 0x00000004;
+              keyId_ = input.readInt32();
+              break;
+            }
+            case 32: {
+              bitField0_ |= 0x00000008;
+              issueDate_ = input.readInt64();
+              break;
+            }
+            case 40: {
+              bitField0_ |= 0x00000010;
+              expirationDate_ = input.readInt64();
+              break;
+            }
+            case 48: {
+              bitField0_ |= 0x00000020;
+              sequenceNumber_ = input.readInt64();
+              break;
+            }
           }
         }
-        return this;
       }
+      
       private int bitField0_;
-
+      
       // required .TokenIdentifier.Kind kind = 1;
       private org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Kind kind_ = org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Kind.HBASE_AUTH_TOKEN;
-      /**
-       * <code>required .TokenIdentifier.Kind kind = 1;</code>
-       */
       public boolean hasKind() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
-      /**
-       * <code>required .TokenIdentifier.Kind kind = 1;</code>
-       */
       public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Kind getKind() {
         return kind_;
       }
-      /**
-       * <code>required .TokenIdentifier.Kind kind = 1;</code>
-       */
       public Builder setKind(org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Kind value) {
         if (value == null) {
           throw new NullPointerException();
@@ -1453,33 +1215,21 @@ public final class AuthenticationProtos 
         onChanged();
         return this;
       }
-      /**
-       * <code>required .TokenIdentifier.Kind kind = 1;</code>
-       */
       public Builder clearKind() {
         bitField0_ = (bitField0_ & ~0x00000001);
         kind_ = org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Kind.HBASE_AUTH_TOKEN;
         onChanged();
         return this;
       }
-
+      
       // required bytes username = 2;
       private com.google.protobuf.ByteString username_ = com.google.protobuf.ByteString.EMPTY;
-      /**
-       * <code>required bytes username = 2;</code>
-       */
       public boolean hasUsername() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
-      /**
-       * <code>required bytes username = 2;</code>
-       */
       public com.google.protobuf.ByteString getUsername() {
         return username_;
       }
-      /**
-       * <code>required bytes username = 2;</code>
-       */
       public Builder setUsername(com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
@@ -1489,375 +1239,182 @@ public final class AuthenticationProtos 
         onChanged();
         return this;
       }
-      /**
-       * <code>required bytes username = 2;</code>
-       */
       public Builder clearUsername() {
         bitField0_ = (bitField0_ & ~0x00000002);
         username_ = getDefaultInstance().getUsername();
         onChanged();
         return this;
       }
-
+      
       // required int32 keyId = 3;
       private int keyId_ ;
-      /**
-       * <code>required int32 keyId = 3;</code>
-       */
       public boolean hasKeyId() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
-      /**
-       * <code>required int32 keyId = 3;</code>
-       */
       public int getKeyId() {
         return keyId_;
       }
-      /**
-       * <code>required int32 keyId = 3;</code>
-       */
       public Builder setKeyId(int value) {
         bitField0_ |= 0x00000004;
         keyId_ = value;
         onChanged();
         return this;
       }
-      /**
-       * <code>required int32 keyId = 3;</code>
-       */
       public Builder clearKeyId() {
         bitField0_ = (bitField0_ & ~0x00000004);
         keyId_ = 0;
         onChanged();
         return this;
       }
-
+      
       // optional int64 issueDate = 4;
       private long issueDate_ ;
-      /**
-       * <code>optional int64 issueDate = 4;</code>
-       */
       public boolean hasIssueDate() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
-      /**
-       * <code>optional int64 issueDate = 4;</code>
-       */
       public long getIssueDate() {
         return issueDate_;
       }
-      /**
-       * <code>optional int64 issueDate = 4;</code>
-       */
       public Builder setIssueDate(long value) {
         bitField0_ |= 0x00000008;
         issueDate_ = value;
         onChanged();
         return this;
       }
-      /**
-       * <code>optional int64 issueDate = 4;</code>
-       */
       public Builder clearIssueDate() {
         bitField0_ = (bitField0_ & ~0x00000008);
         issueDate_ = 0L;
         onChanged();
         return this;
       }
-
+      
       // optional int64 expirationDate = 5;
       private long expirationDate_ ;
-      /**
-       * <code>optional int64 expirationDate = 5;</code>
-       */
       public boolean hasExpirationDate() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
-      /**
-       * <code>optional int64 expirationDate = 5;</code>
-       */
       public long getExpirationDate() {
         return expirationDate_;
       }
-      /**
-       * <code>optional int64 expirationDate = 5;</code>
-       */
       public Builder setExpirationDate(long value) {
         bitField0_ |= 0x00000010;
         expirationDate_ = value;
         onChanged();
         return this;
       }
-      /**
-       * <code>optional int64 expirationDate = 5;</code>
-       */
       public Builder clearExpirationDate() {
         bitField0_ = (bitField0_ & ~0x00000010);
         expirationDate_ = 0L;
         onChanged();
         return this;
       }
-
+      
       // optional int64 sequenceNumber = 6;
       private long sequenceNumber_ ;
-      /**
-       * <code>optional int64 sequenceNumber = 6;</code>
-       */
       public boolean hasSequenceNumber() {
         return ((bitField0_ & 0x00000020) == 0x00000020);
       }
-      /**
-       * <code>optional int64 sequenceNumber = 6;</code>
-       */
       public long getSequenceNumber() {
         return sequenceNumber_;
       }
-      /**
-       * <code>optional int64 sequenceNumber = 6;</code>
-       */
       public Builder setSequenceNumber(long value) {
         bitField0_ |= 0x00000020;
         sequenceNumber_ = value;
         onChanged();
         return this;
       }
-      /**
-       * <code>optional int64 sequenceNumber = 6;</code>
-       */
       public Builder clearSequenceNumber() {
         bitField0_ = (bitField0_ & ~0x00000020);
         sequenceNumber_ = 0L;
         onChanged();
         return this;
       }
-
+      
       // @@protoc_insertion_point(builder_scope:TokenIdentifier)
     }
-
+    
     static {
       defaultInstance = new TokenIdentifier(true);
       defaultInstance.initFields();
     }
-
+    
     // @@protoc_insertion_point(class_scope:TokenIdentifier)
   }
-
+  
   public interface TokenOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
-
+    
     // optional bytes identifier = 1;
-    /**
-     * <code>optional bytes identifier = 1;</code>
-     *
-     * <pre>
-     * the TokenIdentifier in serialized form
-     * Note: we can't use the protobuf directly because the Hadoop Token class
-     * only stores the serialized bytes
-     * </pre>
-     */
     boolean hasIdentifier();
-    /**
-     * <code>optional bytes identifier = 1;</code>
-     *
-     * <pre>
-     * the TokenIdentifier in serialized form
-     * Note: we can't use the protobuf directly because the Hadoop Token class
-     * only stores the serialized bytes
-     * </pre>
-     */
     com.google.protobuf.ByteString getIdentifier();
-
+    
     // optional bytes password = 2;
-    /**
-     * <code>optional bytes password = 2;</code>
-     */
     boolean hasPassword();
-    /**
-     * <code>optional bytes password = 2;</code>
-     */
     com.google.protobuf.ByteString getPassword();
-
+    
     // optional bytes service = 3;
-    /**
-     * <code>optional bytes service = 3;</code>
-     */
     boolean hasService();
-    /**
-     * <code>optional bytes service = 3;</code>
-     */
     com.google.protobuf.ByteString getService();
   }
-  /**
-   * Protobuf type {@code Token}
-   *
-   * <pre>
-   * Serialization of the org.apache.hadoop.security.token.Token class
-   * Note that this is a Hadoop class, so fields may change!
-   * </pre>
-   */
   public static final class Token extends
       com.google.protobuf.GeneratedMessage
       implements TokenOrBuilder {
     // Use Token.newBuilder() to construct.
-    private Token(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private Token(Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private Token(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
+    private Token(boolean noInit) {}
+    
     private static final Token defaultInstance;
     public static Token getDefaultInstance() {
       return defaultInstance;
     }
-
+    
     public Token getDefaultInstanceForType() {
       return defaultInstance;
     }
-
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Token(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              bitField0_ |= 0x00000001;
-              identifier_ = input.readBytes();
-              break;
-            }
-            case 18: {
-              bitField0_ |= 0x00000002;
-              password_ = input.readBytes();
-              break;
-            }
-            case 26: {
-              bitField0_ |= 0x00000004;
-              service_ = input.readBytes();
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
+    
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_Token_descriptor;
     }
-
+    
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_Token_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token.class, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token.Builder.class);
-    }
-
-    public static com.google.protobuf.Parser<Token> PARSER =
-        new com.google.protobuf.AbstractParser<Token>() {
-      public Token parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Token(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Token> getParserForType() {
-      return PARSER;
+      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_Token_fieldAccessorTable;
     }
-
+    
     private int bitField0_;
     // optional bytes identifier = 1;
     public static final int IDENTIFIER_FIELD_NUMBER = 1;
     private com.google.protobuf.ByteString identifier_;
-    /**
-     * <code>optional bytes identifier = 1;</code>
-     *
-     * <pre>
-     * the TokenIdentifier in serialized form
-     * Note: we can't use the protobuf directly because the Hadoop Token class
-     * only stores the serialized bytes
-     * </pre>
-     */
     public boolean hasIdentifier() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
-    /**
-     * <code>optional bytes identifier = 1;</code>
-     *
-     * <pre>
-     * the TokenIdentifier in serialized form
-     * Note: we can't use the protobuf directly because the Hadoop Token class
-     * only stores the serialized bytes
-     * </pre>
-     */
     public com.google.protobuf.ByteString getIdentifier() {
       return identifier_;
     }
-
+    
     // optional bytes password = 2;
     public static final int PASSWORD_FIELD_NUMBER = 2;
     private com.google.protobuf.ByteString password_;
-    /**
-     * <code>optional bytes password = 2;</code>
-     */
     public boolean hasPassword() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
-    /**
-     * <code>optional bytes password = 2;</code>
-     */
     public com.google.protobuf.ByteString getPassword() {
       return password_;
     }
-
+    
     // optional bytes service = 3;
     public static final int SERVICE_FIELD_NUMBER = 3;
     private com.google.protobuf.ByteString service_;
-    /**
-     * <code>optional bytes service = 3;</code>
-     */
     public boolean hasService() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
-    /**
-     * <code>optional bytes service = 3;</code>
-     */
     public com.google.protobuf.ByteString getService() {
       return service_;
     }
-
+    
     private void initFields() {
       identifier_ = com.google.protobuf.ByteString.EMPTY;
       password_ = com.google.protobuf.ByteString.EMPTY;
@@ -1867,11 +1424,11 @@ public final class AuthenticationProtos 
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-
+      
       memoizedIsInitialized = 1;
       return true;
     }
-
+    
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
@@ -1886,12 +1443,12 @@ public final class AuthenticationProtos 
       }
       getUnknownFields().writeTo(output);
     }
-
+    
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-
+    
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
@@ -1909,14 +1466,14 @@ public final class AuthenticationProtos 
       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();
     }
-
+    
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -1926,7 +1483,7 @@ public final class AuthenticationProtos 
         return super.equals(obj);
       }
       org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token other = (org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token) obj;
-
+      
       boolean result = true;
       result = result && (hasIdentifier() == other.hasIdentifier());
       if (hasIdentifier()) {
@@ -1947,13 +1504,9 @@ public final class AuthenticationProtos 
           getUnknownFields().equals(other.getUnknownFields());
       return result;
     }
-
-    private int memoizedHashCode = 0;
+    
     @java.lang.Override
     public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
       int hash = 41;
       hash = (19 * hash) + getDescriptorForType().hashCode();
       if (hasIdentifier()) {
@@ -1969,84 +1522,89 @@ public final class AuthenticationProtos 
         hash = (53 * hash) + getService().hashCode();
       }
       hash = (29 * hash) + getUnknownFields().hashCode();
-      memoizedHashCode = hash;
       return hash;
     }
-
+    
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
+      return newBuilder().mergeFrom(data).buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
+      return newBuilder().mergeFrom(data, extensionRegistry)
+               .buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
+      return newBuilder().mergeFrom(data).buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
+      return newBuilder().mergeFrom(data, extensionRegistry)
+               .buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return newBuilder().mergeFrom(input).buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return newBuilder().mergeFrom(input, extensionRegistry)
+               .buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      Builder builder = newBuilder();
+      if (builder.mergeDelimitedFrom(input)) {
+        return builder.buildParsed();
+      } else {
+        return null;
+      }
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      Builder builder = newBuilder();
+      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
+        return builder.buildParsed();
+      } else {
+        return null;
+      }
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return newBuilder().mergeFrom(input).buildParsed();
     }
     public static org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return newBuilder().mergeFrom(input, extensionRegistry)
+               .buildParsed();
     }
-
+    
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
-
+    
     @java.lang.Override
     protected Builder newBuilderForType(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
-    /**
-     * Protobuf type {@code Token}
-     *
-     * <pre>
-     * Serialization of the org.apache.hadoop.security.token.Token class
-     * Note that this is a Hadoop class, so fields may change!
-     * </pre>
-     */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenOrBuilder {
@@ -2054,21 +1612,18 @@ public final class AuthenticationProtos 
           getDescriptor() {
         return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_Token_descriptor;
       }
-
+      
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_Token_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token.class, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token.Builder.class);
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_Token_fieldAccessorTable;
       }
-
+      
       // Construct using org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      
+      private Builder(BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -2079,7 +1634,7 @@ public final class AuthenticationProtos 
       private static Builder create() {
         return new Builder();
       }
-
+      
       public Builder clear() {
         super.clear();
         identifier_ = com.google.protobuf.ByteString.EMPTY;
@@ -2090,20 +1645,20 @@ public final class AuthenticationProtos 
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
-
+      
       public Builder clone() {
         return create().mergeFrom(buildPartial());
       }
-
+      
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_Token_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token.getDescriptor();
       }
-
+      
       public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token getDefaultInstanceForType() {
         return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token.getDefaultInstance();
       }
-
+      
       public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token build() {
         org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token result = buildPartial();
         if (!result.isInitialized()) {
@@ -2111,7 +1666,17 @@ public final class AuthenticationProtos 
         }
         return result;
       }
-
+      
+      private org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token buildParsed()
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(
+            result).asInvalidProtocolBufferException();
+        }
+        return result;
+      }
+      
       public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token buildPartial() {
         org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token result = new org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token(this);
         int from_bitField0_ = bitField0_;
@@ -2132,7 +1697,7 @@ public final class AuthenticationProtos 
         onBuilt();
         return result;
       }
-
+      
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token) {
           return mergeFrom((org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token)other);
@@ -2141,7 +1706,7 @@ public final class AuthenticationProtos 
           return this;
         }
       }
-
+      
       public Builder mergeFrom(org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token other) {
         if (other == org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token.getDefaultInstance()) return this;
         if (other.hasIdentifier()) {
@@ -2156,65 +1721,63 @@ public final class AuthenticationProtos 
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
-
+      
       public final boolean isInitialized() {
         return true;
       }
-
+      
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token) e.getUnfinishedMessage();
-          throw e;
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      // optional bytes identifier = 1;
-      private com.google.protobuf.ByteString identifier_ = com.google.protobuf.ByteString.EMPTY;
-      /**
-       * <code>optional bytes identifier = 1;</code>
-       *
-       * <pre>
-       * the TokenIdentifier in serialized form
-       * Note: we can't use the protobuf directly because the Hadoop Token class
-       * only stores the serialized bytes
-       * </pre>
-       */
+        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder(
+            this.getUnknownFields());
+        while (true) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              this.setUnknownFields(unknownFields.build());
+              onChanged();
+              return this;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                this.setUnknownFields(unknownFields.build());
+                onChanged();
+                return this;
+              }
+              break;
+            }
+            case 10: {
+              bitField0_ |= 0x00000001;
+              identifier_ = input.readBytes();
+              break;
+            }
+            case 18: {
+              bitField0_ |= 0x00000002;
+              password_ = input.readBytes();
+              break;
+            }
+            case 26: {
+              bitField0_ |= 0x00000004;
+              service_ = input.readBytes();
+              break;
+            }
+          }
+        }
+      }
+      
+      private int bitField0_;
+      
+      // optional bytes identifier = 1;
+      private com.google.protobuf.ByteString identifier_ = com.google.protobuf.ByteString.EMPTY;
       public boolean hasIdentifier() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
-      /**
-       * <code>optional bytes identifier = 1;</code>
-       *
-       * <pre>
-       * the TokenIdentifier in serialized form
-       * Note: we can't use the protobuf directly because the Hadoop Token class
-       * only stores the serialized bytes
-       * </pre>
-       */
       public com.google.protobuf.ByteString getIdentifier() {
         return identifier_;
       }
-      /**
-       * <code>optional bytes identifier = 1;</code>
-       *
-       * <pre>
-       * the TokenIdentifier in serialized form
-       * Note: we can't use the protobuf directly because the Hadoop Token class
-       * only stores the serialized bytes
-       * </pre>
-       */
       public Builder setIdentifier(com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
@@ -2224,39 +1787,21 @@ public final class AuthenticationProtos 
         onChanged();
         return this;
       }
-      /**
-       * <code>optional bytes identifier = 1;</code>
-       *
-       * <pre>
-       * the TokenIdentifier in serialized form
-       * Note: we can't use the protobuf directly because the Hadoop Token class
-       * only stores the serialized bytes
-       * </pre>
-       */
       public Builder clearIdentifier() {
         bitField0_ = (bitField0_ & ~0x00000001);
         identifier_ = getDefaultInstance().getIdentifier();
         onChanged();
         return this;
       }
-
+      
       // optional bytes password = 2;
       private com.google.protobuf.ByteString password_ = com.google.protobuf.ByteString.EMPTY;
-      /**
-       * <code>optional bytes password = 2;</code>
-       */
       public boolean hasPassword() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
-      /**
-       * <code>optional bytes password = 2;</code>
-       */
       public com.google.protobuf.ByteString getPassword() {
         return password_;
       }
-      /**
-       * <code>optional bytes password = 2;</code>
-       */
       public Builder setPassword(com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
@@ -2266,33 +1811,21 @@ public final class AuthenticationProtos 
         onChanged();
         return this;
       }
-      /**
-       * <code>optional bytes password = 2;</code>
-       */
       public Builder clearPassword() {
         bitField0_ = (bitField0_ & ~0x00000002);
         password_ = getDefaultInstance().getPassword();
         onChanged();
         return this;
       }
-
+      
       // optional bytes service = 3;
       private com.google.protobuf.ByteString service_ = com.google.protobuf.ByteString.EMPTY;
-      /**
-       * <code>optional bytes service = 3;</code>
-       */
       public boolean hasService() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
-      /**
-       * <code>optional bytes service = 3;</code>
-       */
       public com.google.protobuf.ByteString getService() {
         return service_;
       }
-      /**
-       * <code>optional bytes service = 3;</code>
-       */
       public Builder setService(com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
@@ -2302,158 +1835,90 @@ public final class AuthenticationProtos 
         onChanged();
         return this;
       }
-      /**
-       * <code>optional bytes service = 3;</code>
-       */
       public Builder clearService() {
         bitField0_ = (bitField0_ & ~0x00000004);
         service_ = getDefaultInstance().getService();
         onChanged();
         return this;
       }
-
+      
       // @@protoc_insertion_point(builder_scope:Token)
     }
-
+    
     static {
       defaultInstance = new Token(true);
       defaultInstance.initFields();
     }
-
+    
     // @@protoc_insertion_point(class_scope:Token)
   }
-
+  
   public interface TokenRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
-  /**
-   * Protobuf type {@code TokenRequest}
-   *
-   * <pre>
-   * RPC request &amp; response messages
-   * </pre>
-   */
   public static final class TokenRequest extends
       com.google.protobuf.GeneratedMessage
       implements TokenRequestOrBuilder {
     // Use TokenRequest.newBuilder() to construct.
-    private TokenRequest(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private TokenRequest(Builder builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private TokenRequest(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
+    private TokenRequest(boolean noInit) {}
+    
     private static final TokenRequest defaultInstance;
     public static TokenRequest getDefaultInstance() {
       return defaultInstance;
     }
-
+    
     public TokenRequest getDefaultInstanceForType() {
       return defaultInstance;
     }
-
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
-      return this.unknownFields;
-    }
-    private TokenRequest(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
+    
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_TokenRequest_descriptor;
     }
-
+    
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_TokenRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenRequest.class, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenRequest.Builder.class);
-    }
-
-    public static com.google.protobuf.Parser<TokenRequest> PARSER =
-        new com.google.protobuf.AbstractParser<TokenRequest>() {
-      public TokenRequest parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TokenRequest(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<TokenRequest> getParserForType() {
-      return PARSER;
+      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_TokenRequest_fieldAccessorTable;
     }
-
+    
     private void initFields() {
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
-
+      
       memoizedIsInitialized = 1;
       return true;
     }
-
+    
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
       getUnknownFields().writeTo(output);
     }
-
+    
     private int memoizedSerializedSize = -1;
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
-
+    
       size = 0;
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
       return size;
     }
-
+    
     private static final long serialVersionUID = 0L;
     @java.lang.Override
     protected java.lang.Object writeReplace()
         throws java.io.ObjectStreamException {
       return super.writeReplace();
     }
-
+    
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -2463,99 +1928,101 @@ public final class AuthenticationProtos 
         return super.equals(obj);
       }
       org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenRequest other = (org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenRequest) obj;
-
+      
       boolean result = true;
       result = result &&
           getUnknownFields().equals(other.getUnknownFields());
       return result;
     }
-
-    private int memoizedHashCode = 0;

[... 2398 lines stripped ...]