http://git-wip-us.apache.org/repos/asf/airavata/blob/8e775660/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
index b1c092b..50d368c 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.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.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"})
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 /**
  * Gateway specific preferences for a Computer Resource
  * 
@@ -85,7 +58,7 @@ import org.slf4j.LoggerFactory;
  *   default credential store.
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class ComputeResourcePreference implements 
org.apache.thrift.TBase<ComputeResourcePreference, 
ComputeResourcePreference._Fields>, java.io.Serializable, Cloneable, 
Comparable<ComputeResourcePreference> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("ComputeResourcePreference");
 
@@ -104,24 +77,21 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
   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)13);
   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)14);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new 
ComputeResourcePreferenceStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new 
ComputeResourcePreferenceTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new ComputeResourcePreferenceStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new ComputeResourcePreferenceTupleSchemeFactory();
 
-  private String computeResourceId; // required
+  private java.lang.String computeResourceId; // required
   private boolean overridebyAiravata; // required
-  private String loginUserName; // optional
+  private java.lang.String loginUserName; // optional
   private 
org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol 
preferredJobSubmissionProtocol; // optional
   private org.apache.airavata.model.data.movement.DataMovementProtocol 
preferredDataMovementProtocol; // optional
-  private String preferredBatchQueue; // optional
-  private String scratchLocation; // optional
-  private String allocationProjectNumber; // optional
-  private String resourceSpecificCredentialStoreToken; // optional
-  private String usageReportingGatewayId; // optional
-  private String qualityOfService; // optional
-  private String reservation; // 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 usageReportingGatewayId; // optional
+  private java.lang.String qualityOfService; // optional
+  private java.lang.String reservation; // optional
   private long reservationStartTime; // optional
   private long reservationEndTime; // optional
 
@@ -150,10 +120,10 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
     RESERVATION_START_TIME((short)13, "reservationStartTime"),
     RESERVATION_END_TIME((short)14, "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);
       }
     }
@@ -202,21 +172,21 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
      */
     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;
     }
@@ -225,7 +195,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -236,9 +206,9 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
   private static final int __RESERVATIONENDTIME_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = 
{_Fields.LOGIN_USER_NAME,_Fields.PREFERRED_JOB_SUBMISSION_PROTOCOL,_Fields.PREFERRED_DATA_MOVEMENT_PROTOCOL,_Fields.PREFERRED_BATCH_QUEUE,_Fields.SCRATCH_LOCATION,_Fields.ALLOCATION_PROJECT_NUMBER,_Fields.RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN,_Fields.USAGE_REPORTING_GATEWAY_ID,_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.OVERRIDEBY_AIRAVATA, new 
org.apache.thrift.meta_data.FieldMetaData("overridebyAiravata", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
@@ -267,7 +237,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
         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(ComputeResourcePreference.class,
 metaDataMap);
   }
 
@@ -277,7 +247,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
   }
 
   public ComputeResourcePreference(
-    String computeResourceId,
+    java.lang.String computeResourceId,
     boolean overridebyAiravata)
   {
     this();
@@ -354,11 +324,11 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
     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;
   }
 
@@ -387,23 +357,23 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
   }
 
   public void unsetOverridebyAiravata() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__OVERRIDEBYAIRAVATA_ISSET_ID);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, 
__OVERRIDEBYAIRAVATA_ISSET_ID);
   }
 
   /** Returns true if field overridebyAiravata is set (has been assigned a 
value) and false otherwise */
   public boolean isSetOverridebyAiravata() {
-    return EncodingUtils.testBit(__isset_bitfield, 
__OVERRIDEBYAIRAVATA_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, 
__OVERRIDEBYAIRAVATA_ISSET_ID);
   }
 
   public void setOverridebyAiravataIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__OVERRIDEBYAIRAVATA_ISSET_ID, value);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, 
__OVERRIDEBYAIRAVATA_ISSET_ID, value);
   }
 
-  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;
   }
 
@@ -484,11 +454,11 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
     }
   }
 
-  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;
   }
 
@@ -507,11 +477,11 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
     }
   }
 
-  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;
   }
 
@@ -530,11 +500,11 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
     }
   }
 
-  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;
   }
 
@@ -553,11 +523,11 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
     }
   }
 
-  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;
   }
 
@@ -576,11 +546,11 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
     }
   }
 
-  public String getUsageReportingGatewayId() {
+  public java.lang.String getUsageReportingGatewayId() {
     return this.usageReportingGatewayId;
   }
 
-  public void setUsageReportingGatewayId(String usageReportingGatewayId) {
+  public void setUsageReportingGatewayId(java.lang.String 
usageReportingGatewayId) {
     this.usageReportingGatewayId = usageReportingGatewayId;
   }
 
@@ -599,11 +569,11 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
     }
   }
 
