http://git-wip-us.apache.org/repos/asf/airavata/blob/8e775660/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java index 9e586ce..0a536c6 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.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.data.movement; -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"}) /** * Data Movement through GridFTP * @@ -60,7 +33,7 @@ import org.slf4j.LoggerFactory; * sshPort: * If a non-default port needs to used, specify it. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)") public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataMovement, GridFTPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<GridFTPDataMovement> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GridFTPDataMovement"); @@ -68,15 +41,12 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM private static final org.apache.thrift.protocol.TField SECURITY_PROTOCOL_FIELD_DESC = new org.apache.thrift.protocol.TField("securityProtocol", org.apache.thrift.protocol.TType.I32, (short)2); private static final org.apache.thrift.protocol.TField GRID_FTPEND_POINTS_FIELD_DESC = new org.apache.thrift.protocol.TField("gridFTPEndPoints", org.apache.thrift.protocol.TType.LIST, (short)3); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new GridFTPDataMovementStandardSchemeFactory()); - schemes.put(TupleScheme.class, new GridFTPDataMovementTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new GridFTPDataMovementStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new GridFTPDataMovementTupleSchemeFactory(); - private String dataMovementInterfaceId; // required + private java.lang.String dataMovementInterfaceId; // required private SecurityProtocol securityProtocol; // required - private List<String> gridFTPEndPoints; // required + private java.util.List<java.lang.String> gridFTPEndPoints; // 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 { @@ -88,10 +58,10 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM SECURITY_PROTOCOL((short)2, "securityProtocol"), GRID_FTPEND_POINTS((short)3, "gridFTPEndPoints"); - 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); } } @@ -118,21 +88,21 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM */ 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; } @@ -141,15 +111,15 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM 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.DATA_MOVEMENT_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("dataMovementInterfaceId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.SECURITY_PROTOCOL, new org.apache.thrift.meta_data.FieldMetaData("securityProtocol", org.apache.thrift.TFieldRequirementType.REQUIRED, @@ -157,7 +127,7 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM tmpMap.put(_Fields.GRID_FTPEND_POINTS, new org.apache.thrift.meta_data.FieldMetaData("gridFTPEndPoints", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 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(GridFTPDataMovement.class, metaDataMap); } @@ -167,9 +137,9 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM } public GridFTPDataMovement( - String dataMovementInterfaceId, + java.lang.String dataMovementInterfaceId, SecurityProtocol securityProtocol, - List<String> gridFTPEndPoints) + java.util.List<java.lang.String> gridFTPEndPoints) { this(); this.dataMovementInterfaceId = dataMovementInterfaceId; @@ -188,7 +158,7 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM this.securityProtocol = other.securityProtocol; } if (other.isSetGridFTPEndPoints()) { - List<String> __this__gridFTPEndPoints = new ArrayList<String>(other.gridFTPEndPoints); + java.util.List<java.lang.String> __this__gridFTPEndPoints = new java.util.ArrayList<java.lang.String>(other.gridFTPEndPoints); this.gridFTPEndPoints = __this__gridFTPEndPoints; } } @@ -205,11 +175,11 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM this.gridFTPEndPoints = null; } - public String getDataMovementInterfaceId() { + public java.lang.String getDataMovementInterfaceId() { return this.dataMovementInterfaceId; } - public void setDataMovementInterfaceId(String dataMovementInterfaceId) { + public void setDataMovementInterfaceId(java.lang.String dataMovementInterfaceId) { this.dataMovementInterfaceId = dataMovementInterfaceId; } @@ -263,22 +233,22 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM return (this.gridFTPEndPoints == null) ? 0 : this.gridFTPEndPoints.size(); } - public java.util.Iterator<String> getGridFTPEndPointsIterator() { + public java.util.Iterator<java.lang.String> getGridFTPEndPointsIterator() { return (this.gridFTPEndPoints == null) ? null : this.gridFTPEndPoints.iterator(); } - public void addToGridFTPEndPoints(String elem) { + public void addToGridFTPEndPoints(java.lang.String elem) { if (this.gridFTPEndPoints == null) { - this.gridFTPEndPoints = new ArrayList<String>(); + this.gridFTPEndPoints = new java.util.ArrayList<java.lang.String>(); } this.gridFTPEndPoints.add(elem); } - public List<String> getGridFTPEndPoints() { + public java.util.List<java.lang.String> getGridFTPEndPoints() { return this.gridFTPEndPoints; } - public void setGridFTPEndPoints(List<String> gridFTPEndPoints) { + public void setGridFTPEndPoints(java.util.List<java.lang.String> gridFTPEndPoints) { this.gridFTPEndPoints = gridFTPEndPoints; } @@ -297,13 +267,13 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case DATA_MOVEMENT_INTERFACE_ID: if (value == null) { unsetDataMovementInterfaceId(); } else { - setDataMovementInterfaceId((String)value); + setDataMovementInterfaceId((java.lang.String)value); } break; @@ -319,14 +289,14 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM if (value == null) { unsetGridFTPEndPoints(); } else { - setGridFTPEndPoints((List<String>)value); + setGridFTPEndPoints((java.util.List<java.lang.String>)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case DATA_MOVEMENT_INTERFACE_ID: return getDataMovementInterfaceId(); @@ -338,13 +308,13 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM return getGridFTPEndPoints(); } - 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) { @@ -355,11 +325,11 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM case GRID_FTPEND_POINTS: return isSetGridFTPEndPoints(); } - 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 GridFTPDataMovement) @@ -370,6 +340,8 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM public boolean equals(GridFTPDataMovement that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_dataMovementInterfaceId = true && this.isSetDataMovementInterfaceId(); boolean that_present_dataMovementInterfaceId = true && that.isSetDataMovementInterfaceId(); @@ -403,24 +375,21 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_dataMovementInterfaceId = true && (isSetDataMovementInterfaceId()); - list.add(present_dataMovementInterfaceId); - if (present_dataMovementInterfaceId) - list.add(dataMovementInterfaceId); + hashCode = hashCode * 8191 + ((isSetDataMovementInterfaceId()) ? 131071 : 524287); + if (isSetDataMovementInterfaceId()) + hashCode = hashCode * 8191 + dataMovementInterfaceId.hashCode(); - boolean present_securityProtocol = true && (isSetSecurityProtocol()); - list.add(present_securityProtocol); - if (present_securityProtocol) - list.add(securityProtocol.getValue()); + hashCode = hashCode * 8191 + ((isSetSecurityProtocol()) ? 131071 : 524287); + if (isSetSecurityProtocol()) + hashCode = hashCode * 8191 + securityProtocol.getValue(); - boolean present_gridFTPEndPoints = true && (isSetGridFTPEndPoints()); - list.add(present_gridFTPEndPoints); - if (present_gridFTPEndPoints) - list.add(gridFTPEndPoints); + hashCode = hashCode * 8191 + ((isSetGridFTPEndPoints()) ? 131071 : 524287); + if (isSetGridFTPEndPoints()) + hashCode = hashCode * 8191 + gridFTPEndPoints.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -431,7 +400,7 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetDataMovementInterfaceId()).compareTo(other.isSetDataMovementInterfaceId()); + lastComparison = java.lang.Boolean.valueOf(isSetDataMovementInterfaceId()).compareTo(other.isSetDataMovementInterfaceId()); if (lastComparison != 0) { return lastComparison; } @@ -441,7 +410,7 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM return lastComparison; } } - lastComparison = Boolean.valueOf(isSetSecurityProtocol()).compareTo(other.isSetSecurityProtocol()); + lastComparison = java.lang.Boolean.valueOf(isSetSecurityProtocol()).compareTo(other.isSetSecurityProtocol()); if (lastComparison != 0) { return lastComparison; } @@ -451,7 +420,7 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM return lastComparison; } } - lastComparison = Boolean.valueOf(isSetGridFTPEndPoints()).compareTo(other.isSetGridFTPEndPoints()); + lastComparison = java.lang.Boolean.valueOf(isSetGridFTPEndPoints()).compareTo(other.isSetGridFTPEndPoints()); if (lastComparison != 0) { return lastComparison; } @@ -469,16 +438,16 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM } 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("GridFTPDataMovement("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("GridFTPDataMovement("); boolean first = true; sb.append("dataMovementInterfaceId:"); @@ -533,7 +502,7 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM } } - 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) { @@ -541,13 +510,13 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM } } - private static class GridFTPDataMovementStandardSchemeFactory implements SchemeFactory { + private static class GridFTPDataMovementStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public GridFTPDataMovementStandardScheme getScheme() { return new GridFTPDataMovementStandardScheme(); } } - private static class GridFTPDataMovementStandardScheme extends StandardScheme<GridFTPDataMovement> { + private static class GridFTPDataMovementStandardScheme extends org.apache.thrift.scheme.StandardScheme<GridFTPDataMovement> { public void read(org.apache.thrift.protocol.TProtocol iprot, GridFTPDataMovement struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -579,8 +548,8 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); - struct.gridFTPEndPoints = new ArrayList<String>(_list0.size); - String _elem1; + struct.gridFTPEndPoints = new java.util.ArrayList<java.lang.String>(_list0.size); + java.lang.String _elem1; for (int _i2 = 0; _i2 < _list0.size; ++_i2) { _elem1 = iprot.readString(); @@ -620,7 +589,7 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM oprot.writeFieldBegin(GRID_FTPEND_POINTS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.gridFTPEndPoints.size())); - for (String _iter3 : struct.gridFTPEndPoints) + for (java.lang.String _iter3 : struct.gridFTPEndPoints) { oprot.writeString(_iter3); } @@ -634,22 +603,22 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM } - private static class GridFTPDataMovementTupleSchemeFactory implements SchemeFactory { + private static class GridFTPDataMovementTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public GridFTPDataMovementTupleScheme getScheme() { return new GridFTPDataMovementTupleScheme(); } } - private static class GridFTPDataMovementTupleScheme extends TupleScheme<GridFTPDataMovement> { + private static class GridFTPDataMovementTupleScheme extends org.apache.thrift.scheme.TupleScheme<GridFTPDataMovement> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, GridFTPDataMovement 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.dataMovementInterfaceId); oprot.writeI32(struct.securityProtocol.getValue()); { oprot.writeI32(struct.gridFTPEndPoints.size()); - for (String _iter4 : struct.gridFTPEndPoints) + for (java.lang.String _iter4 : struct.gridFTPEndPoints) { oprot.writeString(_iter4); } @@ -658,15 +627,15 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM @Override public void read(org.apache.thrift.protocol.TProtocol prot, GridFTPDataMovement struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; struct.dataMovementInterfaceId = iprot.readString(); struct.setDataMovementInterfaceIdIsSet(true); struct.securityProtocol = org.apache.airavata.model.data.movement.SecurityProtocol.findByValue(iprot.readI32()); struct.setSecurityProtocolIsSet(true); { org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.gridFTPEndPoints = new ArrayList<String>(_list5.size); - String _elem6; + struct.gridFTPEndPoints = new java.util.ArrayList<java.lang.String>(_list5.size); + java.lang.String _elem6; for (int _i7 = 0; _i7 < _list5.size; ++_i7) { _elem6 = iprot.readString(); @@ -677,5 +646,8 @@ public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataM } } + 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/8e775660/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java index 3db57a7..c3dcbbe 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.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.data.movement; -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"}) /** * LOCAL * @@ -60,28 +33,25 @@ import org.slf4j.LoggerFactory; * sshPort: * If a non-defualt port needs to used, specify it. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)") public class LOCALDataMovement implements org.apache.thrift.TBase<LOCALDataMovement, LOCALDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALDataMovement> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LOCALDataMovement"); private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovementInterfaceId", 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 LOCALDataMovementStandardSchemeFactory()); - schemes.put(TupleScheme.class, new LOCALDataMovementTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LOCALDataMovementStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LOCALDataMovementTupleSchemeFactory(); - private String dataMovementInterfaceId; // required + private java.lang.String dataMovementInterfaceId; // 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 { DATA_MOVEMENT_INTERFACE_ID((short)1, "dataMovementInterfaceId"); - 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); } } @@ -104,21 +74,21 @@ public class LOCALDataMovement implements org.apache.thrift.TBase<LOCALDataMovem */ 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; } @@ -127,18 +97,18 @@ public class LOCALDataMovement implements org.apache.thrift.TBase<LOCALDataMovem 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.DATA_MOVEMENT_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("dataMovementInterfaceId", 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(LOCALDataMovement.class, metaDataMap); } @@ -148,7 +118,7 @@ public class LOCALDataMovement implements org.apache.thrift.TBase<LOCALDataMovem } public LOCALDataMovement( - String dataMovementInterfaceId) + java.lang.String dataMovementInterfaceId) { this(); this.dataMovementInterfaceId = dataMovementInterfaceId; @@ -173,11 +143,11 @@ public class LOCALDataMovement implements org.apache.thrift.TBase<LOCALDataMovem } - public String getDataMovementInterfaceId() { + public java.lang.String getDataMovementInterfaceId() { return this.dataMovementInterfaceId; } - public void setDataMovementInterfaceId(String dataMovementInterfaceId) { + public void setDataMovementInterfaceId(java.lang.String dataMovementInterfaceId) { this.dataMovementInterfaceId = dataMovementInterfaceId; } @@ -196,43 +166,43 @@ public class LOCALDataMovement implements org.apache.thrift.TBase<LOCALDataMovem } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case DATA_MOVEMENT_INTERFACE_ID: if (value == null) { unsetDataMovementInterfaceId(); } else { - setDataMovementInterfaceId((String)value); + setDataMovementInterfaceId((java.lang.String)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case DATA_MOVEMENT_INTERFACE_ID: return getDataMovementInterfaceId(); } - 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 DATA_MOVEMENT_INTERFACE_ID: return isSetDataMovementInterfaceId(); } - 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 LOCALDataMovement) @@ -243,6 +213,8 @@ public class LOCALDataMovement implements org.apache.thrift.TBase<LOCALDataMovem public boolean equals(LOCALDataMovement that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_dataMovementInterfaceId = true && this.isSetDataMovementInterfaceId(); boolean that_present_dataMovementInterfaceId = true && that.isSetDataMovementInterfaceId(); @@ -258,14 +230,13 @@ public class LOCALDataMovement implements org.apache.thrift.TBase<LOCALDataMovem @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_dataMovementInterfaceId = true && (isSetDataMovementInterfaceId()); - list.add(present_dataMovementInterfaceId); - if (present_dataMovementInterfaceId) - list.add(dataMovementInterfaceId); + hashCode = hashCode * 8191 + ((isSetDataMovementInterfaceId()) ? 131071 : 524287); + if (isSetDataMovementInterfaceId()) + hashCode = hashCode * 8191 + dataMovementInterfaceId.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -276,7 +247,7 @@ public class LOCALDataMovement implements org.apache.thrift.TBase<LOCALDataMovem int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetDataMovementInterfaceId()).compareTo(other.isSetDataMovementInterfaceId()); + lastComparison = java.lang.Boolean.valueOf(isSetDataMovementInterfaceId()).compareTo(other.isSetDataMovementInterfaceId()); if (lastComparison != 0) { return lastComparison; } @@ -294,16 +265,16 @@ public class LOCALDataMovement implements org.apache.thrift.TBase<LOCALDataMovem } 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("LOCALDataMovement("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("LOCALDataMovement("); boolean first = true; sb.append("dataMovementInterfaceId:"); @@ -334,7 +305,7 @@ public class LOCALDataMovement implements org.apache.thrift.TBase<LOCALDataMovem } } - 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) { @@ -342,13 +313,13 @@ public class LOCALDataMovement implements org.apache.thrift.TBase<LOCALDataMovem } } - private static class LOCALDataMovementStandardSchemeFactory implements SchemeFactory { + private static class LOCALDataMovementStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public LOCALDataMovementStandardScheme getScheme() { return new LOCALDataMovementStandardScheme(); } } - private static class LOCALDataMovementStandardScheme extends StandardScheme<LOCALDataMovement> { + private static class LOCALDataMovementStandardScheme extends org.apache.thrift.scheme.StandardScheme<LOCALDataMovement> { public void read(org.apache.thrift.protocol.TProtocol iprot, LOCALDataMovement struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -392,27 +363,30 @@ public class LOCALDataMovement implements org.apache.thrift.TBase<LOCALDataMovem } - private static class LOCALDataMovementTupleSchemeFactory implements SchemeFactory { + private static class LOCALDataMovementTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public LOCALDataMovementTupleScheme getScheme() { return new LOCALDataMovementTupleScheme(); } } - private static class LOCALDataMovementTupleScheme extends TupleScheme<LOCALDataMovement> { + private static class LOCALDataMovementTupleScheme extends org.apache.thrift.scheme.TupleScheme<LOCALDataMovement> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, LOCALDataMovement 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.dataMovementInterfaceId); } @Override public void read(org.apache.thrift.protocol.TProtocol prot, LOCALDataMovement struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; struct.dataMovementInterfaceId = iprot.readString(); struct.setDataMovementInterfaceIdIsSet(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/8e775660/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java index 31c4ddb..c1784c4 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.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.data.movement; -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"}) /** * Data Movement through Secured Copy * @@ -60,7 +33,7 @@ import org.slf4j.LoggerFactory; * sshPort: * If a non-default port needs to used, specify it. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)") public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, SCPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<SCPDataMovement> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SCPDataMovement"); @@ -69,15 +42,12 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, private static final org.apache.thrift.protocol.TField ALTERNATIVE_SCPHOST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("alternativeSCPHostName", org.apache.thrift.protocol.TType.STRING, (short)3); private static final org.apache.thrift.protocol.TField SSH_PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("sshPort", org.apache.thrift.protocol.TType.I32, (short)4); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new SCPDataMovementStandardSchemeFactory()); - schemes.put(TupleScheme.class, new SCPDataMovementTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SCPDataMovementStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SCPDataMovementTupleSchemeFactory(); - private String dataMovementInterfaceId; // required + private java.lang.String dataMovementInterfaceId; // required private SecurityProtocol securityProtocol; // required - private String alternativeSCPHostName; // optional + private java.lang.String alternativeSCPHostName; // optional private int sshPort; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @@ -91,10 +61,10 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, ALTERNATIVE_SCPHOST_NAME((short)3, "alternativeSCPHostName"), SSH_PORT((short)4, "sshPort"); - 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); } } @@ -123,21 +93,21 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, */ 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; } @@ -146,7 +116,7 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -155,9 +125,9 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, private static final int __SSHPORT_ISSET_ID = 0; private byte __isset_bitfield = 0; private static final _Fields optionals[] = {_Fields.ALTERNATIVE_SCPHOST_NAME,_Fields.SSH_PORT}; - 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.DATA_MOVEMENT_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("dataMovementInterfaceId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.SECURITY_PROTOCOL, new org.apache.thrift.meta_data.FieldMetaData("securityProtocol", org.apache.thrift.TFieldRequirementType.REQUIRED, @@ -166,7 +136,7 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.SSH_PORT, new org.apache.thrift.meta_data.FieldMetaData("sshPort", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SCPDataMovement.class, metaDataMap); } @@ -178,7 +148,7 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, } public SCPDataMovement( - String dataMovementInterfaceId, + java.lang.String dataMovementInterfaceId, SecurityProtocol securityProtocol) { this(); @@ -217,11 +187,11 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, } - public String getDataMovementInterfaceId() { + public java.lang.String getDataMovementInterfaceId() { return this.dataMovementInterfaceId; } - public void setDataMovementInterfaceId(String dataMovementInterfaceId) { + public void setDataMovementInterfaceId(java.lang.String dataMovementInterfaceId) { this.dataMovementInterfaceId = dataMovementInterfaceId; } @@ -271,11 +241,11 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, } } - public String getAlternativeSCPHostName() { + public java.lang.String getAlternativeSCPHostName() { return this.alternativeSCPHostName; } - public void setAlternativeSCPHostName(String alternativeSCPHostName) { + public void setAlternativeSCPHostName(java.lang.String alternativeSCPHostName) { this.alternativeSCPHostName = alternativeSCPHostName; } @@ -304,25 +274,25 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, } public void unsetSshPort() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SSHPORT_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SSHPORT_ISSET_ID); } /** Returns true if field sshPort is set (has been assigned a value) and false otherwise */ public boolean isSetSshPort() { - return EncodingUtils.testBit(__isset_bitfield, __SSHPORT_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SSHPORT_ISSET_ID); } public void setSshPortIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SSHPORT_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SSHPORT_ISSET_ID, value); } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case DATA_MOVEMENT_INTERFACE_ID: if (value == null) { unsetDataMovementInterfaceId(); } else { - setDataMovementInterfaceId((String)value); + setDataMovementInterfaceId((java.lang.String)value); } break; @@ -338,7 +308,7 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, if (value == null) { unsetAlternativeSCPHostName(); } else { - setAlternativeSCPHostName((String)value); + setAlternativeSCPHostName((java.lang.String)value); } break; @@ -346,14 +316,14 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, if (value == null) { unsetSshPort(); } else { - setSshPort((Integer)value); + setSshPort((java.lang.Integer)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case DATA_MOVEMENT_INTERFACE_ID: return getDataMovementInterfaceId(); @@ -368,13 +338,13 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, return getSshPort(); } - 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) { @@ -387,11 +357,11 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, case SSH_PORT: return isSetSshPort(); } - 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 SCPDataMovement) @@ -402,6 +372,8 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, public boolean equals(SCPDataMovement that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_dataMovementInterfaceId = true && this.isSetDataMovementInterfaceId(); boolean that_present_dataMovementInterfaceId = true && that.isSetDataMovementInterfaceId(); @@ -444,29 +416,25 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_dataMovementInterfaceId = true && (isSetDataMovementInterfaceId()); - list.add(present_dataMovementInterfaceId); - if (present_dataMovementInterfaceId) - list.add(dataMovementInterfaceId); + hashCode = hashCode * 8191 + ((isSetDataMovementInterfaceId()) ? 131071 : 524287); + if (isSetDataMovementInterfaceId()) + hashCode = hashCode * 8191 + dataMovementInterfaceId.hashCode(); - boolean present_securityProtocol = true && (isSetSecurityProtocol()); - list.add(present_securityProtocol); - if (present_securityProtocol) - list.add(securityProtocol.getValue()); + hashCode = hashCode * 8191 + ((isSetSecurityProtocol()) ? 131071 : 524287); + if (isSetSecurityProtocol()) + hashCode = hashCode * 8191 + securityProtocol.getValue(); - boolean present_alternativeSCPHostName = true && (isSetAlternativeSCPHostName()); - list.add(present_alternativeSCPHostName); - if (present_alternativeSCPHostName) - list.add(alternativeSCPHostName); + hashCode = hashCode * 8191 + ((isSetAlternativeSCPHostName()) ? 131071 : 524287); + if (isSetAlternativeSCPHostName()) + hashCode = hashCode * 8191 + alternativeSCPHostName.hashCode(); - boolean present_sshPort = true && (isSetSshPort()); - list.add(present_sshPort); - if (present_sshPort) - list.add(sshPort); + hashCode = hashCode * 8191 + ((isSetSshPort()) ? 131071 : 524287); + if (isSetSshPort()) + hashCode = hashCode * 8191 + sshPort; - return list.hashCode(); + return hashCode; } @Override @@ -477,7 +445,7 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetDataMovementInterfaceId()).compareTo(other.isSetDataMovementInterfaceId()); + lastComparison = java.lang.Boolean.valueOf(isSetDataMovementInterfaceId()).compareTo(other.isSetDataMovementInterfaceId()); if (lastComparison != 0) { return lastComparison; } @@ -487,7 +455,7 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, return lastComparison; } } - lastComparison = Boolean.valueOf(isSetSecurityProtocol()).compareTo(other.isSetSecurityProtocol()); + lastComparison = java.lang.Boolean.valueOf(isSetSecurityProtocol()).compareTo(other.isSetSecurityProtocol()); if (lastComparison != 0) { return lastComparison; } @@ -497,7 +465,7 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAlternativeSCPHostName()).compareTo(other.isSetAlternativeSCPHostName()); + lastComparison = java.lang.Boolean.valueOf(isSetAlternativeSCPHostName()).compareTo(other.isSetAlternativeSCPHostName()); if (lastComparison != 0) { return lastComparison; } @@ -507,7 +475,7 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, return lastComparison; } } - lastComparison = Boolean.valueOf(isSetSshPort()).compareTo(other.isSetSshPort()); + lastComparison = java.lang.Boolean.valueOf(isSetSshPort()).compareTo(other.isSetSshPort()); if (lastComparison != 0) { return lastComparison; } @@ -525,16 +493,16 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, } 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("SCPDataMovement("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("SCPDataMovement("); boolean first = true; sb.append("dataMovementInterfaceId:"); @@ -593,7 +561,7 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, } } - 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 { // 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; @@ -603,13 +571,13 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, } } - private static class SCPDataMovementStandardSchemeFactory implements SchemeFactory { + private static class SCPDataMovementStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public SCPDataMovementStandardScheme getScheme() { return new SCPDataMovementStandardScheme(); } } - private static class SCPDataMovementStandardScheme extends StandardScheme<SCPDataMovement> { + private static class SCPDataMovementStandardScheme extends org.apache.thrift.scheme.StandardScheme<SCPDataMovement> { public void read(org.apache.thrift.protocol.TProtocol iprot, SCPDataMovement struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -694,20 +662,20 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, } - private static class SCPDataMovementTupleSchemeFactory implements SchemeFactory { + private static class SCPDataMovementTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public SCPDataMovementTupleScheme getScheme() { return new SCPDataMovementTupleScheme(); } } - private static class SCPDataMovementTupleScheme extends TupleScheme<SCPDataMovement> { + private static class SCPDataMovementTupleScheme extends org.apache.thrift.scheme.TupleScheme<SCPDataMovement> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, SCPDataMovement 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.dataMovementInterfaceId); oprot.writeI32(struct.securityProtocol.getValue()); - BitSet optionals = new BitSet(); + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetAlternativeSCPHostName()) { optionals.set(0); } @@ -725,12 +693,12 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, @Override public void read(org.apache.thrift.protocol.TProtocol prot, SCPDataMovement struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; struct.dataMovementInterfaceId = iprot.readString(); struct.setDataMovementInterfaceIdIsSet(true); struct.securityProtocol = org.apache.airavata.model.data.movement.SecurityProtocol.findByValue(iprot.readI32()); struct.setSecurityProtocolIsSet(true); - BitSet incoming = iprot.readBitSet(2); + java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.alternativeSCPHostName = iprot.readString(); struct.setAlternativeSCPHostNameIsSet(true); @@ -742,5 +710,8 @@ public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, } } + 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/8e775660/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SecurityProtocol.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SecurityProtocol.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SecurityProtocol.java index 359930a..49d8322 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SecurityProtocol.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SecurityProtocol.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/8e775660/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java index 8d54c40..feaeb9b 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java @@ -16,48 +16,21 @@ */ /** - * 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.data.movement; -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"}) /** * Data Movement through UnicoreStorage * * unicoreEndPointURL: * unicoreGateway End Point. The provider will query this service to fetch required service end points. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)") public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataMovement, UnicoreDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<UnicoreDataMovement> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnicoreDataMovement"); @@ -65,15 +38,12 @@ public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataM private static final org.apache.thrift.protocol.TField SECURITY_PROTOCOL_FIELD_DESC = new org.apache.thrift.protocol.TField("securityProtocol", org.apache.thrift.protocol.TType.I32, (short)2); private static final org.apache.thrift.protocol.TField UNICORE_END_POINT_URL_FIELD_DESC = new org.apache.thrift.protocol.TField("unicoreEndPointURL", 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 UnicoreDataMovementStandardSchemeFactory()); - schemes.put(TupleScheme.class, new UnicoreDataMovementTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new UnicoreDataMovementStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new UnicoreDataMovementTupleSchemeFactory(); - private String dataMovementInterfaceId; // required + private java.lang.String dataMovementInterfaceId; // required private SecurityProtocol securityProtocol; // required - private String unicoreEndPointURL; // required + private java.lang.String unicoreEndPointURL; // 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 { @@ -85,10 +55,10 @@ public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataM SECURITY_PROTOCOL((short)2, "securityProtocol"), UNICORE_END_POINT_URL((short)3, "unicoreEndPointURL"); - 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); } } @@ -115,21 +85,21 @@ public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataM */ 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; } @@ -138,22 +108,22 @@ public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataM 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.DATA_MOVEMENT_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("dataMovementInterfaceId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.SECURITY_PROTOCOL, new org.apache.thrift.meta_data.FieldMetaData("securityProtocol", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, SecurityProtocol.class))); tmpMap.put(_Fields.UNICORE_END_POINT_URL, new org.apache.thrift.meta_data.FieldMetaData("unicoreEndPointURL", 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(UnicoreDataMovement.class, metaDataMap); } @@ -163,9 +133,9 @@ public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataM } public UnicoreDataMovement( - String dataMovementInterfaceId, + java.lang.String dataMovementInterfaceId, SecurityProtocol securityProtocol, - String unicoreEndPointURL) + java.lang.String unicoreEndPointURL) { this(); this.dataMovementInterfaceId = dataMovementInterfaceId; @@ -200,11 +170,11 @@ public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataM this.unicoreEndPointURL = null; } - public String getDataMovementInterfaceId() { + public java.lang.String getDataMovementInterfaceId() { return this.dataMovementInterfaceId; } - public void setDataMovementInterfaceId(String dataMovementInterfaceId) { + public void setDataMovementInterfaceId(java.lang.String dataMovementInterfaceId) { this.dataMovementInterfaceId = dataMovementInterfaceId; } @@ -254,11 +224,11 @@ public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataM } } - public String getUnicoreEndPointURL() { + public java.lang.String getUnicoreEndPointURL() { return this.unicoreEndPointURL; } - public void setUnicoreEndPointURL(String unicoreEndPointURL) { + public void setUnicoreEndPointURL(java.lang.String unicoreEndPointURL) { this.unicoreEndPointURL = unicoreEndPointURL; } @@ -277,13 +247,13 @@ public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataM } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case DATA_MOVEMENT_INTERFACE_ID: if (value == null) { unsetDataMovementInterfaceId(); } else { - setDataMovementInterfaceId((String)value); + setDataMovementInterfaceId((java.lang.String)value); } break; @@ -299,14 +269,14 @@ public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataM if (value == null) { unsetUnicoreEndPointURL(); } else { - setUnicoreEndPointURL((String)value); + setUnicoreEndPointURL((java.lang.String)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case DATA_MOVEMENT_INTERFACE_ID: return getDataMovementInterfaceId(); @@ -318,13 +288,13 @@ public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataM return getUnicoreEndPointURL(); } - 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) { @@ -335,11 +305,11 @@ public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataM case UNICORE_END_POINT_URL: return isSetUnicoreEndPointURL(); } - 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 UnicoreDataMovement) @@ -350,6 +320,8 @@ public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataM public boolean equals(UnicoreDataMovement that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_dataMovementInterfaceId = true && this.isSetDataMovementInterfaceId(); boolean that_present_dataMovementInterfaceId = true && that.isSetDataMovementInterfaceId(); @@ -383,24 +355,21 @@ public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataM @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_dataMovementInterfaceId = true && (isSetDataMovementInterfaceId()); - list.add(present_dataMovementInterfaceId); - if (present_dataMovementInterfaceId) - list.add(dataMovementInterfaceId); + hashCode = hashCode * 8191 + ((isSetDataMovementInterfaceId()) ? 131071 : 524287); + if (isSetDataMovementInterfaceId()) + hashCode = hashCode * 8191 + dataMovementInterfaceId.hashCode(); - boolean present_securityProtocol = true && (isSetSecurityProtocol()); - list.add(present_securityProtocol); - if (present_securityProtocol) - list.add(securityProtocol.getValue()); + hashCode = hashCode * 8191 + ((isSetSecurityProtocol()) ? 131071 : 524287); + if (isSetSecurityProtocol()) + hashCode = hashCode * 8191 + securityProtocol.getValue(); - boolean present_unicoreEndPointURL = true && (isSetUnicoreEndPointURL()); - list.add(present_unicoreEndPointURL); - if (present_unicoreEndPointURL) - list.add(unicoreEndPointURL); + hashCode = hashCode * 8191 + ((isSetUnicoreEndPointURL()) ? 131071 : 524287); + if (isSetUnicoreEndPointURL()) + hashCode = hashCode * 8191 + unicoreEndPointURL.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -411,7 +380,7 @@ public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataM int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetDataMovementInterfaceId()).compareTo(other.isSetDataMovementInterfaceId()); + lastComparison = java.lang.Boolean.valueOf(isSetDataMovementInterfaceId()).compareTo(other.isSetDataMovementInterfaceId()); if (lastComparison != 0) { return lastComparison; } @@ -421,7 +390,7 @@ public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataM return lastComparison; } } - lastComparison = Boolean.valueOf(isSetSecurityProtocol()).compareTo(other.isSetSecurityProtocol()); + lastComparison = java.lang.Boolean.valueOf(isSetSecurityProtocol()).compareTo(other.isSetSecurityProtocol()); if (lastComparison != 0) { return lastComparison; } @@ -431,7 +400,7 @@ public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataM return lastComparison; } } - lastComparison = Boolean.valueOf(isSetUnicoreEndPointURL()).compareTo(other.isSetUnicoreEndPointURL()); + lastComparison = java.lang.Boolean.valueOf(isSetUnicoreEndPointURL()).compareTo(other.isSetUnicoreEndPointURL()); if (lastComparison != 0) { return lastComparison; } @@ -449,16 +418,16 @@ public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataM } 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("UnicoreDataMovement("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("UnicoreDataMovement("); boolean first = true; sb.append("dataMovementInterfaceId:"); @@ -513,7 +482,7 @@ public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataM } } - 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) { @@ -521,13 +490,13 @@ public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataM } } - private static class UnicoreDataMovementStandardSchemeFactory implements SchemeFactory { + private static class UnicoreDataMovementStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public UnicoreDataMovementStandardScheme getScheme() { return new UnicoreDataMovementStandardScheme(); } } - private static class UnicoreDataMovementStandardScheme extends StandardScheme<UnicoreDataMovement> { + private static class UnicoreDataMovementStandardScheme extends org.apache.thrift.scheme.StandardScheme<UnicoreDataMovement> { public void read(org.apache.thrift.protocol.TProtocol iprot, UnicoreDataMovement struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -597,17 +566,17 @@ public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataM } - private static class UnicoreDataMovementTupleSchemeFactory implements SchemeFactory { + private static class UnicoreDataMovementTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public UnicoreDataMovementTupleScheme getScheme() { return new UnicoreDataMovementTupleScheme(); } } - private static class UnicoreDataMovementTupleScheme extends TupleScheme<UnicoreDataMovement> { + private static class UnicoreDataMovementTupleScheme extends org.apache.thrift.scheme.TupleScheme<UnicoreDataMovement> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, UnicoreDataMovement 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.dataMovementInterfaceId); oprot.writeI32(struct.securityProtocol.getValue()); oprot.writeString(struct.unicoreEndPointURL); @@ -615,7 +584,7 @@ public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataM @Override public void read(org.apache.thrift.protocol.TProtocol prot, UnicoreDataMovement struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; struct.dataMovementInterfaceId = iprot.readString(); struct.setDataMovementInterfaceIdIsSet(true); struct.securityProtocol = org.apache.airavata.model.data.movement.SecurityProtocol.findByValue(iprot.readI32()); @@ -625,5 +594,8 @@ public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataM } } + 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(); + } }