http://git-wip-us.apache.org/repos/asf/airavata/blob/14ff0916/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java index 9c274d6..b8754ed 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.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.appcatalog.gatewayprofile; -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"}) [email protected](value = "Autogenerated by Thrift Compiler (0.10.0)") public class StoragePreference implements org.apache.thrift.TBase<StoragePreference, StoragePreference._Fields>, java.io.Serializable, Cloneable, Comparable<StoragePreference> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StoragePreference"); @@ -60,16 +33,13 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere private static final org.apache.thrift.protocol.TField FILE_SYSTEM_ROOT_LOCATION_FIELD_DESC = new org.apache.thrift.protocol.TField("fileSystemRootLocation", org.apache.thrift.protocol.TType.STRING, (short)3); private static final org.apache.thrift.protocol.TField RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceSpecificCredentialStoreToken", org.apache.thrift.protocol.TType.STRING, (short)4); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new StoragePreferenceStandardSchemeFactory()); - schemes.put(TupleScheme.class, new StoragePreferenceTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new StoragePreferenceStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new StoragePreferenceTupleSchemeFactory(); - private String storageResourceId; // required - private String loginUserName; // optional - private String fileSystemRootLocation; // optional - private String resourceSpecificCredentialStoreToken; // optional + private java.lang.String storageResourceId; // required + private java.lang.String loginUserName; // optional + private java.lang.String fileSystemRootLocation; // optional + private java.lang.String resourceSpecificCredentialStoreToken; // 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 { @@ -78,10 +48,10 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere FILE_SYSTEM_ROOT_LOCATION((short)3, "fileSystemRootLocation"), RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN((short)4, "resourceSpecificCredentialStoreToken"); - 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); } } @@ -110,21 +80,21 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere */ 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; } @@ -133,16 +103,16 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments private static final _Fields optionals[] = {_Fields.LOGIN_USER_NAME,_Fields.FILE_SYSTEM_ROOT_LOCATION,_Fields.RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN}; - 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.STORAGE_RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("storageResourceId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.LOGIN_USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("loginUserName", org.apache.thrift.TFieldRequirementType.OPTIONAL, @@ -151,7 +121,7 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("resourceSpecificCredentialStoreToken", org.apache.thrift.TFieldRequirementType.OPTIONAL, 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(StoragePreference.class, metaDataMap); } @@ -159,7 +129,7 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere } public StoragePreference( - String storageResourceId) + java.lang.String storageResourceId) { this(); this.storageResourceId = storageResourceId; @@ -195,11 +165,11 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere this.resourceSpecificCredentialStoreToken = null; } - 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; } @@ -218,11 +188,11 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere } } - public String getLoginUserName() { + public java.lang.String getLoginUserName() { return this.loginUserName; } - public void setLoginUserName(String loginUserName) { + public void setLoginUserName(java.lang.String loginUserName) { this.loginUserName = loginUserName; } @@ -241,11 +211,11 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere } } - public String getFileSystemRootLocation() { + public java.lang.String getFileSystemRootLocation() { return this.fileSystemRootLocation; } - public void setFileSystemRootLocation(String fileSystemRootLocation) { + public void setFileSystemRootLocation(java.lang.String fileSystemRootLocation) { this.fileSystemRootLocation = fileSystemRootLocation; } @@ -264,11 +234,11 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere } } - public String getResourceSpecificCredentialStoreToken() { + public java.lang.String getResourceSpecificCredentialStoreToken() { return this.resourceSpecificCredentialStoreToken; } - public void setResourceSpecificCredentialStoreToken(String resourceSpecificCredentialStoreToken) { + public void setResourceSpecificCredentialStoreToken(java.lang.String resourceSpecificCredentialStoreToken) { this.resourceSpecificCredentialStoreToken = resourceSpecificCredentialStoreToken; } @@ -287,13 +257,13 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case STORAGE_RESOURCE_ID: if (value == null) { unsetStorageResourceId(); } else { - setStorageResourceId((String)value); + setStorageResourceId((java.lang.String)value); } break; @@ -301,7 +271,7 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere if (value == null) { unsetLoginUserName(); } else { - setLoginUserName((String)value); + setLoginUserName((java.lang.String)value); } break; @@ -309,7 +279,7 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere if (value == null) { unsetFileSystemRootLocation(); } else { - setFileSystemRootLocation((String)value); + setFileSystemRootLocation((java.lang.String)value); } break; @@ -317,14 +287,14 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere if (value == null) { unsetResourceSpecificCredentialStoreToken(); } else { - setResourceSpecificCredentialStoreToken((String)value); + setResourceSpecificCredentialStoreToken((java.lang.String)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case STORAGE_RESOURCE_ID: return getStorageResourceId(); @@ -339,13 +309,13 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere return getResourceSpecificCredentialStoreToken(); } - 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) { @@ -358,11 +328,11 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere case RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN: return isSetResourceSpecificCredentialStoreToken(); } - 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 StoragePreference) @@ -373,6 +343,8 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere public boolean equals(StoragePreference that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_storageResourceId = true && this.isSetStorageResourceId(); boolean that_present_storageResourceId = true && that.isSetStorageResourceId(); @@ -415,29 +387,25 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_storageResourceId = true && (isSetStorageResourceId()); - list.add(present_storageResourceId); - if (present_storageResourceId) - list.add(storageResourceId); + hashCode = hashCode * 8191 + ((isSetStorageResourceId()) ? 131071 : 524287); + if (isSetStorageResourceId()) + hashCode = hashCode * 8191 + storageResourceId.hashCode(); - boolean present_loginUserName = true && (isSetLoginUserName()); - list.add(present_loginUserName); - if (present_loginUserName) - list.add(loginUserName); + hashCode = hashCode * 8191 + ((isSetLoginUserName()) ? 131071 : 524287); + if (isSetLoginUserName()) + hashCode = hashCode * 8191 + loginUserName.hashCode(); - boolean present_fileSystemRootLocation = true && (isSetFileSystemRootLocation()); - list.add(present_fileSystemRootLocation); - if (present_fileSystemRootLocation) - list.add(fileSystemRootLocation); + hashCode = hashCode * 8191 + ((isSetFileSystemRootLocation()) ? 131071 : 524287); + if (isSetFileSystemRootLocation()) + hashCode = hashCode * 8191 + fileSystemRootLocation.hashCode(); - boolean present_resourceSpecificCredentialStoreToken = true && (isSetResourceSpecificCredentialStoreToken()); - list.add(present_resourceSpecificCredentialStoreToken); - if (present_resourceSpecificCredentialStoreToken) - list.add(resourceSpecificCredentialStoreToken); + hashCode = hashCode * 8191 + ((isSetResourceSpecificCredentialStoreToken()) ? 131071 : 524287); + if (isSetResourceSpecificCredentialStoreToken()) + hashCode = hashCode * 8191 + resourceSpecificCredentialStoreToken.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -448,7 +416,7 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetStorageResourceId()).compareTo(other.isSetStorageResourceId()); + lastComparison = java.lang.Boolean.valueOf(isSetStorageResourceId()).compareTo(other.isSetStorageResourceId()); if (lastComparison != 0) { return lastComparison; } @@ -458,7 +426,7 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere return lastComparison; } } - lastComparison = Boolean.valueOf(isSetLoginUserName()).compareTo(other.isSetLoginUserName()); + lastComparison = java.lang.Boolean.valueOf(isSetLoginUserName()).compareTo(other.isSetLoginUserName()); if (lastComparison != 0) { return lastComparison; } @@ -468,7 +436,7 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFileSystemRootLocation()).compareTo(other.isSetFileSystemRootLocation()); + lastComparison = java.lang.Boolean.valueOf(isSetFileSystemRootLocation()).compareTo(other.isSetFileSystemRootLocation()); if (lastComparison != 0) { return lastComparison; } @@ -478,7 +446,7 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere return lastComparison; } } - lastComparison = Boolean.valueOf(isSetResourceSpecificCredentialStoreToken()).compareTo(other.isSetResourceSpecificCredentialStoreToken()); + lastComparison = java.lang.Boolean.valueOf(isSetResourceSpecificCredentialStoreToken()).compareTo(other.isSetResourceSpecificCredentialStoreToken()); if (lastComparison != 0) { return lastComparison; } @@ -496,16 +464,16 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere } 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("StoragePreference("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("StoragePreference("); boolean first = true; sb.append("storageResourceId:"); @@ -566,7 +534,7 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere } } - 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) { @@ -574,13 +542,13 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere } } - private static class StoragePreferenceStandardSchemeFactory implements SchemeFactory { + private static class StoragePreferenceStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public StoragePreferenceStandardScheme getScheme() { return new StoragePreferenceStandardScheme(); } } - private static class StoragePreferenceStandardScheme extends StandardScheme<StoragePreference> { + private static class StoragePreferenceStandardScheme extends org.apache.thrift.scheme.StandardScheme<StoragePreference> { public void read(org.apache.thrift.protocol.TProtocol iprot, StoragePreference struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -669,19 +637,19 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere } - private static class StoragePreferenceTupleSchemeFactory implements SchemeFactory { + private static class StoragePreferenceTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public StoragePreferenceTupleScheme getScheme() { return new StoragePreferenceTupleScheme(); } } - private static class StoragePreferenceTupleScheme extends TupleScheme<StoragePreference> { + private static class StoragePreferenceTupleScheme extends org.apache.thrift.scheme.TupleScheme<StoragePreference> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, StoragePreference 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.storageResourceId); - BitSet optionals = new BitSet(); + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetLoginUserName()) { optionals.set(0); } @@ -705,10 +673,10 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere @Override public void read(org.apache.thrift.protocol.TProtocol prot, StoragePreference struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; struct.storageResourceId = iprot.readString(); struct.setStorageResourceIdIsSet(true); - BitSet incoming = iprot.readBitSet(3); + java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.loginUserName = iprot.readString(); struct.setLoginUserNameIsSet(true); @@ -724,5 +692,8 @@ public class StoragePreference implements org.apache.thrift.TBase<StoragePrefere } } + 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/appcatalog/storageresource/StorageResourceDescription.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java index 1499cd8..600819f 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.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.appcatalog.storageresource; -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"}) /** * Storage Resource Description * @@ -68,7 +41,7 @@ import org.slf4j.LoggerFactory; * * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") [email protected](value = "Autogenerated by Thrift Compiler (0.10.0)") public class StorageResourceDescription implements org.apache.thrift.TBase<StorageResourceDescription, StorageResourceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<StorageResourceDescription> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StorageResourceDescription"); @@ -78,17 +51,14 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora private static final org.apache.thrift.protocol.TField ENABLED_FIELD_DESC = new org.apache.thrift.protocol.TField("enabled", org.apache.thrift.protocol.TType.BOOL, (short)4); private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_INTERFACES_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovementInterfaces", org.apache.thrift.protocol.TType.LIST, (short)5); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new StorageResourceDescriptionStandardSchemeFactory()); - schemes.put(TupleScheme.class, new StorageResourceDescriptionTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new StorageResourceDescriptionStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new StorageResourceDescriptionTupleSchemeFactory(); - private String storageResourceId; // required - private String hostName; // required - private String storageResourceDescription; // optional + private java.lang.String storageResourceId; // required + private java.lang.String hostName; // required + private java.lang.String storageResourceDescription; // optional private boolean enabled; // optional - private List<org.apache.airavata.model.data.movement.DataMovementInterface> dataMovementInterfaces; // optional + private java.util.List<org.apache.airavata.model.data.movement.DataMovementInterface> dataMovementInterfaces; // 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 { @@ -98,10 +68,10 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora ENABLED((short)4, "enabled"), DATA_MOVEMENT_INTERFACES((short)5, "dataMovementInterfaces"); - 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); } } @@ -132,21 +102,21 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora */ 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; } @@ -155,7 +125,7 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -164,9 +134,9 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora private static final int __ENABLED_ISSET_ID = 0; private byte __isset_bitfield = 0; private static final _Fields optionals[] = {_Fields.STORAGE_RESOURCE_DESCRIPTION,_Fields.ENABLED,_Fields.DATA_MOVEMENT_INTERFACES}; - 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.STORAGE_RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("storageResourceId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.HOST_NAME, new org.apache.thrift.meta_data.FieldMetaData("hostName", org.apache.thrift.TFieldRequirementType.REQUIRED, @@ -178,7 +148,7 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora tmpMap.put(_Fields.DATA_MOVEMENT_INTERFACES, new org.apache.thrift.meta_data.FieldMetaData("dataMovementInterfaces", 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, org.apache.airavata.model.data.movement.DataMovementInterface.class)))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(StorageResourceDescription.class, metaDataMap); } @@ -188,8 +158,8 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora } public StorageResourceDescription( - String storageResourceId, - String hostName) + java.lang.String storageResourceId, + java.lang.String hostName) { this(); this.storageResourceId = storageResourceId; @@ -212,7 +182,7 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora } this.enabled = other.enabled; if (other.isSetDataMovementInterfaces()) { - List<org.apache.airavata.model.data.movement.DataMovementInterface> __this__dataMovementInterfaces = new ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(other.dataMovementInterfaces.size()); + java.util.List<org.apache.airavata.model.data.movement.DataMovementInterface> __this__dataMovementInterfaces = new java.util.ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(other.dataMovementInterfaces.size()); for (org.apache.airavata.model.data.movement.DataMovementInterface other_element : other.dataMovementInterfaces) { __this__dataMovementInterfaces.add(new org.apache.airavata.model.data.movement.DataMovementInterface(other_element)); } @@ -235,11 +205,11 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora this.dataMovementInterfaces = null; } - 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; } @@ -258,11 +228,11 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora } } - public String getHostName() { + public java.lang.String getHostName() { return this.hostName; } - public void setHostName(String hostName) { + public void setHostName(java.lang.String hostName) { this.hostName = hostName; } @@ -281,11 +251,11 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora } } - public String getStorageResourceDescription() { + public java.lang.String getStorageResourceDescription() { return this.storageResourceDescription; } - public void setStorageResourceDescription(String storageResourceDescription) { + public void setStorageResourceDescription(java.lang.String storageResourceDescription) { this.storageResourceDescription = storageResourceDescription; } @@ -314,16 +284,16 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora } public void unsetEnabled() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ENABLED_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ENABLED_ISSET_ID); } /** Returns true if field enabled is set (has been assigned a value) and false otherwise */ public boolean isSetEnabled() { - return EncodingUtils.testBit(__isset_bitfield, __ENABLED_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ENABLED_ISSET_ID); } public void setEnabledIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ENABLED_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ENABLED_ISSET_ID, value); } public int getDataMovementInterfacesSize() { @@ -336,16 +306,16 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora public void addToDataMovementInterfaces(org.apache.airavata.model.data.movement.DataMovementInterface elem) { if (this.dataMovementInterfaces == null) { - this.dataMovementInterfaces = new ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(); + this.dataMovementInterfaces = new java.util.ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(); } this.dataMovementInterfaces.add(elem); } - public List<org.apache.airavata.model.data.movement.DataMovementInterface> getDataMovementInterfaces() { + public java.util.List<org.apache.airavata.model.data.movement.DataMovementInterface> getDataMovementInterfaces() { return this.dataMovementInterfaces; } - public void setDataMovementInterfaces(List<org.apache.airavata.model.data.movement.DataMovementInterface> dataMovementInterfaces) { + public void setDataMovementInterfaces(java.util.List<org.apache.airavata.model.data.movement.DataMovementInterface> dataMovementInterfaces) { this.dataMovementInterfaces = dataMovementInterfaces; } @@ -364,13 +334,13 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case STORAGE_RESOURCE_ID: if (value == null) { unsetStorageResourceId(); } else { - setStorageResourceId((String)value); + setStorageResourceId((java.lang.String)value); } break; @@ -378,7 +348,7 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora if (value == null) { unsetHostName(); } else { - setHostName((String)value); + setHostName((java.lang.String)value); } break; @@ -386,7 +356,7 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora if (value == null) { unsetStorageResourceDescription(); } else { - setStorageResourceDescription((String)value); + setStorageResourceDescription((java.lang.String)value); } break; @@ -394,7 +364,7 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora if (value == null) { unsetEnabled(); } else { - setEnabled((Boolean)value); + setEnabled((java.lang.Boolean)value); } break; @@ -402,14 +372,14 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora if (value == null) { unsetDataMovementInterfaces(); } else { - setDataMovementInterfaces((List<org.apache.airavata.model.data.movement.DataMovementInterface>)value); + setDataMovementInterfaces((java.util.List<org.apache.airavata.model.data.movement.DataMovementInterface>)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case STORAGE_RESOURCE_ID: return getStorageResourceId(); @@ -427,13 +397,13 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora return getDataMovementInterfaces(); } - 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) { @@ -448,11 +418,11 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora case DATA_MOVEMENT_INTERFACES: return isSetDataMovementInterfaces(); } - 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 StorageResourceDescription) @@ -463,6 +433,8 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora public boolean equals(StorageResourceDescription that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_storageResourceId = true && this.isSetStorageResourceId(); boolean that_present_storageResourceId = true && that.isSetStorageResourceId(); @@ -514,34 +486,29 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_storageResourceId = true && (isSetStorageResourceId()); - list.add(present_storageResourceId); - if (present_storageResourceId) - list.add(storageResourceId); + hashCode = hashCode * 8191 + ((isSetStorageResourceId()) ? 131071 : 524287); + if (isSetStorageResourceId()) + hashCode = hashCode * 8191 + storageResourceId.hashCode(); - boolean present_hostName = true && (isSetHostName()); - list.add(present_hostName); - if (present_hostName) - list.add(hostName); + hashCode = hashCode * 8191 + ((isSetHostName()) ? 131071 : 524287); + if (isSetHostName()) + hashCode = hashCode * 8191 + hostName.hashCode(); - boolean present_storageResourceDescription = true && (isSetStorageResourceDescription()); - list.add(present_storageResourceDescription); - if (present_storageResourceDescription) - list.add(storageResourceDescription); + hashCode = hashCode * 8191 + ((isSetStorageResourceDescription()) ? 131071 : 524287); + if (isSetStorageResourceDescription()) + hashCode = hashCode * 8191 + storageResourceDescription.hashCode(); - boolean present_enabled = true && (isSetEnabled()); - list.add(present_enabled); - if (present_enabled) - list.add(enabled); + hashCode = hashCode * 8191 + ((isSetEnabled()) ? 131071 : 524287); + if (isSetEnabled()) + hashCode = hashCode * 8191 + ((enabled) ? 131071 : 524287); - boolean present_dataMovementInterfaces = true && (isSetDataMovementInterfaces()); - list.add(present_dataMovementInterfaces); - if (present_dataMovementInterfaces) - list.add(dataMovementInterfaces); + hashCode = hashCode * 8191 + ((isSetDataMovementInterfaces()) ? 131071 : 524287); + if (isSetDataMovementInterfaces()) + hashCode = hashCode * 8191 + dataMovementInterfaces.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -552,7 +519,7 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetStorageResourceId()).compareTo(other.isSetStorageResourceId()); + lastComparison = java.lang.Boolean.valueOf(isSetStorageResourceId()).compareTo(other.isSetStorageResourceId()); if (lastComparison != 0) { return lastComparison; } @@ -562,7 +529,7 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora return lastComparison; } } - lastComparison = Boolean.valueOf(isSetHostName()).compareTo(other.isSetHostName()); + lastComparison = java.lang.Boolean.valueOf(isSetHostName()).compareTo(other.isSetHostName()); if (lastComparison != 0) { return lastComparison; } @@ -572,7 +539,7 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora return lastComparison; } } - lastComparison = Boolean.valueOf(isSetStorageResourceDescription()).compareTo(other.isSetStorageResourceDescription()); + lastComparison = java.lang.Boolean.valueOf(isSetStorageResourceDescription()).compareTo(other.isSetStorageResourceDescription()); if (lastComparison != 0) { return lastComparison; } @@ -582,7 +549,7 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora return lastComparison; } } - lastComparison = Boolean.valueOf(isSetEnabled()).compareTo(other.isSetEnabled()); + lastComparison = java.lang.Boolean.valueOf(isSetEnabled()).compareTo(other.isSetEnabled()); if (lastComparison != 0) { return lastComparison; } @@ -592,7 +559,7 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora return lastComparison; } } - lastComparison = Boolean.valueOf(isSetDataMovementInterfaces()).compareTo(other.isSetDataMovementInterfaces()); + lastComparison = java.lang.Boolean.valueOf(isSetDataMovementInterfaces()).compareTo(other.isSetDataMovementInterfaces()); if (lastComparison != 0) { return lastComparison; } @@ -610,16 +577,16 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora } 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("StorageResourceDescription("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("StorageResourceDescription("); boolean first = true; sb.append("storageResourceId:"); @@ -688,7 +655,7 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora } } - 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; @@ -698,13 +665,13 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora } } - private static class StorageResourceDescriptionStandardSchemeFactory implements SchemeFactory { + private static class StorageResourceDescriptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public StorageResourceDescriptionStandardScheme getScheme() { return new StorageResourceDescriptionStandardScheme(); } } - private static class StorageResourceDescriptionStandardScheme extends StandardScheme<StorageResourceDescription> { + private static class StorageResourceDescriptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<StorageResourceDescription> { public void read(org.apache.thrift.protocol.TProtocol iprot, StorageResourceDescription struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -752,7 +719,7 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); - struct.dataMovementInterfaces = new ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(_list0.size); + struct.dataMovementInterfaces = new java.util.ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(_list0.size); org.apache.airavata.model.data.movement.DataMovementInterface _elem1; for (int _i2 = 0; _i2 < _list0.size; ++_i2) { @@ -822,20 +789,20 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora } - private static class StorageResourceDescriptionTupleSchemeFactory implements SchemeFactory { + private static class StorageResourceDescriptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public StorageResourceDescriptionTupleScheme getScheme() { return new StorageResourceDescriptionTupleScheme(); } } - private static class StorageResourceDescriptionTupleScheme extends TupleScheme<StorageResourceDescription> { + private static class StorageResourceDescriptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<StorageResourceDescription> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, StorageResourceDescription 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.storageResourceId); oprot.writeString(struct.hostName); - BitSet optionals = new BitSet(); + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetStorageResourceDescription()) { optionals.set(0); } @@ -865,12 +832,12 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora @Override public void read(org.apache.thrift.protocol.TProtocol prot, StorageResourceDescription struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; struct.storageResourceId = iprot.readString(); struct.setStorageResourceIdIsSet(true); struct.hostName = iprot.readString(); struct.setHostNameIsSet(true); - BitSet incoming = iprot.readBitSet(3); + java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.storageResourceDescription = iprot.readString(); struct.setStorageResourceDescriptionIsSet(true); @@ -882,7 +849,7 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora if (incoming.get(2)) { { org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.dataMovementInterfaces = new ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(_list5.size); + struct.dataMovementInterfaces = new java.util.ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(_list5.size); org.apache.airavata.model.data.movement.DataMovementInterface _elem6; for (int _i7 = 0; _i7 < _list5.size; ++_i7) { @@ -896,5 +863,8 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora } } + 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/appcatalog/userresourceprofile/UserComputeResourcePreference.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/userresourceprofile/UserComputeResourcePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/userresourceprofile/UserComputeResourcePreference.java index 276b7ca..c4a179c 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/userresourceprofile/UserComputeResourcePreference.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/userresourceprofile/UserComputeResourcePreference.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.appcatalog.userresourceprofile; -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"}) /** * User specific preferences for a Computer Resource * @@ -78,7 +51,7 @@ import org.slf4j.LoggerFactory; * default credential store. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") [email protected](value = "Autogenerated by Thrift Compiler (0.10.0)") public class UserComputeResourcePreference implements org.apache.thrift.TBase<UserComputeResourcePreference, UserComputeResourcePreference._Fields>, java.io.Serializable, Cloneable, Comparable<UserComputeResourcePreference> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserComputeResourcePreference"); @@ -93,20 +66,17 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us private static final org.apache.thrift.protocol.TField RESERVATION_START_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("reservationStartTime", org.apache.thrift.protocol.TType.I64, (short)9); private static final org.apache.thrift.protocol.TField RESERVATION_END_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("reservationEndTime", org.apache.thrift.protocol.TType.I64, (short)10); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new UserComputeResourcePreferenceStandardSchemeFactory()); - schemes.put(TupleScheme.class, new UserComputeResourcePreferenceTupleSchemeFactory()); - } - - private String computeResourceId; // required - private String loginUserName; // optional - private String preferredBatchQueue; // optional - private String scratchLocation; // optional - private String allocationProjectNumber; // optional - private String resourceSpecificCredentialStoreToken; // optional - private String qualityOfService; // optional - private String reservation; // optional + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new UserComputeResourcePreferenceStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new UserComputeResourcePreferenceTupleSchemeFactory(); + + private java.lang.String computeResourceId; // required + private java.lang.String loginUserName; // optional + private java.lang.String preferredBatchQueue; // optional + private java.lang.String scratchLocation; // optional + private java.lang.String allocationProjectNumber; // optional + private java.lang.String resourceSpecificCredentialStoreToken; // optional + private java.lang.String qualityOfService; // optional + private java.lang.String reservation; // optional private long reservationStartTime; // optional private long reservationEndTime; // optional @@ -123,10 +93,10 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us RESERVATION_START_TIME((short)9, "reservationStartTime"), RESERVATION_END_TIME((short)10, "reservationEndTime"); - 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); } } @@ -167,21 +137,21 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us */ 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; } @@ -190,7 +160,7 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -200,9 +170,9 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us private static final int __RESERVATIONENDTIME_ISSET_ID = 1; private byte __isset_bitfield = 0; private static final _Fields optionals[] = {_Fields.LOGIN_USER_NAME,_Fields.PREFERRED_BATCH_QUEUE,_Fields.SCRATCH_LOCATION,_Fields.ALLOCATION_PROJECT_NUMBER,_Fields.RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN,_Fields.QUALITY_OF_SERVICE,_Fields.RESERVATION,_Fields.RESERVATION_START_TIME,_Fields.RESERVATION_END_TIME}; - 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.COMPUTE_RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("computeResourceId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.LOGIN_USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("loginUserName", org.apache.thrift.TFieldRequirementType.OPTIONAL, @@ -223,7 +193,7 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.RESERVATION_END_TIME, new org.apache.thrift.meta_data.FieldMetaData("reservationEndTime", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(UserComputeResourcePreference.class, metaDataMap); } @@ -231,7 +201,7 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us } public UserComputeResourcePreference( - String computeResourceId) + java.lang.String computeResourceId) { this(); this.computeResourceId = computeResourceId; @@ -290,11 +260,11 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us this.reservationEndTime = 0; } - public String getComputeResourceId() { + public java.lang.String getComputeResourceId() { return this.computeResourceId; } - public void setComputeResourceId(String computeResourceId) { + public void setComputeResourceId(java.lang.String computeResourceId) { this.computeResourceId = computeResourceId; } @@ -313,11 +283,11 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us } } - public String getLoginUserName() { + public java.lang.String getLoginUserName() { return this.loginUserName; } - public void setLoginUserName(String loginUserName) { + public void setLoginUserName(java.lang.String loginUserName) { this.loginUserName = loginUserName; } @@ -336,11 +306,11 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us } } - public String getPreferredBatchQueue() { + public java.lang.String getPreferredBatchQueue() { return this.preferredBatchQueue; } - public void setPreferredBatchQueue(String preferredBatchQueue) { + public void setPreferredBatchQueue(java.lang.String preferredBatchQueue) { this.preferredBatchQueue = preferredBatchQueue; } @@ -359,11 +329,11 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us } } - public String getScratchLocation() { + public java.lang.String getScratchLocation() { return this.scratchLocation; } - public void setScratchLocation(String scratchLocation) { + public void setScratchLocation(java.lang.String scratchLocation) { this.scratchLocation = scratchLocation; } @@ -382,11 +352,11 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us } } - public String getAllocationProjectNumber() { + public java.lang.String getAllocationProjectNumber() { return this.allocationProjectNumber; } - public void setAllocationProjectNumber(String allocationProjectNumber) { + public void setAllocationProjectNumber(java.lang.String allocationProjectNumber) { this.allocationProjectNumber = allocationProjectNumber; } @@ -405,11 +375,11 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us } } - public String getResourceSpecificCredentialStoreToken() { + public java.lang.String getResourceSpecificCredentialStoreToken() { return this.resourceSpecificCredentialStoreToken; } - public void setResourceSpecificCredentialStoreToken(String resourceSpecificCredentialStoreToken) { + public void setResourceSpecificCredentialStoreToken(java.lang.String resourceSpecificCredentialStoreToken) { this.resourceSpecificCredentialStoreToken = resourceSpecificCredentialStoreToken; } @@ -428,11 +398,11 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us } } - public String getQualityOfService() { + public java.lang.String getQualityOfService() { return this.qualityOfService; } - public void setQualityOfService(String qualityOfService) { + public void setQualityOfService(java.lang.String qualityOfService) { this.qualityOfService = qualityOfService; } @@ -451,11 +421,11 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us } } - public String getReservation() { + public java.lang.String getReservation() { return this.reservation; } - public void setReservation(String reservation) { + public void setReservation(java.lang.String reservation) { this.reservation = reservation; } @@ -484,16 +454,16 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us } public void unsetReservationStartTime() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __RESERVATIONSTARTTIME_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __RESERVATIONSTARTTIME_ISSET_ID); } /** Returns true if field reservationStartTime is set (has been assigned a value) and false otherwise */ public boolean isSetReservationStartTime() { - return EncodingUtils.testBit(__isset_bitfield, __RESERVATIONSTARTTIME_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __RESERVATIONSTARTTIME_ISSET_ID); } public void setReservationStartTimeIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __RESERVATIONSTARTTIME_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __RESERVATIONSTARTTIME_ISSET_ID, value); } public long getReservationEndTime() { @@ -506,25 +476,25 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us } public void unsetReservationEndTime() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __RESERVATIONENDTIME_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __RESERVATIONENDTIME_ISSET_ID); } /** Returns true if field reservationEndTime is set (has been assigned a value) and false otherwise */ public boolean isSetReservationEndTime() { - return EncodingUtils.testBit(__isset_bitfield, __RESERVATIONENDTIME_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __RESERVATIONENDTIME_ISSET_ID); } public void setReservationEndTimeIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __RESERVATIONENDTIME_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __RESERVATIONENDTIME_ISSET_ID, value); } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case COMPUTE_RESOURCE_ID: if (value == null) { unsetComputeResourceId(); } else { - setComputeResourceId((String)value); + setComputeResourceId((java.lang.String)value); } break; @@ -532,7 +502,7 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us if (value == null) { unsetLoginUserName(); } else { - setLoginUserName((String)value); + setLoginUserName((java.lang.String)value); } break; @@ -540,7 +510,7 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us if (value == null) { unsetPreferredBatchQueue(); } else { - setPreferredBatchQueue((String)value); + setPreferredBatchQueue((java.lang.String)value); } break; @@ -548,7 +518,7 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us if (value == null) { unsetScratchLocation(); } else { - setScratchLocation((String)value); + setScratchLocation((java.lang.String)value); } break; @@ -556,7 +526,7 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us if (value == null) { unsetAllocationProjectNumber(); } else { - setAllocationProjectNumber((String)value); + setAllocationProjectNumber((java.lang.String)value); } break; @@ -564,7 +534,7 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us if (value == null) { unsetResourceSpecificCredentialStoreToken(); } else { - setResourceSpecificCredentialStoreToken((String)value); + setResourceSpecificCredentialStoreToken((java.lang.String)value); } break; @@ -572,7 +542,7 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us if (value == null) { unsetQualityOfService(); } else { - setQualityOfService((String)value); + setQualityOfService((java.lang.String)value); } break; @@ -580,7 +550,7 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us if (value == null) { unsetReservation(); } else { - setReservation((String)value); + setReservation((java.lang.String)value); } break; @@ -588,7 +558,7 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us if (value == null) { unsetReservationStartTime(); } else { - setReservationStartTime((Long)value); + setReservationStartTime((java.lang.Long)value); } break; @@ -596,14 +566,14 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us if (value == null) { unsetReservationEndTime(); } else { - setReservationEndTime((Long)value); + setReservationEndTime((java.lang.Long)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case COMPUTE_RESOURCE_ID: return getComputeResourceId(); @@ -636,13 +606,13 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us return getReservationEndTime(); } - 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) { @@ -667,11 +637,11 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us case RESERVATION_END_TIME: return isSetReservationEndTime(); } - 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 UserComputeResourcePreference) @@ -682,6 +652,8 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us public boolean equals(UserComputeResourcePreference that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_computeResourceId = true && this.isSetComputeResourceId(); boolean that_present_computeResourceId = true && that.isSetComputeResourceId(); @@ -778,59 +750,49 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_computeResourceId = true && (isSetComputeResourceId()); - list.add(present_computeResourceId); - if (present_computeResourceId) - list.add(computeResourceId); + hashCode = hashCode * 8191 + ((isSetComputeResourceId()) ? 131071 : 524287); + if (isSetComputeResourceId()) + hashCode = hashCode * 8191 + computeResourceId.hashCode(); - boolean present_loginUserName = true && (isSetLoginUserName()); - list.add(present_loginUserName); - if (present_loginUserName) - list.add(loginUserName); + hashCode = hashCode * 8191 + ((isSetLoginUserName()) ? 131071 : 524287); + if (isSetLoginUserName()) + hashCode = hashCode * 8191 + loginUserName.hashCode(); - boolean present_preferredBatchQueue = true && (isSetPreferredBatchQueue()); - list.add(present_preferredBatchQueue); - if (present_preferredBatchQueue) - list.add(preferredBatchQueue); + hashCode = hashCode * 8191 + ((isSetPreferredBatchQueue()) ? 131071 : 524287); + if (isSetPreferredBatchQueue()) + hashCode = hashCode * 8191 + preferredBatchQueue.hashCode(); - boolean present_scratchLocation = true && (isSetScratchLocation()); - list.add(present_scratchLocation); - if (present_scratchLocation) - list.add(scratchLocation); + hashCode = hashCode * 8191 + ((isSetScratchLocation()) ? 131071 : 524287); + if (isSetScratchLocation()) + hashCode = hashCode * 8191 + scratchLocation.hashCode(); - boolean present_allocationProjectNumber = true && (isSetAllocationProjectNumber()); - list.add(present_allocationProjectNumber); - if (present_allocationProjectNumber) - list.add(allocationProjectNumber); + hashCode = hashCode * 8191 + ((isSetAllocationProjectNumber()) ? 131071 : 524287); + if (isSetAllocationProjectNumber()) + hashCode = hashCode * 8191 + allocationProjectNumber.hashCode(); - boolean present_resourceSpecificCredentialStoreToken = true && (isSetResourceSpecificCredentialStoreToken()); - list.add(present_resourceSpecificCredentialStoreToken); - if (present_resourceSpecificCredentialStoreToken) - list.add(resourceSpecificCredentialStoreToken); + hashCode = hashCode * 8191 + ((isSetResourceSpecificCredentialStoreToken()) ? 131071 : 524287); + if (isSetResourceSpecificCredentialStoreToken()) + hashCode = hashCode * 8191 + resourceSpecificCredentialStoreToken.hashCode(); - boolean present_qualityOfService = true && (isSetQualityOfService()); - list.add(present_qualityOfService); - if (present_qualityOfService) - list.add(qualityOfService); + hashCode = hashCode * 8191 + ((isSetQualityOfService()) ? 131071 : 524287); + if (isSetQualityOfService()) + hashCode = hashCode * 8191 + qualityOfService.hashCode(); - boolean present_reservation = true && (isSetReservation()); - list.add(present_reservation); - if (present_reservation) - list.add(reservation); + hashCode = hashCode * 8191 + ((isSetReservation()) ? 131071 : 524287); + if (isSetReservation()) + hashCode = hashCode * 8191 + reservation.hashCode(); - boolean present_reservationStartTime = true && (isSetReservationStartTime()); - list.add(present_reservationStartTime); - if (present_reservationStartTime) - list.add(reservationStartTime); + hashCode = hashCode * 8191 + ((isSetReservationStartTime()) ? 131071 : 524287); + if (isSetReservationStartTime()) + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(reservationStartTime); - boolean present_reservationEndTime = true && (isSetReservationEndTime()); - list.add(present_reservationEndTime); - if (present_reservationEndTime) - list.add(reservationEndTime); + hashCode = hashCode * 8191 + ((isSetReservationEndTime()) ? 131071 : 524287); + if (isSetReservationEndTime()) + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(reservationEndTime); - return list.hashCode(); + return hashCode; } @Override @@ -841,7 +803,7 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetComputeResourceId()).compareTo(other.isSetComputeResourceId()); + lastComparison = java.lang.Boolean.valueOf(isSetComputeResourceId()).compareTo(other.isSetComputeResourceId()); if (lastComparison != 0) { return lastComparison; } @@ -851,7 +813,7 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us return lastComparison; } } - lastComparison = Boolean.valueOf(isSetLoginUserName()).compareTo(other.isSetLoginUserName()); + lastComparison = java.lang.Boolean.valueOf(isSetLoginUserName()).compareTo(other.isSetLoginUserName()); if (lastComparison != 0) { return lastComparison; } @@ -861,7 +823,7 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us return lastComparison; } } - lastComparison = Boolean.valueOf(isSetPreferredBatchQueue()).compareTo(other.isSetPreferredBatchQueue()); + lastComparison = java.lang.Boolean.valueOf(isSetPreferredBatchQueue()).compareTo(other.isSetPreferredBatchQueue()); if (lastComparison != 0) { return lastComparison; } @@ -871,7 +833,7 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us return lastComparison; } } - lastComparison = Boolean.valueOf(isSetScratchLocation()).compareTo(other.isSetScratchLocation()); + lastComparison = java.lang.Boolean.valueOf(isSetScratchLocation()).compareTo(other.isSetScratchLocation()); if (lastComparison != 0) { return lastComparison; } @@ -881,7 +843,7 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAllocationProjectNumber()).compareTo(other.isSetAllocationProjectNumber()); + lastComparison = java.lang.Boolean.valueOf(isSetAllocationProjectNumber()).compareTo(other.isSetAllocationProjectNumber()); if (lastComparison != 0) { return lastComparison; } @@ -891,7 +853,7 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us return lastComparison; } } - lastComparison = Boolean.valueOf(isSetResourceSpecificCredentialStoreToken()).compareTo(other.isSetResourceSpecificCredentialStoreToken()); + lastComparison = java.lang.Boolean.valueOf(isSetResourceSpecificCredentialStoreToken()).compareTo(other.isSetResourceSpecificCredentialStoreToken()); if (lastComparison != 0) { return lastComparison; } @@ -901,7 +863,7 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us return lastComparison; } } - lastComparison = Boolean.valueOf(isSetQualityOfService()).compareTo(other.isSetQualityOfService()); + lastComparison = java.lang.Boolean.valueOf(isSetQualityOfService()).compareTo(other.isSetQualityOfService()); if (lastComparison != 0) { return lastComparison; } @@ -911,7 +873,7 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us return lastComparison; } } - lastComparison = Boolean.valueOf(isSetReservation()).compareTo(other.isSetReservation()); + lastComparison = java.lang.Boolean.valueOf(isSetReservation()).compareTo(other.isSetReservation()); if (lastComparison != 0) { return lastComparison; } @@ -921,7 +883,7 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us return lastComparison; } } - lastComparison = Boolean.valueOf(isSetReservationStartTime()).compareTo(other.isSetReservationStartTime()); + lastComparison = java.lang.Boolean.valueOf(isSetReservationStartTime()).compareTo(other.isSetReservationStartTime()); if (lastComparison != 0) { return lastComparison; } @@ -931,7 +893,7 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us return lastComparison; } } - lastComparison = Boolean.valueOf(isSetReservationEndTime()).compareTo(other.isSetReservationEndTime()); + lastComparison = java.lang.Boolean.valueOf(isSetReservationEndTime()).compareTo(other.isSetReservationEndTime()); if (lastComparison != 0) { return lastComparison; } @@ -949,16 +911,16 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us } 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("UserComputeResourcePreference("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("UserComputeResourcePreference("); boolean first = true; sb.append("computeResourceId:"); @@ -1071,7 +1033,7 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us } } - 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; @@ -1081,13 +1043,13 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us } } - private static class UserComputeResourcePreferenceStandardSchemeFactory implements SchemeFactory { + private static class UserComputeResourcePreferenceStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public UserComputeResourcePreferenceStandardScheme getScheme() { return new UserComputeResourcePreferenceStandardScheme(); } } - private static class UserComputeResourcePreferenceStandardScheme extends StandardScheme<UserComputeResourcePreference> { + private static class UserComputeResourcePreferenceStandardScheme extends org.apache.thrift.scheme.StandardScheme<UserComputeResourcePreference> { public void read(org.apache.thrift.protocol.TProtocol iprot, UserComputeResourcePreference struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -1262,19 +1224,19 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us } - private static class UserComputeResourcePreferenceTupleSchemeFactory implements SchemeFactory { + private static class UserComputeResourcePreferenceTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public UserComputeResourcePreferenceTupleScheme getScheme() { return new UserComputeResourcePreferenceTupleScheme(); } } - private static class UserComputeResourcePreferenceTupleScheme extends TupleScheme<UserComputeResourcePreference> { + private static class UserComputeResourcePreferenceTupleScheme extends org.apache.thrift.scheme.TupleScheme<UserComputeResourcePreference> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, UserComputeResourcePreference 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.computeResourceId); - BitSet optionals = new BitSet(); + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetLoginUserName()) { optionals.set(0); } @@ -1334,10 +1296,10 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us @Override public void read(org.apache.thrift.protocol.TProtocol prot, UserComputeResourcePreference struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; struct.computeResourceId = iprot.readString(); struct.setComputeResourceIdIsSet(true); - BitSet incoming = iprot.readBitSet(9); + java.util.BitSet incoming = iprot.readBitSet(9); if (incoming.get(0)) { struct.loginUserName = iprot.readString(); struct.setLoginUserNameIsSet(true); @@ -1377,5 +1339,8 @@ public class UserComputeResourcePreference implements org.apache.thrift.TBase<Us } } + 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(); + } }