-  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;
   }
 
@@ -622,11 +592,11 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
     }
   }
 
-  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;
   }
 
@@ -655,16 +625,16 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
   }
 
   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() {
@@ -677,25 +647,25 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
   }
 
   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;
 
@@ -703,7 +673,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
       if (value == null) {
         unsetOverridebyAiravata();
       } else {
-        setOverridebyAiravata((Boolean)value);
+        setOverridebyAiravata((java.lang.Boolean)value);
       }
       break;
 
@@ -711,7 +681,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
       if (value == null) {
         unsetLoginUserName();
       } else {
-        setLoginUserName((String)value);
+        setLoginUserName((java.lang.String)value);
       }
       break;
 
@@ -735,7 +705,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
       if (value == null) {
         unsetPreferredBatchQueue();
       } else {
-        setPreferredBatchQueue((String)value);
+        setPreferredBatchQueue((java.lang.String)value);
       }
       break;
 
@@ -743,7 +713,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
       if (value == null) {
         unsetScratchLocation();
       } else {
-        setScratchLocation((String)value);
+        setScratchLocation((java.lang.String)value);
       }
       break;
 
@@ -751,7 +721,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
       if (value == null) {
         unsetAllocationProjectNumber();
       } else {
-        setAllocationProjectNumber((String)value);
+        setAllocationProjectNumber((java.lang.String)value);
       }
       break;
 
@@ -759,7 +729,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
       if (value == null) {
         unsetResourceSpecificCredentialStoreToken();
       } else {
-        setResourceSpecificCredentialStoreToken((String)value);
+        setResourceSpecificCredentialStoreToken((java.lang.String)value);
       }
       break;
 
@@ -767,7 +737,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
       if (value == null) {
         unsetUsageReportingGatewayId();
       } else {
-        setUsageReportingGatewayId((String)value);
+        setUsageReportingGatewayId((java.lang.String)value);
       }
       break;
 
@@ -775,7 +745,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
       if (value == null) {
         unsetQualityOfService();
       } else {
-        setQualityOfService((String)value);
+        setQualityOfService((java.lang.String)value);
       }
       break;
 
@@ -783,7 +753,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
       if (value == null) {
         unsetReservation();
       } else {
-        setReservation((String)value);
+        setReservation((java.lang.String)value);
       }
       break;
 
@@ -791,7 +761,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
       if (value == null) {
         unsetReservationStartTime();
       } else {
-        setReservationStartTime((Long)value);
+        setReservationStartTime((java.lang.Long)value);
       }
       break;
 
@@ -799,14 +769,14 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
       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();
@@ -851,13 +821,13 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
       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) {
@@ -890,11 +860,11 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
     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 ComputeResourcePreference)
