[05/53] [abbrv] curator git commit: Squashed commit of the following:

[ra...@apache.org]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/GetDataSpec.java
----------------------------------------------------------------------
diff --git a/curator-x-rpc/src/test/java/org/apache/curator/generated/GetDataSpec.java b/curator-x-rpc/src/test/java/org/apache/curator/generated/GetDataSpec.java
deleted file mode 100644
index 5644401..0000000
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/GetDataSpec.java
+++ /dev/null
@@ -1,680 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class GetDataSpec implements org.apache.thrift.TBase<GetDataSpec, GetDataSpec._Fields>, java.io.Serializable, Cloneable, Comparable<GetDataSpec> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetDataSpec");
-
-  private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField WATCHED_FIELD_DESC = new org.apache.thrift.protocol.TField("watched", org.apache.thrift.protocol.TType.BOOL, (short)2);
-  private static final org.apache.thrift.protocol.TField ASYNC_CONTEXT_FIELD_DESC = new org.apache.thrift.protocol.TField("asyncContext", org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField DECOMPRESSED_FIELD_DESC = new org.apache.thrift.protocol.TField("decompressed", org.apache.thrift.protocol.TType.BOOL, (short)4);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new GetDataSpecStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new GetDataSpecTupleSchemeFactory());
-  }
-
-  public String path; // required
-  public boolean watched; // required
-  public String asyncContext; // required
-  public boolean decompressed; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    PATH((short)1, "path"),
-    WATCHED((short)2, "watched"),
-    ASYNC_CONTEXT((short)3, "asyncContext"),
-    DECOMPRESSED((short)4, "decompressed");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // PATH
-          return PATH;
-        case 2: // WATCHED
-          return WATCHED;
-        case 3: // ASYNC_CONTEXT
-          return ASYNC_CONTEXT;
-        case 4: // DECOMPRESSED
-          return DECOMPRESSED;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  private static final int __WATCHED_ISSET_ID = 0;
-  private static final int __DECOMPRESSED_ISSET_ID = 1;
-  private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.WATCHED, new org.apache.thrift.meta_data.FieldMetaData("watched", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    tmpMap.put(_Fields.ASYNC_CONTEXT, new org.apache.thrift.meta_data.FieldMetaData("asyncContext", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.DECOMPRESSED, new org.apache.thrift.meta_data.FieldMetaData("decompressed", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GetDataSpec.class, metaDataMap);
-  }
-
-  public GetDataSpec() {
-  }
-
-  public GetDataSpec(
-    String path,
-    boolean watched,
-    String asyncContext,
-    boolean decompressed)
-  {
-    this();
-    this.path = path;
-    this.watched = watched;
-    setWatchedIsSet(true);
-    this.asyncContext = asyncContext;
-    this.decompressed = decompressed;
-    setDecompressedIsSet(true);
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public GetDataSpec(GetDataSpec other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetPath()) {
-      this.path = other.path;
-    }
-    this.watched = other.watched;
-    if (other.isSetAsyncContext()) {
-      this.asyncContext = other.asyncContext;
-    }
-    this.decompressed = other.decompressed;
-  }
-
-  public GetDataSpec deepCopy() {
-    return new GetDataSpec(this);
-  }
-
-  @Override
-  public void clear() {
-    this.path = null;
-    setWatchedIsSet(false);
-    this.watched = false;
-    this.asyncContext = null;
-    setDecompressedIsSet(false);
-    this.decompressed = false;
-  }
-
-  public String getPath() {
-    return this.path;
-  }
-
-  public GetDataSpec setPath(String path) {
-    this.path = path;
-    return this;
-  }
-
-  public void unsetPath() {
-    this.path = null;
-  }
-
-  /** Returns true if field path is set (has been assigned a value) and false otherwise */
-  public boolean isSetPath() {
-    return this.path != null;
-  }
-
-  public void setPathIsSet(boolean value) {
-    if (!value) {
-      this.path = null;
-    }
-  }
-
-  public boolean isWatched() {
-    return this.watched;
-  }
-
-  public GetDataSpec setWatched(boolean watched) {
-    this.watched = watched;
-    setWatchedIsSet(true);
-    return this;
-  }
-
-  public void unsetWatched() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __WATCHED_ISSET_ID);
-  }
-
-  /** Returns true if field watched is set (has been assigned a value) and false otherwise */
-  public boolean isSetWatched() {
-    return EncodingUtils.testBit(__isset_bitfield, __WATCHED_ISSET_ID);
-  }
-
-  public void setWatchedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __WATCHED_ISSET_ID, value);
-  }
-
-  public String getAsyncContext() {
-    return this.asyncContext;
-  }
-
-  public GetDataSpec setAsyncContext(String asyncContext) {
-    this.asyncContext = asyncContext;
-    return this;
-  }
-
-  public void unsetAsyncContext() {
-    this.asyncContext = null;
-  }
-
-  /** Returns true if field asyncContext is set (has been assigned a value) and false otherwise */
-  public boolean isSetAsyncContext() {
-    return this.asyncContext != null;
-  }
-
-  public void setAsyncContextIsSet(boolean value) {
-    if (!value) {
-      this.asyncContext = null;
-    }
-  }
-
-  public boolean isDecompressed() {
-    return this.decompressed;
-  }
-
-  public GetDataSpec setDecompressed(boolean decompressed) {
-    this.decompressed = decompressed;
-    setDecompressedIsSet(true);
-    return this;
-  }
-
-  public void unsetDecompressed() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __DECOMPRESSED_ISSET_ID);
-  }
-
-  /** Returns true if field decompressed is set (has been assigned a value) and false otherwise */
-  public boolean isSetDecompressed() {
-    return EncodingUtils.testBit(__isset_bitfield, __DECOMPRESSED_ISSET_ID);
-  }
-
-  public void setDecompressedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DECOMPRESSED_ISSET_ID, value);
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case PATH:
-      if (value == null) {
-        unsetPath();
-      } else {
-        setPath((String)value);
-      }
-      break;
-
-    case WATCHED:
-      if (value == null) {
-        unsetWatched();
-      } else {
-        setWatched((Boolean)value);
-      }
-      break;
-
-    case ASYNC_CONTEXT:
-      if (value == null) {
-        unsetAsyncContext();
-      } else {
-        setAsyncContext((String)value);
-      }
-      break;
-
-    case DECOMPRESSED:
-      if (value == null) {
-        unsetDecompressed();
-      } else {
-        setDecompressed((Boolean)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case PATH:
-      return getPath();
-
-    case WATCHED:
-      return Boolean.valueOf(isWatched());
-
-    case ASYNC_CONTEXT:
-      return getAsyncContext();
-
-    case DECOMPRESSED:
-      return Boolean.valueOf(isDecompressed());
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case PATH:
-      return isSetPath();
-    case WATCHED:
-      return isSetWatched();
-    case ASYNC_CONTEXT:
-      return isSetAsyncContext();
-    case DECOMPRESSED:
-      return isSetDecompressed();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof GetDataSpec)
-      return this.equals((GetDataSpec)that);
-    return false;
-  }
-
-  public boolean equals(GetDataSpec that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_path = true && this.isSetPath();
-    boolean that_present_path = true && that.isSetPath();
-    if (this_present_path || that_present_path) {
-      if (!(this_present_path && that_present_path))
-        return false;
-      if (!this.path.equals(that.path))
-        return false;
-    }
-
-    boolean this_present_watched = true;
-    boolean that_present_watched = true;
-    if (this_present_watched || that_present_watched) {
-      if (!(this_present_watched && that_present_watched))
-        return false;
-      if (this.watched != that.watched)
-        return false;
-    }
-
-    boolean this_present_asyncContext = true && this.isSetAsyncContext();
-    boolean that_present_asyncContext = true && that.isSetAsyncContext();
-    if (this_present_asyncContext || that_present_asyncContext) {
-      if (!(this_present_asyncContext && that_present_asyncContext))
-        return false;
-      if (!this.asyncContext.equals(that.asyncContext))
-        return false;
-    }
-
-    boolean this_present_decompressed = true;
-    boolean that_present_decompressed = true;
-    if (this_present_decompressed || that_present_decompressed) {
-      if (!(this_present_decompressed && that_present_decompressed))
-        return false;
-      if (this.decompressed != that.decompressed)
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  @Override
-  public int compareTo(GetDataSpec other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetPath()).compareTo(other.isSetPath());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetPath()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, other.path);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetWatched()).compareTo(other.isSetWatched());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetWatched()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.watched, other.watched);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetAsyncContext()).compareTo(other.isSetAsyncContext());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetAsyncContext()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.asyncContext, other.asyncContext);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetDecompressed()).compareTo(other.isSetDecompressed());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetDecompressed()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.decompressed, other.decompressed);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("GetDataSpec(");
-    boolean first = true;
-
-    sb.append("path:");
-    if (this.path == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.path);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("watched:");
-    sb.append(this.watched);
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("asyncContext:");
-    if (this.asyncContext == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.asyncContext);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("decompressed:");
-    sb.append(this.decompressed);
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-      __isset_bitfield = 0;
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class GetDataSpecStandardSchemeFactory implements SchemeFactory {
-    public GetDataSpecStandardScheme getScheme() {
-      return new GetDataSpecStandardScheme();
-    }
-  }
-
-  private static class GetDataSpecStandardScheme extends StandardScheme<GetDataSpec> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, GetDataSpec struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // PATH
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.path = iprot.readString();
-              struct.setPathIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // WATCHED
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.watched = iprot.readBool();
-              struct.setWatchedIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // ASYNC_CONTEXT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.asyncContext = iprot.readString();
-              struct.setAsyncContextIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // DECOMPRESSED
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.decompressed = iprot.readBool();
-              struct.setDecompressedIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-
-      // check for required fields of primitive type, which can't be checked in the validate method
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, GetDataSpec struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.path != null) {
-        oprot.writeFieldBegin(PATH_FIELD_DESC);
-        oprot.writeString(struct.path);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldBegin(WATCHED_FIELD_DESC);
-      oprot.writeBool(struct.watched);
-      oprot.writeFieldEnd();
-      if (struct.asyncContext != null) {
-        oprot.writeFieldBegin(ASYNC_CONTEXT_FIELD_DESC);
-        oprot.writeString(struct.asyncContext);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldBegin(DECOMPRESSED_FIELD_DESC);
-      oprot.writeBool(struct.decompressed);
-      oprot.writeFieldEnd();
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class GetDataSpecTupleSchemeFactory implements SchemeFactory {
-    public GetDataSpecTupleScheme getScheme() {
-      return new GetDataSpecTupleScheme();
-    }
-  }
-
-  private static class GetDataSpecTupleScheme extends TupleScheme<GetDataSpec> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, GetDataSpec struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetPath()) {
-        optionals.set(0);
-      }
-      if (struct.isSetWatched()) {
-        optionals.set(1);
-      }
-      if (struct.isSetAsyncContext()) {
-        optionals.set(2);
-      }
-      if (struct.isSetDecompressed()) {
-        optionals.set(3);
-      }
-      oprot.writeBitSet(optionals, 4);
-      if (struct.isSetPath()) {
-        oprot.writeString(struct.path);
-      }
-      if (struct.isSetWatched()) {
-        oprot.writeBool(struct.watched);
-      }
-      if (struct.isSetAsyncContext()) {
-        oprot.writeString(struct.asyncContext);
-      }
-      if (struct.isSetDecompressed()) {
-        oprot.writeBool(struct.decompressed);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, GetDataSpec struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.path = iprot.readString();
-        struct.setPathIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.watched = iprot.readBool();
-        struct.setWatchedIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.asyncContext = iprot.readString();
-        struct.setAsyncContextIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.decompressed = iprot.readBool();
-        struct.setDecompressedIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/Id.java
----------------------------------------------------------------------
diff --git a/curator-x-rpc/src/test/java/org/apache/curator/generated/Id.java b/curator-x-rpc/src/test/java/org/apache/curator/generated/Id.java
deleted file mode 100644
index 247de18..0000000
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/Id.java
+++ /dev/null
@@ -1,488 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class Id implements org.apache.thrift.TBase<Id, Id._Fields>, java.io.Serializable, Cloneable, Comparable<Id> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Id");
-
-  private static final org.apache.thrift.protocol.TField SCHEME_FIELD_DESC = new org.apache.thrift.protocol.TField("scheme", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)2);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new IdStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new IdTupleSchemeFactory());
-  }
-
-  public String scheme; // required
-  public String id; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    SCHEME((short)1, "scheme"),
-    ID((short)2, "id");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // SCHEME
-          return SCHEME;
-        case 2: // ID
-          return ID;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.SCHEME, new org.apache.thrift.meta_data.FieldMetaData("scheme", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Id.class, metaDataMap);
-  }
-
-  public Id() {
-  }
-
-  public Id(
-    String scheme,
-    String id)
-  {
-    this();
-    this.scheme = scheme;
-    this.id = id;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public Id(Id other) {
-    if (other.isSetScheme()) {
-      this.scheme = other.scheme;
-    }
-    if (other.isSetId()) {
-      this.id = other.id;
-    }
-  }
-
-  public Id deepCopy() {
-    return new Id(this);
-  }
-
-  @Override
-  public void clear() {
-    this.scheme = null;
-    this.id = null;
-  }
-
-  public String getScheme() {
-    return this.scheme;
-  }
-
-  public Id setScheme(String scheme) {
-    this.scheme = scheme;
-    return this;
-  }
-
-  public void unsetScheme() {
-    this.scheme = null;
-  }
-
-  /** Returns true if field scheme is set (has been assigned a value) and false otherwise */
-  public boolean isSetScheme() {
-    return this.scheme != null;
-  }
-
-  public void setSchemeIsSet(boolean value) {
-    if (!value) {
-      this.scheme = null;
-    }
-  }
-
-  public String getId() {
-    return this.id;
-  }
-
-  public Id setId(String id) {
-    this.id = id;
-    return this;
-  }
-
-  public void unsetId() {
-    this.id = null;
-  }
-
-  /** Returns true if field id is set (has been assigned a value) and false otherwise */
-  public boolean isSetId() {
-    return this.id != null;
-  }
-
-  public void setIdIsSet(boolean value) {
-    if (!value) {
-      this.id = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case SCHEME:
-      if (value == null) {
-        unsetScheme();
-      } else {
-        setScheme((String)value);
-      }
-      break;
-
-    case ID:
-      if (value == null) {
-        unsetId();
-      } else {
-        setId((String)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case SCHEME:
-      return getScheme();
-
-    case ID:
-      return getId();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case SCHEME:
-      return isSetScheme();
-    case ID:
-      return isSetId();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof Id)
-      return this.equals((Id)that);
-    return false;
-  }
-
-  public boolean equals(Id that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_scheme = true && this.isSetScheme();
-    boolean that_present_scheme = true && that.isSetScheme();
-    if (this_present_scheme || that_present_scheme) {
-      if (!(this_present_scheme && that_present_scheme))
-        return false;
-      if (!this.scheme.equals(that.scheme))
-        return false;
-    }
-
-    boolean this_present_id = true && this.isSetId();
-    boolean that_present_id = true && that.isSetId();
-    if (this_present_id || that_present_id) {
-      if (!(this_present_id && that_present_id))
-        return false;
-      if (!this.id.equals(that.id))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  @Override
-  public int compareTo(Id other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetScheme()).compareTo(other.isSetScheme());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetScheme()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.scheme, other.scheme);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetId()).compareTo(other.isSetId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("Id(");
-    boolean first = true;
-
-    sb.append("scheme:");
-    if (this.scheme == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.scheme);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("id:");
-    if (this.id == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.id);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class IdStandardSchemeFactory implements SchemeFactory {
-    public IdStandardScheme getScheme() {
-      return new IdStandardScheme();
-    }
-  }
-
-  private static class IdStandardScheme extends StandardScheme<Id> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, Id struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // SCHEME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.scheme = iprot.readString();
-              struct.setSchemeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.id = iprot.readString();
-              struct.setIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-
-      // check for required fields of primitive type, which can't be checked in the validate method
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, Id struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.scheme != null) {
-        oprot.writeFieldBegin(SCHEME_FIELD_DESC);
-        oprot.writeString(struct.scheme);
-        oprot.writeFieldEnd();
-      }
-      if (struct.id != null) {
-        oprot.writeFieldBegin(ID_FIELD_DESC);
-        oprot.writeString(struct.id);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class IdTupleSchemeFactory implements SchemeFactory {
-    public IdTupleScheme getScheme() {
-      return new IdTupleScheme();
-    }
-  }
-
-  private static class IdTupleScheme extends TupleScheme<Id> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, Id struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetScheme()) {
-        optionals.set(0);
-      }
-      if (struct.isSetId()) {
-        optionals.set(1);
-      }
-      oprot.writeBitSet(optionals, 2);
-      if (struct.isSetScheme()) {
-        oprot.writeString(struct.scheme);
-      }
-      if (struct.isSetId()) {
-        oprot.writeString(struct.id);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, Id struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.scheme = iprot.readString();
-        struct.setSchemeIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.id = iprot.readString();
-        struct.setIdIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/KeeperState.java
----------------------------------------------------------------------
diff --git a/curator-x-rpc/src/test/java/org/apache/curator/generated/KeeperState.java b/curator-x-rpc/src/test/java/org/apache/curator/generated/KeeperState.java
deleted file mode 100644
index cd945ee..0000000
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/KeeperState.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-public enum KeeperState implements org.apache.thrift.TEnum {
-  Unknown(0),
-  Disconnected(1),
-  NoSyncConnected(2),
-  SyncConnected(3),
-  AuthFailed(4),
-  ConnectedReadOnly(5),
-  SaslAuthenticated(6),
-  Expired(7);
-
-  private final int value;
-
-  private KeeperState(int value) {
-    this.value = value;
-  }
-
-  /**
-   * Get the integer value of this enum value, as defined in the Thrift IDL.
-   */
-  public int getValue() {
-    return value;
-  }
-
-  /**
-   * Find a the enum type by its integer value, as defined in the Thrift IDL.
-   * @return null if the value is not found.
-   */
-  public static KeeperState findByValue(int value) { 
-    switch (value) {
-      case 0:
-        return Unknown;
-      case 1:
-        return Disconnected;
-      case 2:
-        return NoSyncConnected;
-      case 3:
-        return SyncConnected;
-      case 4:
-        return AuthFailed;
-      case 5:
-        return ConnectedReadOnly;
-      case 6:
-        return SaslAuthenticated;
-      case 7:
-        return Expired;
-      default:
-        return null;
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/LeaderEvent.java
----------------------------------------------------------------------
diff --git a/curator-x-rpc/src/test/java/org/apache/curator/generated/LeaderEvent.java b/curator-x-rpc/src/test/java/org/apache/curator/generated/LeaderEvent.java
deleted file mode 100644
index 3cfcbae..0000000
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/LeaderEvent.java
+++ /dev/null
@@ -1,586 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class LeaderEvent implements org.apache.thrift.TBase<LeaderEvent, LeaderEvent._Fields>, java.io.Serializable, Cloneable, Comparable<LeaderEvent> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LeaderEvent");
-
-  private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField PARTICIPANT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("participantId", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField IS_LEADER_FIELD_DESC = new org.apache.thrift.protocol.TField("isLeader", org.apache.thrift.protocol.TType.BOOL, (short)3);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new LeaderEventStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new LeaderEventTupleSchemeFactory());
-  }
-
-  public String path; // required
-  public String participantId; // required
-  public boolean isLeader; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    PATH((short)1, "path"),
-    PARTICIPANT_ID((short)2, "participantId"),
-    IS_LEADER((short)3, "isLeader");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // PATH
-          return PATH;
-        case 2: // PARTICIPANT_ID
-          return PARTICIPANT_ID;
-        case 3: // IS_LEADER
-          return IS_LEADER;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  private static final int __ISLEADER_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.PARTICIPANT_ID, new org.apache.thrift.meta_data.FieldMetaData("participantId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.IS_LEADER, new org.apache.thrift.meta_data.FieldMetaData("isLeader", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LeaderEvent.class, metaDataMap);
-  }
-
-  public LeaderEvent() {
-  }
-
-  public LeaderEvent(
-    String path,
-    String participantId,
-    boolean isLeader)
-  {
-    this();
-    this.path = path;
-    this.participantId = participantId;
-    this.isLeader = isLeader;
-    setIsLeaderIsSet(true);
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public LeaderEvent(LeaderEvent other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetPath()) {
-      this.path = other.path;
-    }
-    if (other.isSetParticipantId()) {
-      this.participantId = other.participantId;
-    }
-    this.isLeader = other.isLeader;
-  }
-
-  public LeaderEvent deepCopy() {
-    return new LeaderEvent(this);
-  }
-
-  @Override
-  public void clear() {
-    this.path = null;
-    this.participantId = null;
-    setIsLeaderIsSet(false);
-    this.isLeader = false;
-  }
-
-  public String getPath() {
-    return this.path;
-  }
-
-  public LeaderEvent setPath(String path) {
-    this.path = path;
-    return this;
-  }
-
-  public void unsetPath() {
-    this.path = null;
-  }
-
-  /** Returns true if field path is set (has been assigned a value) and false otherwise */
-  public boolean isSetPath() {
-    return this.path != null;
-  }
-
-  public void setPathIsSet(boolean value) {
-    if (!value) {
-      this.path = null;
-    }
-  }
-
-  public String getParticipantId() {
-    return this.participantId;
-  }
-
-  public LeaderEvent setParticipantId(String participantId) {
-    this.participantId = participantId;
-    return this;
-  }
-
-  public void unsetParticipantId() {
-    this.participantId = null;
-  }
-
-  /** Returns true if field participantId is set (has been assigned a value) and false otherwise */
-  public boolean isSetParticipantId() {
-    return this.participantId != null;
-  }
-
-  public void setParticipantIdIsSet(boolean value) {
-    if (!value) {
-      this.participantId = null;
-    }
-  }
-
-  public boolean isIsLeader() {
-    return this.isLeader;
-  }
-
-  public LeaderEvent setIsLeader(boolean isLeader) {
-    this.isLeader = isLeader;
-    setIsLeaderIsSet(true);
-    return this;
-  }
-
-  public void unsetIsLeader() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISLEADER_ISSET_ID);
-  }
-
-  /** Returns true if field isLeader is set (has been assigned a value) and false otherwise */
-  public boolean isSetIsLeader() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISLEADER_ISSET_ID);
-  }
-
-  public void setIsLeaderIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISLEADER_ISSET_ID, value);
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case PATH:
-      if (value == null) {
-        unsetPath();
-      } else {
-        setPath((String)value);
-      }
-      break;
-
-    case PARTICIPANT_ID:
-      if (value == null) {
-        unsetParticipantId();
-      } else {
-        setParticipantId((String)value);
-      }
-      break;
-
-    case IS_LEADER:
-      if (value == null) {
-        unsetIsLeader();
-      } else {
-        setIsLeader((Boolean)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case PATH:
-      return getPath();
-
-    case PARTICIPANT_ID:
-      return getParticipantId();
-
-    case IS_LEADER:
-      return Boolean.valueOf(isIsLeader());
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case PATH:
-      return isSetPath();
-    case PARTICIPANT_ID:
-      return isSetParticipantId();
-    case IS_LEADER:
-      return isSetIsLeader();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof LeaderEvent)
-      return this.equals((LeaderEvent)that);
-    return false;
-  }
-
-  public boolean equals(LeaderEvent that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_path = true && this.isSetPath();
-    boolean that_present_path = true && that.isSetPath();
-    if (this_present_path || that_present_path) {
-      if (!(this_present_path && that_present_path))
-        return false;
-      if (!this.path.equals(that.path))
-        return false;
-    }
-
-    boolean this_present_participantId = true && this.isSetParticipantId();
-    boolean that_present_participantId = true && that.isSetParticipantId();
-    if (this_present_participantId || that_present_participantId) {
-      if (!(this_present_participantId && that_present_participantId))
-        return false;
-      if (!this.participantId.equals(that.participantId))
-        return false;
-    }
-
-    boolean this_present_isLeader = true;
-    boolean that_present_isLeader = true;
-    if (this_present_isLeader || that_present_isLeader) {
-      if (!(this_present_isLeader && that_present_isLeader))
-        return false;
-      if (this.isLeader != that.isLeader)
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  @Override
-  public int compareTo(LeaderEvent other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetPath()).compareTo(other.isSetPath());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetPath()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.path, other.path);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetParticipantId()).compareTo(other.isSetParticipantId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetParticipantId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.participantId, other.participantId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetIsLeader()).compareTo(other.isSetIsLeader());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetIsLeader()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isLeader, other.isLeader);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("LeaderEvent(");
-    boolean first = true;
-
-    sb.append("path:");
-    if (this.path == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.path);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("participantId:");
-    if (this.participantId == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.participantId);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("isLeader:");
-    sb.append(this.isLeader);
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-      __isset_bitfield = 0;
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class LeaderEventStandardSchemeFactory implements SchemeFactory {
-    public LeaderEventStandardScheme getScheme() {
-      return new LeaderEventStandardScheme();
-    }
-  }
-
-  private static class LeaderEventStandardScheme extends StandardScheme<LeaderEvent> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, LeaderEvent struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // PATH
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.path = iprot.readString();
-              struct.setPathIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // PARTICIPANT_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.participantId = iprot.readString();
-              struct.setParticipantIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // IS_LEADER
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isLeader = iprot.readBool();
-              struct.setIsLeaderIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-
-      // check for required fields of primitive type, which can't be checked in the validate method
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, LeaderEvent struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.path != null) {
-        oprot.writeFieldBegin(PATH_FIELD_DESC);
-        oprot.writeString(struct.path);
-        oprot.writeFieldEnd();
-      }
-      if (struct.participantId != null) {
-        oprot.writeFieldBegin(PARTICIPANT_ID_FIELD_DESC);
-        oprot.writeString(struct.participantId);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldBegin(IS_LEADER_FIELD_DESC);
-      oprot.writeBool(struct.isLeader);
-      oprot.writeFieldEnd();
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class LeaderEventTupleSchemeFactory implements SchemeFactory {
-    public LeaderEventTupleScheme getScheme() {
-      return new LeaderEventTupleScheme();
-    }
-  }
-
-  private static class LeaderEventTupleScheme extends TupleScheme<LeaderEvent> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, LeaderEvent struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetPath()) {
-        optionals.set(0);
-      }
-      if (struct.isSetParticipantId()) {
-        optionals.set(1);
-      }
-      if (struct.isSetIsLeader()) {
-        optionals.set(2);
-      }
-      oprot.writeBitSet(optionals, 3);
-      if (struct.isSetPath()) {
-        oprot.writeString(struct.path);
-      }
-      if (struct.isSetParticipantId()) {
-        oprot.writeString(struct.participantId);
-      }
-      if (struct.isSetIsLeader()) {
-        oprot.writeBool(struct.isLeader);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, LeaderEvent struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.path = iprot.readString();
-        struct.setPathIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.participantId = iprot.readString();
-        struct.setParticipantIdIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.isLeader = iprot.readBool();
-        struct.setIsLeaderIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/LeaderProjection.java
----------------------------------------------------------------------
diff --git a/curator-x-rpc/src/test/java/org/apache/curator/generated/LeaderProjection.java b/curator-x-rpc/src/test/java/org/apache/curator/generated/LeaderProjection.java
deleted file mode 100644
index e5ddff9..0000000
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/LeaderProjection.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class LeaderProjection implements org.apache.thrift.TBase<LeaderProjection, LeaderProjection._Fields>, java.io.Serializable, Cloneable, Comparable<LeaderProjection> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LeaderProjection");
-
-  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new LeaderProjectionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new LeaderProjectionTupleSchemeFactory());
-  }
-
-  public String id; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    ID((short)1, "id");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // ID
-          return ID;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LeaderProjection.class, metaDataMap);
-  }
-
-  public LeaderProjection() {
-  }
-
-  public LeaderProjection(
-    String id)
-  {
-    this();
-    this.id = id;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public LeaderProjection(LeaderProjection other) {
-    if (other.isSetId()) {
-      this.id = other.id;
-    }
-  }
-
-  public LeaderProjection deepCopy() {
-    return new LeaderProjection(this);
-  }
-
-  @Override
-  public void clear() {
-    this.id = null;
-  }
-
-  public String getId() {
-    return this.id;
-  }
-
-  public LeaderProjection setId(String id) {
-    this.id = id;
-    return this;
-  }
-
-  public void unsetId() {
-    this.id = null;
-  }
-
-  /** Returns true if field id is set (has been assigned a value) and false otherwise */
-  public boolean isSetId() {
-    return this.id != null;
-  }
-
-  public void setIdIsSet(boolean value) {
-    if (!value) {
-      this.id = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case ID:
-      if (value == null) {
-        unsetId();
-      } else {
-        setId((String)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case ID:
-      return getId();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case ID:
-      return isSetId();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof LeaderProjection)
-      return this.equals((LeaderProjection)that);
-    return false;
-  }
-
-  public boolean equals(LeaderProjection that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_id = true && this.isSetId();
-    boolean that_present_id = true && that.isSetId();
-    if (this_present_id || that_present_id) {
-      if (!(this_present_id && that_present_id))
-        return false;
-      if (!this.id.equals(that.id))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  @Override
-  public int compareTo(LeaderProjection other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetId()).compareTo(other.isSetId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("LeaderProjection(");
-    boolean first = true;
-
-    sb.append("id:");
-    if (this.id == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.id);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class LeaderProjectionStandardSchemeFactory implements SchemeFactory {
-    public LeaderProjectionStandardScheme getScheme() {
-      return new LeaderProjectionStandardScheme();
-    }
-  }
-
-  private static class LeaderProjectionStandardScheme extends StandardScheme<LeaderProjection> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, LeaderProjection struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.id = iprot.readString();
-              struct.setIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-
-      // check for required fields of primitive type, which can't be checked in the validate method
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, LeaderProjection struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.id != null) {
-        oprot.writeFieldBegin(ID_FIELD_DESC);
-        oprot.writeString(struct.id);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class LeaderProjectionTupleSchemeFactory implements SchemeFactory {
-    public LeaderProjectionTupleScheme getScheme() {
-      return new LeaderProjectionTupleScheme();
-    }
-  }
-
-  private static class LeaderProjectionTupleScheme extends TupleScheme<LeaderProjection> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, LeaderProjection struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetId()) {
-        optionals.set(0);
-      }
-      oprot.writeBitSet(optionals, 1);
-      if (struct.isSetId()) {
-        oprot.writeString(struct.id);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, LeaderProjection struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.id = iprot.readString();
-        struct.setIdIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/LeaderResult.java
----------------------------------------------------------------------
diff --git a/curator-x-rpc/src/test/java/org/apache/curator/generated/LeaderResult.java b/curator-x-rpc/src/test/java/org/apache/curator/generated/LeaderResult.java
deleted file mode 100644
index 4fba9d6..0000000
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/LeaderResult.java
+++ /dev/null
@@ -1,491 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class LeaderResult implements org.apache.thrift.TBase<LeaderResult, LeaderResult._Fields>, java.io.Serializable, Cloneable, Comparable<LeaderResult> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LeaderResult");
-
-  private static final org.apache.thrift.protocol.TField PROJECTION_FIELD_DESC = new org.apache.thrift.protocol.TField("projection", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-  private static final org.apache.thrift.protocol.TField IS_LEADER_FIELD_DESC = new org.apache.thrift.protocol.TField("isLeader", org.apache.thrift.protocol.TType.BOOL, (short)2);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new LeaderResultStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new LeaderResultTupleSchemeFactory());
-  }
-
-  public LeaderProjection projection; // required
-  public boolean isLeader; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    PROJECTION((short)1, "projection"),
-    IS_LEADER((short)2, "isLeader");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // PROJECTION
-          return PROJECTION;
-        case 2: // IS_LEADER
-          return IS_LEADER;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  private static final int __ISLEADER_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.PROJECTION, new org.apache.thrift.meta_data.FieldMetaData("projection", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, LeaderProjection.class)));
-    tmpMap.put(_Fields.IS_LEADER, new org.apache.thrift.meta_data.FieldMetaData("isLeader", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LeaderResult.class, metaDataMap);
-  }
-
-  public LeaderResult() {
-  }
-
-  public LeaderResult(
-    LeaderProjection projection,
-    boolean isLeader)
-  {
-    this();
-    this.projection = projection;
-    this.isLeader = isLeader;
-    setIsLeaderIsSet(true);
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public LeaderResult(LeaderResult other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetProjection()) {
-      this.projection = new LeaderProjection(other.projection);
-    }
-    this.isLeader = other.isLeader;
-  }
-
-  public LeaderResult deepCopy() {
-    return new LeaderResult(this);
-  }
-
-  @Override
-  public void clear() {
-    this.projection = null;
-    setIsLeaderIsSet(false);
-    this.isLeader = false;
-  }
-
-  public LeaderProjection getProjection() {
-    return this.projection;
-  }
-
-  public LeaderResult setProjection(LeaderProjection projection) {
-    this.projection = projection;
-    return this;
-  }
-
-  public void unsetProjection() {
-    this.projection = null;
-  }
-
-  /** Returns true if field projection is set (has been assigned a value) and false otherwise */
-  public boolean isSetProjection() {
-    return this.projection != null;
-  }
-
-  public void setProjectionIsSet(boolean value) {
-    if (!value) {
-      this.projection = null;
-    }
-  }
-
-  public boolean isIsLeader() {
-    return this.isLeader;
-  }
-
-  public LeaderResult setIsLeader(boolean isLeader) {
-    this.isLeader = isLeader;
-    setIsLeaderIsSet(true);
-    return this;
-  }
-
-  public void unsetIsLeader() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISLEADER_ISSET_ID);
-  }
-
-  /** Returns true if field isLeader is set (has been assigned a value) and false otherwise */
-  public boolean isSetIsLeader() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISLEADER_ISSET_ID);
-  }
-
-  public void setIsLeaderIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISLEADER_ISSET_ID, value);
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case PROJECTION:
-      if (value == null) {
-        unsetProjection();
-      } else {
-        setProjection((LeaderProjection)value);
-      }
-      break;
-
-    case IS_LEADER:
-      if (value == null) {
-        unsetIsLeader();
-      } else {
-        setIsLeader((Boolean)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case PROJECTION:
-      return getProjection();
-
-    case IS_LEADER:
-      return Boolean.valueOf(isIsLeader());
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case PROJECTION:
-      return isSetProjection();
-    case IS_LEADER:
-      return isSetIsLeader();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof LeaderResult)
-      return this.equals((LeaderResult)that);
-    return false;
-  }
-
-  public boolean equals(LeaderResult that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_projection = true && this.isSetProjection();
-    boolean that_present_projection = true && that.isSetProjection();
-    if (this_present_projection || that_present_projection) {
-      if (!(this_present_projection && that_present_projection))
-        return false;
-      if (!this.projection.equals(that.projection))
-        return false;
-    }
-
-    boolean this_present_isLeader = true;
-    boolean that_present_isLeader = true;
-    if (this_present_isLeader || that_present_isLeader) {
-      if (!(this_present_isLeader && that_present_isLeader))
-        return false;
-      if (this.isLeader != that.isLeader)
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  @Override
-  public int compareTo(LeaderResult other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetProjection()).compareTo(other.isSetProjection());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetProjection()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.projection, other.projection);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetIsLeader()).compareTo(other.isSetIsLeader());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetIsLeader()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isLeader, other.isLeader);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("LeaderResult(");
-    boolean first = true;
-
-    sb.append("projection:");
-    if (this.projection == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.projection);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("isLeader:");
-    sb.append(this.isLeader);
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    // check for sub-struct validity
-    if (projection != null) {
-      projection.validate();
-    }
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-      __isset_bitfield = 0;
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class LeaderResultStandardSchemeFactory implements SchemeFactory {
-    public LeaderResultStandardScheme getScheme() {
-      return new LeaderResultStandardScheme();
-    }
-  }
-
-  private static class LeaderResultStandardScheme extends StandardScheme<LeaderResult> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, LeaderResult struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // PROJECTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.projection = new LeaderProjection();
-              struct.projection.read(iprot);
-              struct.setProjectionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // IS_LEADER
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isLeader = iprot.readBool();
-              struct.setIsLeaderIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-
-      // check for required fields of primitive type, which can't be checked in the validate method
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, LeaderResult struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.projection != null) {
-        oprot.writeFieldBegin(PROJECTION_FIELD_DESC);
-        struct.projection.write(oprot);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldBegin(IS_LEADER_FIELD_DESC);
-      oprot.writeBool(struct.isLeader);
-      oprot.writeFieldEnd();
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class LeaderResultTupleSchemeFactory implements SchemeFactory {
-    public LeaderResultTupleScheme getScheme() {
-      return new LeaderResultTupleScheme();
-    }
-  }
-
-  private static class LeaderResultTupleScheme extends TupleScheme<LeaderResult> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, LeaderResult struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetProjection()) {
-        optionals.set(0);
-      }
-      if (struct.isSetIsLeader()) {
-        optionals.set(1);
-      }
-      oprot.writeBitSet(optionals, 2);
-      if (struct.isSetProjection()) {
-        struct.projection.write(oprot);
-      }
-      if (struct.isSetIsLeader()) {
-        oprot.writeBool(struct.isLeader);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, LeaderResult struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.projection = new LeaderProjection();
-        struct.projection.read(iprot);
-        struct.setProjectionIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.isLeader = iprot.readBool();
-        struct.setIsLeaderIsSet(true);
-      }
-    }
-  }
-
-}
-