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/07 14:00:45 UTC
[09/51] [abbrv] [partial] airavata git commit: AIRAVATA-2505 Upgrade
Airavata to Thrift 0.10.0
http://git-wip-us.apache.org/repos/asf/airavata/blob/14ff0916/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java
index 931e94c..ec1c1bb 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.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.data.replica;
-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 DataProductModel implements org.apache.thrift.TBase<DataProductModel, DataProductModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataProductModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataProductModel");
@@ -68,24 +41,21 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
private static final org.apache.thrift.protocol.TField PRODUCT_METADATA_FIELD_DESC = new org.apache.thrift.protocol.TField("productMetadata", org.apache.thrift.protocol.TType.MAP, (short)11);
private static final org.apache.thrift.protocol.TField REPLICA_LOCATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("replicaLocations", org.apache.thrift.protocol.TType.LIST, (short)12);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new DataProductModelStandardSchemeFactory());
- schemes.put(TupleScheme.class, new DataProductModelTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new DataProductModelStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new DataProductModelTupleSchemeFactory();
- private String productUri; // optional
- private String gatewayId; // optional
- private String parentProductUri; // optional
- private String productName; // optional
- private String productDescription; // optional
- private String ownerName; // optional
+ private java.lang.String productUri; // optional
+ private java.lang.String gatewayId; // optional
+ private java.lang.String parentProductUri; // optional
+ private java.lang.String productName; // optional
+ private java.lang.String productDescription; // optional
+ private java.lang.String ownerName; // optional
private DataProductType dataProductType; // optional
private int productSize; // optional
private long creationTime; // optional
private long lastModifiedTime; // optional
- private Map<String,String> productMetadata; // optional
- private List<DataReplicaLocationModel> replicaLocations; // optional
+ private java.util.Map<java.lang.String,java.lang.String> productMetadata; // optional
+ private java.util.List<DataReplicaLocationModel> replicaLocations; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -106,10 +76,10 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
PRODUCT_METADATA((short)11, "productMetadata"),
REPLICA_LOCATIONS((short)12, "replicaLocations");
- 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);
}
}
@@ -154,21 +124,21 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
*/
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;
}
@@ -177,7 +147,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
@@ -188,9 +158,9 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
private static final int __LASTMODIFIEDTIME_ISSET_ID = 2;
private byte __isset_bitfield = 0;
private static final _Fields optionals[] = {_Fields.PRODUCT_URI,_Fields.GATEWAY_ID,_Fields.PARENT_PRODUCT_URI,_Fields.PRODUCT_NAME,_Fields.PRODUCT_DESCRIPTION,_Fields.OWNER_NAME,_Fields.DATA_PRODUCT_TYPE,_Fields.PRODUCT_SIZE,_Fields.CREATION_TIME,_Fields.LAST_MODIFIED_TIME,_Fields.PRODUCT_METADATA,_Fields.REPLICA_LOCATIONS};
- 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.PRODUCT_URI, new org.apache.thrift.meta_data.FieldMetaData("productUri", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -218,7 +188,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
tmpMap.put(_Fields.REPLICA_LOCATIONS, new org.apache.thrift.meta_data.FieldMetaData("replicaLocations", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DataReplicaLocationModel.class))));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DataProductModel.class, metaDataMap);
}
@@ -255,11 +225,11 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
this.creationTime = other.creationTime;
this.lastModifiedTime = other.lastModifiedTime;
if (other.isSetProductMetadata()) {
- Map<String,String> __this__productMetadata = new HashMap<String,String>(other.productMetadata);
+ java.util.Map<java.lang.String,java.lang.String> __this__productMetadata = new java.util.HashMap<java.lang.String,java.lang.String>(other.productMetadata);
this.productMetadata = __this__productMetadata;
}
if (other.isSetReplicaLocations()) {
- List<DataReplicaLocationModel> __this__replicaLocations = new ArrayList<DataReplicaLocationModel>(other.replicaLocations.size());
+ java.util.List<DataReplicaLocationModel> __this__replicaLocations = new java.util.ArrayList<DataReplicaLocationModel>(other.replicaLocations.size());
for (DataReplicaLocationModel other_element : other.replicaLocations) {
__this__replicaLocations.add(new DataReplicaLocationModel(other_element));
}
@@ -290,11 +260,11 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
this.replicaLocations = null;
}
- public String getProductUri() {
+ public java.lang.String getProductUri() {
return this.productUri;
}
- public void setProductUri(String productUri) {
+ public void setProductUri(java.lang.String productUri) {
this.productUri = productUri;
}
@@ -313,11 +283,11 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
}
}
- public String getGatewayId() {
+ public java.lang.String getGatewayId() {
return this.gatewayId;
}
- public void setGatewayId(String gatewayId) {
+ public void setGatewayId(java.lang.String gatewayId) {
this.gatewayId = gatewayId;
}
@@ -336,11 +306,11 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
}
}
- public String getParentProductUri() {
+ public java.lang.String getParentProductUri() {
return this.parentProductUri;
}
- public void setParentProductUri(String parentProductUri) {
+ public void setParentProductUri(java.lang.String parentProductUri) {
this.parentProductUri = parentProductUri;
}
@@ -359,11 +329,11 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
}
}
- public String getProductName() {
+ public java.lang.String getProductName() {
return this.productName;
}
- public void setProductName(String productName) {
+ public void setProductName(java.lang.String productName) {
this.productName = productName;
}
@@ -382,11 +352,11 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
}
}
- public String getProductDescription() {
+ public java.lang.String getProductDescription() {
return this.productDescription;
}
- public void setProductDescription(String productDescription) {
+ public void setProductDescription(java.lang.String productDescription) {
this.productDescription = productDescription;
}
@@ -405,11 +375,11 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
}
}
- public String getOwnerName() {
+ public java.lang.String getOwnerName() {
return this.ownerName;
}
- public void setOwnerName(String ownerName) {
+ public void setOwnerName(java.lang.String ownerName) {
this.ownerName = ownerName;
}
@@ -469,16 +439,16 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
}
public void unsetProductSize() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PRODUCTSIZE_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PRODUCTSIZE_ISSET_ID);
}
/** Returns true if field productSize is set (has been assigned a value) and false otherwise */
public boolean isSetProductSize() {
- return EncodingUtils.testBit(__isset_bitfield, __PRODUCTSIZE_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PRODUCTSIZE_ISSET_ID);
}
public void setProductSizeIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PRODUCTSIZE_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PRODUCTSIZE_ISSET_ID, value);
}
public long getCreationTime() {
@@ -491,16 +461,16 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
}
public void unsetCreationTime() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __CREATIONTIME_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __CREATIONTIME_ISSET_ID);
}
/** Returns true if field creationTime is set (has been assigned a value) and false otherwise */
public boolean isSetCreationTime() {
- return EncodingUtils.testBit(__isset_bitfield, __CREATIONTIME_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __CREATIONTIME_ISSET_ID);
}
public void setCreationTimeIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CREATIONTIME_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CREATIONTIME_ISSET_ID, value);
}
public long getLastModifiedTime() {
@@ -513,34 +483,34 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
}
public void unsetLastModifiedTime() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LASTMODIFIEDTIME_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LASTMODIFIEDTIME_ISSET_ID);
}
/** Returns true if field lastModifiedTime is set (has been assigned a value) and false otherwise */
public boolean isSetLastModifiedTime() {
- return EncodingUtils.testBit(__isset_bitfield, __LASTMODIFIEDTIME_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LASTMODIFIEDTIME_ISSET_ID);
}
public void setLastModifiedTimeIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LASTMODIFIEDTIME_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LASTMODIFIEDTIME_ISSET_ID, value);
}
public int getProductMetadataSize() {
return (this.productMetadata == null) ? 0 : this.productMetadata.size();
}
- public void putToProductMetadata(String key, String val) {
+ public void putToProductMetadata(java.lang.String key, java.lang.String val) {
if (this.productMetadata == null) {
- this.productMetadata = new HashMap<String,String>();
+ this.productMetadata = new java.util.HashMap<java.lang.String,java.lang.String>();
}
this.productMetadata.put(key, val);
}
- public Map<String,String> getProductMetadata() {
+ public java.util.Map<java.lang.String,java.lang.String> getProductMetadata() {
return this.productMetadata;
}
- public void setProductMetadata(Map<String,String> productMetadata) {
+ public void setProductMetadata(java.util.Map<java.lang.String,java.lang.String> productMetadata) {
this.productMetadata = productMetadata;
}
@@ -569,16 +539,16 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
public void addToReplicaLocations(DataReplicaLocationModel elem) {
if (this.replicaLocations == null) {
- this.replicaLocations = new ArrayList<DataReplicaLocationModel>();
+ this.replicaLocations = new java.util.ArrayList<DataReplicaLocationModel>();
}
this.replicaLocations.add(elem);
}
- public List<DataReplicaLocationModel> getReplicaLocations() {
+ public java.util.List<DataReplicaLocationModel> getReplicaLocations() {
return this.replicaLocations;
}
- public void setReplicaLocations(List<DataReplicaLocationModel> replicaLocations) {
+ public void setReplicaLocations(java.util.List<DataReplicaLocationModel> replicaLocations) {
this.replicaLocations = replicaLocations;
}
@@ -597,13 +567,13 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
}
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case PRODUCT_URI:
if (value == null) {
unsetProductUri();
} else {
- setProductUri((String)value);
+ setProductUri((java.lang.String)value);
}
break;
@@ -611,7 +581,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
if (value == null) {
unsetGatewayId();
} else {
- setGatewayId((String)value);
+ setGatewayId((java.lang.String)value);
}
break;
@@ -619,7 +589,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
if (value == null) {
unsetParentProductUri();
} else {
- setParentProductUri((String)value);
+ setParentProductUri((java.lang.String)value);
}
break;
@@ -627,7 +597,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
if (value == null) {
unsetProductName();
} else {
- setProductName((String)value);
+ setProductName((java.lang.String)value);
}
break;
@@ -635,7 +605,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
if (value == null) {
unsetProductDescription();
} else {
- setProductDescription((String)value);
+ setProductDescription((java.lang.String)value);
}
break;
@@ -643,7 +613,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
if (value == null) {
unsetOwnerName();
} else {
- setOwnerName((String)value);
+ setOwnerName((java.lang.String)value);
}
break;
@@ -659,7 +629,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
if (value == null) {
unsetProductSize();
} else {
- setProductSize((Integer)value);
+ setProductSize((java.lang.Integer)value);
}
break;
@@ -667,7 +637,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
if (value == null) {
unsetCreationTime();
} else {
- setCreationTime((Long)value);
+ setCreationTime((java.lang.Long)value);
}
break;
@@ -675,7 +645,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
if (value == null) {
unsetLastModifiedTime();
} else {
- setLastModifiedTime((Long)value);
+ setLastModifiedTime((java.lang.Long)value);
}
break;
@@ -683,7 +653,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
if (value == null) {
unsetProductMetadata();
} else {
- setProductMetadata((Map<String,String>)value);
+ setProductMetadata((java.util.Map<java.lang.String,java.lang.String>)value);
}
break;
@@ -691,14 +661,14 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
if (value == null) {
unsetReplicaLocations();
} else {
- setReplicaLocations((List<DataReplicaLocationModel>)value);
+ setReplicaLocations((java.util.List<DataReplicaLocationModel>)value);
}
break;
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case PRODUCT_URI:
return getProductUri();
@@ -737,13 +707,13 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
return getReplicaLocations();
}
- 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) {
@@ -772,11 +742,11 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
case REPLICA_LOCATIONS:
return isSetReplicaLocations();
}
- 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 DataProductModel)
@@ -787,6 +757,8 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
public boolean equals(DataProductModel that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_productUri = true && this.isSetProductUri();
boolean that_present_productUri = true && that.isSetProductUri();
@@ -901,69 +873,57 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
-
- boolean present_productUri = true && (isSetProductUri());
- list.add(present_productUri);
- if (present_productUri)
- list.add(productUri);
-
- boolean present_gatewayId = true && (isSetGatewayId());
- list.add(present_gatewayId);
- if (present_gatewayId)
- list.add(gatewayId);
-
- boolean present_parentProductUri = true && (isSetParentProductUri());
- list.add(present_parentProductUri);
- if (present_parentProductUri)
- list.add(parentProductUri);
-
- boolean present_productName = true && (isSetProductName());
- list.add(present_productName);
- if (present_productName)
- list.add(productName);
-
- boolean present_productDescription = true && (isSetProductDescription());
- list.add(present_productDescription);
- if (present_productDescription)
- list.add(productDescription);
-
- boolean present_ownerName = true && (isSetOwnerName());
- list.add(present_ownerName);
- if (present_ownerName)
- list.add(ownerName);
-
- boolean present_dataProductType = true && (isSetDataProductType());
- list.add(present_dataProductType);
- if (present_dataProductType)
- list.add(dataProductType.getValue());
-
- boolean present_productSize = true && (isSetProductSize());
- list.add(present_productSize);
- if (present_productSize)
- list.add(productSize);
-
- boolean present_creationTime = true && (isSetCreationTime());
- list.add(present_creationTime);
- if (present_creationTime)
- list.add(creationTime);
-
- boolean present_lastModifiedTime = true && (isSetLastModifiedTime());
- list.add(present_lastModifiedTime);
- if (present_lastModifiedTime)
- list.add(lastModifiedTime);
-
- boolean present_productMetadata = true && (isSetProductMetadata());
- list.add(present_productMetadata);
- if (present_productMetadata)
- list.add(productMetadata);
-
- boolean present_replicaLocations = true && (isSetReplicaLocations());
- list.add(present_replicaLocations);
- if (present_replicaLocations)
- list.add(replicaLocations);
-
- return list.hashCode();
+ int hashCode = 1;
+
+ hashCode = hashCode * 8191 + ((isSetProductUri()) ? 131071 : 524287);
+ if (isSetProductUri())
+ hashCode = hashCode * 8191 + productUri.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetGatewayId()) ? 131071 : 524287);
+ if (isSetGatewayId())
+ hashCode = hashCode * 8191 + gatewayId.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetParentProductUri()) ? 131071 : 524287);
+ if (isSetParentProductUri())
+ hashCode = hashCode * 8191 + parentProductUri.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetProductName()) ? 131071 : 524287);
+ if (isSetProductName())
+ hashCode = hashCode * 8191 + productName.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetProductDescription()) ? 131071 : 524287);
+ if (isSetProductDescription())
+ hashCode = hashCode * 8191 + productDescription.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetOwnerName()) ? 131071 : 524287);
+ if (isSetOwnerName())
+ hashCode = hashCode * 8191 + ownerName.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetDataProductType()) ? 131071 : 524287);
+ if (isSetDataProductType())
+ hashCode = hashCode * 8191 + dataProductType.getValue();
+
+ hashCode = hashCode * 8191 + ((isSetProductSize()) ? 131071 : 524287);
+ if (isSetProductSize())
+ hashCode = hashCode * 8191 + productSize;
+
+ hashCode = hashCode * 8191 + ((isSetCreationTime()) ? 131071 : 524287);
+ if (isSetCreationTime())
+ hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(creationTime);
+
+ hashCode = hashCode * 8191 + ((isSetLastModifiedTime()) ? 131071 : 524287);
+ if (isSetLastModifiedTime())
+ hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(lastModifiedTime);
+
+ hashCode = hashCode * 8191 + ((isSetProductMetadata()) ? 131071 : 524287);
+ if (isSetProductMetadata())
+ hashCode = hashCode * 8191 + productMetadata.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetReplicaLocations()) ? 131071 : 524287);
+ if (isSetReplicaLocations())
+ hashCode = hashCode * 8191 + replicaLocations.hashCode();
+
+ return hashCode;
}
@Override
@@ -974,7 +934,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetProductUri()).compareTo(other.isSetProductUri());
+ lastComparison = java.lang.Boolean.valueOf(isSetProductUri()).compareTo(other.isSetProductUri());
if (lastComparison != 0) {
return lastComparison;
}
@@ -984,7 +944,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
+ lastComparison = java.lang.Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
if (lastComparison != 0) {
return lastComparison;
}
@@ -994,7 +954,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetParentProductUri()).compareTo(other.isSetParentProductUri());
+ lastComparison = java.lang.Boolean.valueOf(isSetParentProductUri()).compareTo(other.isSetParentProductUri());
if (lastComparison != 0) {
return lastComparison;
}
@@ -1004,7 +964,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetProductName()).compareTo(other.isSetProductName());
+ lastComparison = java.lang.Boolean.valueOf(isSetProductName()).compareTo(other.isSetProductName());
if (lastComparison != 0) {
return lastComparison;
}
@@ -1014,7 +974,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetProductDescription()).compareTo(other.isSetProductDescription());
+ lastComparison = java.lang.Boolean.valueOf(isSetProductDescription()).compareTo(other.isSetProductDescription());
if (lastComparison != 0) {
return lastComparison;
}
@@ -1024,7 +984,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetOwnerName()).compareTo(other.isSetOwnerName());
+ lastComparison = java.lang.Boolean.valueOf(isSetOwnerName()).compareTo(other.isSetOwnerName());
if (lastComparison != 0) {
return lastComparison;
}
@@ -1034,7 +994,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetDataProductType()).compareTo(other.isSetDataProductType());
+ lastComparison = java.lang.Boolean.valueOf(isSetDataProductType()).compareTo(other.isSetDataProductType());
if (lastComparison != 0) {
return lastComparison;
}
@@ -1044,7 +1004,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetProductSize()).compareTo(other.isSetProductSize());
+ lastComparison = java.lang.Boolean.valueOf(isSetProductSize()).compareTo(other.isSetProductSize());
if (lastComparison != 0) {
return lastComparison;
}
@@ -1054,7 +1014,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetCreationTime()).compareTo(other.isSetCreationTime());
+ lastComparison = java.lang.Boolean.valueOf(isSetCreationTime()).compareTo(other.isSetCreationTime());
if (lastComparison != 0) {
return lastComparison;
}
@@ -1064,7 +1024,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetLastModifiedTime()).compareTo(other.isSetLastModifiedTime());
+ lastComparison = java.lang.Boolean.valueOf(isSetLastModifiedTime()).compareTo(other.isSetLastModifiedTime());
if (lastComparison != 0) {
return lastComparison;
}
@@ -1074,7 +1034,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetProductMetadata()).compareTo(other.isSetProductMetadata());
+ lastComparison = java.lang.Boolean.valueOf(isSetProductMetadata()).compareTo(other.isSetProductMetadata());
if (lastComparison != 0) {
return lastComparison;
}
@@ -1084,7 +1044,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetReplicaLocations()).compareTo(other.isSetReplicaLocations());
+ lastComparison = java.lang.Boolean.valueOf(isSetReplicaLocations()).compareTo(other.isSetReplicaLocations());
if (lastComparison != 0) {
return lastComparison;
}
@@ -1102,16 +1062,16 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
}
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("DataProductModel(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("DataProductModel(");
boolean first = true;
if (isSetProductUri()) {
@@ -1238,7 +1198,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
}
}
- 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;
@@ -1248,13 +1208,13 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
}
}
- private static class DataProductModelStandardSchemeFactory implements SchemeFactory {
+ private static class DataProductModelStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public DataProductModelStandardScheme getScheme() {
return new DataProductModelStandardScheme();
}
}
- private static class DataProductModelStandardScheme extends StandardScheme<DataProductModel> {
+ private static class DataProductModelStandardScheme extends org.apache.thrift.scheme.StandardScheme<DataProductModel> {
public void read(org.apache.thrift.protocol.TProtocol iprot, DataProductModel struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -1350,9 +1310,9 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
org.apache.thrift.protocol.TMap _map10 = iprot.readMapBegin();
- struct.productMetadata = new HashMap<String,String>(2*_map10.size);
- String _key11;
- String _val12;
+ struct.productMetadata = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map10.size);
+ java.lang.String _key11;
+ java.lang.String _val12;
for (int _i13 = 0; _i13 < _map10.size; ++_i13)
{
_key11 = iprot.readString();
@@ -1370,7 +1330,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list14 = iprot.readListBegin();
- struct.replicaLocations = new ArrayList<DataReplicaLocationModel>(_list14.size);
+ struct.replicaLocations = new java.util.ArrayList<DataReplicaLocationModel>(_list14.size);
DataReplicaLocationModel _elem15;
for (int _i16 = 0; _i16 < _list14.size; ++_i16)
{
@@ -1467,7 +1427,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
oprot.writeFieldBegin(PRODUCT_METADATA_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.productMetadata.size()));
- for (Map.Entry<String, String> _iter17 : struct.productMetadata.entrySet())
+ for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter17 : struct.productMetadata.entrySet())
{
oprot.writeString(_iter17.getKey());
oprot.writeString(_iter17.getValue());
@@ -1497,18 +1457,18 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
}
- private static class DataProductModelTupleSchemeFactory implements SchemeFactory {
+ private static class DataProductModelTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public DataProductModelTupleScheme getScheme() {
return new DataProductModelTupleScheme();
}
}
- private static class DataProductModelTupleScheme extends TupleScheme<DataProductModel> {
+ private static class DataProductModelTupleScheme extends org.apache.thrift.scheme.TupleScheme<DataProductModel> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, DataProductModel struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
- BitSet optionals = new BitSet();
+ org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+ java.util.BitSet optionals = new java.util.BitSet();
if (struct.isSetProductUri()) {
optionals.set(0);
}
@@ -1579,7 +1539,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
if (struct.isSetProductMetadata()) {
{
oprot.writeI32(struct.productMetadata.size());
- for (Map.Entry<String, String> _iter19 : struct.productMetadata.entrySet())
+ for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter19 : struct.productMetadata.entrySet())
{
oprot.writeString(_iter19.getKey());
oprot.writeString(_iter19.getValue());
@@ -1599,8 +1559,8 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, DataProductModel struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(12);
+ org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+ java.util.BitSet incoming = iprot.readBitSet(12);
if (incoming.get(0)) {
struct.productUri = iprot.readString();
struct.setProductUriIsSet(true);
@@ -1644,9 +1604,9 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
if (incoming.get(10)) {
{
org.apache.thrift.protocol.TMap _map21 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.productMetadata = new HashMap<String,String>(2*_map21.size);
- String _key22;
- String _val23;
+ struct.productMetadata = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map21.size);
+ java.lang.String _key22;
+ java.lang.String _val23;
for (int _i24 = 0; _i24 < _map21.size; ++_i24)
{
_key22 = iprot.readString();
@@ -1659,7 +1619,7 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
if (incoming.get(11)) {
{
org.apache.thrift.protocol.TList _list25 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.replicaLocations = new ArrayList<DataReplicaLocationModel>(_list25.size);
+ struct.replicaLocations = new java.util.ArrayList<DataReplicaLocationModel>(_list25.size);
DataReplicaLocationModel _elem26;
for (int _i27 = 0; _i27 < _list25.size; ++_i27)
{
@@ -1673,5 +1633,8 @@ public class DataProductModel implements org.apache.thrift.TBase<DataProductMode
}
}
+ 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/14ff0916/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductType.java
index db4895d..5de03d0 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductType.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/14ff0916/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java
index 151f9c2..a2e763c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.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.data.replica;
-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 DataReplicaLocationModel implements org.apache.thrift.TBase<DataReplicaLocationModel, DataReplicaLocationModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataReplicaLocationModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataReplicaLocationModel");
@@ -68,24 +41,21 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
private static final org.apache.thrift.protocol.TField FILE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("filePath", org.apache.thrift.protocol.TType.STRING, (short)11);
private static final org.apache.thrift.protocol.TField REPLICA_METADATA_FIELD_DESC = new org.apache.thrift.protocol.TField("replicaMetadata", org.apache.thrift.protocol.TType.MAP, (short)12);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new DataReplicaLocationModelStandardSchemeFactory());
- schemes.put(TupleScheme.class, new DataReplicaLocationModelTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new DataReplicaLocationModelStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new DataReplicaLocationModelTupleSchemeFactory();
- private String replicaId; // optional
- private String productUri; // optional
- private String replicaName; // optional
- private String replicaDescription; // optional
+ private java.lang.String replicaId; // optional
+ private java.lang.String productUri; // optional
+ private java.lang.String replicaName; // optional
+ private java.lang.String replicaDescription; // optional
private long creationTime; // optional
private long lastModifiedTime; // optional
private long validUntilTime; // optional
private ReplicaLocationCategory replicaLocationCategory; // optional
private ReplicaPersistentType replicaPersistentType; // optional
- private String storageResourceId; // optional
- private String filePath; // optional
- private Map<String,String> replicaMetadata; // optional
+ private java.lang.String storageResourceId; // optional
+ private java.lang.String filePath; // optional
+ private java.util.Map<java.lang.String,java.lang.String> replicaMetadata; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -110,10 +80,10 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
FILE_PATH((short)11, "filePath"),
REPLICA_METADATA((short)12, "replicaMetadata");
- 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);
}
}
@@ -158,21 +128,21 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
*/
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;
}
@@ -181,7 +151,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
@@ -192,9 +162,9 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
private static final int __VALIDUNTILTIME_ISSET_ID = 2;
private byte __isset_bitfield = 0;
private static final _Fields optionals[] = {_Fields.REPLICA_ID,_Fields.PRODUCT_URI,_Fields.REPLICA_NAME,_Fields.REPLICA_DESCRIPTION,_Fields.CREATION_TIME,_Fields.LAST_MODIFIED_TIME,_Fields.VALID_UNTIL_TIME,_Fields.REPLICA_LOCATION_CATEGORY,_Fields.REPLICA_PERSISTENT_TYPE,_Fields.STORAGE_RESOURCE_ID,_Fields.FILE_PATH,_Fields.REPLICA_METADATA};
- 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.REPLICA_ID, new org.apache.thrift.meta_data.FieldMetaData("replicaId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.PRODUCT_URI, new org.apache.thrift.meta_data.FieldMetaData("productUri", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -221,7 +191,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
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(DataReplicaLocationModel.class, metaDataMap);
}
@@ -261,7 +231,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
this.filePath = other.filePath;
}
if (other.isSetReplicaMetadata()) {
- Map<String,String> __this__replicaMetadata = new HashMap<String,String>(other.replicaMetadata);
+ java.util.Map<java.lang.String,java.lang.String> __this__replicaMetadata = new java.util.HashMap<java.lang.String,java.lang.String>(other.replicaMetadata);
this.replicaMetadata = __this__replicaMetadata;
}
}
@@ -289,11 +259,11 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
this.replicaMetadata = null;
}
- public String getReplicaId() {
+ public java.lang.String getReplicaId() {
return this.replicaId;
}
- public void setReplicaId(String replicaId) {
+ public void setReplicaId(java.lang.String replicaId) {
this.replicaId = replicaId;
}
@@ -312,11 +282,11 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
}
}
- public String getProductUri() {
+ public java.lang.String getProductUri() {
return this.productUri;
}
- public void setProductUri(String productUri) {
+ public void setProductUri(java.lang.String productUri) {
this.productUri = productUri;
}
@@ -335,11 +305,11 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
}
}
- public String getReplicaName() {
+ public java.lang.String getReplicaName() {
return this.replicaName;
}
- public void setReplicaName(String replicaName) {
+ public void setReplicaName(java.lang.String replicaName) {
this.replicaName = replicaName;
}
@@ -358,11 +328,11 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
}
}
- public String getReplicaDescription() {
+ public java.lang.String getReplicaDescription() {
return this.replicaDescription;
}
- public void setReplicaDescription(String replicaDescription) {
+ public void setReplicaDescription(java.lang.String replicaDescription) {
this.replicaDescription = replicaDescription;
}
@@ -391,16 +361,16 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
}
public void unsetCreationTime() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __CREATIONTIME_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __CREATIONTIME_ISSET_ID);
}
/** Returns true if field creationTime is set (has been assigned a value) and false otherwise */
public boolean isSetCreationTime() {
- return EncodingUtils.testBit(__isset_bitfield, __CREATIONTIME_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __CREATIONTIME_ISSET_ID);
}
public void setCreationTimeIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CREATIONTIME_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CREATIONTIME_ISSET_ID, value);
}
public long getLastModifiedTime() {
@@ -413,16 +383,16 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
}
public void unsetLastModifiedTime() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LASTMODIFIEDTIME_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LASTMODIFIEDTIME_ISSET_ID);
}
/** Returns true if field lastModifiedTime is set (has been assigned a value) and false otherwise */
public boolean isSetLastModifiedTime() {
- return EncodingUtils.testBit(__isset_bitfield, __LASTMODIFIEDTIME_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LASTMODIFIEDTIME_ISSET_ID);
}
public void setLastModifiedTimeIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LASTMODIFIEDTIME_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LASTMODIFIEDTIME_ISSET_ID, value);
}
public long getValidUntilTime() {
@@ -435,16 +405,16 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
}
public void unsetValidUntilTime() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __VALIDUNTILTIME_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __VALIDUNTILTIME_ISSET_ID);
}
/** Returns true if field validUntilTime is set (has been assigned a value) and false otherwise */
public boolean isSetValidUntilTime() {
- return EncodingUtils.testBit(__isset_bitfield, __VALIDUNTILTIME_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __VALIDUNTILTIME_ISSET_ID);
}
public void setValidUntilTimeIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __VALIDUNTILTIME_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __VALIDUNTILTIME_ISSET_ID, value);
}
/**
@@ -509,11 +479,11 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
}
}
- public String getStorageResourceId() {
+ public java.lang.String getStorageResourceId() {
return this.storageResourceId;
}
- public void setStorageResourceId(String storageResourceId) {
+ public void setStorageResourceId(java.lang.String storageResourceId) {
this.storageResourceId = storageResourceId;
}
@@ -532,11 +502,11 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
}
}
- public String getFilePath() {
+ public java.lang.String getFilePath() {
return this.filePath;
}
- public void setFilePath(String filePath) {
+ public void setFilePath(java.lang.String filePath) {
this.filePath = filePath;
}
@@ -559,18 +529,18 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
return (this.replicaMetadata == null) ? 0 : this.replicaMetadata.size();
}
- public void putToReplicaMetadata(String key, String val) {
+ public void putToReplicaMetadata(java.lang.String key, java.lang.String val) {
if (this.replicaMetadata == null) {
- this.replicaMetadata = new HashMap<String,String>();
+ this.replicaMetadata = new java.util.HashMap<java.lang.String,java.lang.String>();
}
this.replicaMetadata.put(key, val);
}
- public Map<String,String> getReplicaMetadata() {
+ public java.util.Map<java.lang.String,java.lang.String> getReplicaMetadata() {
return this.replicaMetadata;
}
- public void setReplicaMetadata(Map<String,String> replicaMetadata) {
+ public void setReplicaMetadata(java.util.Map<java.lang.String,java.lang.String> replicaMetadata) {
this.replicaMetadata = replicaMetadata;
}
@@ -589,13 +559,13 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
}
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case REPLICA_ID:
if (value == null) {
unsetReplicaId();
} else {
- setReplicaId((String)value);
+ setReplicaId((java.lang.String)value);
}
break;
@@ -603,7 +573,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
if (value == null) {
unsetProductUri();
} else {
- setProductUri((String)value);
+ setProductUri((java.lang.String)value);
}
break;
@@ -611,7 +581,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
if (value == null) {
unsetReplicaName();
} else {
- setReplicaName((String)value);
+ setReplicaName((java.lang.String)value);
}
break;
@@ -619,7 +589,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
if (value == null) {
unsetReplicaDescription();
} else {
- setReplicaDescription((String)value);
+ setReplicaDescription((java.lang.String)value);
}
break;
@@ -627,7 +597,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
if (value == null) {
unsetCreationTime();
} else {
- setCreationTime((Long)value);
+ setCreationTime((java.lang.Long)value);
}
break;
@@ -635,7 +605,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
if (value == null) {
unsetLastModifiedTime();
} else {
- setLastModifiedTime((Long)value);
+ setLastModifiedTime((java.lang.Long)value);
}
break;
@@ -643,7 +613,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
if (value == null) {
unsetValidUntilTime();
} else {
- setValidUntilTime((Long)value);
+ setValidUntilTime((java.lang.Long)value);
}
break;
@@ -667,7 +637,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
if (value == null) {
unsetStorageResourceId();
} else {
- setStorageResourceId((String)value);
+ setStorageResourceId((java.lang.String)value);
}
break;
@@ -675,7 +645,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
if (value == null) {
unsetFilePath();
} else {
- setFilePath((String)value);
+ setFilePath((java.lang.String)value);
}
break;
@@ -683,14 +653,14 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
if (value == null) {
unsetReplicaMetadata();
} else {
- setReplicaMetadata((Map<String,String>)value);
+ setReplicaMetadata((java.util.Map<java.lang.String,java.lang.String>)value);
}
break;
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case REPLICA_ID:
return getReplicaId();
@@ -729,13 +699,13 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
return getReplicaMetadata();
}
- 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) {
@@ -764,11 +734,11 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
case REPLICA_METADATA:
return isSetReplicaMetadata();
}
- 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 DataReplicaLocationModel)
@@ -779,6 +749,8 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
public boolean equals(DataReplicaLocationModel that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_replicaId = true && this.isSetReplicaId();
boolean that_present_replicaId = true && that.isSetReplicaId();
@@ -893,69 +865,57 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
-
- boolean present_replicaId = true && (isSetReplicaId());
- list.add(present_replicaId);
- if (present_replicaId)
- list.add(replicaId);
-
- boolean present_productUri = true && (isSetProductUri());
- list.add(present_productUri);
- if (present_productUri)
- list.add(productUri);
-
- boolean present_replicaName = true && (isSetReplicaName());
- list.add(present_replicaName);
- if (present_replicaName)
- list.add(replicaName);
-
- boolean present_replicaDescription = true && (isSetReplicaDescription());
- list.add(present_replicaDescription);
- if (present_replicaDescription)
- list.add(replicaDescription);
-
- boolean present_creationTime = true && (isSetCreationTime());
- list.add(present_creationTime);
- if (present_creationTime)
- list.add(creationTime);
-
- boolean present_lastModifiedTime = true && (isSetLastModifiedTime());
- list.add(present_lastModifiedTime);
- if (present_lastModifiedTime)
- list.add(lastModifiedTime);
-
- boolean present_validUntilTime = true && (isSetValidUntilTime());
- list.add(present_validUntilTime);
- if (present_validUntilTime)
- list.add(validUntilTime);
-
- boolean present_replicaLocationCategory = true && (isSetReplicaLocationCategory());
- list.add(present_replicaLocationCategory);
- if (present_replicaLocationCategory)
- list.add(replicaLocationCategory.getValue());
-
- boolean present_replicaPersistentType = true && (isSetReplicaPersistentType());
- list.add(present_replicaPersistentType);
- if (present_replicaPersistentType)
- list.add(replicaPersistentType.getValue());
-
- boolean present_storageResourceId = true && (isSetStorageResourceId());
- list.add(present_storageResourceId);
- if (present_storageResourceId)
- list.add(storageResourceId);
-
- boolean present_filePath = true && (isSetFilePath());
- list.add(present_filePath);
- if (present_filePath)
- list.add(filePath);
-
- boolean present_replicaMetadata = true && (isSetReplicaMetadata());
- list.add(present_replicaMetadata);
- if (present_replicaMetadata)
- list.add(replicaMetadata);
-
- return list.hashCode();
+ int hashCode = 1;
+
+ hashCode = hashCode * 8191 + ((isSetReplicaId()) ? 131071 : 524287);
+ if (isSetReplicaId())
+ hashCode = hashCode * 8191 + replicaId.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetProductUri()) ? 131071 : 524287);
+ if (isSetProductUri())
+ hashCode = hashCode * 8191 + productUri.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetReplicaName()) ? 131071 : 524287);
+ if (isSetReplicaName())
+ hashCode = hashCode * 8191 + replicaName.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetReplicaDescription()) ? 131071 : 524287);
+ if (isSetReplicaDescription())
+ hashCode = hashCode * 8191 + replicaDescription.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetCreationTime()) ? 131071 : 524287);
+ if (isSetCreationTime())
+ hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(creationTime);
+
+ hashCode = hashCode * 8191 + ((isSetLastModifiedTime()) ? 131071 : 524287);
+ if (isSetLastModifiedTime())
+ hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(lastModifiedTime);
+
+ hashCode = hashCode * 8191 + ((isSetValidUntilTime()) ? 131071 : 524287);
+ if (isSetValidUntilTime())
+ hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(validUntilTime);
+
+ hashCode = hashCode * 8191 + ((isSetReplicaLocationCategory()) ? 131071 : 524287);
+ if (isSetReplicaLocationCategory())
+ hashCode = hashCode * 8191 + replicaLocationCategory.getValue();
+
+ hashCode = hashCode * 8191 + ((isSetReplicaPersistentType()) ? 131071 : 524287);
+ if (isSetReplicaPersistentType())
+ hashCode = hashCode * 8191 + replicaPersistentType.getValue();
+
+ hashCode = hashCode * 8191 + ((isSetStorageResourceId()) ? 131071 : 524287);
+ if (isSetStorageResourceId())
+ hashCode = hashCode * 8191 + storageResourceId.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetFilePath()) ? 131071 : 524287);
+ if (isSetFilePath())
+ hashCode = hashCode * 8191 + filePath.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetReplicaMetadata()) ? 131071 : 524287);
+ if (isSetReplicaMetadata())
+ hashCode = hashCode * 8191 + replicaMetadata.hashCode();
+
+ return hashCode;
}
@Override
@@ -966,7 +926,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetReplicaId()).compareTo(other.isSetReplicaId());
+ lastComparison = java.lang.Boolean.valueOf(isSetReplicaId()).compareTo(other.isSetReplicaId());
if (lastComparison != 0) {
return lastComparison;
}
@@ -976,7 +936,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetProductUri()).compareTo(other.isSetProductUri());
+ lastComparison = java.lang.Boolean.valueOf(isSetProductUri()).compareTo(other.isSetProductUri());
if (lastComparison != 0) {
return lastComparison;
}
@@ -986,7 +946,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetReplicaName()).compareTo(other.isSetReplicaName());
+ lastComparison = java.lang.Boolean.valueOf(isSetReplicaName()).compareTo(other.isSetReplicaName());
if (lastComparison != 0) {
return lastComparison;
}
@@ -996,7 +956,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetReplicaDescription()).compareTo(other.isSetReplicaDescription());
+ lastComparison = java.lang.Boolean.valueOf(isSetReplicaDescription()).compareTo(other.isSetReplicaDescription());
if (lastComparison != 0) {
return lastComparison;
}
@@ -1006,7 +966,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetCreationTime()).compareTo(other.isSetCreationTime());
+ lastComparison = java.lang.Boolean.valueOf(isSetCreationTime()).compareTo(other.isSetCreationTime());
if (lastComparison != 0) {
return lastComparison;
}
@@ -1016,7 +976,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetLastModifiedTime()).compareTo(other.isSetLastModifiedTime());
+ lastComparison = java.lang.Boolean.valueOf(isSetLastModifiedTime()).compareTo(other.isSetLastModifiedTime());
if (lastComparison != 0) {
return lastComparison;
}
@@ -1026,7 +986,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetValidUntilTime()).compareTo(other.isSetValidUntilTime());
+ lastComparison = java.lang.Boolean.valueOf(isSetValidUntilTime()).compareTo(other.isSetValidUntilTime());
if (lastComparison != 0) {
return lastComparison;
}
@@ -1036,7 +996,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetReplicaLocationCategory()).compareTo(other.isSetReplicaLocationCategory());
+ lastComparison = java.lang.Boolean.valueOf(isSetReplicaLocationCategory()).compareTo(other.isSetReplicaLocationCategory());
if (lastComparison != 0) {
return lastComparison;
}
@@ -1046,7 +1006,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetReplicaPersistentType()).compareTo(other.isSetReplicaPersistentType());
+ lastComparison = java.lang.Boolean.valueOf(isSetReplicaPersistentType()).compareTo(other.isSetReplicaPersistentType());
if (lastComparison != 0) {
return lastComparison;
}
@@ -1056,7 +1016,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetStorageResourceId()).compareTo(other.isSetStorageResourceId());
+ lastComparison = java.lang.Boolean.valueOf(isSetStorageResourceId()).compareTo(other.isSetStorageResourceId());
if (lastComparison != 0) {
return lastComparison;
}
@@ -1066,7 +1026,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetFilePath()).compareTo(other.isSetFilePath());
+ lastComparison = java.lang.Boolean.valueOf(isSetFilePath()).compareTo(other.isSetFilePath());
if (lastComparison != 0) {
return lastComparison;
}
@@ -1076,7 +1036,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetReplicaMetadata()).compareTo(other.isSetReplicaMetadata());
+ lastComparison = java.lang.Boolean.valueOf(isSetReplicaMetadata()).compareTo(other.isSetReplicaMetadata());
if (lastComparison != 0) {
return lastComparison;
}
@@ -1094,16 +1054,16 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
}
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("DataReplicaLocationModel(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("DataReplicaLocationModel(");
boolean first = true;
if (isSetReplicaId()) {
@@ -1230,7 +1190,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
}
}
- 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;
@@ -1240,13 +1200,13 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
}
}
- private static class DataReplicaLocationModelStandardSchemeFactory implements SchemeFactory {
+ private static class DataReplicaLocationModelStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public DataReplicaLocationModelStandardScheme getScheme() {
return new DataReplicaLocationModelStandardScheme();
}
}
- private static class DataReplicaLocationModelStandardScheme extends StandardScheme<DataReplicaLocationModel> {
+ private static class DataReplicaLocationModelStandardScheme extends org.apache.thrift.scheme.StandardScheme<DataReplicaLocationModel> {
public void read(org.apache.thrift.protocol.TProtocol iprot, DataReplicaLocationModel struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -1350,9 +1310,9 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
org.apache.thrift.protocol.TMap _map0 = iprot.readMapBegin();
- struct.replicaMetadata = new HashMap<String,String>(2*_map0.size);
- String _key1;
- String _val2;
+ struct.replicaMetadata = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map0.size);
+ java.lang.String _key1;
+ java.lang.String _val2;
for (int _i3 = 0; _i3 < _map0.size; ++_i3)
{
_key1 = iprot.readString();
@@ -1455,7 +1415,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
oprot.writeFieldBegin(REPLICA_METADATA_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.replicaMetadata.size()));
- for (Map.Entry<String, String> _iter4 : struct.replicaMetadata.entrySet())
+ for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter4 : struct.replicaMetadata.entrySet())
{
oprot.writeString(_iter4.getKey());
oprot.writeString(_iter4.getValue());
@@ -1471,18 +1431,18 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
}
- private static class DataReplicaLocationModelTupleSchemeFactory implements SchemeFactory {
+ private static class DataReplicaLocationModelTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public DataReplicaLocationModelTupleScheme getScheme() {
return new DataReplicaLocationModelTupleScheme();
}
}
- private static class DataReplicaLocationModelTupleScheme extends TupleScheme<DataReplicaLocationModel> {
+ private static class DataReplicaLocationModelTupleScheme extends org.apache.thrift.scheme.TupleScheme<DataReplicaLocationModel> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, DataReplicaLocationModel struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
- BitSet optionals = new BitSet();
+ org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+ java.util.BitSet optionals = new java.util.BitSet();
if (struct.isSetReplicaId()) {
optionals.set(0);
}
@@ -1556,7 +1516,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
if (struct.isSetReplicaMetadata()) {
{
oprot.writeI32(struct.replicaMetadata.size());
- for (Map.Entry<String, String> _iter5 : struct.replicaMetadata.entrySet())
+ for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter5 : struct.replicaMetadata.entrySet())
{
oprot.writeString(_iter5.getKey());
oprot.writeString(_iter5.getValue());
@@ -1567,8 +1527,8 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, DataReplicaLocationModel struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(12);
+ org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+ java.util.BitSet incoming = iprot.readBitSet(12);
if (incoming.get(0)) {
struct.replicaId = iprot.readString();
struct.setReplicaIdIsSet(true);
@@ -1616,9 +1576,9 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
if (incoming.get(11)) {
{
org.apache.thrift.protocol.TMap _map6 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.replicaMetadata = new HashMap<String,String>(2*_map6.size);
- String _key7;
- String _val8;
+ struct.replicaMetadata = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map6.size);
+ java.lang.String _key7;
+ java.lang.String _val8;
for (int _i9 = 0; _i9 < _map6.size; ++_i9)
{
_key7 = iprot.readString();
@@ -1631,5 +1591,8 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep
}
}
+ 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/14ff0916/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/ReplicaLocationCategory.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/ReplicaLocationCategory.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/ReplicaLocationCategory.java
index 6cf5a8e..b891ffe 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/ReplicaLocationCategory.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/ReplicaLocationCategory.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/14ff0916/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/ReplicaPersistentType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/ReplicaPersistentType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/ReplicaPersistentType.java
index 518ca9f..705d024 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/ReplicaPersistentType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/ReplicaPersistentType.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/14ff0916/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/CrudType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/CrudType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/CrudType.java
index 23947b1..1500d20 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/CrudType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/dbevent/CrudType.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