@@ -905,6 +875,8 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
   public boolean equals(ComputeResourcePreference 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();
@@ -1037,79 +1009,63 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_computeResourceId = true && (isSetComputeResourceId());
-    list.add(present_computeResourceId);
-    if (present_computeResourceId)
-      list.add(computeResourceId);
-
-    boolean present_overridebyAiravata = true;
-    list.add(present_overridebyAiravata);
-    if (present_overridebyAiravata)
-      list.add(overridebyAiravata);
-
-    boolean present_loginUserName = true && (isSetLoginUserName());
-    list.add(present_loginUserName);
-    if (present_loginUserName)
-      list.add(loginUserName);
-
-    boolean present_preferredJobSubmissionProtocol = true && 
(isSetPreferredJobSubmissionProtocol());
-    list.add(present_preferredJobSubmissionProtocol);
-    if (present_preferredJobSubmissionProtocol)
-      list.add(preferredJobSubmissionProtocol.getValue());
-
-    boolean present_preferredDataMovementProtocol = true && 
(isSetPreferredDataMovementProtocol());
-    list.add(present_preferredDataMovementProtocol);
-    if (present_preferredDataMovementProtocol)
-      list.add(preferredDataMovementProtocol.getValue());
-
-    boolean present_preferredBatchQueue = true && (isSetPreferredBatchQueue());
-    list.add(present_preferredBatchQueue);
-    if (present_preferredBatchQueue)
-      list.add(preferredBatchQueue);
-
-    boolean present_scratchLocation = true && (isSetScratchLocation());
-    list.add(present_scratchLocation);
-    if (present_scratchLocation)
-      list.add(scratchLocation);
-
-    boolean present_allocationProjectNumber = true && 
(isSetAllocationProjectNumber());
-    list.add(present_allocationProjectNumber);
-    if (present_allocationProjectNumber)
-      list.add(allocationProjectNumber);
-
-    boolean present_resourceSpecificCredentialStoreToken = true && 
(isSetResourceSpecificCredentialStoreToken());
-    list.add(present_resourceSpecificCredentialStoreToken);
-    if (present_resourceSpecificCredentialStoreToken)
-      list.add(resourceSpecificCredentialStoreToken);
-
-    boolean present_usageReportingGatewayId = true && 
(isSetUsageReportingGatewayId());
-    list.add(present_usageReportingGatewayId);
-    if (present_usageReportingGatewayId)
-      list.add(usageReportingGatewayId);
-
-    boolean present_qualityOfService = true && (isSetQualityOfService());
-    list.add(present_qualityOfService);
-    if (present_qualityOfService)
-      list.add(qualityOfService);
-
-    boolean present_reservation = true && (isSetReservation());
-    list.add(present_reservation);
-    if (present_reservation)
-      list.add(reservation);
-
-    boolean present_reservationStartTime = true && 
(isSetReservationStartTime());
-    list.add(present_reservationStartTime);
-    if (present_reservationStartTime)
-      list.add(reservationStartTime);
-
-    boolean present_reservationEndTime = true && (isSetReservationEndTime());
-    list.add(present_reservationEndTime);
-    if (present_reservationEndTime)
-      list.add(reservationEndTime);
-
-    return list.hashCode();
+    int hashCode = 1;
+
+    hashCode = hashCode * 8191 + ((isSetComputeResourceId()) ? 131071 : 
524287);
+    if (isSetComputeResourceId())
+      hashCode = hashCode * 8191 + computeResourceId.hashCode();
+
+    hashCode = hashCode * 8191 + ((overridebyAiravata) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isSetLoginUserName()) ? 131071 : 524287);
+    if (isSetLoginUserName())
+      hashCode = hashCode * 8191 + loginUserName.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetPreferredJobSubmissionProtocol()) ? 
131071 : 524287);
+    if (isSetPreferredJobSubmissionProtocol())
+      hashCode = hashCode * 8191 + preferredJobSubmissionProtocol.getValue();
+
+    hashCode = hashCode * 8191 + ((isSetPreferredDataMovementProtocol()) ? 
131071 : 524287);
+    if (isSetPreferredDataMovementProtocol())
+      hashCode = hashCode * 8191 + preferredDataMovementProtocol.getValue();
+
+    hashCode = hashCode * 8191 + ((isSetPreferredBatchQueue()) ? 131071 : 
524287);
+    if (isSetPreferredBatchQueue())
+      hashCode = hashCode * 8191 + preferredBatchQueue.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetScratchLocation()) ? 131071 : 524287);
+    if (isSetScratchLocation())
+      hashCode = hashCode * 8191 + scratchLocation.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetAllocationProjectNumber()) ? 131071 : 
524287);
+    if (isSetAllocationProjectNumber())
+      hashCode = hashCode * 8191 + allocationProjectNumber.hashCode();
+
+    hashCode = hashCode * 8191 + 
((isSetResourceSpecificCredentialStoreToken()) ? 131071 : 524287);
+    if (isSetResourceSpecificCredentialStoreToken())
+      hashCode = hashCode * 8191 + 
resourceSpecificCredentialStoreToken.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetUsageReportingGatewayId()) ? 131071 : 
524287);
+    if (isSetUsageReportingGatewayId())
+      hashCode = hashCode * 8191 + usageReportingGatewayId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetQualityOfService()) ? 131071 : 524287);
+    if (isSetQualityOfService())
+      hashCode = hashCode * 8191 + qualityOfService.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetReservation()) ? 131071 : 524287);
+    if (isSetReservation())
+      hashCode = hashCode * 8191 + reservation.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetReservationStartTime()) ? 131071 : 
524287);
+    if (isSetReservationStartTime())
+      hashCode = hashCode * 8191 + 
org.apache.thrift.TBaseHelper.hashCode(reservationStartTime);
+
+    hashCode = hashCode * 8191 + ((isSetReservationEndTime()) ? 131071 : 
524287);
+    if (isSetReservationEndTime())
+      hashCode = hashCode * 8191 + 
org.apache.thrift.TBaseHelper.hashCode(reservationEndTime);
+
+    return hashCode;
   }
 
   @Override
@@ -1120,7 +1076,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
 
     int lastComparison = 0;
 
