You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/08/04 20:10:25 UTC
[08/51] [partial] airavata git commit: AIRAVATA-2505 Upgrade Airavata
to Thrift 0.10.0
http://git-wip-us.apache.org/repos/asf/airavata/blob/9d165bd8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventMessage.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventMessage.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventMessage.java
index 89e06fb..7c06306 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventMessage.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventMessage.java
@@ -16,42 +16,15 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package org.apache.airavata.model.dbevent;
-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 javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
public class DBEventMessage implements org.apache.thrift.TBase<DBEventMessage, DBEventMessage._Fields>, java.io.Serializable, Cloneable, Comparable<DBEventMessage> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DBEventMessage");
@@ -59,15 +32,12 @@ public class DBEventMessage implements org.apache.thrift.TBase<DBEventMessage, D
private static final org.apache.thrift.protocol.TField MESSAGE_CONTEXT_FIELD_DESC = new org.apache.thrift.protocol.TField("messageContext", org.apache.thrift.protocol.TType.STRUCT, (short)2);
private static final org.apache.thrift.protocol.TField PUBLISHER_SERVICE_FIELD_DESC = new org.apache.thrift.protocol.TField("publisherService", 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 DBEventMessageStandardSchemeFactory());
- schemes.put(TupleScheme.class, new DBEventMessageTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new DBEventMessageStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new DBEventMessageTupleSchemeFactory();
private DBEventType dbEventType; // required
private DBEventMessageContext messageContext; // required
- private String publisherService; // required
+ private java.lang.String publisherService; // 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 {
@@ -79,10 +49,10 @@ public class DBEventMessage implements org.apache.thrift.TBase<DBEventMessage, D
MESSAGE_CONTEXT((short)2, "messageContext"),
PUBLISHER_SERVICE((short)3, "publisherService");
- private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+ private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
static {
- for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
byName.put(field.getFieldName(), field);
}
}
@@ -109,21 +79,21 @@ public class DBEventMessage implements org.apache.thrift.TBase<DBEventMessage, D
*/
public static _Fields findByThriftIdOrThrow(int fieldId) {
_Fields fields = findByThriftId(fieldId);
- if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ if (fields == null) throw new java.lang.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) {
+ public static _Fields findByName(java.lang.String name) {
return byName.get(name);
}
private final short _thriftId;
- private final String _fieldName;
+ private final java.lang.String _fieldName;
- _Fields(short thriftId, String fieldName) {
+ _Fields(short thriftId, java.lang.String fieldName) {
_thriftId = thriftId;
_fieldName = fieldName;
}
@@ -132,22 +102,22 @@ public class DBEventMessage implements org.apache.thrift.TBase<DBEventMessage, D
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
// isset id assignments
- public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ public static final java.util.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);
+ java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.DB_EVENT_TYPE, new org.apache.thrift.meta_data.FieldMetaData("dbEventType", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, DBEventType.class)));
tmpMap.put(_Fields.MESSAGE_CONTEXT, new org.apache.thrift.meta_data.FieldMetaData("messageContext", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DBEventMessageContext.class)));
tmpMap.put(_Fields.PUBLISHER_SERVICE, new org.apache.thrift.meta_data.FieldMetaData("publisherService", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DBEventMessage.class, metaDataMap);
}
@@ -157,7 +127,7 @@ public class DBEventMessage implements org.apache.thrift.TBase<DBEventMessage, D
public DBEventMessage(
DBEventType dbEventType,
DBEventMessageContext messageContext,
- String publisherService)
+ java.lang.String publisherService)
{
this();
this.dbEventType = dbEventType;
@@ -245,11 +215,11 @@ public class DBEventMessage implements org.apache.thrift.TBase<DBEventMessage, D
}
}
- public String getPublisherService() {
+ public java.lang.String getPublisherService() {
return this.publisherService;
}
- public void setPublisherService(String publisherService) {
+ public void setPublisherService(java.lang.String publisherService) {
this.publisherService = publisherService;
}
@@ -268,7 +238,7 @@ public class DBEventMessage implements org.apache.thrift.TBase<DBEventMessage, D
}
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case DB_EVENT_TYPE:
if (value == null) {
@@ -290,14 +260,14 @@ public class DBEventMessage implements org.apache.thrift.TBase<DBEventMessage, D
if (value == null) {
unsetPublisherService();
} else {
- setPublisherService((String)value);
+ setPublisherService((java.lang.String)value);
}
break;
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case DB_EVENT_TYPE:
return getDbEventType();
@@ -309,13 +279,13 @@ public class DBEventMessage implements org.apache.thrift.TBase<DBEventMessage, D
return getPublisherService();
}
- throw new IllegalStateException();
+ throw new java.lang.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();
+ throw new java.lang.IllegalArgumentException();
}
switch (field) {
@@ -326,11 +296,11 @@ public class DBEventMessage implements org.apache.thrift.TBase<DBEventMessage, D
case PUBLISHER_SERVICE:
return isSetPublisherService();
}
- throw new IllegalStateException();
+ throw new java.lang.IllegalStateException();
}
@Override
- public boolean equals(Object that) {
+ public boolean equals(java.lang.Object that) {
if (that == null)
return false;
if (that instanceof DBEventMessage)
@@ -341,6 +311,8 @@ public class DBEventMessage implements org.apache.thrift.TBase<DBEventMessage, D
public boolean equals(DBEventMessage that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_dbEventType = true && this.isSetDbEventType();
boolean that_present_dbEventType = true && that.isSetDbEventType();
@@ -374,24 +346,21 @@ public class DBEventMessage implements org.apache.thrift.TBase<DBEventMessage, D
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- boolean present_dbEventType = true && (isSetDbEventType());
- list.add(present_dbEventType);
- if (present_dbEventType)
- list.add(dbEventType.getValue());
+ hashCode = hashCode * 8191 + ((isSetDbEventType()) ? 131071 : 524287);
+ if (isSetDbEventType())
+ hashCode = hashCode * 8191 + dbEventType.getValue();
- boolean present_messageContext = true && (isSetMessageContext());
- list.add(present_messageContext);
- if (present_messageContext)
- list.add(messageContext);
+ hashCode = hashCode * 8191 + ((isSetMessageContext()) ? 131071 : 524287);
+ if (isSetMessageContext())
+ hashCode = hashCode * 8191 + messageContext.hashCode();
- boolean present_publisherService = true && (isSetPublisherService());
- list.add(present_publisherService);
- if (present_publisherService)
- list.add(publisherService);
+ hashCode = hashCode * 8191 + ((isSetPublisherService()) ? 131071 : 524287);
+ if (isSetPublisherService())
+ hashCode = hashCode * 8191 + publisherService.hashCode();
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -402,7 +371,7 @@ public class DBEventMessage implements org.apache.thrift.TBase<DBEventMessage, D
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetDbEventType()).compareTo(other.isSetDbEventType());
+ lastComparison = java.lang.Boolean.valueOf(isSetDbEventType()).compareTo(other.isSetDbEventType());
if (lastComparison != 0) {
return lastComparison;
}
@@ -412,7 +381,7 @@ public class DBEventMessage implements org.apache.thrift.TBase<DBEventMessage, D
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetMessageContext()).compareTo(other.isSetMessageContext());
+ lastComparison = java.lang.Boolean.valueOf(isSetMessageContext()).compareTo(other.isSetMessageContext());
if (lastComparison != 0) {
return lastComparison;
}
@@ -422,7 +391,7 @@ public class DBEventMessage implements org.apache.thrift.TBase<DBEventMessage, D
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetPublisherService()).compareTo(other.isSetPublisherService());
+ lastComparison = java.lang.Boolean.valueOf(isSetPublisherService()).compareTo(other.isSetPublisherService());
if (lastComparison != 0) {
return lastComparison;
}
@@ -440,16 +409,16 @@ public class DBEventMessage implements org.apache.thrift.TBase<DBEventMessage, D
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+ scheme(iprot).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);
+ scheme(oprot).write(oprot, this);
}
@Override
- public String toString() {
- StringBuilder sb = new StringBuilder("DBEventMessage(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("DBEventMessage(");
boolean first = true;
sb.append("dbEventType:");
@@ -504,7 +473,7 @@ public class DBEventMessage implements org.apache.thrift.TBase<DBEventMessage, D
}
}
- private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
try {
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
@@ -512,13 +481,13 @@ public class DBEventMessage implements org.apache.thrift.TBase<DBEventMessage, D
}
}
- private static class DBEventMessageStandardSchemeFactory implements SchemeFactory {
+ private static class DBEventMessageStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public DBEventMessageStandardScheme getScheme() {
return new DBEventMessageStandardScheme();
}
}
- private static class DBEventMessageStandardScheme extends StandardScheme<DBEventMessage> {
+ private static class DBEventMessageStandardScheme extends org.apache.thrift.scheme.StandardScheme<DBEventMessage> {
public void read(org.apache.thrift.protocol.TProtocol iprot, DBEventMessage struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -589,17 +558,17 @@ public class DBEventMessage implements org.apache.thrift.TBase<DBEventMessage, D
}
- private static class DBEventMessageTupleSchemeFactory implements SchemeFactory {
+ private static class DBEventMessageTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public DBEventMessageTupleScheme getScheme() {
return new DBEventMessageTupleScheme();
}
}
- private static class DBEventMessageTupleScheme extends TupleScheme<DBEventMessage> {
+ private static class DBEventMessageTupleScheme extends org.apache.thrift.scheme.TupleScheme<DBEventMessage> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, DBEventMessage struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
+ org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
oprot.writeI32(struct.dbEventType.getValue());
struct.messageContext.write(oprot);
oprot.writeString(struct.publisherService);
@@ -607,7 +576,7 @@ public class DBEventMessage implements org.apache.thrift.TBase<DBEventMessage, D
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, DBEventMessage struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
+ org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
struct.dbEventType = org.apache.airavata.model.dbevent.DBEventType.findByValue(iprot.readI32());
struct.setDbEventTypeIsSet(true);
struct.messageContext = new DBEventMessageContext();
@@ -618,5 +587,8 @@ public class DBEventMessage implements org.apache.thrift.TBase<DBEventMessage, D
}
}
+ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+ return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+ }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/9d165bd8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventMessageContext.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventMessageContext.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventMessageContext.java
index b6a6587..5dc839e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventMessageContext.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventMessageContext.java
@@ -16,41 +16,14 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package org.apache.airavata.model.dbevent;
-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 javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
public class DBEventMessageContext extends org.apache.thrift.TUnion<DBEventMessageContext, DBEventMessageContext._Fields> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DBEventMessageContext");
private static final org.apache.thrift.protocol.TField PUBLISHER_FIELD_DESC = new org.apache.thrift.protocol.TField("publisher", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -61,10 +34,10 @@ public class DBEventMessageContext extends org.apache.thrift.TUnion<DBEventMessa
PUBLISHER((short)1, "publisher"),
SUBSCRIBER((short)2, "subscriber");
- private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+ private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
static {
- for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
byName.put(field.getFieldName(), field);
}
}
@@ -89,21 +62,21 @@ public class DBEventMessageContext extends org.apache.thrift.TUnion<DBEventMessa
*/
public static _Fields findByThriftIdOrThrow(int fieldId) {
_Fields fields = findByThriftId(fieldId);
- if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ if (fields == null) throw new java.lang.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) {
+ public static _Fields findByName(java.lang.String name) {
return byName.get(name);
}
private final short _thriftId;
- private final String _fieldName;
+ private final java.lang.String _fieldName;
- _Fields(short thriftId, String fieldName) {
+ _Fields(short thriftId, java.lang.String fieldName) {
_thriftId = thriftId;
_fieldName = fieldName;
}
@@ -112,19 +85,19 @@ public class DBEventMessageContext extends org.apache.thrift.TUnion<DBEventMessa
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
- public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ public static final java.util.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.PUBLISHER, new org.apache.thrift.meta_data.FieldMetaData("publisher", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.PUBLISHER, new org.apache.thrift.meta_data.FieldMetaData("publisher", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DBEventPublisher.class)));
- tmpMap.put(_Fields.SUBSCRIBER, new org.apache.thrift.meta_data.FieldMetaData("subscriber", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ tmpMap.put(_Fields.SUBSCRIBER, new org.apache.thrift.meta_data.FieldMetaData("subscriber", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DBEventSubscriber.class)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DBEventMessageContext.class, metaDataMap);
}
@@ -132,7 +105,7 @@ public class DBEventMessageContext extends org.apache.thrift.TUnion<DBEventMessa
super();
}
- public DBEventMessageContext(_Fields setField, Object value) {
+ public DBEventMessageContext(_Fields setField, java.lang.Object value) {
super(setField, value);
}
@@ -157,25 +130,25 @@ public class DBEventMessageContext extends org.apache.thrift.TUnion<DBEventMessa
@Override
- protected void checkType(_Fields setField, Object value) throws ClassCastException {
+ protected void checkType(_Fields setField, java.lang.Object value) throws java.lang.ClassCastException {
switch (setField) {
case PUBLISHER:
if (value instanceof DBEventPublisher) {
break;
}
- throw new ClassCastException("Was expecting value of type DBEventPublisher for field 'publisher', but got " + value.getClass().getSimpleName());
+ throw new java.lang.ClassCastException("Was expecting value of type DBEventPublisher for field 'publisher', but got " + value.getClass().getSimpleName());
case SUBSCRIBER:
if (value instanceof DBEventSubscriber) {
break;
}
- throw new ClassCastException("Was expecting value of type DBEventSubscriber for field 'subscriber', but got " + value.getClass().getSimpleName());
+ throw new java.lang.ClassCastException("Was expecting value of type DBEventSubscriber for field 'subscriber', but got " + value.getClass().getSimpleName());
default:
- throw new IllegalArgumentException("Unknown field id " + setField);
+ throw new java.lang.IllegalArgumentException("Unknown field id " + setField);
}
}
@Override
- protected Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
+ protected java.lang.Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
_Fields setField = _Fields.findByThriftId(field.id);
if (setField != null) {
switch (setField) {
@@ -200,7 +173,7 @@ public class DBEventMessageContext extends org.apache.thrift.TUnion<DBEventMessa
return null;
}
default:
- throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
+ throw new java.lang.IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
}
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
@@ -220,12 +193,12 @@ public class DBEventMessageContext extends org.apache.thrift.TUnion<DBEventMessa
subscriber.write(oprot);
return;
default:
- throw new IllegalStateException("Cannot write union with unknown field " + setField_);
+ throw new java.lang.IllegalStateException("Cannot write union with unknown field " + setField_);
}
}
@Override
- protected Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.thrift.TException {
+ protected java.lang.Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.thrift.TException {
_Fields setField = _Fields.findByThriftId(fieldID);
if (setField != null) {
switch (setField) {
@@ -240,10 +213,10 @@ public class DBEventMessageContext extends org.apache.thrift.TUnion<DBEventMessa
subscriber.read(iprot);
return subscriber;
default:
- throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
+ throw new java.lang.IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
}
} else {
- throw new TProtocolException("Couldn't find a field with field id " + fieldID);
+ throw new org.apache.thrift.protocol.TProtocolException("Couldn't find a field with field id " + fieldID);
}
}
@@ -259,7 +232,7 @@ public class DBEventMessageContext extends org.apache.thrift.TUnion<DBEventMessa
subscriber.write(oprot);
return;
default:
- throw new IllegalStateException("Cannot write union with unknown field " + setField_);
+ throw new java.lang.IllegalStateException("Cannot write union with unknown field " + setField_);
}
}
@@ -271,7 +244,7 @@ public class DBEventMessageContext extends org.apache.thrift.TUnion<DBEventMessa
case SUBSCRIBER:
return SUBSCRIBER_FIELD_DESC;
default:
- throw new IllegalArgumentException("Unknown field id " + setField);
+ throw new java.lang.IllegalArgumentException("Unknown field id " + setField);
}
}
@@ -294,12 +267,12 @@ public class DBEventMessageContext extends org.apache.thrift.TUnion<DBEventMessa
if (getSetField() == _Fields.PUBLISHER) {
return (DBEventPublisher)getFieldValue();
} else {
- throw new RuntimeException("Cannot get field 'publisher' because union is currently set to " + getFieldDesc(getSetField()).name);
+ throw new java.lang.RuntimeException("Cannot get field 'publisher' because union is currently set to " + getFieldDesc(getSetField()).name);
}
}
public void setPublisher(DBEventPublisher value) {
- if (value == null) throw new NullPointerException();
+ if (value == null) throw new java.lang.NullPointerException();
setField_ = _Fields.PUBLISHER;
value_ = value;
}
@@ -308,12 +281,12 @@ public class DBEventMessageContext extends org.apache.thrift.TUnion<DBEventMessa
if (getSetField() == _Fields.SUBSCRIBER) {
return (DBEventSubscriber)getFieldValue();
} else {
- throw new RuntimeException("Cannot get field 'subscriber' because union is currently set to " + getFieldDesc(getSetField()).name);
+ throw new java.lang.RuntimeException("Cannot get field 'subscriber' because union is currently set to " + getFieldDesc(getSetField()).name);
}
}
public void setSubscriber(DBEventSubscriber value) {
- if (value == null) throw new NullPointerException();
+ if (value == null) throw new java.lang.NullPointerException();
setField_ = _Fields.SUBSCRIBER;
value_ = value;
}
@@ -328,7 +301,7 @@ public class DBEventMessageContext extends org.apache.thrift.TUnion<DBEventMessa
}
- public boolean equals(Object other) {
+ public boolean equals(java.lang.Object other) {
if (other instanceof DBEventMessageContext) {
return equals((DBEventMessageContext)other);
} else {
@@ -352,12 +325,12 @@ public class DBEventMessageContext extends org.apache.thrift.TUnion<DBEventMessa
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ java.util.List<java.lang.Object> list = new java.util.ArrayList<java.lang.Object>();
list.add(this.getClass().getName());
org.apache.thrift.TFieldIdEnum setField = getSetField();
if (setField != null) {
list.add(setField.getThriftFieldId());
- Object value = getFieldValue();
+ java.lang.Object value = getFieldValue();
if (value instanceof org.apache.thrift.TEnum) {
list.add(((org.apache.thrift.TEnum)getFieldValue()).getValue());
} else {
@@ -375,7 +348,7 @@ public class DBEventMessageContext extends org.apache.thrift.TUnion<DBEventMessa
}
- private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
try {
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/9d165bd8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventPublisher.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventPublisher.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventPublisher.java
index 4c776d2..f9bfb22 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventPublisher.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventPublisher.java
@@ -16,52 +16,22 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package org.apache.airavata.model.dbevent;
-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 javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
public class DBEventPublisher implements org.apache.thrift.TBase<DBEventPublisher, DBEventPublisher._Fields>, java.io.Serializable, Cloneable, Comparable<DBEventPublisher> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DBEventPublisher");
private static final org.apache.thrift.protocol.TField PUBLISHER_CONTEXT_FIELD_DESC = new org.apache.thrift.protocol.TField("publisherContext", org.apache.thrift.protocol.TType.STRUCT, (short)1);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new DBEventPublisherStandardSchemeFactory());
- schemes.put(TupleScheme.class, new DBEventPublisherTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new DBEventPublisherStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new DBEventPublisherTupleSchemeFactory();
private DBEventPublisherContext publisherContext; // required
@@ -69,10 +39,10 @@ public class DBEventPublisher implements org.apache.thrift.TBase<DBEventPublishe
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
PUBLISHER_CONTEXT((short)1, "publisherContext");
- private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+ private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
static {
- for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
byName.put(field.getFieldName(), field);
}
}
@@ -95,21 +65,21 @@ public class DBEventPublisher implements org.apache.thrift.TBase<DBEventPublishe
*/
public static _Fields findByThriftIdOrThrow(int fieldId) {
_Fields fields = findByThriftId(fieldId);
- if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ if (fields == null) throw new java.lang.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) {
+ public static _Fields findByName(java.lang.String name) {
return byName.get(name);
}
private final short _thriftId;
- private final String _fieldName;
+ private final java.lang.String _fieldName;
- _Fields(short thriftId, String fieldName) {
+ _Fields(short thriftId, java.lang.String fieldName) {
_thriftId = thriftId;
_fieldName = fieldName;
}
@@ -118,18 +88,18 @@ public class DBEventPublisher implements org.apache.thrift.TBase<DBEventPublishe
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
// isset id assignments
- public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ public static final java.util.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);
+ java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.PUBLISHER_CONTEXT, new org.apache.thrift.meta_data.FieldMetaData("publisherContext", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DBEventPublisherContext.class)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DBEventPublisher.class, metaDataMap);
}
@@ -184,7 +154,7 @@ public class DBEventPublisher implements org.apache.thrift.TBase<DBEventPublishe
}
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case PUBLISHER_CONTEXT:
if (value == null) {
@@ -197,30 +167,30 @@ public class DBEventPublisher implements org.apache.thrift.TBase<DBEventPublishe
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case PUBLISHER_CONTEXT:
return getPublisherContext();
}
- throw new IllegalStateException();
+ throw new java.lang.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();
+ throw new java.lang.IllegalArgumentException();
}
switch (field) {
case PUBLISHER_CONTEXT:
return isSetPublisherContext();
}
- throw new IllegalStateException();
+ throw new java.lang.IllegalStateException();
}
@Override
- public boolean equals(Object that) {
+ public boolean equals(java.lang.Object that) {
if (that == null)
return false;
if (that instanceof DBEventPublisher)
@@ -231,6 +201,8 @@ public class DBEventPublisher implements org.apache.thrift.TBase<DBEventPublishe
public boolean equals(DBEventPublisher that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_publisherContext = true && this.isSetPublisherContext();
boolean that_present_publisherContext = true && that.isSetPublisherContext();
@@ -246,14 +218,13 @@ public class DBEventPublisher implements org.apache.thrift.TBase<DBEventPublishe
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- boolean present_publisherContext = true && (isSetPublisherContext());
- list.add(present_publisherContext);
- if (present_publisherContext)
- list.add(publisherContext);
+ hashCode = hashCode * 8191 + ((isSetPublisherContext()) ? 131071 : 524287);
+ if (isSetPublisherContext())
+ hashCode = hashCode * 8191 + publisherContext.hashCode();
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -264,7 +235,7 @@ public class DBEventPublisher implements org.apache.thrift.TBase<DBEventPublishe
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetPublisherContext()).compareTo(other.isSetPublisherContext());
+ lastComparison = java.lang.Boolean.valueOf(isSetPublisherContext()).compareTo(other.isSetPublisherContext());
if (lastComparison != 0) {
return lastComparison;
}
@@ -282,16 +253,16 @@ public class DBEventPublisher implements org.apache.thrift.TBase<DBEventPublishe
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+ scheme(iprot).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);
+ scheme(oprot).write(oprot, this);
}
@Override
- public String toString() {
- StringBuilder sb = new StringBuilder("DBEventPublisher(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("DBEventPublisher(");
boolean first = true;
sb.append("publisherContext:");
@@ -325,7 +296,7 @@ public class DBEventPublisher implements org.apache.thrift.TBase<DBEventPublishe
}
}
- private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
try {
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
@@ -333,13 +304,13 @@ public class DBEventPublisher implements org.apache.thrift.TBase<DBEventPublishe
}
}
- private static class DBEventPublisherStandardSchemeFactory implements SchemeFactory {
+ private static class DBEventPublisherStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public DBEventPublisherStandardScheme getScheme() {
return new DBEventPublisherStandardScheme();
}
}
- private static class DBEventPublisherStandardScheme extends StandardScheme<DBEventPublisher> {
+ private static class DBEventPublisherStandardScheme extends org.apache.thrift.scheme.StandardScheme<DBEventPublisher> {
public void read(org.apache.thrift.protocol.TProtocol iprot, DBEventPublisher struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -384,28 +355,31 @@ public class DBEventPublisher implements org.apache.thrift.TBase<DBEventPublishe
}
- private static class DBEventPublisherTupleSchemeFactory implements SchemeFactory {
+ private static class DBEventPublisherTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public DBEventPublisherTupleScheme getScheme() {
return new DBEventPublisherTupleScheme();
}
}
- private static class DBEventPublisherTupleScheme extends TupleScheme<DBEventPublisher> {
+ private static class DBEventPublisherTupleScheme extends org.apache.thrift.scheme.TupleScheme<DBEventPublisher> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, DBEventPublisher struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
+ org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
struct.publisherContext.write(oprot);
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, DBEventPublisher struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
+ org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
struct.publisherContext = new DBEventPublisherContext();
struct.publisherContext.read(iprot);
struct.setPublisherContextIsSet(true);
}
}
+ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+ return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+ }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/9d165bd8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventPublisherContext.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventPublisherContext.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventPublisherContext.java
index a95a806..2e885e7 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventPublisherContext.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventPublisherContext.java
@@ -16,42 +16,15 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package org.apache.airavata.model.dbevent;
-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 javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
public class DBEventPublisherContext implements org.apache.thrift.TBase<DBEventPublisherContext, DBEventPublisherContext._Fields>, java.io.Serializable, Cloneable, Comparable<DBEventPublisherContext> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DBEventPublisherContext");
@@ -59,15 +32,12 @@ public class DBEventPublisherContext implements org.apache.thrift.TBase<DBEventP
private static final org.apache.thrift.protocol.TField ENTITY_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("entityType", org.apache.thrift.protocol.TType.I32, (short)2);
private static final org.apache.thrift.protocol.TField ENTITY_DATA_MODEL_FIELD_DESC = new org.apache.thrift.protocol.TField("entityDataModel", 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 DBEventPublisherContextStandardSchemeFactory());
- schemes.put(TupleScheme.class, new DBEventPublisherContextTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new DBEventPublisherContextStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new DBEventPublisherContextTupleSchemeFactory();
private CrudType crudType; // required
private EntityType entityType; // required
- private ByteBuffer entityDataModel; // required
+ private java.nio.ByteBuffer entityDataModel; // 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 {
@@ -83,10 +53,10 @@ public class DBEventPublisherContext implements org.apache.thrift.TBase<DBEventP
ENTITY_TYPE((short)2, "entityType"),
ENTITY_DATA_MODEL((short)3, "entityDataModel");
- private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+ private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
static {
- for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
byName.put(field.getFieldName(), field);
}
}
@@ -113,21 +83,21 @@ public class DBEventPublisherContext implements org.apache.thrift.TBase<DBEventP
*/
public static _Fields findByThriftIdOrThrow(int fieldId) {
_Fields fields = findByThriftId(fieldId);
- if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ if (fields == null) throw new java.lang.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) {
+ public static _Fields findByName(java.lang.String name) {
return byName.get(name);
}
private final short _thriftId;
- private final String _fieldName;
+ private final java.lang.String _fieldName;
- _Fields(short thriftId, String fieldName) {
+ _Fields(short thriftId, java.lang.String fieldName) {
_thriftId = thriftId;
_fieldName = fieldName;
}
@@ -136,22 +106,22 @@ public class DBEventPublisherContext implements org.apache.thrift.TBase<DBEventP
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
// isset id assignments
- public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ public static final java.util.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);
+ java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.CRUD_TYPE, new org.apache.thrift.meta_data.FieldMetaData("crudType", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, CrudType.class)));
tmpMap.put(_Fields.ENTITY_TYPE, new org.apache.thrift.meta_data.FieldMetaData("entityType", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, EntityType.class)));
tmpMap.put(_Fields.ENTITY_DATA_MODEL, new org.apache.thrift.meta_data.FieldMetaData("entityDataModel", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DBEventPublisherContext.class, metaDataMap);
}
@@ -161,7 +131,7 @@ public class DBEventPublisherContext implements org.apache.thrift.TBase<DBEventP
public DBEventPublisherContext(
CrudType crudType,
EntityType entityType,
- ByteBuffer entityDataModel)
+ java.nio.ByteBuffer entityDataModel)
{
this();
this.crudType = crudType;
@@ -262,15 +232,15 @@ public class DBEventPublisherContext implements org.apache.thrift.TBase<DBEventP
return entityDataModel == null ? null : entityDataModel.array();
}
- public ByteBuffer bufferForEntityDataModel() {
+ public java.nio.ByteBuffer bufferForEntityDataModel() {
return org.apache.thrift.TBaseHelper.copyBinary(entityDataModel);
}
public void setEntityDataModel(byte[] entityDataModel) {
- this.entityDataModel = entityDataModel == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(entityDataModel, entityDataModel.length));
+ this.entityDataModel = entityDataModel == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(entityDataModel.clone());
}
- public void setEntityDataModel(ByteBuffer entityDataModel) {
+ public void setEntityDataModel(java.nio.ByteBuffer entityDataModel) {
this.entityDataModel = org.apache.thrift.TBaseHelper.copyBinary(entityDataModel);
}
@@ -289,7 +259,7 @@ public class DBEventPublisherContext implements org.apache.thrift.TBase<DBEventP
}
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case CRUD_TYPE:
if (value == null) {
@@ -311,14 +281,18 @@ public class DBEventPublisherContext implements org.apache.thrift.TBase<DBEventP
if (value == null) {
unsetEntityDataModel();
} else {
- setEntityDataModel((ByteBuffer)value);
+ if (value instanceof byte[]) {
+ setEntityDataModel((byte[])value);
+ } else {
+ setEntityDataModel((java.nio.ByteBuffer)value);
+ }
}
break;
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case CRUD_TYPE:
return getCrudType();
@@ -330,13 +304,13 @@ public class DBEventPublisherContext implements org.apache.thrift.TBase<DBEventP
return getEntityDataModel();
}
- throw new IllegalStateException();
+ throw new java.lang.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();
+ throw new java.lang.IllegalArgumentException();
}
switch (field) {
@@ -347,11 +321,11 @@ public class DBEventPublisherContext implements org.apache.thrift.TBase<DBEventP
case ENTITY_DATA_MODEL:
return isSetEntityDataModel();
}
- throw new IllegalStateException();
+ throw new java.lang.IllegalStateException();
}
@Override
- public boolean equals(Object that) {
+ public boolean equals(java.lang.Object that) {
if (that == null)
return false;
if (that instanceof DBEventPublisherContext)
@@ -362,6 +336,8 @@ public class DBEventPublisherContext implements org.apache.thrift.TBase<DBEventP
public boolean equals(DBEventPublisherContext that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_crudType = true && this.isSetCrudType();
boolean that_present_crudType = true && that.isSetCrudType();
@@ -395,24 +371,21 @@ public class DBEventPublisherContext implements org.apache.thrift.TBase<DBEventP
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- boolean present_crudType = true && (isSetCrudType());
- list.add(present_crudType);
- if (present_crudType)
- list.add(crudType.getValue());
+ hashCode = hashCode * 8191 + ((isSetCrudType()) ? 131071 : 524287);
+ if (isSetCrudType())
+ hashCode = hashCode * 8191 + crudType.getValue();
- boolean present_entityType = true && (isSetEntityType());
- list.add(present_entityType);
- if (present_entityType)
- list.add(entityType.getValue());
+ hashCode = hashCode * 8191 + ((isSetEntityType()) ? 131071 : 524287);
+ if (isSetEntityType())
+ hashCode = hashCode * 8191 + entityType.getValue();
- boolean present_entityDataModel = true && (isSetEntityDataModel());
- list.add(present_entityDataModel);
- if (present_entityDataModel)
- list.add(entityDataModel);
+ hashCode = hashCode * 8191 + ((isSetEntityDataModel()) ? 131071 : 524287);
+ if (isSetEntityDataModel())
+ hashCode = hashCode * 8191 + entityDataModel.hashCode();
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -423,7 +396,7 @@ public class DBEventPublisherContext implements org.apache.thrift.TBase<DBEventP
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetCrudType()).compareTo(other.isSetCrudType());
+ lastComparison = java.lang.Boolean.valueOf(isSetCrudType()).compareTo(other.isSetCrudType());
if (lastComparison != 0) {
return lastComparison;
}
@@ -433,7 +406,7 @@ public class DBEventPublisherContext implements org.apache.thrift.TBase<DBEventP
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetEntityType()).compareTo(other.isSetEntityType());
+ lastComparison = java.lang.Boolean.valueOf(isSetEntityType()).compareTo(other.isSetEntityType());
if (lastComparison != 0) {
return lastComparison;
}
@@ -443,7 +416,7 @@ public class DBEventPublisherContext implements org.apache.thrift.TBase<DBEventP
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetEntityDataModel()).compareTo(other.isSetEntityDataModel());
+ lastComparison = java.lang.Boolean.valueOf(isSetEntityDataModel()).compareTo(other.isSetEntityDataModel());
if (lastComparison != 0) {
return lastComparison;
}
@@ -461,16 +434,16 @@ public class DBEventPublisherContext implements org.apache.thrift.TBase<DBEventP
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+ scheme(iprot).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);
+ scheme(oprot).write(oprot, this);
}
@Override
- public String toString() {
- StringBuilder sb = new StringBuilder("DBEventPublisherContext(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("DBEventPublisherContext(");
boolean first = true;
sb.append("crudType:");
@@ -525,7 +498,7 @@ public class DBEventPublisherContext implements org.apache.thrift.TBase<DBEventP
}
}
- private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
try {
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
@@ -533,13 +506,13 @@ public class DBEventPublisherContext implements org.apache.thrift.TBase<DBEventP
}
}
- private static class DBEventPublisherContextStandardSchemeFactory implements SchemeFactory {
+ private static class DBEventPublisherContextStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public DBEventPublisherContextStandardScheme getScheme() {
return new DBEventPublisherContextStandardScheme();
}
}
- private static class DBEventPublisherContextStandardScheme extends StandardScheme<DBEventPublisherContext> {
+ private static class DBEventPublisherContextStandardScheme extends org.apache.thrift.scheme.StandardScheme<DBEventPublisherContext> {
public void read(org.apache.thrift.protocol.TProtocol iprot, DBEventPublisherContext struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -609,17 +582,17 @@ public class DBEventPublisherContext implements org.apache.thrift.TBase<DBEventP
}
- private static class DBEventPublisherContextTupleSchemeFactory implements SchemeFactory {
+ private static class DBEventPublisherContextTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public DBEventPublisherContextTupleScheme getScheme() {
return new DBEventPublisherContextTupleScheme();
}
}
- private static class DBEventPublisherContextTupleScheme extends TupleScheme<DBEventPublisherContext> {
+ private static class DBEventPublisherContextTupleScheme extends org.apache.thrift.scheme.TupleScheme<DBEventPublisherContext> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, DBEventPublisherContext struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
+ org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
oprot.writeI32(struct.crudType.getValue());
oprot.writeI32(struct.entityType.getValue());
oprot.writeBinary(struct.entityDataModel);
@@ -627,7 +600,7 @@ public class DBEventPublisherContext implements org.apache.thrift.TBase<DBEventP
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, DBEventPublisherContext struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
+ org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
struct.crudType = org.apache.airavata.model.dbevent.CrudType.findByValue(iprot.readI32());
struct.setCrudTypeIsSet(true);
struct.entityType = org.apache.airavata.model.dbevent.EntityType.findByValue(iprot.readI32());
@@ -637,5 +610,8 @@ public class DBEventPublisherContext implements org.apache.thrift.TBase<DBEventP
}
}
+ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+ return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+ }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/9d165bd8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventSubscriber.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventSubscriber.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventSubscriber.java
index 5e3a3d7..366f196 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventSubscriber.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventSubscriber.java
@@ -16,63 +16,33 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package org.apache.airavata.model.dbevent;
-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 javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
public class DBEventSubscriber implements org.apache.thrift.TBase<DBEventSubscriber, DBEventSubscriber._Fields>, java.io.Serializable, Cloneable, Comparable<DBEventSubscriber> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DBEventSubscriber");
private static final org.apache.thrift.protocol.TField SUBSCRIBER_SERVICE_FIELD_DESC = new org.apache.thrift.protocol.TField("subscriberService", 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 DBEventSubscriberStandardSchemeFactory());
- schemes.put(TupleScheme.class, new DBEventSubscriberTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new DBEventSubscriberStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new DBEventSubscriberTupleSchemeFactory();
- private String subscriberService; // required
+ private java.lang.String subscriberService; // 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 {
SUBSCRIBER_SERVICE((short)1, "subscriberService");
- private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+ private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
static {
- for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
byName.put(field.getFieldName(), field);
}
}
@@ -95,21 +65,21 @@ public class DBEventSubscriber implements org.apache.thrift.TBase<DBEventSubscri
*/
public static _Fields findByThriftIdOrThrow(int fieldId) {
_Fields fields = findByThriftId(fieldId);
- if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ if (fields == null) throw new java.lang.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) {
+ public static _Fields findByName(java.lang.String name) {
return byName.get(name);
}
private final short _thriftId;
- private final String _fieldName;
+ private final java.lang.String _fieldName;
- _Fields(short thriftId, String fieldName) {
+ _Fields(short thriftId, java.lang.String fieldName) {
_thriftId = thriftId;
_fieldName = fieldName;
}
@@ -118,18 +88,18 @@ public class DBEventSubscriber implements org.apache.thrift.TBase<DBEventSubscri
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
// isset id assignments
- public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ public static final java.util.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);
+ java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.SUBSCRIBER_SERVICE, new org.apache.thrift.meta_data.FieldMetaData("subscriberService", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DBEventSubscriber.class, metaDataMap);
}
@@ -137,7 +107,7 @@ public class DBEventSubscriber implements org.apache.thrift.TBase<DBEventSubscri
}
public DBEventSubscriber(
- String subscriberService)
+ java.lang.String subscriberService)
{
this();
this.subscriberService = subscriberService;
@@ -161,11 +131,11 @@ public class DBEventSubscriber implements org.apache.thrift.TBase<DBEventSubscri
this.subscriberService = null;
}
- public String getSubscriberService() {
+ public java.lang.String getSubscriberService() {
return this.subscriberService;
}
- public void setSubscriberService(String subscriberService) {
+ public void setSubscriberService(java.lang.String subscriberService) {
this.subscriberService = subscriberService;
}
@@ -184,43 +154,43 @@ public class DBEventSubscriber implements org.apache.thrift.TBase<DBEventSubscri
}
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case SUBSCRIBER_SERVICE:
if (value == null) {
unsetSubscriberService();
} else {
- setSubscriberService((String)value);
+ setSubscriberService((java.lang.String)value);
}
break;
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case SUBSCRIBER_SERVICE:
return getSubscriberService();
}
- throw new IllegalStateException();
+ throw new java.lang.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();
+ throw new java.lang.IllegalArgumentException();
}
switch (field) {
case SUBSCRIBER_SERVICE:
return isSetSubscriberService();
}
- throw new IllegalStateException();
+ throw new java.lang.IllegalStateException();
}
@Override
- public boolean equals(Object that) {
+ public boolean equals(java.lang.Object that) {
if (that == null)
return false;
if (that instanceof DBEventSubscriber)
@@ -231,6 +201,8 @@ public class DBEventSubscriber implements org.apache.thrift.TBase<DBEventSubscri
public boolean equals(DBEventSubscriber that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_subscriberService = true && this.isSetSubscriberService();
boolean that_present_subscriberService = true && that.isSetSubscriberService();
@@ -246,14 +218,13 @@ public class DBEventSubscriber implements org.apache.thrift.TBase<DBEventSubscri
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- boolean present_subscriberService = true && (isSetSubscriberService());
- list.add(present_subscriberService);
- if (present_subscriberService)
- list.add(subscriberService);
+ hashCode = hashCode * 8191 + ((isSetSubscriberService()) ? 131071 : 524287);
+ if (isSetSubscriberService())
+ hashCode = hashCode * 8191 + subscriberService.hashCode();
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -264,7 +235,7 @@ public class DBEventSubscriber implements org.apache.thrift.TBase<DBEventSubscri
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetSubscriberService()).compareTo(other.isSetSubscriberService());
+ lastComparison = java.lang.Boolean.valueOf(isSetSubscriberService()).compareTo(other.isSetSubscriberService());
if (lastComparison != 0) {
return lastComparison;
}
@@ -282,16 +253,16 @@ public class DBEventSubscriber implements org.apache.thrift.TBase<DBEventSubscri
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+ scheme(iprot).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);
+ scheme(oprot).write(oprot, this);
}
@Override
- public String toString() {
- StringBuilder sb = new StringBuilder("DBEventSubscriber(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("DBEventSubscriber(");
boolean first = true;
sb.append("subscriberService:");
@@ -322,7 +293,7 @@ public class DBEventSubscriber implements org.apache.thrift.TBase<DBEventSubscri
}
}
- private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
try {
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
@@ -330,13 +301,13 @@ public class DBEventSubscriber implements org.apache.thrift.TBase<DBEventSubscri
}
}
- private static class DBEventSubscriberStandardSchemeFactory implements SchemeFactory {
+ private static class DBEventSubscriberStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public DBEventSubscriberStandardScheme getScheme() {
return new DBEventSubscriberStandardScheme();
}
}
- private static class DBEventSubscriberStandardScheme extends StandardScheme<DBEventSubscriber> {
+ private static class DBEventSubscriberStandardScheme extends org.apache.thrift.scheme.StandardScheme<DBEventSubscriber> {
public void read(org.apache.thrift.protocol.TProtocol iprot, DBEventSubscriber struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -380,27 +351,30 @@ public class DBEventSubscriber implements org.apache.thrift.TBase<DBEventSubscri
}
- private static class DBEventSubscriberTupleSchemeFactory implements SchemeFactory {
+ private static class DBEventSubscriberTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public DBEventSubscriberTupleScheme getScheme() {
return new DBEventSubscriberTupleScheme();
}
}
- private static class DBEventSubscriberTupleScheme extends TupleScheme<DBEventSubscriber> {
+ private static class DBEventSubscriberTupleScheme extends org.apache.thrift.scheme.TupleScheme<DBEventSubscriber> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, DBEventSubscriber struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
+ org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
oprot.writeString(struct.subscriberService);
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, DBEventSubscriber struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
+ org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
struct.subscriberService = iprot.readString();
struct.setSubscriberServiceIsSet(true);
}
}
+ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+ return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+ }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/9d165bd8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventType.java
index 79a1cf3..756d9f2 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/DBEventType.java
@@ -16,7 +16,7 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata/blob/9d165bd8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/EntityType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/EntityType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/EntityType.java
index 479937f..4832e16 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/EntityType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/EntityType.java
@@ -16,7 +16,7 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated