http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7d8609e7/proto_src/org/waveprotocol/box/server/persistence/protos/ProtoAccountStoreData.java
----------------------------------------------------------------------
diff --git 
a/proto_src/org/waveprotocol/box/server/persistence/protos/ProtoAccountStoreData.java
 
b/proto_src/org/waveprotocol/box/server/persistence/protos/ProtoAccountStoreData.java
deleted file mode 100644
index 8757879..0000000
--- 
a/proto_src/org/waveprotocol/box/server/persistence/protos/ProtoAccountStoreData.java
+++ /dev/null
@@ -1,5168 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: org/waveprotocol/box/server/persistence/protos/account-store.proto
-
-package org.waveprotocol.box.server.persistence.protos;
-
-public final class ProtoAccountStoreData {
-  private ProtoAccountStoreData() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-  }
-  public interface ProtoAccountDataOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
-
-    // required .protoaccountstore.ProtoAccountData.AccountDataType 
account_type = 1;
-    /**
-     * <code>required .protoaccountstore.ProtoAccountData.AccountDataType 
account_type = 1;</code>
-     */
-    boolean hasAccountType();
-    /**
-     * <code>required .protoaccountstore.ProtoAccountData.AccountDataType 
account_type = 1;</code>
-     */
-    
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData.AccountDataType
 getAccountType();
-
-    // required string account_id = 2;
-    /**
-     * <code>required string account_id = 2;</code>
-     *
-     * <pre>
-     * The participant id
-     * </pre>
-     */
-    boolean hasAccountId();
-    /**
-     * <code>required string account_id = 2;</code>
-     *
-     * <pre>
-     * The participant id
-     * </pre>
-     */
-    java.lang.String getAccountId();
-    /**
-     * <code>required string account_id = 2;</code>
-     *
-     * <pre>
-     * The participant id
-     * </pre>
-     */
-    com.google.protobuf.ByteString
-        getAccountIdBytes();
-
-    // optional .protoaccountstore.ProtoHumanAccountData human_account_data = 
3;
-    /**
-     * <code>optional .protoaccountstore.ProtoHumanAccountData 
human_account_data = 3;</code>
-     *
-     * <pre>
-     * One must be provided depending on the value of account_type.    
-     * </pre>
-     */
-    boolean hasHumanAccountData();
-    /**
-     * <code>optional .protoaccountstore.ProtoHumanAccountData 
human_account_data = 3;</code>
-     *
-     * <pre>
-     * One must be provided depending on the value of account_type.    
-     * </pre>
-     */
-    
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 getHumanAccountData();
-    /**
-     * <code>optional .protoaccountstore.ProtoHumanAccountData 
human_account_data = 3;</code>
-     *
-     * <pre>
-     * One must be provided depending on the value of account_type.    
-     * </pre>
-     */
-    
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountDataOrBuilder
 getHumanAccountDataOrBuilder();
-
-    // optional .protoaccountstore.ProtoRobotAccountData robot_account_data = 
4;
-    /**
-     * <code>optional .protoaccountstore.ProtoRobotAccountData 
robot_account_data = 4;</code>
-     */
-    boolean hasRobotAccountData();
-    /**
-     * <code>optional .protoaccountstore.ProtoRobotAccountData 
robot_account_data = 4;</code>
-     */
-    
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountData
 getRobotAccountData();
-    /**
-     * <code>optional .protoaccountstore.ProtoRobotAccountData 
robot_account_data = 4;</code>
-     */
-    
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountDataOrBuilder
 getRobotAccountDataOrBuilder();