-    lastComparison = 
Boolean.valueOf(isSetComputeResourceId()).compareTo(other.isSetComputeResourceId());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetComputeResourceId()).compareTo(other.isSetComputeResourceId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1130,7 +1086,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetOverridebyAiravata()).compareTo(other.isSetOverridebyAiravata());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetOverridebyAiravata()).compareTo(other.isSetOverridebyAiravata());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1140,7 +1096,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetLoginUserName()).compareTo(other.isSetLoginUserName());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetLoginUserName()).compareTo(other.isSetLoginUserName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1150,7 +1106,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetPreferredJobSubmissionProtocol()).compareTo(other.isSetPreferredJobSubmissionProtocol());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetPreferredJobSubmissionProtocol()).compareTo(other.isSetPreferredJobSubmissionProtocol());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1160,7 +1116,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetPreferredDataMovementProtocol()).compareTo(other.isSetPreferredDataMovementProtocol());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetPreferredDataMovementProtocol()).compareTo(other.isSetPreferredDataMovementProtocol());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1170,7 +1126,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetPreferredBatchQueue()).compareTo(other.isSetPreferredBatchQueue());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetPreferredBatchQueue()).compareTo(other.isSetPreferredBatchQueue());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1180,7 +1136,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetScratchLocation()).compareTo(other.isSetScratchLocation());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetScratchLocation()).compareTo(other.isSetScratchLocation());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1190,7 +1146,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetAllocationProjectNumber()).compareTo(other.isSetAllocationProjectNumber());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetAllocationProjectNumber()).compareTo(other.isSetAllocationProjectNumber());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1200,7 +1156,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetResourceSpecificCredentialStoreToken()).compareTo(other.isSetResourceSpecificCredentialStoreToken());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetResourceSpecificCredentialStoreToken()).compareTo(other.isSetResourceSpecificCredentialStoreToken());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1210,7 +1166,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetUsageReportingGatewayId()).compareTo(other.isSetUsageReportingGatewayId());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetUsageReportingGatewayId()).compareTo(other.isSetUsageReportingGatewayId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1220,7 +1176,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetQualityOfService()).compareTo(other.isSetQualityOfService());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetQualityOfService()).compareTo(other.isSetQualityOfService());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1230,7 +1186,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetReservation()).compareTo(other.isSetReservation());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetReservation()).compareTo(other.isSetReservation());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1240,7 +1196,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetReservationStartTime()).compareTo(other.isSetReservationStartTime());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetReservationStartTime()).compareTo(other.isSetReservationStartTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1250,7 +1206,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetReservationEndTime()).compareTo(other.isSetReservationEndTime());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetReservationEndTime()).compareTo(other.isSetReservationEndTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1268,16 +1224,16 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
   }
 
   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("ComputeResourcePreference(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new 
java.lang.StringBuilder("ComputeResourcePreference(");
     boolean first = true;
 
     sb.append("computeResourceId:");
@@ -1428,7 +1384,7 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
     }
   }
 
-  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;
@@ -1438,13 +1394,13 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
     }
   }
 
-  private static class ComputeResourcePreferenceStandardSchemeFactory 
implements SchemeFactory {
+  private static class ComputeResourcePreferenceStandardSchemeFactory 
implements org.apache.thrift.scheme.SchemeFactory {
     public ComputeResourcePreferenceStandardScheme getScheme() {
       return new ComputeResourcePreferenceStandardScheme();
     }
   }
 
-  private static class ComputeResourcePreferenceStandardScheme extends 
StandardScheme<ComputeResourcePreference> {
+  private static class ComputeResourcePreferenceStandardScheme extends 
org.apache.thrift.scheme.StandardScheme<ComputeResourcePreference> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, 
ComputeResourcePreference struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -1675,20 +1631,20 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
 
   }
 
-  private static class ComputeResourcePreferenceTupleSchemeFactory implements 
SchemeFactory {
+  private static class ComputeResourcePreferenceTupleSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public ComputeResourcePreferenceTupleScheme getScheme() {
       return new ComputeResourcePreferenceTupleScheme();
     }
   }
 
-  private static class ComputeResourcePreferenceTupleScheme extends 
TupleScheme<ComputeResourcePreference> {
+  private static class ComputeResourcePreferenceTupleScheme extends 
org.apache.thrift.scheme.TupleScheme<ComputeResourcePreference> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, 
ComputeResourcePreference 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);
       oprot.writeBool(struct.overridebyAiravata);
-      BitSet optionals = new BitSet();
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetLoginUserName()) {
         optionals.set(0);
       }
