Repository: curator Updated Branches: refs/heads/CURATOR-426 ee6859eee -> 71ed99d3d
http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/Version.java ---------------------------------------------------------------------- diff --git a/curator-x-rpc/src/test/java/org/apache/curator/generated/Version.java b/curator-x-rpc/src/test/java/org/apache/curator/generated/Version.java deleted file mode 100644 index d629635..0000000 --- a/curator-x-rpc/src/test/java/org/apache/curator/generated/Version.java +++ /dev/null @@ -1,386 +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 Version implements org.apache.thrift.TBase<Version, Version._Fields>, java.io.Serializable, Cloneable, Comparable<Version> { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Version"); - - private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.I32, (short)1); - - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new VersionStandardSchemeFactory()); - schemes.put(TupleScheme.class, new VersionTupleSchemeFactory()); - } - - public int version; // 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 { - VERSION((short)1, "version"); - - 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: // VERSION - return VERSION; - 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 __VERSION_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.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Version.class, metaDataMap); - } - - public Version() { - } - - public Version( - int version) - { - this(); - this.version = version; - setVersionIsSet(true); - } - - /** - * Performs a deep copy on <i>other</i>. - */ - public Version(Version other) { - __isset_bitfield = other.__isset_bitfield; - this.version = other.version; - } - - public Version deepCopy() { - return new Version(this); - } - - @Override - public void clear() { - setVersionIsSet(false); - this.version = 0; - } - - public int getVersion() { - return this.version; - } - - public Version setVersion(int version) { - this.version = version; - setVersionIsSet(true); - return this; - } - - public void unsetVersion() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __VERSION_ISSET_ID); - } - - /** Returns true if field version is set (has been assigned a value) and false otherwise */ - public boolean isSetVersion() { - return EncodingUtils.testBit(__isset_bitfield, __VERSION_ISSET_ID); - } - - public void setVersionIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __VERSION_ISSET_ID, value); - } - - public void setFieldValue(_Fields field, Object value) { - switch (field) { - case VERSION: - if (value == null) { - unsetVersion(); - } else { - setVersion((Integer)value); - } - break; - - } - } - - public Object getFieldValue(_Fields field) { - switch (field) { - case VERSION: - return Integer.valueOf(getVersion()); - - } - 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 VERSION: - return isSetVersion(); - } - throw new IllegalStateException(); - } - - @Override - public boolean equals(Object that) { - if (that == null) - return false; - if (that instanceof Version) - return this.equals((Version)that); - return false; - } - - public boolean equals(Version that) { - if (that == null) - return false; - - boolean this_present_version = true; - boolean that_present_version = true; - if (this_present_version || that_present_version) { - if (!(this_present_version && that_present_version)) - return false; - if (this.version != that.version) - return false; - } - - return true; - } - - @Override - public int hashCode() { - return 0; - } - - @Override - public int compareTo(Version other) { - if (!getClass().equals(other.getClass())) { - return getClass().getName().compareTo(other.getClass().getName()); - } - - int lastComparison = 0; - - lastComparison = Boolean.valueOf(isSetVersion()).compareTo(other.isSetVersion()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetVersion()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.version, other.version); - 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("Version("); - boolean first = true; - - sb.append("version:"); - sb.append(this.version); - 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 VersionStandardSchemeFactory implements SchemeFactory { - public VersionStandardScheme getScheme() { - return new VersionStandardScheme(); - } - } - - private static class VersionStandardScheme extends StandardScheme<Version> { - - public void read(org.apache.thrift.protocol.TProtocol iprot, Version 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: // VERSION - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.version = iprot.readI32(); - struct.setVersionIsSet(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, Version struct) throws org.apache.thrift.TException { - struct.validate(); - - oprot.writeStructBegin(STRUCT_DESC); - oprot.writeFieldBegin(VERSION_FIELD_DESC); - oprot.writeI32(struct.version); - oprot.writeFieldEnd(); - oprot.writeFieldStop(); - oprot.writeStructEnd(); - } - - } - - private static class VersionTupleSchemeFactory implements SchemeFactory { - public VersionTupleScheme getScheme() { - return new VersionTupleScheme(); - } - } - - private static class VersionTupleScheme extends TupleScheme<Version> { - - @Override - public void write(org.apache.thrift.protocol.TProtocol prot, Version struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); - if (struct.isSetVersion()) { - optionals.set(0); - } - oprot.writeBitSet(optionals, 1); - if (struct.isSetVersion()) { - oprot.writeI32(struct.version); - } - } - - @Override - public void read(org.apache.thrift.protocol.TProtocol prot, Version struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); - if (incoming.get(0)) { - struct.version = iprot.readI32(); - struct.setVersionIsSet(true); - } - } - } - -} - http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/WatchedEvent.java ---------------------------------------------------------------------- diff --git a/curator-x-rpc/src/test/java/org/apache/curator/generated/WatchedEvent.java b/curator-x-rpc/src/test/java/org/apache/curator/generated/WatchedEvent.java deleted file mode 100644 index 025db2e..0000000 --- a/curator-x-rpc/src/test/java/org/apache/curator/generated/WatchedEvent.java +++ /dev/null @@ -1,620 +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 WatchedEvent implements org.apache.thrift.TBase<WatchedEvent, WatchedEvent._Fields>, java.io.Serializable, Cloneable, Comparable<WatchedEvent> { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WatchedEvent"); - - private static final org.apache.thrift.protocol.TField KEEPER_STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("keeperState", org.apache.thrift.protocol.TType.I32, (short)1); - private static final org.apache.thrift.protocol.TField EVENT_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("eventType", org.apache.thrift.protocol.TType.I32, (short)2); - 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)3); - - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new WatchedEventStandardSchemeFactory()); - schemes.put(TupleScheme.class, new WatchedEventTupleSchemeFactory()); - } - - /** - * - * @see KeeperState - */ - public KeeperState keeperState; // required - /** - * - * @see EventType - */ - public EventType eventType; // required - public String path; // 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 { - /** - * - * @see KeeperState - */ - KEEPER_STATE((short)1, "keeperState"), - /** - * - * @see EventType - */ - EVENT_TYPE((short)2, "eventType"), - PATH((short)3, "path"); - - 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: // KEEPER_STATE - return KEEPER_STATE; - case 2: // EVENT_TYPE - return EVENT_TYPE; - case 3: // PATH - return PATH; - 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.KEEPER_STATE, new org.apache.thrift.meta_data.FieldMetaData("keeperState", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, KeeperState.class))); - tmpMap.put(_Fields.EVENT_TYPE, new org.apache.thrift.meta_data.FieldMetaData("eventType", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, EventType.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))); - metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WatchedEvent.class, metaDataMap); - } - - public WatchedEvent() { - } - - public WatchedEvent( - KeeperState keeperState, - EventType eventType, - String path) - { - this(); - this.keeperState = keeperState; - this.eventType = eventType; - this.path = path; - } - - /** - * Performs a deep copy on <i>other</i>. - */ - public WatchedEvent(WatchedEvent other) { - if (other.isSetKeeperState()) { - this.keeperState = other.keeperState; - } - if (other.isSetEventType()) { - this.eventType = other.eventType; - } - if (other.isSetPath()) { - this.path = other.path; - } - } - - public WatchedEvent deepCopy() { - return new WatchedEvent(this); - } - - @Override - public void clear() { - this.keeperState = null; - this.eventType = null; - this.path = null; - } - - /** - * - * @see KeeperState - */ - public KeeperState getKeeperState() { - return this.keeperState; - } - - /** - * - * @see KeeperState - */ - public WatchedEvent setKeeperState(KeeperState keeperState) { - this.keeperState = keeperState; - return this; - } - - public void unsetKeeperState() { - this.keeperState = null; - } - - /** Returns true if field keeperState is set (has been assigned a value) and false otherwise */ - public boolean isSetKeeperState() { - return this.keeperState != null; - } - - public void setKeeperStateIsSet(boolean value) { - if (!value) { - this.keeperState = null; - } - } - - /** - * - * @see EventType - */ - public EventType getEventType() { - return this.eventType; - } - - /** - * - * @see EventType - */ - public WatchedEvent setEventType(EventType eventType) { - this.eventType = eventType; - return this; - } - - public void unsetEventType() { - this.eventType = null; - } - - /** Returns true if field eventType is set (has been assigned a value) and false otherwise */ - public boolean isSetEventType() { - return this.eventType != null; - } - - public void setEventTypeIsSet(boolean value) { - if (!value) { - this.eventType = null; - } - } - - public String getPath() { - return this.path; - } - - public WatchedEvent 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 void setFieldValue(_Fields field, Object value) { - switch (field) { - case KEEPER_STATE: - if (value == null) { - unsetKeeperState(); - } else { - setKeeperState((KeeperState)value); - } - break; - - case EVENT_TYPE: - if (value == null) { - unsetEventType(); - } else { - setEventType((EventType)value); - } - break; - - case PATH: - if (value == null) { - unsetPath(); - } else { - setPath((String)value); - } - break; - - } - } - - public Object getFieldValue(_Fields field) { - switch (field) { - case KEEPER_STATE: - return getKeeperState(); - - case EVENT_TYPE: - return getEventType(); - - case PATH: - return getPath(); - - } - 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 KEEPER_STATE: - return isSetKeeperState(); - case EVENT_TYPE: - return isSetEventType(); - case PATH: - return isSetPath(); - } - throw new IllegalStateException(); - } - - @Override - public boolean equals(Object that) { - if (that == null) - return false; - if (that instanceof WatchedEvent) - return this.equals((WatchedEvent)that); - return false; - } - - public boolean equals(WatchedEvent that) { - if (that == null) - return false; - - boolean this_present_keeperState = true && this.isSetKeeperState(); - boolean that_present_keeperState = true && that.isSetKeeperState(); - if (this_present_keeperState || that_present_keeperState) { - if (!(this_present_keeperState && that_present_keeperState)) - return false; - if (!this.keeperState.equals(that.keeperState)) - return false; - } - - boolean this_present_eventType = true && this.isSetEventType(); - boolean that_present_eventType = true && that.isSetEventType(); - if (this_present_eventType || that_present_eventType) { - if (!(this_present_eventType && that_present_eventType)) - return false; - if (!this.eventType.equals(that.eventType)) - 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; - } - - return true; - } - - @Override - public int hashCode() { - return 0; - } - - @Override - public int compareTo(WatchedEvent other) { - if (!getClass().equals(other.getClass())) { - return getClass().getName().compareTo(other.getClass().getName()); - } - - int lastComparison = 0; - - lastComparison = Boolean.valueOf(isSetKeeperState()).compareTo(other.isSetKeeperState()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetKeeperState()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.keeperState, other.keeperState); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetEventType()).compareTo(other.isSetEventType()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetEventType()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.eventType, other.eventType); - if (lastComparison != 0) { - return lastComparison; - } - } - 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; - } - } - 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("WatchedEvent("); - boolean first = true; - - sb.append("keeperState:"); - if (this.keeperState == null) { - sb.append("null"); - } else { - sb.append(this.keeperState); - } - first = false; - if (!first) sb.append(", "); - sb.append("eventType:"); - if (this.eventType == null) { - sb.append("null"); - } else { - sb.append(this.eventType); - } - first = false; - if (!first) sb.append(", "); - sb.append("path:"); - if (this.path == null) { - sb.append("null"); - } else { - sb.append(this.path); - } - 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 WatchedEventStandardSchemeFactory implements SchemeFactory { - public WatchedEventStandardScheme getScheme() { - return new WatchedEventStandardScheme(); - } - } - - private static class WatchedEventStandardScheme extends StandardScheme<WatchedEvent> { - - public void read(org.apache.thrift.protocol.TProtocol iprot, WatchedEvent 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: // KEEPER_STATE - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.keeperState = KeeperState.findByValue(iprot.readI32()); - struct.setKeeperStateIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 2: // EVENT_TYPE - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.eventType = EventType.findByValue(iprot.readI32()); - struct.setEventTypeIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 3: // 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; - 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, WatchedEvent struct) throws org.apache.thrift.TException { - struct.validate(); - - oprot.writeStructBegin(STRUCT_DESC); - if (struct.keeperState != null) { - oprot.writeFieldBegin(KEEPER_STATE_FIELD_DESC); - oprot.writeI32(struct.keeperState.getValue()); - oprot.writeFieldEnd(); - } - if (struct.eventType != null) { - oprot.writeFieldBegin(EVENT_TYPE_FIELD_DESC); - oprot.writeI32(struct.eventType.getValue()); - oprot.writeFieldEnd(); - } - if (struct.path != null) { - oprot.writeFieldBegin(PATH_FIELD_DESC); - oprot.writeString(struct.path); - oprot.writeFieldEnd(); - } - oprot.writeFieldStop(); - oprot.writeStructEnd(); - } - - } - - private static class WatchedEventTupleSchemeFactory implements SchemeFactory { - public WatchedEventTupleScheme getScheme() { - return new WatchedEventTupleScheme(); - } - } - - private static class WatchedEventTupleScheme extends TupleScheme<WatchedEvent> { - - @Override - public void write(org.apache.thrift.protocol.TProtocol prot, WatchedEvent struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); - if (struct.isSetKeeperState()) { - optionals.set(0); - } - if (struct.isSetEventType()) { - optionals.set(1); - } - if (struct.isSetPath()) { - optionals.set(2); - } - oprot.writeBitSet(optionals, 3); - if (struct.isSetKeeperState()) { - oprot.writeI32(struct.keeperState.getValue()); - } - if (struct.isSetEventType()) { - oprot.writeI32(struct.eventType.getValue()); - } - if (struct.isSetPath()) { - oprot.writeString(struct.path); - } - } - - @Override - public void read(org.apache.thrift.protocol.TProtocol prot, WatchedEvent struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(3); - if (incoming.get(0)) { - struct.keeperState = KeeperState.findByValue(iprot.readI32()); - struct.setKeeperStateIsSet(true); - } - if (incoming.get(1)) { - struct.eventType = EventType.findByValue(iprot.readI32()); - struct.setEventTypeIsSet(true); - } - if (incoming.get(2)) { - struct.path = iprot.readString(); - struct.setPathIsSet(true); - } - } - } - -} - http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/ZooKeeperExceptionType.java ---------------------------------------------------------------------- diff --git a/curator-x-rpc/src/test/java/org/apache/curator/generated/ZooKeeperExceptionType.java b/curator-x-rpc/src/test/java/org/apache/curator/generated/ZooKeeperExceptionType.java deleted file mode 100644 index 2514d30..0000000 --- a/curator-x-rpc/src/test/java/org/apache/curator/generated/ZooKeeperExceptionType.java +++ /dev/null @@ -1,90 +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 ZooKeeperExceptionType implements org.apache.thrift.TEnum { - SYSTEMERROR(0), - RUNTIMEINCONSISTENCY(1), - DATAINCONSISTENCY(2), - CONNECTIONLOSS(3), - MARSHALLINGERROR(4), - UNIMPLEMENTED(5), - OPERATIONTIMEOUT(6), - BADARGUMENTS(7), - APIERROR(8), - NOAUTH(9), - NOCHILDRENFOREPHEMERALS(10), - INVALIDACL(11), - AUTHFAILED(12), - SESSIONEXPIRED(13), - INVALIDCALLBACK(14), - SESSIONMOVED(15), - NOTREADONLY(16); - - private final int value; - - private ZooKeeperExceptionType(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 ZooKeeperExceptionType findByValue(int value) { - switch (value) { - case 0: - return SYSTEMERROR; - case 1: - return RUNTIMEINCONSISTENCY; - case 2: - return DATAINCONSISTENCY; - case 3: - return CONNECTIONLOSS; - case 4: - return MARSHALLINGERROR; - case 5: - return UNIMPLEMENTED; - case 6: - return OPERATIONTIMEOUT; - case 7: - return BADARGUMENTS; - case 8: - return APIERROR; - case 9: - return NOAUTH; - case 10: - return NOCHILDRENFOREPHEMERALS; - case 11: - return INVALIDACL; - case 12: - return AUTHFAILED; - case 13: - return SESSIONEXPIRED; - case 14: - return INVALIDCALLBACK; - case 15: - return SESSIONMOVED; - case 16: - return NOTREADONLY; - default: - return null; - } - } -} http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/x/rpc/RpcTests.java ---------------------------------------------------------------------- diff --git a/curator-x-rpc/src/test/java/org/apache/curator/x/rpc/RpcTests.java b/curator-x-rpc/src/test/java/org/apache/curator/x/rpc/RpcTests.java deleted file mode 100644 index 792eedd..0000000 --- a/curator-x-rpc/src/test/java/org/apache/curator/x/rpc/RpcTests.java +++ /dev/null @@ -1,294 +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. - */ -package org.apache.curator.x.rpc; - -import org.apache.curator.framework.CuratorFramework; -import org.apache.curator.framework.CuratorFrameworkFactory; -import org.apache.curator.generated.*; -import org.apache.curator.retry.RetryOneTime; -import org.apache.curator.test.BaseClassForTests; -import org.apache.curator.test.InstanceSpec; -import org.apache.curator.test.Timing; -import org.apache.curator.utils.CloseableUtils; -import org.apache.curator.utils.ThreadUtils; -import org.apache.thrift.protocol.TBinaryProtocol; -import org.apache.thrift.protocol.TProtocol; -import org.apache.thrift.transport.TSocket; -import org.apache.zookeeper.WatchedEvent; -import org.apache.zookeeper.Watcher; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.node.ArrayNode; -import org.codehaus.jackson.node.ObjectNode; -import org.testng.Assert; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; -import java.nio.ByteBuffer; -import java.util.concurrent.Callable; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutorCompletionService; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; -import java.util.concurrent.atomic.AtomicBoolean; - -public class RpcTests extends BaseClassForTests -{ - private Timing timing = new Timing(); - private CuratorProjectionServer thriftServer; - private CuratorService.Client curatorServiceClient; - private EventService.Client eventServiceClient; - private int thriftPort; - - @BeforeMethod - @Override - public void setup() throws Exception - { - super.setup(); - - ObjectMapper mapper = new ObjectMapper(); - - ObjectNode connectionNode = mapper.createObjectNode(); - connectionNode.put("name", "test"); - connectionNode.put("connectionString", server.getConnectString()); - - ObjectNode thriftNode = mapper.createObjectNode(); - thriftPort = InstanceSpec.getRandomPort(); - thriftNode.put("port", thriftPort); - - ArrayNode connections = mapper.createArrayNode(); - connections.add(connectionNode); - - ObjectNode node = mapper.createObjectNode(); - node.put("connections", connections); - node.put("thrift", thriftNode); - - final String configurationJson = mapper.writeValueAsString(node); - - thriftServer = CuratorProjectionServer.startServer(configurationJson); - - TSocket clientTransport = new TSocket("localhost", thriftPort); - clientTransport.setTimeout(timing.connection()); - clientTransport.open(); - TProtocol clientProtocol = new TBinaryProtocol(clientTransport); - curatorServiceClient = new CuratorService.Client(clientProtocol); - - TSocket eventTransport = new TSocket("localhost", thriftPort); - eventTransport.setTimeout(timing.connection()); - eventTransport.open(); - TProtocol eventProtocol = new TBinaryProtocol(eventTransport); - eventServiceClient = new EventService.Client(eventProtocol); - - } - - @AfterMethod - @Override - public void teardown() throws Exception - { - try - { - thriftServer.stop(); - } - finally - { - super.teardown(); - } - } - - @Test - public void testBasic() throws Exception - { - CuratorProjection curatorProjection = curatorServiceClient.newCuratorProjection("test"); - CreateSpec spec = new CreateSpec(); - spec.path = "/test"; - spec.data = ByteBuffer.wrap("value".getBytes()); - OptionalPath node = curatorServiceClient.createNode(curatorProjection, spec); - Assert.assertEquals(node.path, "/test"); - - GetDataSpec dataSpec = new GetDataSpec(); - dataSpec.path = "/test"; - OptionalData data = curatorServiceClient.getData(curatorProjection, dataSpec); - Assert.assertEquals(data.data, ByteBuffer.wrap("value".getBytes())); - } - - @Test - public void testEvents() throws Exception - { - final CuratorProjection curatorProjection = curatorServiceClient.newCuratorProjection("test"); - - final CountDownLatch connectedLatch = new CountDownLatch(1); - final CountDownLatch nodeCreatedLatch = new CountDownLatch(1); - Callable<Void> proc = new Callable<Void>() - { - @Override - public Void call() throws Exception - { - while ( !Thread.currentThread().isInterrupted() ) - { - CuratorEvent event = eventServiceClient.getNextEvent(curatorProjection); - if ( event.type == CuratorEventType.CONNECTION_CONNECTED ) - { - connectedLatch.countDown(); - } - else if ( event.type == CuratorEventType.WATCHED ) - { - if ( event.watchedEvent.eventType == EventType.NodeCreated ) - { - nodeCreatedLatch.countDown(); - } - } - } - return null; - } - }; - Future<Void> eventFuture = ThreadUtils.newSingleThreadExecutor("test").submit(proc); - - Assert.assertTrue(timing.awaitLatch(connectedLatch)); - - ExistsSpec spec = new ExistsSpec(); - spec.path = "/test"; - spec.watched = true; - curatorServiceClient.exists(curatorProjection, spec); - - CreateSpec createSpec = new CreateSpec(); - createSpec.path = "/test"; - curatorServiceClient.createNode(curatorProjection, createSpec); - - Assert.assertTrue(timing.awaitLatch(nodeCreatedLatch)); - - eventFuture.cancel(true); - } - - @Test - public void testLockMultiThread() throws Exception - { - final Timing timing = new Timing(); - - TSocket clientTransport = new TSocket("localhost", thriftPort); - clientTransport.setTimeout(timing.connection()); - clientTransport.open(); - TProtocol clientProtocol = new TBinaryProtocol(clientTransport); - final CuratorService.Client secondCuratorServiceClient = new CuratorService.Client(clientProtocol); - ExecutorService service = ThreadUtils.newFixedThreadPool(2, "test"); - ExecutorCompletionService<Void> completer = new ExecutorCompletionService<Void>(service); - - final CountDownLatch lockLatch = new CountDownLatch(2); - final AtomicBoolean hasTheLock = new AtomicBoolean(); - for ( int i = 0; i < 2; ++i ) - { - final CuratorService.Client client = (i == 0) ? curatorServiceClient : secondCuratorServiceClient; - Callable<Void> proc = new Callable<Void>() - { - @Override - public Void call() throws Exception - { - CuratorProjection curatorProjection = client.newCuratorProjection("test"); - OptionalLockProjection lockProjection = client.acquireLock(curatorProjection, "/lock", timing.forWaiting().milliseconds()); - if ( lockProjection.lockProjection == null ) - { - throw new Exception("Could not acquire lock"); - } - try - { - if ( !hasTheLock.compareAndSet(false, true) ) - { - throw new Exception("Two lockers"); - } - - timing.sleepABit(); - } - finally - { - hasTheLock.set(false); - lockLatch.countDown(); - client.closeGenericProjection(curatorProjection, lockProjection.lockProjection.id); - } - - return null; - } - }; - completer.submit(proc); - } - - completer.take().get(); - completer.take().get(); - - Assert.assertTrue(timing.awaitLatch(lockLatch)); - - service.shutdownNow(); - } - - @Test - public void testRecoverableException() throws Exception - { - CuratorProjection curatorProjection = curatorServiceClient.newCuratorProjection("test"); - CreateSpec spec = new CreateSpec(); - spec.path = "/this/wont/work"; - spec.data = ByteBuffer.wrap("value".getBytes()); - try - { - curatorServiceClient.createNode(curatorProjection, spec); - Assert.fail("Should have failed"); - } - catch ( CuratorException e ) - { - Assert.assertEquals(e.getType(), ExceptionType.NODE); - Assert.assertNotNull(e.nodeException); - Assert.assertEquals(e.nodeException, NodeExceptionType.NONODE); - } - } - - @Test - public void testEphemeralCleanup() throws Exception - { - CuratorProjection curatorProjection = curatorServiceClient.newCuratorProjection("test"); - CreateSpec spec = new CreateSpec(); - spec.path = "/test"; - spec.data = ByteBuffer.wrap("value".getBytes()); - spec.mode = CreateMode.EPHEMERAL; - OptionalPath node = curatorServiceClient.createNode(curatorProjection, spec); - System.out.println(node); - - final CountDownLatch latch = new CountDownLatch(1); - CuratorFramework client = CuratorFrameworkFactory.newClient(server.getConnectString(), new RetryOneTime(1)); - try - { - client.start(); - Watcher watcher = new Watcher() - { - @Override - public void process(WatchedEvent event) - { - if ( event.getType() == Event.EventType.NodeDeleted ) - { - latch.countDown(); - } - } - }; - client.checkExists().usingWatcher(watcher).forPath("/test"); - - curatorServiceClient.closeCuratorProjection(curatorProjection); - - Assert.assertTrue(timing.awaitLatch(latch)); - } - finally - { - CloseableUtils.closeQuietly(client); - } - } -} http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/x/rpc/TestClient.java ---------------------------------------------------------------------- diff --git a/curator-x-rpc/src/test/java/org/apache/curator/x/rpc/TestClient.java b/curator-x-rpc/src/test/java/org/apache/curator/x/rpc/TestClient.java deleted file mode 100644 index e15351e..0000000 --- a/curator-x-rpc/src/test/java/org/apache/curator/x/rpc/TestClient.java +++ /dev/null @@ -1,168 +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. - */ -package org.apache.curator.x.rpc; - -import org.apache.curator.generated.*; -import org.apache.thrift.TException; -import org.apache.thrift.protocol.TBinaryProtocol; -import org.apache.thrift.protocol.TProtocol; -import org.apache.thrift.transport.TSocket; -import java.nio.ByteBuffer; -import java.util.List; -import java.util.concurrent.Executors; - -public class TestClient -{ - public static void main(String[] args) throws Exception - { - TSocket clientTransport = new TSocket("localhost", 8899); - clientTransport.open(); - TProtocol clientProtocol = new TBinaryProtocol(clientTransport); - final CuratorService.Client client = new CuratorService.Client(clientProtocol); - - TSocket eventTransport = new TSocket("localhost", 8899); - eventTransport.open(); - TProtocol eventProtocol = new TBinaryProtocol(eventTransport); - final EventService.Client serviceClient = new EventService.Client(eventProtocol); - - TSocket discoveryTransport = new TSocket("localhost", 8899); - discoveryTransport.open(); - TProtocol discoveryProtocol = new TBinaryProtocol(discoveryTransport); - final DiscoveryService.Client discoveryClient = new DiscoveryService.Client(discoveryProtocol); - - final CuratorProjection curatorProjection = client.newCuratorProjection("test"); - - Executors.newSingleThreadExecutor().submit - ( - new Runnable() - { - @Override - public void run() - { - try - { - //noinspection InfiniteLoopStatement - for(;;) - { - CuratorEvent nextEvent = serviceClient.getNextEvent(curatorProjection); - System.out.println(nextEvent); - } - } - catch ( TException e ) - { - e.printStackTrace(); - } - } - } - ); - - CreateSpec createSpec = new CreateSpec(); - createSpec.path = "/this/should/fail"; - createSpec.data = ByteBuffer.wrap("hey".getBytes()); - try - { - client.createNode(curatorProjection, createSpec); - } - catch ( CuratorException e ) - { - System.out.println("Ex: " + e); - } - - createSpec = new CreateSpec(); - createSpec.path = "/a/b/c"; - createSpec.creatingParentsIfNeeded = true; - createSpec.data = ByteBuffer.wrap("hey".getBytes()); - OptionalPath path = client.createNode(curatorProjection, createSpec); - System.out.println("Path: " + path); - - PathChildrenCacheProjection pathChildrenCacheProjection = client.startPathChildrenCache(curatorProjection, "/a/b", true, false, PathChildrenCacheStartMode.BUILD_INITIAL_CACHE); - - NodeCacheProjection nodeCache = client.startNodeCache(curatorProjection, "/a/b/c", false, true); - ChildData nodeCacheData = client.getNodeCacheData(curatorProjection, nodeCache); - System.out.println("nodeCacheData: " + nodeCacheData); - - List<ChildData> pathChildrenCacheData = client.getPathChildrenCacheData(curatorProjection, pathChildrenCacheProjection); - System.out.println("Child data: " + pathChildrenCacheData); - - GetChildrenSpec getChildrenSpec = new GetChildrenSpec(); - getChildrenSpec.path = "/a"; - OptionalChildrenList children = client.getChildren(curatorProjection, getChildrenSpec); - System.out.println("Children: " + children); - - ChildData pathChildrenCacheDataForPath = client.getPathChildrenCacheDataForPath(curatorProjection, pathChildrenCacheProjection, "/a/b/c"); - System.out.println(pathChildrenCacheDataForPath); - - OptionalLockProjection lockId = client.acquireLock(curatorProjection, "/mylock", 1000); - client.closeGenericProjection(curatorProjection, lockId.lockProjection.id); - - GetDataSpec getDataSpec = new GetDataSpec(); - getDataSpec.watched = true; - getDataSpec.path = "/a/b/c"; - getDataSpec.asyncContext = "hey"; - OptionalData optionalData = client.getData(curatorProjection, getDataSpec); - System.out.println("getData: " + optionalData); - - ExistsSpec existsSpec = new ExistsSpec(); - existsSpec.path = "/a/b/c"; - System.out.println("exists: " + client.exists(curatorProjection, existsSpec)); - - DeleteSpec deleteSpec = new DeleteSpec(); - deleteSpec.path = "/a/b/c"; - client.deleteNode(curatorProjection, deleteSpec); - - System.out.println("exists: " + client.exists(curatorProjection, existsSpec)); - - LeaderResult leader = client.startLeaderSelector(curatorProjection, "/leader", "me", 10000); - System.out.println("Has Leader: " + leader.isLeader); - - List<Participant> leaderParticipants = client.getLeaderParticipants(curatorProjection, leader.projection); - System.out.println("Participants: " + leaderParticipants); - - boolean isLeader = client.isLeader(curatorProjection, leader.projection); - System.out.println("isLeader: " + isLeader); - - client.closeGenericProjection(curatorProjection, leader.projection.id); - - pathChildrenCacheData = client.getPathChildrenCacheData(curatorProjection, pathChildrenCacheProjection); - System.out.println("Child data: " + pathChildrenCacheData); - - nodeCacheData = client.getNodeCacheData(curatorProjection, nodeCache); - System.out.println("nodeCacheData: " + nodeCacheData); - - PersistentEphemeralNodeProjection node = client.startPersistentEphemeralNode(curatorProjection, "/my/path", ByteBuffer.wrap("hey".getBytes()), PersistentEphemeralNodeMode.EPHEMERAL); - existsSpec.path = "/my/path"; - OptionalStat nodeExists = client.exists(curatorProjection, existsSpec); - System.out.println("nodeExists: " + nodeExists); - client.closeGenericProjection(curatorProjection, node.id); - - List<LeaseProjection> leaseProjections = client.acquireSemaphore(curatorProjection, "/semi", 3, 1000, 10); - System.out.println("leaseProjections: " + leaseProjections); - for ( LeaseProjection leaseProjection : leaseProjections ) - { - client.closeGenericProjection(curatorProjection, leaseProjection.id); - } - - DiscoveryInstance yourInstance = discoveryClient.makeDiscoveryInstance("mine", ByteBuffer.wrap(new byte[]{}), 8080); - DiscoveryProjection discovery = discoveryClient.startDiscovery(curatorProjection, "/discovery", yourInstance); - DiscoveryProviderProjection provider = discoveryClient.startProvider(curatorProjection, discovery, "mine", ProviderStrategyType.ROUND_ROBIN, 1000, 3); - - DiscoveryInstance instance = discoveryClient.getInstance(curatorProjection, provider); - System.out.println("Instance: " + instance); - } -} http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/x/rpc/TestServer.java ---------------------------------------------------------------------- diff --git a/curator-x-rpc/src/test/java/org/apache/curator/x/rpc/TestServer.java b/curator-x-rpc/src/test/java/org/apache/curator/x/rpc/TestServer.java deleted file mode 100644 index 3564777..0000000 --- a/curator-x-rpc/src/test/java/org/apache/curator/x/rpc/TestServer.java +++ /dev/null @@ -1,34 +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. - */ -package org.apache.curator.x.rpc; - -import com.google.common.io.Resources; -import org.apache.curator.test.TestingServer; -import java.nio.charset.Charset; - -public class TestServer -{ - public static void main(String[] args) throws Exception - { - new TestingServer(2181); - - String configurationSource = Resources.toString(Resources.getResource("configuration/test.json"), Charset.defaultCharset()); - CuratorProjectionServer.main(new String[]{configurationSource}); - } -} http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/resources/configuration/connections.json ---------------------------------------------------------------------- diff --git a/curator-x-rpc/src/test/resources/configuration/connections.json b/curator-x-rpc/src/test/resources/configuration/connections.json deleted file mode 100644 index fb5f84a..0000000 --- a/curator-x-rpc/src/test/resources/configuration/connections.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "connections": [ - { - "name": "test", - "connectionString": "one:1,two:2", - "sessionLength": "3m", - "connectionTimeout": "20s", - "retry": { - "type": "exponential-backoff", - "baseSleepTime": "1s", - "maxRetries": 10 - } - }, - - { - "name": "alt", - "connectionString": "three:3,four:4", - "sessionLength": "4m", - "connectionTimeout": "30s", - "retry": { - "type": "ntimes", - "sleepBetweenRetries": "1m", - "n": 10 - } - } - ] -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/resources/configuration/logging.json ---------------------------------------------------------------------- diff --git a/curator-x-rpc/src/test/resources/configuration/logging.json b/curator-x-rpc/src/test/resources/configuration/logging.json deleted file mode 100644 index 970ef20..0000000 --- a/curator-x-rpc/src/test/resources/configuration/logging.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "logging": { - "level": "INFO", - - "appenders": [ - { - "type": "file", - "currentLogFilename": "logs/foo.log", - "archivedLogFilenamePattern": "logs/foo-%d.log.gz", - "archivedFileCount": 10, - "timeZone": "UTC" - }, - - { - "type": "console" - } - ] - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/resources/configuration/simple.json ---------------------------------------------------------------------- diff --git a/curator-x-rpc/src/test/resources/configuration/simple.json b/curator-x-rpc/src/test/resources/configuration/simple.json deleted file mode 100644 index ccb2925..0000000 --- a/curator-x-rpc/src/test/resources/configuration/simple.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "thrift": { - "port": 1234 - }, - - "pingTime": "10s" -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/resources/configuration/test.json ---------------------------------------------------------------------- diff --git a/curator-x-rpc/src/test/resources/configuration/test.json b/curator-x-rpc/src/test/resources/configuration/test.json deleted file mode 100644 index c9d6cb8..0000000 --- a/curator-x-rpc/src/test/resources/configuration/test.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "projectionExpiration": "15s", - - "thrift": { - "port": 8899 - }, - - "connections": [ - { - "name": "test", - "connectionString": "localhost:2181" - } - ] -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index aa8fd86..3aceb5f 100644 --- a/pom.xml +++ b/pom.xml @@ -296,7 +296,6 @@ <module>curator-examples</module> <module>curator-x-discovery</module> <module>curator-x-discovery-server</module> - <module>curator-x-rpc</module> <module>curator-x-async</module> </modules> @@ -370,12 +369,6 @@ </dependency> <dependency> - <groupId>org.apache.curator</groupId> - <artifactId>curator-x-rpc</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-math</artifactId> <version>${commons-math-version}</version> http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/src/site/confluence/index.confluence ---------------------------------------------------------------------- diff --git a/src/site/confluence/index.confluence b/src/site/confluence/index.confluence index f9490b4..4caf9c8 100644 --- a/src/site/confluence/index.confluence +++ b/src/site/confluence/index.confluence @@ -34,7 +34,6 @@ most users, the only artifact you need is curator\-recipes. |org.apache.curator|curator\-examples|Example usages of various Curator features.| |org.apache.curator|curator\-x\-discovery|A Service Discovery implementation built on the Curator Framework.| |org.apache.curator|curator\-x\-discovery-server|A RESTful server that can be used with Curator Discovery.| -|org.apache.curator|curator\-x\-rpc|A proxy that bridges non\-java environments with the Curator framework and recipes.| h2. Versions http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/src/site/site.xml ---------------------------------------------------------------------- diff --git a/src/site/site.xml b/src/site/site.xml index 8136c9a..7761966 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -99,7 +99,6 @@ <menu name="Extensions" inherit="top"> <item name="Service Discovery" href="curator-x-discovery/index.html"/> <item name="Service Discovery Server" href="curator-x-discovery-server/index.html"/> - <item name="Curator RPC Proxy" href="curator-x-rpc/index.html"/> <item name="Curator Java 8/Async" href="curator-x-async/index.html"/> </menu>