-  }
-  /**
-   * Protobuf type {@code protoaccountstore.ProtoAccountData}
-   *
-   * <pre>
-   * Represents an AccountData instance
-   * </pre>
-   */
-  public static final class ProtoAccountData extends
-      com.google.protobuf.GeneratedMessage
-      implements ProtoAccountDataOrBuilder {
-    // Use ProtoAccountData.newBuilder() to construct.
-    private ProtoAccountData(com.google.protobuf.GeneratedMessage.Builder<?> 
builder) {
-      super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private ProtoAccountData(boolean noInit) { this.unknownFields = 
com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final ProtoAccountData defaultInstance;
-    public static ProtoAccountData getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public ProtoAccountData getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ProtoAccountData(
-        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.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData.AccountDataType
 value = 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData.AccountDataType.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(1, rawValue);
-              } else {
-                bitField0_ |= 0x00000001;
-                accountType_ = value;
-              }
-              break;
-            }
-            case 18: {
-              bitField0_ |= 0x00000002;
-              accountId_ = input.readBytes();
-              break;
-            }
-            case 26: {
-              
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData.Builder
 subBuilder = null;
-              if (((bitField0_ & 0x00000004) == 0x00000004)) {
-                subBuilder = humanAccountData_.toBuilder();
-              }
-              humanAccountData_ = 
input.readMessage(org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData.PARSER,
 extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(humanAccountData_);
-                humanAccountData_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000004;
-              break;
-            }
-            case 34: {
-              
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountData.Builder
 subBuilder = null;
-              if (((bitField0_ & 0x00000008) == 0x00000008)) {
-                subBuilder = robotAccountData_.toBuilder();
-              }
-              robotAccountData_ = 
input.readMessage(org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountData.PARSER,
 extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(robotAccountData_);
-                robotAccountData_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000008;
-              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.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.internal_static_protoaccountstore_ProtoAccountData_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.internal_static_protoaccountstore_ProtoAccountData_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData.class,
 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData.Builder.class);
-    }
-
-    public static com.google.protobuf.Parser<ProtoAccountData> PARSER =
-        new com.google.protobuf.AbstractParser<ProtoAccountData>() {
-      public ProtoAccountData parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ProtoAccountData(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<ProtoAccountData> getParserForType() {
-      return PARSER;
-    }
-
-    /**
-     * Protobuf enum {@code protoaccountstore.ProtoAccountData.AccountDataType}
-     */
-    public enum AccountDataType
-        implements com.google.protobuf.ProtocolMessageEnum {
-      /**
-       * <code>HUMAN_ACCOUNT = 1;</code>
-       */
-      HUMAN_ACCOUNT(0, 1),
-      /**
-       * <code>ROBOT_ACCOUNT = 2;</code>
-       */
-      ROBOT_ACCOUNT(1, 2),
-      ;
-
-      /**
-       * <code>HUMAN_ACCOUNT = 1;</code>
-       */
-      public static final int HUMAN_ACCOUNT_VALUE = 1;
-      /**
-       * <code>ROBOT_ACCOUNT = 2;</code>
-       */
-      public static final int ROBOT_ACCOUNT_VALUE = 2;
-
-
-      public final int getNumber() { return value; }
-
-      public static AccountDataType valueOf(int value) {
-        switch (value) {
-          case 1: return HUMAN_ACCOUNT;
-          case 2: return ROBOT_ACCOUNT;
-          default: return null;
-        }
-      }
-
-      public static com.google.protobuf.Internal.EnumLiteMap<AccountDataType>
-          internalGetValueMap() {
-        return internalValueMap;
-      }
-      private static com.google.protobuf.Internal.EnumLiteMap<AccountDataType>
-          internalValueMap =
-            new com.google.protobuf.Internal.EnumLiteMap<AccountDataType>() {
-              public AccountDataType findValueByNumber(int number) {
-                return AccountDataType.valueOf(number);
-              }
-            };
-
-      public final com.google.protobuf.Descriptors.EnumValueDescriptor
-          getValueDescriptor() {
-        return getDescriptor().getValues().get(index);
-      }
-      public final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptorForType() {
-        return getDescriptor();
-      }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptor() {
-        return 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData.getDescriptor().getEnumTypes().get(0);
-      }
-
-      private static final AccountDataType[] VALUES = values();
-
-      public static AccountDataType valueOf(
-          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-        if (desc.getType() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException(
-            "EnumValueDescriptor is not for this type.");
-        }
-        return VALUES[desc.getIndex()];
-      }
-
-      private final int index;
-      private final int value;
-
-      private AccountDataType(int index, int value) {
-        this.index = index;
-        this.value = value;
-      }
-
-      // 
@@protoc_insertion_point(enum_scope:protoaccountstore.ProtoAccountData.AccountDataType)
-    }
-
-    private int bitField0_;
-    // required .protoaccountstore.ProtoAccountData.AccountDataType 
account_type = 1;
-    public static final int ACCOUNT_TYPE_FIELD_NUMBER = 1;
-    private 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData.AccountDataType
 accountType_;
-    /**
-     * <code>required .protoaccountstore.ProtoAccountData.AccountDataType 
account_type = 1;</code>
-     */
-    public boolean hasAccountType() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    /**
-     * <code>required .protoaccountstore.ProtoAccountData.AccountDataType 
account_type = 1;</code>
-     */
-    public 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData.AccountDataType
 getAccountType() {
-      return accountType_;
-    }
-
-    // required string account_id = 2;
-    public static final int ACCOUNT_ID_FIELD_NUMBER = 2;
-    private java.lang.Object accountId_;
-    /**
-     * <code>required string account_id = 2;</code>
-     *
-     * <pre>
-     * The participant id
-     * </pre>
-     */
-    public boolean hasAccountId() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
-    }
-    /**
-     * <code>required string account_id = 2;</code>
-     *
-     * <pre>
-     * The participant id
-     * </pre>
-     */
-    public java.lang.String getAccountId() {
-      java.lang.Object ref = accountId_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        if (bs.isValidUtf8()) {
-          accountId_ = s;
-        }
-        return s;
-      }
-    }
-    /**
-     * <code>required string account_id = 2;</code>
-     *
-     * <pre>
-     * The participant id
-     * </pre>
-     */
-    public com.google.protobuf.ByteString
-        getAccountIdBytes() {
-      java.lang.Object ref = accountId_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        accountId_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    // optional .protoaccountstore.ProtoHumanAccountData human_account_data = 
3;
-    public static final int HUMAN_ACCOUNT_DATA_FIELD_NUMBER = 3;
-    private 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 humanAccountData_;
-    /**
-     * <code>optional .protoaccountstore.ProtoHumanAccountData 
human_account_data = 3;</code>
-     *
-     * <pre>
-     * One must be provided depending on the value of account_type.    
-     * </pre>
-     */
-    public boolean hasHumanAccountData() {
-      return ((bitField0_ & 0x00000004) == 0x00000004);
-    }
-    /**
-     * <code>optional .protoaccountstore.ProtoHumanAccountData 
human_account_data = 3;</code>
-     *
-     * <pre>
-     * One must be provided depending on the value of account_type.    
-     * </pre>
-     */
-    public 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 getHumanAccountData() {
-      return humanAccountData_;
-    }
-    /**
-     * <code>optional .protoaccountstore.ProtoHumanAccountData 
human_account_data = 3;</code>
-     *
-     * <pre>
-     * One must be provided depending on the value of account_type.    
-     * </pre>
-     */
-    public 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountDataOrBuilder
 getHumanAccountDataOrBuilder() {
-      return humanAccountData_;
-    }
-
-    // optional .protoaccountstore.ProtoRobotAccountData robot_account_data = 
4;
-    public static final int ROBOT_ACCOUNT_DATA_FIELD_NUMBER = 4;
-    private 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountData
 robotAccountData_;
-    /**
-     * <code>optional .protoaccountstore.ProtoRobotAccountData 
robot_account_data = 4;</code>
-     */
-    public boolean hasRobotAccountData() {
-      return ((bitField0_ & 0x00000008) == 0x00000008);
-    }
-    /**
-     * <code>optional .protoaccountstore.ProtoRobotAccountData 
robot_account_data = 4;</code>
-     */
-    public 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountData
 getRobotAccountData() {
-      return robotAccountData_;
-    }
-    /**
-     * <code>optional .protoaccountstore.ProtoRobotAccountData 
robot_account_data = 4;</code>
-     */
-    public 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountDataOrBuilder
 getRobotAccountDataOrBuilder() {
-      return robotAccountData_;
-    }
-
-    private void initFields() {
-      accountType_ = 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData.AccountDataType.HUMAN_ACCOUNT;
-      accountId_ = "";
-      humanAccountData_ = 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData.getDefaultInstance();
-      robotAccountData_ = 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountData.getDefaultInstance();
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
-
-      if (!hasAccountType()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasAccountId()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (hasHumanAccountData()) {
-        if (!getHumanAccountData().isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      if (hasRobotAccountData()) {
-        if (!getRobotAccountData().isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeEnum(1, accountType_.getNumber());
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeBytes(2, getAccountIdBytes());
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeMessage(3, humanAccountData_);
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        output.writeMessage(4, robotAccountData_);
-      }
-      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
-          .computeEnumSize(1, accountType_.getNumber());
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(2, getAccountIdBytes());
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, humanAccountData_);
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, robotAccountData_);
-      }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData
 parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData
 parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData
 parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData
 parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData
 parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData
 parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData
 parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData
 parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData
 parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData
 parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
-    }
-
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder 
newBuilder(org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData
 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 protoaccountstore.ProtoAccountData}
-     *
-     * <pre>
-     * Represents an AccountData instance
-     * </pre>
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountDataOrBuilder
 {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.internal_static_protoaccountstore_ProtoAccountData_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.internal_static_protoaccountstore_ProtoAccountData_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData.class,
 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData.Builder.class);
-      }
-
-      // Construct using 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-          getHumanAccountDataFieldBuilder();
-          getRobotAccountDataFieldBuilder();
-        }
-      }
-      private static Builder create() {
-        return new Builder();
-      }
-
-      public Builder clear() {
-        super.clear();
-        accountType_ = 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData.AccountDataType.HUMAN_ACCOUNT;
-        bitField0_ = (bitField0_ & ~0x00000001);
-        accountId_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
-        if (humanAccountDataBuilder_ == null) {
-          humanAccountData_ = 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData.getDefaultInstance();
-        } else {
-          humanAccountDataBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000004);
-        if (robotAccountDataBuilder_ == null) {
-          robotAccountData_ = 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountData.getDefaultInstance();
-        } else {
-          robotAccountDataBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000008);
-        return this;
-      }
-
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.internal_static_protoaccountstore_ProtoAccountData_descriptor;
-      }
-
-      public 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData
 getDefaultInstanceForType() {
-        return 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData.getDefaultInstance();
-      }
-
-      public 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData
 build() {
-        
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData
 result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData
 buildPartial() {
-        
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData
 result = new 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        result.accountType_ = accountType_;
-        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-          to_bitField0_ |= 0x00000002;
-        }
-        result.accountId_ = accountId_;
-        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
-          to_bitField0_ |= 0x00000004;
-        }
-        if (humanAccountDataBuilder_ == null) {
-          result.humanAccountData_ = humanAccountData_;
-        } else {
-          result.humanAccountData_ = humanAccountDataBuilder_.build();
-        }
-        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
-          to_bitField0_ |= 0x00000008;
-        }
-        if (robotAccountDataBuilder_ == null) {
-          result.robotAccountData_ = robotAccountData_;
-        } else {
-          result.robotAccountData_ = robotAccountDataBuilder_.build();
-        }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData)
 {
-          return 
mergeFrom((org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder 
mergeFrom(org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData
 other) {
-        if (other == 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData.getDefaultInstance())
 return this;
-        if (other.hasAccountType()) {
-          setAccountType(other.getAccountType());
-        }
-        if (other.hasAccountId()) {
-          bitField0_ |= 0x00000002;
-          accountId_ = other.accountId_;
-          onChanged();
-        }
-        if (other.hasHumanAccountData()) {
-          mergeHumanAccountData(other.getHumanAccountData());
-        }
-        if (other.hasRobotAccountData()) {
-          mergeRobotAccountData(other.getRobotAccountData());
-        }
-        this.mergeUnknownFields(other.getUnknownFields());
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        if (!hasAccountType()) {
-          
-          return false;
-        }
-        if (!hasAccountId()) {
-          
-          return false;
-        }
-        if (hasHumanAccountData()) {
-          if (!getHumanAccountData().isInitialized()) {
-            
-            return false;
-          }
-        }
-        if (hasRobotAccountData()) {
-          if (!getRobotAccountData().isInitialized()) {
-            
-            return false;
-          }
-        }
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData
 parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = 
(org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData)
 e.getUnfinishedMessage();
-          throw e;
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      // required .protoaccountstore.ProtoAccountData.AccountDataType 
account_type = 1;
-      private 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData.AccountDataType
 accountType_ = 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData.AccountDataType.HUMAN_ACCOUNT;
-      /**
-       * <code>required .protoaccountstore.ProtoAccountData.AccountDataType 
account_type = 1;</code>
-       */
-      public boolean hasAccountType() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
-      }
-      /**
-       * <code>required .protoaccountstore.ProtoAccountData.AccountDataType 
account_type = 1;</code>
-       */
-      public 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData.AccountDataType
 getAccountType() {
-        return accountType_;
-      }
-      /**
-       * <code>required .protoaccountstore.ProtoAccountData.AccountDataType 
account_type = 1;</code>
-       */
-      public Builder 
setAccountType(org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData.AccountDataType
 value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        bitField0_ |= 0x00000001;
-        accountType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>required .protoaccountstore.ProtoAccountData.AccountDataType 
account_type = 1;</code>
-       */
-      public Builder clearAccountType() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        accountType_ = 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoAccountData.AccountDataType.HUMAN_ACCOUNT;
-        onChanged();
-        return this;
-      }
-
-      // required string account_id = 2;
-      private java.lang.Object accountId_ = "";
-      /**
-       * <code>required string account_id = 2;</code>
-       *
-       * <pre>
-       * The participant id
-       * </pre>
-       */
-      public boolean hasAccountId() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
-      }
-      /**
-       * <code>required string account_id = 2;</code>
-       *
-       * <pre>
-       * The participant id
-       * </pre>
-       */
-      public java.lang.String getAccountId() {
-        java.lang.Object ref = accountId_;
-        if (!(ref instanceof java.lang.String)) {
-          java.lang.String s = ((com.google.protobuf.ByteString) ref)
-              .toStringUtf8();
-          accountId_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>required string account_id = 2;</code>
-       *
-       * <pre>
-       * The participant id
-       * </pre>
-       */
-      public com.google.protobuf.ByteString
-          getAccountIdBytes() {
-        java.lang.Object ref = accountId_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          accountId_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>required string account_id = 2;</code>
-       *
-       * <pre>
-       * The participant id
-       * </pre>
-       */
-      public Builder setAccountId(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
-        accountId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>required string account_id = 2;</code>
-       *
-       * <pre>
-       * The participant id
-       * </pre>
-       */
-      public Builder clearAccountId() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        accountId_ = getDefaultInstance().getAccountId();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>required string account_id = 2;</code>
-       *
-       * <pre>
-       * The participant id
-       * </pre>
-       */
-      public Builder setAccountIdBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
-        accountId_ = value;
-        onChanged();
-        return this;
-      }
-
-      // optional .protoaccountstore.ProtoHumanAccountData human_account_data 
= 3;
-      private 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 humanAccountData_ = 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData,
 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData.Builder,
 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountDataOrBuilder>
 humanAccountDataBuilder_;
-      /**
-       * <code>optional .protoaccountstore.ProtoHumanAccountData 
human_account_data = 3;</code>
-       *
-       * <pre>
-       * One must be provided depending on the value of account_type.  
-       * </pre>
-       */
-      public boolean hasHumanAccountData() {
-        return ((bitField0_ & 0x00000004) == 0x00000004);
-      }
-      /**
-       * <code>optional .protoaccountstore.ProtoHumanAccountData 
human_account_data = 3;</code>
-       *
-       * <pre>
-       * One must be provided depending on the value of account_type.  
-       * </pre>
-       */
-      public 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 getHumanAccountData() {
-        if (humanAccountDataBuilder_ == null) {
-          return humanAccountData_;
-        } else {
-          return humanAccountDataBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>optional .protoaccountstore.ProtoHumanAccountData 
human_account_data = 3;</code>
-       *
-       * <pre>
-       * One must be provided depending on the value of account_type.  
-       * </pre>
-       */
-      public Builder 
setHumanAccountData(org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 value) {
-        if (humanAccountDataBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          humanAccountData_ = value;
-          onChanged();
-        } else {
-          humanAccountDataBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000004;
-        return this;
-      }
-      /**
-       * <code>optional .protoaccountstore.ProtoHumanAccountData 
human_account_data = 3;</code>
-       *
-       * <pre>
-       * One must be provided depending on the value of account_type.  
-       * </pre>
-       */
-      public Builder setHumanAccountData(
-          
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData.Builder
 builderForValue) {
-        if (humanAccountDataBuilder_ == null) {
-          humanAccountData_ = builderForValue.build();
-          onChanged();
-        } else {
-          humanAccountDataBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000004;
-        return this;
-      }
-      /**
-       * <code>optional .protoaccountstore.ProtoHumanAccountData 
human_account_data = 3;</code>
-       *
-       * <pre>
-       * One must be provided depending on the value of account_type.  
-       * </pre>
-       */
-      public Builder 
mergeHumanAccountData(org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 value) {
-        if (humanAccountDataBuilder_ == null) {
-          if (((bitField0_ & 0x00000004) == 0x00000004) &&
-              humanAccountData_ != 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData.getDefaultInstance())
 {
-            humanAccountData_ =
-              
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData.newBuilder(humanAccountData_).mergeFrom(value).buildPartial();
-          } else {
-            humanAccountData_ = value;
-          }
-          onChanged();
-        } else {
-          humanAccountDataBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000004;
-        return this;
-      }
-      /**
-       * <code>optional .protoaccountstore.ProtoHumanAccountData 
human_account_data = 3;</code>
-       *
-       * <pre>
-       * One must be provided depending on the value of account_type.  
-       * </pre>
-       */
-      public Builder clearHumanAccountData() {
-        if (humanAccountDataBuilder_ == null) {
-          humanAccountData_ = 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData.getDefaultInstance();
-          onChanged();
-        } else {
-          humanAccountDataBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000004);
-        return this;
-      }
-      /**
-       * <code>optional .protoaccountstore.ProtoHumanAccountData 
human_account_data = 3;</code>
-       *
-       * <pre>
-       * One must be provided depending on the value of account_type.  
-       * </pre>
-       */
-      public 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData.Builder
 getHumanAccountDataBuilder() {
-        bitField0_ |= 0x00000004;
-        onChanged();
-        return getHumanAccountDataFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>optional .protoaccountstore.ProtoHumanAccountData 
human_account_data = 3;</code>
-       *
-       * <pre>
-       * One must be provided depending on the value of account_type.  
-       * </pre>
-       */
-      public 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountDataOrBuilder
 getHumanAccountDataOrBuilder() {
-        if (humanAccountDataBuilder_ != null) {
-          return humanAccountDataBuilder_.getMessageOrBuilder();
-        } else {
-          return humanAccountData_;
-        }
-      }
-      /**
-       * <code>optional .protoaccountstore.ProtoHumanAccountData 
human_account_data = 3;</code>
-       *
-       * <pre>
-       * One must be provided depending on the value of account_type.  
-       * </pre>
-       */
-      private com.google.protobuf.SingleFieldBuilder<
-          
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData,
 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData.Builder,
 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountDataOrBuilder>
 
-          getHumanAccountDataFieldBuilder() {
-        if (humanAccountDataBuilder_ == null) {
-          humanAccountDataBuilder_ = new 
com.google.protobuf.SingleFieldBuilder<
-              
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData,
 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData.Builder,
 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountDataOrBuilder>(
-                  humanAccountData_,
-                  getParentForChildren(),
-                  isClean());
-          humanAccountData_ = null;
-        }
-        return humanAccountDataBuilder_;
-      }
-
-      // optional .protoaccountstore.ProtoRobotAccountData robot_account_data 
= 4;
-      private 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountData
 robotAccountData_ = 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountData.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountData,
 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountData.Builder,
 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountDataOrBuilder>
 robotAccountDataBuilder_;
-      /**
-       * <code>optional .protoaccountstore.ProtoRobotAccountData 
robot_account_data = 4;</code>
-       */
-      public boolean hasRobotAccountData() {
-        return ((bitField0_ & 0x00000008) == 0x00000008);
-      }
-      /**
-       * <code>optional .protoaccountstore.ProtoRobotAccountData 
robot_account_data = 4;</code>
-       */
-      public 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountData
 getRobotAccountData() {
-        if (robotAccountDataBuilder_ == null) {
-          return robotAccountData_;
-        } else {
-          return robotAccountDataBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>optional .protoaccountstore.ProtoRobotAccountData 
robot_account_data = 4;</code>
-       */
-      public Builder 
setRobotAccountData(org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountData
 value) {
-        if (robotAccountDataBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          robotAccountData_ = value;
-          onChanged();
-        } else {
-          robotAccountDataBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000008;
-        return this;
-      }
-      /**
-       * <code>optional .protoaccountstore.ProtoRobotAccountData 
robot_account_data = 4;</code>
-       */
-      public Builder setRobotAccountData(
-          
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountData.Builder
 builderForValue) {
-        if (robotAccountDataBuilder_ == null) {
-          robotAccountData_ = builderForValue.build();
-          onChanged();
-        } else {
-          robotAccountDataBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000008;
-        return this;
-      }
-      /**
-       * <code>optional .protoaccountstore.ProtoRobotAccountData 
robot_account_data = 4;</code>
-       */
-      public Builder 
mergeRobotAccountData(org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountData
 value) {
-        if (robotAccountDataBuilder_ == null) {
-          if (((bitField0_ & 0x00000008) == 0x00000008) &&
-              robotAccountData_ != 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountData.getDefaultInstance())
 {
-            robotAccountData_ =
-              
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountData.newBuilder(robotAccountData_).mergeFrom(value).buildPartial();
-          } else {
-            robotAccountData_ = value;
-          }
-          onChanged();
-        } else {
-          robotAccountDataBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000008;
-        return this;
-      }
-      /**
-       * <code>optional .protoaccountstore.ProtoRobotAccountData 
robot_account_data = 4;</code>
-       */
-      public Builder clearRobotAccountData() {
-        if (robotAccountDataBuilder_ == null) {
-          robotAccountData_ = 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountData.getDefaultInstance();
-          onChanged();
-        } else {
-          robotAccountDataBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000008);
-        return this;
-      }
-      /**
-       * <code>optional .protoaccountstore.ProtoRobotAccountData 
robot_account_data = 4;</code>
-       */
-      public 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountData.Builder
 getRobotAccountDataBuilder() {
-        bitField0_ |= 0x00000008;
-        onChanged();
-        return getRobotAccountDataFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>optional .protoaccountstore.ProtoRobotAccountData 
robot_account_data = 4;</code>
-       */
-      public 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountDataOrBuilder
 getRobotAccountDataOrBuilder() {
-        if (robotAccountDataBuilder_ != null) {
-          return robotAccountDataBuilder_.getMessageOrBuilder();
-        } else {
-          return robotAccountData_;
-        }
-      }
-      /**
-       * <code>optional .protoaccountstore.ProtoRobotAccountData 
robot_account_data = 4;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilder<
-          
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountData,
 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountData.Builder,
 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountDataOrBuilder>
 
-          getRobotAccountDataFieldBuilder() {
-        if (robotAccountDataBuilder_ == null) {
-          robotAccountDataBuilder_ = new 
com.google.protobuf.SingleFieldBuilder<
-              
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountData,
 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountData.Builder,
 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoRobotAccountDataOrBuilder>(
-                  robotAccountData_,
-                  getParentForChildren(),
-                  isClean());
-          robotAccountData_ = null;
-        }
-        return robotAccountDataBuilder_;
-      }
-
-      // 
@@protoc_insertion_point(builder_scope:protoaccountstore.ProtoAccountData)
-    }
-
-    static {
-      defaultInstance = new ProtoAccountData(true);
-      defaultInstance.initFields();
-    }
-
-    // @@protoc_insertion_point(class_scope:protoaccountstore.ProtoAccountData)
-  }
-
-  public interface ProtoHumanAccountDataOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
-
-    // optional .protoaccountstore.ProtoPasswordDigest password_digest = 1;
-    /**
-     * <code>optional .protoaccountstore.ProtoPasswordDigest password_digest = 
1;</code>
-     */
-    boolean hasPasswordDigest();
-    /**
-     * <code>optional .protoaccountstore.ProtoPasswordDigest password_digest = 
1;</code>
-     */
-    
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest
 getPasswordDigest();
-    /**
-     * <code>optional .protoaccountstore.ProtoPasswordDigest password_digest = 
1;</code>
-     */
-    
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigestOrBuilder
 getPasswordDigestOrBuilder();
-  }
-  /**
-   * Protobuf type {@code protoaccountstore.ProtoHumanAccountData}
-   *
-   * <pre>
-   * Data specific to a human account
-   * </pre>
-   */
-  public static final class ProtoHumanAccountData extends
-      com.google.protobuf.GeneratedMessage
-      implements ProtoHumanAccountDataOrBuilder {
-    // Use ProtoHumanAccountData.newBuilder() to construct.
-    private 
ProtoHumanAccountData(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
-      super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private ProtoHumanAccountData(boolean noInit) { this.unknownFields = 
com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final ProtoHumanAccountData defaultInstance;
-    public static ProtoHumanAccountData getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public ProtoHumanAccountData getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ProtoHumanAccountData(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest.Builder
 subBuilder = null;
-              if (((bitField0_ & 0x00000001) == 0x00000001)) {
-                subBuilder = passwordDigest_.toBuilder();
-              }
-              passwordDigest_ = 
input.readMessage(org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest.PARSER,
 extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(passwordDigest_);
-                passwordDigest_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              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.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.internal_static_protoaccountstore_ProtoHumanAccountData_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.internal_static_protoaccountstore_ProtoHumanAccountData_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData.class,
 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData.Builder.class);
-    }
-
-    public static com.google.protobuf.Parser<ProtoHumanAccountData> PARSER =
-        new com.google.protobuf.AbstractParser<ProtoHumanAccountData>() {
-      public ProtoHumanAccountData parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ProtoHumanAccountData(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<ProtoHumanAccountData> 
getParserForType() {
-      return PARSER;
-    }
-
-    private int bitField0_;
-    // optional .protoaccountstore.ProtoPasswordDigest password_digest = 1;
-    public static final int PASSWORD_DIGEST_FIELD_NUMBER = 1;
-    private 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest
 passwordDigest_;
-    /**
-     * <code>optional .protoaccountstore.ProtoPasswordDigest password_digest = 
1;</code>
-     */
-    public boolean hasPasswordDigest() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    /**
-     * <code>optional .protoaccountstore.ProtoPasswordDigest password_digest = 
1;</code>
-     */
-    public 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest
 getPasswordDigest() {
-      return passwordDigest_;
-    }
-    /**
-     * <code>optional .protoaccountstore.ProtoPasswordDigest password_digest = 
1;</code>
-     */
-    public 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigestOrBuilder
 getPasswordDigestOrBuilder() {
-      return passwordDigest_;
-    }
-
-    private void initFields() {
-      passwordDigest_ = 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest.getDefaultInstance();
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
-
-      if (hasPasswordDigest()) {
-        if (!getPasswordDigest().isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeMessage(1, passwordDigest_);
-      }
-      getUnknownFields().writeTo(output);
-    }
-
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, passwordDigest_);
-      }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
-    }
-
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder 
newBuilder(org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 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 protoaccountstore.ProtoHumanAccountData}
-     *
-     * <pre>
-     * Data specific to a human account
-     * </pre>
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountDataOrBuilder
 {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.internal_static_protoaccountstore_ProtoHumanAccountData_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.internal_static_protoaccountstore_ProtoHumanAccountData_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData.class,
 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData.Builder.class);
-      }
-
-      // Construct using 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-          getPasswordDigestFieldBuilder();
-        }
-      }
-      private static Builder create() {
-        return new Builder();
-      }
-
-      public Builder clear() {
-        super.clear();
-        if (passwordDigestBuilder_ == null) {
-          passwordDigest_ = 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest.getDefaultInstance();
-        } else {
-          passwordDigestBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        return this;
-      }
-
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.internal_static_protoaccountstore_ProtoHumanAccountData_descriptor;
-      }
-
-      public 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 getDefaultInstanceForType() {
-        return 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData.getDefaultInstance();
-      }
-
-      public 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 build() {
-        
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 buildPartial() {
-        
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 result = new 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        if (passwordDigestBuilder_ == null) {
-          result.passwordDigest_ = passwordDigest_;
-        } else {
-          result.passwordDigest_ = passwordDigestBuilder_.build();
-        }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData)
 {
-          return 
mergeFrom((org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder 
mergeFrom(org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 other) {
-        if (other == 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData.getDefaultInstance())
 return this;
-        if (other.hasPasswordDigest()) {
-          mergePasswordDigest(other.getPasswordDigest());
-        }
-        this.mergeUnknownFields(other.getUnknownFields());
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        if (hasPasswordDigest()) {
-          if (!getPasswordDigest().isInitialized()) {
-            
-            return false;
-          }
-        }
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData
 parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = 
(org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoHumanAccountData)
 e.getUnfinishedMessage();
-          throw e;
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      // optional .protoaccountstore.ProtoPasswordDigest password_digest = 1;
-      private 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest
 passwordDigest_ = 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest,
 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest.Builder,
 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigestOrBuilder>
 passwordDigestBuilder_;
-      /**
-       * <code>optional .protoaccountstore.ProtoPasswordDigest password_digest 
= 1;</code>
-       */
-      public boolean hasPasswordDigest() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
-      }
-      /**
-       * <code>optional .protoaccountstore.ProtoPasswordDigest password_digest 
= 1;</code>
-       */
-      public 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest
 getPasswordDigest() {
-        if (passwordDigestBuilder_ == null) {
-          return passwordDigest_;
-        } else {
-          return passwordDigestBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>optional .protoaccountstore.ProtoPasswordDigest password_digest 
= 1;</code>
-       */
-      public Builder 
setPasswordDigest(org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest
 value) {
-        if (passwordDigestBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          passwordDigest_ = value;
-          onChanged();
-        } else {
-          passwordDigestBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      /**
-       * <code>optional .protoaccountstore.ProtoPasswordDigest password_digest 
= 1;</code>
-       */
-      public Builder setPasswordDigest(
-          
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest.Builder
 builderForValue) {
-        if (passwordDigestBuilder_ == null) {
-          passwordDigest_ = builderForValue.build();
-          onChanged();
-        } else {
-          passwordDigestBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      /**
-       * <code>optional .protoaccountstore.ProtoPasswordDigest password_digest 
= 1;</code>
-       */
-      public Builder 
mergePasswordDigest(org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest
 value) {
-        if (passwordDigestBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              passwordDigest_ != 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest.getDefaultInstance())
 {
-            passwordDigest_ =
-              
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest.newBuilder(passwordDigest_).mergeFrom(value).buildPartial();
-          } else {
-            passwordDigest_ = value;
-          }
-          onChanged();
-        } else {
-          passwordDigestBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      /**
-       * <code>optional .protoaccountstore.ProtoPasswordDigest password_digest 
= 1;</code>
-       */
-      public Builder clearPasswordDigest() {
-        if (passwordDigestBuilder_ == null) {
-          passwordDigest_ = 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest.getDefaultInstance();
-          onChanged();
-        } else {
-          passwordDigestBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        return this;
-      }
-      /**
-       * <code>optional .protoaccountstore.ProtoPasswordDigest password_digest 
= 1;</code>
-       */
-      public 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest.Builder
 getPasswordDigestBuilder() {
-        bitField0_ |= 0x00000001;
-        onChanged();
-        return getPasswordDigestFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>optional .protoaccountstore.ProtoPasswordDigest password_digest 
= 1;</code>
-       */
-      public 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigestOrBuilder
 getPasswordDigestOrBuilder() {
-        if (passwordDigestBuilder_ != null) {
-          return passwordDigestBuilder_.getMessageOrBuilder();
-        } else {
-          return passwordDigest_;
-        }
-      }
-      /**
-       * <code>optional .protoaccountstore.ProtoPasswordDigest password_digest 
= 1;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilder<
-          
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest,
 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest.Builder,
 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigestOrBuilder>
 
-          getPasswordDigestFieldBuilder() {
-        if (passwordDigestBuilder_ == null) {
-          passwordDigestBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest,
 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest.Builder,
 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigestOrBuilder>(
-                  passwordDigest_,
-                  getParentForChildren(),
-                  isClean());
-          passwordDigest_ = null;
-        }
-        return passwordDigestBuilder_;
-      }
-
-      // 
@@protoc_insertion_point(builder_scope:protoaccountstore.ProtoHumanAccountData)
-    }
-
-    static {
-      defaultInstance = new ProtoHumanAccountData(true);
-      defaultInstance.initFields();
-    }
-
-    // 
@@protoc_insertion_point(class_scope:protoaccountstore.ProtoHumanAccountData)
-  }
-
-  public interface ProtoPasswordDigestOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
-
-    // required bytes salt = 1;
-    /**
-     * <code>required bytes salt = 1;</code>
-     */
-    boolean hasSalt();
-    /**
-     * <code>required bytes salt = 1;</code>
-     */
-    com.google.protobuf.ByteString getSalt();
-
-    // required bytes digest = 2;
-    /**
-     * <code>required bytes digest = 2;</code>
-     */
-    boolean hasDigest();
-    /**
-     * <code>required bytes digest = 2;</code>
-     */
-    com.google.protobuf.ByteString getDigest();
-  }
-  /**
-   * Protobuf type {@code protoaccountstore.ProtoPasswordDigest}
-   *
-   * <pre>
-   * The values from a PAsswordDigest instance
-   * </pre>
-   */
-  public static final class ProtoPasswordDigest extends
-      com.google.protobuf.GeneratedMessage
-      implements ProtoPasswordDigestOrBuilder {
-    // Use ProtoPasswordDigest.newBuilder() to construct.
-    private 
ProtoPasswordDigest(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
-      super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private ProtoPasswordDigest(boolean noInit) { this.unknownFields = 
com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final ProtoPasswordDigest defaultInstance;
-    public static ProtoPasswordDigest getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public ProtoPasswordDigest getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ProtoPasswordDigest(
-        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;
-              salt_ = input.readBytes();
-              break;
-            }
-            case 18: {
-              bitField0_ |= 0x00000002;
-              digest_ = 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.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.internal_static_protoaccountstore_ProtoPasswordDigest_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.internal_static_protoaccountstore_ProtoPasswordDigest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest.class,
 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest.Builder.class);
-    }
-
-    public static com.google.protobuf.Parser<ProtoPasswordDigest> PARSER =
-        new com.google.protobuf.AbstractParser<ProtoPasswordDigest>() {
-      public ProtoPasswordDigest parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ProtoPasswordDigest(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<ProtoPasswordDigest> getParserForType() {
-      return PARSER;
-    }
-
-    private int bitField0_;
-    // required bytes salt = 1;
-    public static final int SALT_FIELD_NUMBER = 1;
-    private com.google.protobuf.ByteString salt_;
-    /**
-     * <code>required bytes salt = 1;</code>
-     */
-    public boolean hasSalt() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    /**
-     * <code>required bytes salt = 1;</code>
-     */
-    public com.google.protobuf.ByteString getSalt() {
-      return salt_;
-    }
-
-    // required bytes digest = 2;
-    public static final int DIGEST_FIELD_NUMBER = 2;
-    private com.google.protobuf.ByteString digest_;
-    /**
-     * <code>required bytes digest = 2;</code>
-     */
-    public boolean hasDigest() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
-    }
-    /**
-     * <code>required bytes digest = 2;</code>
-     */
-    public com.google.protobuf.ByteString getDigest() {
-      return digest_;
-    }
-
-    private void initFields() {
-      salt_ = com.google.protobuf.ByteString.EMPTY;
-      digest_ = com.google.protobuf.ByteString.EMPTY;
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
-
-      if (!hasSalt()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasDigest()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeBytes(1, salt_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeBytes(2, digest_);
-      }
-      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
-          .computeBytesSize(1, salt_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(2, digest_);
-      }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest
 parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest
 parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest
 parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest
 parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest
 parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest
 parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest
 parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest
 parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest
 parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input);
-    }
-    public static 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest
 parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
-    }
-
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder 
newBuilder(org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest
 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 protoaccountstore.ProtoPasswordDigest}
-     *
-     * <pre>
-     * The values from a PAsswordDigest instance
-     * </pre>
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigestOrBuilder
 {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.internal_static_protoaccountstore_ProtoPasswordDigest_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.internal_static_protoaccountstore_ProtoPasswordDigest_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest.class,
 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest.Builder.class);
-      }
-
-      // Construct using 
org.waveprotocol.box.server.persistence.protos.ProtoAccountStoreData.ProtoPasswordDigest.newBuilder()
-      private Buil

<TRUNCATED>

Reply via email to