@@ -1766,12 +1722,12 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, 
ComputeResourcePreference 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);
       struct.overridebyAiravata = iprot.readBool();
       struct.setOverridebyAiravataIsSet(true);
-      BitSet incoming = iprot.readBitSet(12);
+      java.util.BitSet incoming = iprot.readBitSet(12);
       if (incoming.get(0)) {
         struct.loginUserName = iprot.readString();
         struct.setLoginUserNameIsSet(true);
@@ -1823,5 +1779,8 @@ public class ComputeResourcePreference implements 
org.apache.thrift.TBase<Comput
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S 
scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return 
(org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? 
STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/8e775660/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
index 31f33f6..cb2f0fb 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.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.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"})
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 /**
  * Gateway Resource Profile
  * 
@@ -68,7 +41,7 @@ import org.slf4j.LoggerFactory;
  *  identityServerPwdCredToken:
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayResourceProfile, 
GatewayResourceProfile._Fields>, java.io.Serializable, Cloneable, 
Comparable<GatewayResourceProfile> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("GatewayResourceProfile");
 
@@ -79,18 +52,15 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
   private static final org.apache.thrift.protocol.TField 
IDENTITY_SERVER_TENANT_FIELD_DESC = new 
org.apache.thrift.protocol.TField("identityServerTenant", 
org.apache.thrift.protocol.TType.STRING, (short)5);
   private static final org.apache.thrift.protocol.TField 
IDENTITY_SERVER_PWD_CRED_TOKEN_FIELD_DESC = new 
org.apache.thrift.protocol.TField("identityServerPwdCredToken", 
org.apache.thrift.protocol.TType.STRING, (short)6);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new 
GatewayResourceProfileStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new 
GatewayResourceProfileTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new GatewayResourceProfileStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new GatewayResourceProfileTupleSchemeFactory();
 
-  private String gatewayID; // required
-  private String credentialStoreToken; // optional
-  private List<ComputeResourcePreference> computeResourcePreferences; // 
optional
-  private List<StoragePreference> storagePreferences; // optional
-  private String identityServerTenant; // optional
-  private String identityServerPwdCredToken; // optional
+  private java.lang.String gatewayID; // required
+  private java.lang.String credentialStoreToken; // optional
+  private java.util.List<ComputeResourcePreference> 
computeResourcePreferences; // optional
+  private java.util.List<StoragePreference> storagePreferences; // optional
+  private java.lang.String identityServerTenant; // optional
+  private java.lang.String identityServerPwdCredToken; // 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 {
@@ -101,10 +71,10 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
     IDENTITY_SERVER_TENANT((short)5, "identityServerTenant"),
     IDENTITY_SERVER_PWD_CRED_TOKEN((short)6, "identityServerPwdCredToken");
 
-    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);
       }
     }
@@ -137,21 +107,21 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
      */
     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;
     }
@@ -160,16 +130,16 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
   private static final _Fields optionals[] = 
{_Fields.CREDENTIAL_STORE_TOKEN,_Fields.COMPUTE_RESOURCE_PREFERENCES,_Fields.STORAGE_PREFERENCES,_Fields.IDENTITY_SERVER_TENANT,_Fields.IDENTITY_SERVER_PWD_CRED_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.GATEWAY_ID, new 
org.apache.thrift.meta_data.FieldMetaData("gatewayID", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.CREDENTIAL_STORE_TOKEN, new 
org.apache.thrift.meta_data.FieldMetaData("credentialStoreToken", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
@@ -184,7 +154,7 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.IDENTITY_SERVER_PWD_CRED_TOKEN, new 
org.apache.thrift.meta_data.FieldMetaData("identityServerPwdCredToken", 
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(GatewayResourceProfile.class,
 metaDataMap);
   }
 
@@ -192,7 +162,7 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
   }
 
   public GatewayResourceProfile(
-    String gatewayID)
+    java.lang.String gatewayID)
   {
     this();
     this.gatewayID = gatewayID;
@@ -209,14 +179,14 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
       this.credentialStoreToken = other.credentialStoreToken;
     }
     if (other.isSetComputeResourcePreferences()) {
-      List<ComputeResourcePreference> __this__computeResourcePreferences = new 
ArrayList<ComputeResourcePreference>(other.computeResourcePreferences.size());
+      java.util.List<ComputeResourcePreference> 
__this__computeResourcePreferences = new 
java.util.ArrayList<ComputeResourcePreference>(other.computeResourcePreferences.size());
       for (ComputeResourcePreference other_element : 
other.computeResourcePreferences) {
         __this__computeResourcePreferences.add(new 
ComputeResourcePreference(other_element));
       }
       this.computeResourcePreferences = __this__computeResourcePreferences;
     }
     if (other.isSetStoragePreferences()) {
-      List<StoragePreference> __this__storagePreferences = new 
ArrayList<StoragePreference>(other.storagePreferences.size());
+      java.util.List<StoragePreference> __this__storagePreferences = new 
java.util.ArrayList<StoragePreference>(other.storagePreferences.size());
       for (StoragePreference other_element : other.storagePreferences) {
         __this__storagePreferences.add(new StoragePreference(other_element));
       }
@@ -244,11 +214,11 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
     this.identityServerPwdCredToken = null;
   }
 
-  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;
   }
 
@@ -267,11 +237,11 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
     }
   }
 
-  public String getCredentialStoreToken() {
+  public java.lang.String getCredentialStoreToken() {
     return this.credentialStoreToken;
   }
 
-  public void setCredentialStoreToken(String credentialStoreToken) {
+  public void setCredentialStoreToken(java.lang.String credentialStoreToken) {
     this.credentialStoreToken = credentialStoreToken;
   }
 
@@ -300,16 +270,16 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
 
   public void addToComputeResourcePreferences(ComputeResourcePreference elem) {
     if (this.computeResourcePreferences == null) {
-      this.computeResourcePreferences = new 
ArrayList<ComputeResourcePreference>();
+      this.computeResourcePreferences = new 
java.util.ArrayList<ComputeResourcePreference>();
     }
     this.computeResourcePreferences.add(elem);
   }
 
-  public List<ComputeResourcePreference> getComputeResourcePreferences() {
+  public java.util.List<ComputeResourcePreference> 
getComputeResourcePreferences() {
     return this.computeResourcePreferences;
   }
 
-  public void setComputeResourcePreferences(List<ComputeResourcePreference> 
computeResourcePreferences) {
+  public void 
setComputeResourcePreferences(java.util.List<ComputeResourcePreference> 
computeResourcePreferences) {
     this.computeResourcePreferences = computeResourcePreferences;
   }
 
@@ -338,16 +308,16 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
 
   public void addToStoragePreferences(StoragePreference elem) {
     if (this.storagePreferences == null) {
-      this.storagePreferences = new ArrayList<StoragePreference>();
+      this.storagePreferences = new java.util.ArrayList<StoragePreference>();
     }
     this.storagePreferences.add(elem);
   }
 
-  public List<StoragePreference> getStoragePreferences() {
+  public java.util.List<StoragePreference> getStoragePreferences() {
     return this.storagePreferences;
   }
 
-  public void setStoragePreferences(List<StoragePreference> 
storagePreferences) {
+  public void setStoragePreferences(java.util.List<StoragePreference> 
storagePreferences) {
     this.storagePreferences = storagePreferences;
   }
 
@@ -366,11 +336,11 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
     }
   }
 
-  public String getIdentityServerTenant() {
+  public java.lang.String getIdentityServerTenant() {
     return this.identityServerTenant;
   }
 
-  public void setIdentityServerTenant(String identityServerTenant) {
+  public void setIdentityServerTenant(java.lang.String identityServerTenant) {
     this.identityServerTenant = identityServerTenant;
   }
 
@@ -389,11 +359,11 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
     }
   }
 
-  public String getIdentityServerPwdCredToken() {
+  public java.lang.String getIdentityServerPwdCredToken() {
     return this.identityServerPwdCredToken;
   }
 
-  public void setIdentityServerPwdCredToken(String identityServerPwdCredToken) 
{
+  public void setIdentityServerPwdCredToken(java.lang.String 
identityServerPwdCredToken) {
     this.identityServerPwdCredToken = identityServerPwdCredToken;
   }
 
@@ -412,13 +382,13 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case GATEWAY_ID:
       if (value == null) {
         unsetGatewayID();
       } else {
-        setGatewayID((String)value);
+        setGatewayID((java.lang.String)value);
       }
       break;
 
@@ -426,7 +396,7 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
       if (value == null) {
         unsetCredentialStoreToken();
       } else {
-        setCredentialStoreToken((String)value);
+        setCredentialStoreToken((java.lang.String)value);
       }
       break;
 
@@ -434,7 +404,7 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
       if (value == null) {
         unsetComputeResourcePreferences();
       } else {
-        setComputeResourcePreferences((List<ComputeResourcePreference>)value);
+        
setComputeResourcePreferences((java.util.List<ComputeResourcePreference>)value);
       }
       break;
 
@@ -442,7 +412,7 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
       if (value == null) {
         unsetStoragePreferences();
       } else {
-        setStoragePreferences((List<StoragePreference>)value);
+        setStoragePreferences((java.util.List<StoragePreference>)value);
       }
       break;
 
@@ -450,7 +420,7 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
       if (value == null) {
         unsetIdentityServerTenant();
       } else {
-        setIdentityServerTenant((String)value);
+        setIdentityServerTenant((java.lang.String)value);
       }
       break;
 
@@ -458,14 +428,14 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
       if (value == null) {
         unsetIdentityServerPwdCredToken();
       } else {
-        setIdentityServerPwdCredToken((String)value);
+        setIdentityServerPwdCredToken((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case GATEWAY_ID:
       return getGatewayID();
@@ -486,13 +456,13 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
       return getIdentityServerPwdCredToken();
 
     }
-    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) {
@@ -509,11 +479,11 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
     case IDENTITY_SERVER_PWD_CRED_TOKEN:
       return isSetIdentityServerPwdCredToken();
     }
-    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 GatewayResourceProfile)
@@ -524,6 +494,8 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
   public boolean equals(GatewayResourceProfile that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_gatewayID = true && this.isSetGatewayID();
     boolean that_present_gatewayID = true && that.isSetGatewayID();
@@ -584,39 +556,33 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_gatewayID = true && (isSetGatewayID());
-    list.add(present_gatewayID);
-    if (present_gatewayID)
-      list.add(gatewayID);
-
-    boolean present_credentialStoreToken = true && 
(isSetCredentialStoreToken());
-    list.add(present_credentialStoreToken);
-    if (present_credentialStoreToken)
-      list.add(credentialStoreToken);
-
-    boolean present_computeResourcePreferences = true && 
(isSetComputeResourcePreferences());
-    list.add(present_computeResourcePreferences);
-    if (present_computeResourcePreferences)
-      list.add(computeResourcePreferences);
-
-    boolean present_storagePreferences = true && (isSetStoragePreferences());
-    list.add(present_storagePreferences);
-    if (present_storagePreferences)
-      list.add(storagePreferences);
-
-    boolean present_identityServerTenant = true && 
(isSetIdentityServerTenant());
-    list.add(present_identityServerTenant);
-    if (present_identityServerTenant)
-      list.add(identityServerTenant);
-
-    boolean present_identityServerPwdCredToken = true && 
(isSetIdentityServerPwdCredToken());
-    list.add(present_identityServerPwdCredToken);
-    if (present_identityServerPwdCredToken)
-      list.add(identityServerPwdCredToken);
-
-    return list.hashCode();
+    int hashCode = 1;
+
+    hashCode = hashCode * 8191 + ((isSetGatewayID()) ? 131071 : 524287);
+    if (isSetGatewayID())
+      hashCode = hashCode * 8191 + gatewayID.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetCredentialStoreToken()) ? 131071 : 
524287);
+    if (isSetCredentialStoreToken())
+      hashCode = hashCode * 8191 + credentialStoreToken.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetComputeResourcePreferences()) ? 131071 
: 524287);
+    if (isSetComputeResourcePreferences())
+      hashCode = hashCode * 8191 + computeResourcePreferences.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetStoragePreferences()) ? 131071 : 
524287);
+    if (isSetStoragePreferences())
+      hashCode = hashCode * 8191 + storagePreferences.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetIdentityServerTenant()) ? 131071 : 
524287);
+    if (isSetIdentityServerTenant())
+      hashCode = hashCode * 8191 + identityServerTenant.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetIdentityServerPwdCredToken()) ? 131071 
: 524287);
+    if (isSetIdentityServerPwdCredToken())
+      hashCode = hashCode * 8191 + identityServerPwdCredToken.hashCode();
+
+    return hashCode;
   }
 
   @Override
@@ -627,7 +593,7 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
 
     int lastComparison = 0;
 
-    lastComparison = 
Boolean.valueOf(isSetGatewayID()).compareTo(other.isSetGatewayID());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetGatewayID()).compareTo(other.isSetGatewayID());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -637,7 +603,7 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetCredentialStoreToken()).compareTo(other.isSetCredentialStoreToken());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetCredentialStoreToken()).compareTo(other.isSetCredentialStoreToken());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -647,7 +613,7 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetComputeResourcePreferences()).compareTo(other.isSetComputeResourcePreferences());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetComputeResourcePreferences()).compareTo(other.isSetComputeResourcePreferences());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -657,7 +623,7 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetStoragePreferences()).compareTo(other.isSetStoragePreferences());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetStoragePreferences()).compareTo(other.isSetStoragePreferences());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -667,7 +633,7 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetIdentityServerTenant()).compareTo(other.isSetIdentityServerTenant());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetIdentityServerTenant()).compareTo(other.isSetIdentityServerTenant());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -677,7 +643,7 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetIdentityServerPwdCredToken()).compareTo(other.isSetIdentityServerPwdCredToken());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetIdentityServerPwdCredToken()).compareTo(other.isSetIdentityServerPwdCredToken());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -695,16 +661,16 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
   }
 
   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("GatewayResourceProfile(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new 
java.lang.StringBuilder("GatewayResourceProfile(");
     boolean first = true;
 
     sb.append("gatewayID:");
@@ -785,7 +751,7 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
     }
   }
 
-  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) {
@@ -793,13 +759,13 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
     }
   }
 
-  private static class GatewayResourceProfileStandardSchemeFactory implements 
SchemeFactory {
+  private static class GatewayResourceProfileStandardSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public GatewayResourceProfileStandardScheme getScheme() {
       return new GatewayResourceProfileStandardScheme();
     }
   }
 
-  private static class GatewayResourceProfileStandardScheme extends 
StandardScheme<GatewayResourceProfile> {
+  private static class GatewayResourceProfileStandardScheme extends 
org.apache.thrift.scheme.StandardScheme<GatewayResourceProfile> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, 
GatewayResourceProfile struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -831,7 +797,7 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list0 = 
iprot.readListBegin();
-                struct.computeResourcePreferences = new 
ArrayList<ComputeResourcePreference>(_list0.size);
+                struct.computeResourcePreferences = new 
java.util.ArrayList<ComputeResourcePreference>(_list0.size);
                 ComputeResourcePreference _elem1;
                 for (int _i2 = 0; _i2 < _list0.size; ++_i2)
                 {
@@ -850,7 +816,7 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list3 = 
iprot.readListBegin();
-                struct.storagePreferences = new 
ArrayList<StoragePreference>(_list3.size);
+                struct.storagePreferences = new 
java.util.ArrayList<StoragePreference>(_list3.size);
                 StoragePreference _elem4;
                 for (int _i5 = 0; _i5 < _list3.size; ++_i5)
                 {
@@ -954,19 +920,19 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
 
   }
 
-  private static class GatewayResourceProfileTupleSchemeFactory implements 
SchemeFactory {
+  private static class GatewayResourceProfileTupleSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public GatewayResourceProfileTupleScheme getScheme() {
       return new GatewayResourceProfileTupleScheme();
     }
   }
 
-  private static class GatewayResourceProfileTupleScheme extends 
TupleScheme<GatewayResourceProfile> {
+  private static class GatewayResourceProfileTupleScheme extends 
org.apache.thrift.scheme.TupleScheme<GatewayResourceProfile> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, 
GatewayResourceProfile 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.gatewayID);
-      BitSet optionals = new BitSet();
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetCredentialStoreToken()) {
         optionals.set(0);
       }
@@ -1014,10 +980,10 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, 
GatewayResourceProfile struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol iprot = 
(org.apache.thrift.protocol.TTupleProtocol) prot;
       struct.gatewayID = iprot.readString();
       struct.setGatewayIDIsSet(true);
-      BitSet incoming = iprot.readBitSet(5);
+      java.util.BitSet incoming = iprot.readBitSet(5);
       if (incoming.get(0)) {
         struct.credentialStoreToken = iprot.readString();
         struct.setCredentialStoreTokenIsSet(true);
@@ -1025,7 +991,7 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
       if (incoming.get(1)) {
         {
           org.apache.thrift.protocol.TList _list10 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, 
iprot.readI32());
-          struct.computeResourcePreferences = new 
ArrayList<ComputeResourcePreference>(_list10.size);
+          struct.computeResourcePreferences = new 
java.util.ArrayList<ComputeResourcePreference>(_list10.size);
           ComputeResourcePreference _elem11;
           for (int _i12 = 0; _i12 < _list10.size; ++_i12)
           {
@@ -1039,7 +1005,7 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
       if (incoming.get(2)) {
         {
           org.apache.thrift.protocol.TList _list13 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, 
iprot.readI32());
-          struct.storagePreferences = new 
ArrayList<StoragePreference>(_list13.size);
+          struct.storagePreferences = new 
java.util.ArrayList<StoragePreference>(_list13.size);
           StoragePreference _elem14;
           for (int _i15 = 0; _i15 < _list13.size; ++_i15)
           {
@@ -1061,5 +1027,8 @@ public class GatewayResourceProfile implements 
org.apache.thrift.TBase<GatewayRe
     }
   }
 
+  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();
+  }
 }
 

Reply via email to