http://git-wip-us.apache.org/repos/asf/airavata/blob/8e775660/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/userresourceprofile/UserResourceProfile.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/userresourceprofile/UserResourceProfile.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/userresourceprofile/UserResourceProfile.java
index 5ac614d..d738b5f 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/userresourceprofile/UserResourceProfile.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/userresourceprofile/UserResourceProfile.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 Resource Profile
  * 
@@ -74,7 +47,7 @@ import org.slf4j.LoggerFactory;
  *  Indicates that this instance is just a container for a null value.
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResourceProfile, UserResourceProfile._Fields>, 
java.io.Serializable, Cloneable, Comparable<UserResourceProfile> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("UserResourceProfile");
 
@@ -87,19 +60,16 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
   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)7);
   private static final org.apache.thrift.protocol.TField IS_NULL_FIELD_DESC = 
new org.apache.thrift.protocol.TField("isNull", 
org.apache.thrift.protocol.TType.BOOL, (short)8);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new 
UserResourceProfileStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new 
UserResourceProfileTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new UserResourceProfileStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new UserResourceProfileTupleSchemeFactory();
 
-  private String userId; // required
-  private String gatewayID; // required
-  private String credentialStoreToken; // optional
-  private List<UserComputeResourcePreference> userComputeResourcePreferences; 
// optional
-  private List<UserStoragePreference> userStoragePreferences; // optional
-  private String identityServerTenant; // optional
-  private String identityServerPwdCredToken; // optional
+  private java.lang.String userId; // required
+  private java.lang.String gatewayID; // required
+  private java.lang.String credentialStoreToken; // optional
+  private java.util.List<UserComputeResourcePreference> 
userComputeResourcePreferences; // optional
+  private java.util.List<UserStoragePreference> userStoragePreferences; // 
optional
+  private java.lang.String identityServerTenant; // optional
+  private java.lang.String identityServerPwdCredToken; // optional
   private boolean isNull; // optional
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
@@ -113,10 +83,10 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
     IDENTITY_SERVER_PWD_CRED_TOKEN((short)7, "identityServerPwdCredToken"),
     IS_NULL((short)8, "isNull");
 
-    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);
       }
     }
@@ -153,21 +123,21 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
      */
     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;
     }
@@ -176,7 +146,7 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -185,9 +155,9 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
   private static final int __ISNULL_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = 
{_Fields.CREDENTIAL_STORE_TOKEN,_Fields.USER_COMPUTE_RESOURCE_PREFERENCES,_Fields.USER_STORAGE_PREFERENCES,_Fields.IDENTITY_SERVER_TENANT,_Fields.IDENTITY_SERVER_PWD_CRED_TOKEN,_Fields.IS_NULL};
-  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.USER_ID, new 
org.apache.thrift.meta_data.FieldMetaData("userId", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.GATEWAY_ID, new 
org.apache.thrift.meta_data.FieldMetaData("gatewayID", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
@@ -206,7 +176,7 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.IS_NULL, new 
org.apache.thrift.meta_data.FieldMetaData("isNull", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(UserResourceProfile.class,
 metaDataMap);
   }
 
@@ -216,8 +186,8 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
   }
 
   public UserResourceProfile(
-    String userId,
-    String gatewayID)
+    java.lang.String userId,
+    java.lang.String gatewayID)
   {
     this();
     this.userId = userId;
@@ -239,14 +209,14 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
       this.credentialStoreToken = other.credentialStoreToken;
     }
     if (other.isSetUserComputeResourcePreferences()) {
-      List<UserComputeResourcePreference> 
__this__userComputeResourcePreferences = new 
ArrayList<UserComputeResourcePreference>(other.userComputeResourcePreferences.size());
+      java.util.List<UserComputeResourcePreference> 
__this__userComputeResourcePreferences = new 
java.util.ArrayList<UserComputeResourcePreference>(other.userComputeResourcePreferences.size());
       for (UserComputeResourcePreference other_element : 
other.userComputeResourcePreferences) {
         __this__userComputeResourcePreferences.add(new 
UserComputeResourcePreference(other_element));
       }
       this.userComputeResourcePreferences = 
__this__userComputeResourcePreferences;
     }
     if (other.isSetUserStoragePreferences()) {
-      List<UserStoragePreference> __this__userStoragePreferences = new 
ArrayList<UserStoragePreference>(other.userStoragePreferences.size());
+      java.util.List<UserStoragePreference> __this__userStoragePreferences = 
new 
java.util.ArrayList<UserStoragePreference>(other.userStoragePreferences.size());
       for (UserStoragePreference other_element : other.userStoragePreferences) 
{
         __this__userStoragePreferences.add(new 
UserStoragePreference(other_element));
       }
@@ -278,11 +248,11 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
 
   }
 
-  public String getUserId() {
+  public java.lang.String getUserId() {
     return this.userId;
   }
 
-  public void setUserId(String userId) {
+  public void setUserId(java.lang.String userId) {
     this.userId = userId;
   }
 
@@ -301,11 +271,11 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
     }
   }
 
-  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;
   }
 
@@ -324,11 +294,11 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
     }
   }
 
-  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;
   }
 
@@ -357,16 +327,16 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
 
   public void 
addToUserComputeResourcePreferences(UserComputeResourcePreference elem) {
     if (this.userComputeResourcePreferences == null) {
-      this.userComputeResourcePreferences = new 
ArrayList<UserComputeResourcePreference>();
+      this.userComputeResourcePreferences = new 
java.util.ArrayList<UserComputeResourcePreference>();
     }
     this.userComputeResourcePreferences.add(elem);
   }
 
-  public List<UserComputeResourcePreference> 
getUserComputeResourcePreferences() {
+  public java.util.List<UserComputeResourcePreference> 
getUserComputeResourcePreferences() {
     return this.userComputeResourcePreferences;
   }
 
-  public void 
setUserComputeResourcePreferences(List<UserComputeResourcePreference> 
userComputeResourcePreferences) {
+  public void 
setUserComputeResourcePreferences(java.util.List<UserComputeResourcePreference> 
userComputeResourcePreferences) {
     this.userComputeResourcePreferences = userComputeResourcePreferences;
   }
 
@@ -395,16 +365,16 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
 
   public void addToUserStoragePreferences(UserStoragePreference elem) {
     if (this.userStoragePreferences == null) {
-      this.userStoragePreferences = new ArrayList<UserStoragePreference>();
+      this.userStoragePreferences = new 
java.util.ArrayList<UserStoragePreference>();
     }
     this.userStoragePreferences.add(elem);
   }
 
-  public List<UserStoragePreference> getUserStoragePreferences() {
+  public java.util.List<UserStoragePreference> getUserStoragePreferences() {
     return this.userStoragePreferences;
   }
 
-  public void setUserStoragePreferences(List<UserStoragePreference> 
userStoragePreferences) {
+  public void setUserStoragePreferences(java.util.List<UserStoragePreference> 
userStoragePreferences) {
     this.userStoragePreferences = userStoragePreferences;
   }
 
@@ -423,11 +393,11 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
     }
   }
 
-  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;
   }
 
@@ -446,11 +416,11 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
     }
   }
 
-  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;
   }
 
@@ -479,25 +449,25 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
   }
 
   public void unsetIsNull() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__ISNULL_ISSET_ID);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISNULL_ISSET_ID);
   }
 
   /** Returns true if field isNull is set (has been assigned a value) and 
false otherwise */
   public boolean isSetIsNull() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISNULL_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, 
__ISNULL_ISSET_ID);
   }
 
   public void setIsNullIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__ISNULL_ISSET_ID, value);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISNULL_ISSET_ID, 
value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case USER_ID:
       if (value == null) {
         unsetUserId();
       } else {
-        setUserId((String)value);
+        setUserId((java.lang.String)value);
       }
       break;
 
@@ -505,7 +475,7 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
       if (value == null) {
         unsetGatewayID();
       } else {
-        setGatewayID((String)value);
+        setGatewayID((java.lang.String)value);
       }
       break;
 
@@ -513,7 +483,7 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
       if (value == null) {
         unsetCredentialStoreToken();
       } else {
-        setCredentialStoreToken((String)value);
+        setCredentialStoreToken((java.lang.String)value);
       }
       break;
 
@@ -521,7 +491,7 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
       if (value == null) {
         unsetUserComputeResourcePreferences();
       } else {
-        
setUserComputeResourcePreferences((List<UserComputeResourcePreference>)value);
+        
setUserComputeResourcePreferences((java.util.List<UserComputeResourcePreference>)value);
       }
       break;
 
@@ -529,7 +499,7 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
       if (value == null) {
         unsetUserStoragePreferences();
       } else {
-        setUserStoragePreferences((List<UserStoragePreference>)value);
+        
setUserStoragePreferences((java.util.List<UserStoragePreference>)value);
       }
       break;
 
@@ -537,7 +507,7 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
       if (value == null) {
         unsetIdentityServerTenant();
       } else {
-        setIdentityServerTenant((String)value);
+        setIdentityServerTenant((java.lang.String)value);
       }
       break;
 
@@ -545,7 +515,7 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
       if (value == null) {
         unsetIdentityServerPwdCredToken();
       } else {
-        setIdentityServerPwdCredToken((String)value);
+        setIdentityServerPwdCredToken((java.lang.String)value);
       }
       break;
 
@@ -553,14 +523,14 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
       if (value == null) {
         unsetIsNull();
       } else {
-        setIsNull((Boolean)value);
+        setIsNull((java.lang.Boolean)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case USER_ID:
       return getUserId();
@@ -587,13 +557,13 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
       return isIsNull();
 
     }
-    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) {
@@ -614,11 +584,11 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
     case IS_NULL:
       return isSetIsNull();
     }
-    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 UserResourceProfile)
@@ -629,6 +599,8 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
   public boolean equals(UserResourceProfile that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_userId = true && this.isSetUserId();
     boolean that_present_userId = true && that.isSetUserId();
@@ -707,49 +679,41 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_userId = true && (isSetUserId());
-    list.add(present_userId);
-    if (present_userId)
-      list.add(userId);
+    hashCode = hashCode * 8191 + ((isSetUserId()) ? 131071 : 524287);
+    if (isSetUserId())
+      hashCode = hashCode * 8191 + userId.hashCode();
 
-    boolean present_gatewayID = true && (isSetGatewayID());
-    list.add(present_gatewayID);
-    if (present_gatewayID)
-      list.add(gatewayID);
+    hashCode = hashCode * 8191 + ((isSetGatewayID()) ? 131071 : 524287);
+    if (isSetGatewayID())
+      hashCode = hashCode * 8191 + gatewayID.hashCode();
 
-    boolean present_credentialStoreToken = true && 
(isSetCredentialStoreToken());
-    list.add(present_credentialStoreToken);
-    if (present_credentialStoreToken)
-      list.add(credentialStoreToken);
+    hashCode = hashCode * 8191 + ((isSetCredentialStoreToken()) ? 131071 : 
524287);
+    if (isSetCredentialStoreToken())
+      hashCode = hashCode * 8191 + credentialStoreToken.hashCode();
 
-    boolean present_userComputeResourcePreferences = true && 
(isSetUserComputeResourcePreferences());
-    list.add(present_userComputeResourcePreferences);
-    if (present_userComputeResourcePreferences)
-      list.add(userComputeResourcePreferences);
+    hashCode = hashCode * 8191 + ((isSetUserComputeResourcePreferences()) ? 
131071 : 524287);
+    if (isSetUserComputeResourcePreferences())
+      hashCode = hashCode * 8191 + userComputeResourcePreferences.hashCode();
 
-    boolean present_userStoragePreferences = true && 
(isSetUserStoragePreferences());
-    list.add(present_userStoragePreferences);
-    if (present_userStoragePreferences)
-      list.add(userStoragePreferences);
+    hashCode = hashCode * 8191 + ((isSetUserStoragePreferences()) ? 131071 : 
524287);
+    if (isSetUserStoragePreferences())
+      hashCode = hashCode * 8191 + userStoragePreferences.hashCode();
 
-    boolean present_identityServerTenant = true && 
(isSetIdentityServerTenant());
-    list.add(present_identityServerTenant);
-    if (present_identityServerTenant)
-      list.add(identityServerTenant);
+    hashCode = hashCode * 8191 + ((isSetIdentityServerTenant()) ? 131071 : 
524287);
+    if (isSetIdentityServerTenant())
+      hashCode = hashCode * 8191 + identityServerTenant.hashCode();
 
-    boolean present_identityServerPwdCredToken = true && 
(isSetIdentityServerPwdCredToken());
-    list.add(present_identityServerPwdCredToken);
-    if (present_identityServerPwdCredToken)
-      list.add(identityServerPwdCredToken);
+    hashCode = hashCode * 8191 + ((isSetIdentityServerPwdCredToken()) ? 131071 
: 524287);
+    if (isSetIdentityServerPwdCredToken())
+      hashCode = hashCode * 8191 + identityServerPwdCredToken.hashCode();
 
-    boolean present_isNull = true && (isSetIsNull());
-    list.add(present_isNull);
-    if (present_isNull)
-      list.add(isNull);
+    hashCode = hashCode * 8191 + ((isSetIsNull()) ? 131071 : 524287);
+    if (isSetIsNull())
+      hashCode = hashCode * 8191 + ((isNull) ? 131071 : 524287);
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -760,7 +724,7 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
 
     int lastComparison = 0;
 
-    lastComparison = 
Boolean.valueOf(isSetUserId()).compareTo(other.isSetUserId());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetUserId()).compareTo(other.isSetUserId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -770,7 +734,7 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetGatewayID()).compareTo(other.isSetGatewayID());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetGatewayID()).compareTo(other.isSetGatewayID());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -780,7 +744,7 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetCredentialStoreToken()).compareTo(other.isSetCredentialStoreToken());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetCredentialStoreToken()).compareTo(other.isSetCredentialStoreToken());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -790,7 +754,7 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetUserComputeResourcePreferences()).compareTo(other.isSetUserComputeResourcePreferences());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetUserComputeResourcePreferences()).compareTo(other.isSetUserComputeResourcePreferences());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -800,7 +764,7 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetUserStoragePreferences()).compareTo(other.isSetUserStoragePreferences());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetUserStoragePreferences()).compareTo(other.isSetUserStoragePreferences());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -810,7 +774,7 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetIdentityServerTenant()).compareTo(other.isSetIdentityServerTenant());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetIdentityServerTenant()).compareTo(other.isSetIdentityServerTenant());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -820,7 +784,7 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetIdentityServerPwdCredToken()).compareTo(other.isSetIdentityServerPwdCredToken());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetIdentityServerPwdCredToken()).compareTo(other.isSetIdentityServerPwdCredToken());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -830,7 +794,7 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetIsNull()).compareTo(other.isSetIsNull());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetIsNull()).compareTo(other.isSetIsNull());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -848,16 +812,16 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
   }
 
   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("UserResourceProfile(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new 
java.lang.StringBuilder("UserResourceProfile(");
     boolean first = true;
 
     sb.append("userId:");
@@ -956,7 +920,7 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
     }
   }
 
-  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;
@@ -966,13 +930,13 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
     }
   }
 
-  private static class UserResourceProfileStandardSchemeFactory implements 
SchemeFactory {
+  private static class UserResourceProfileStandardSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public UserResourceProfileStandardScheme getScheme() {
       return new UserResourceProfileStandardScheme();
     }
   }
 
-  private static class UserResourceProfileStandardScheme extends 
StandardScheme<UserResourceProfile> {
+  private static class UserResourceProfileStandardScheme extends 
org.apache.thrift.scheme.StandardScheme<UserResourceProfile> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, 
UserResourceProfile struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -1012,7 +976,7 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list0 = 
iprot.readListBegin();
-                struct.userComputeResourcePreferences = new 
ArrayList<UserComputeResourcePreference>(_list0.size);
+                struct.userComputeResourcePreferences = new 
java.util.ArrayList<UserComputeResourcePreference>(_list0.size);
                 UserComputeResourcePreference _elem1;
                 for (int _i2 = 0; _i2 < _list0.size; ++_i2)
                 {
@@ -1031,7 +995,7 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list3 = 
iprot.readListBegin();
-                struct.userStoragePreferences = new 
ArrayList<UserStoragePreference>(_list3.size);
+                struct.userStoragePreferences = new 
java.util.ArrayList<UserStoragePreference>(_list3.size);
                 UserStoragePreference _elem4;
                 for (int _i5 = 0; _i5 < _list3.size; ++_i5)
                 {
@@ -1153,20 +1117,20 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
 
   }
 
-  private static class UserResourceProfileTupleSchemeFactory implements 
SchemeFactory {
+  private static class UserResourceProfileTupleSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public UserResourceProfileTupleScheme getScheme() {
       return new UserResourceProfileTupleScheme();
     }
   }
 
-  private static class UserResourceProfileTupleScheme extends 
TupleScheme<UserResourceProfile> {
+  private static class UserResourceProfileTupleScheme extends 
org.apache.thrift.scheme.TupleScheme<UserResourceProfile> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, 
UserResourceProfile 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.userId);
       oprot.writeString(struct.gatewayID);
-      BitSet optionals = new BitSet();
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetCredentialStoreToken()) {
         optionals.set(0);
       }
@@ -1220,12 +1184,12 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, 
UserResourceProfile struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol iprot = 
(org.apache.thrift.protocol.TTupleProtocol) prot;
       struct.userId = iprot.readString();
       struct.setUserIdIsSet(true);
       struct.gatewayID = iprot.readString();
       struct.setGatewayIDIsSet(true);
-      BitSet incoming = iprot.readBitSet(6);
+      java.util.BitSet incoming = iprot.readBitSet(6);
       if (incoming.get(0)) {
         struct.credentialStoreToken = iprot.readString();
         struct.setCredentialStoreTokenIsSet(true);
@@ -1233,7 +1197,7 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
       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.userComputeResourcePreferences = new 
ArrayList<UserComputeResourcePreference>(_list10.size);
+          struct.userComputeResourcePreferences = new 
java.util.ArrayList<UserComputeResourcePreference>(_list10.size);
           UserComputeResourcePreference _elem11;
           for (int _i12 = 0; _i12 < _list10.size; ++_i12)
           {
@@ -1247,7 +1211,7 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
       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.userStoragePreferences = new 
ArrayList<UserStoragePreference>(_list13.size);
+          struct.userStoragePreferences = new 
java.util.ArrayList<UserStoragePreference>(_list13.size);
           UserStoragePreference _elem14;
           for (int _i15 = 0; _i15 < _list13.size; ++_i15)
           {
@@ -1273,5 +1237,8 @@ public class UserResourceProfile implements 
org.apache.thrift.TBase<UserResource
     }
   }
 
+  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/userresourceprofile/UserStoragePreference.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/userresourceprofile/UserStoragePreference.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/userresourceprofile/UserStoragePreference.java
index daa5df2..44a5fc3 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/userresourceprofile/UserStoragePreference.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/userresourceprofile/UserStoragePreference.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.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"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class UserStoragePreference implements 
org.apache.thrift.TBase<UserStoragePreference, UserStoragePreference._Fields>, 
java.io.Serializable, Cloneable, Comparable<UserStoragePreference> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("UserStoragePreference");
 
@@ -60,16 +33,13 @@ public class UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
   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 
UserStoragePreferenceStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new 
UserStoragePreferenceTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new UserStoragePreferenceStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new UserStoragePreferenceTupleSchemeFactory();
 
-  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 UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
     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 UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
      */
     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 UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
       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 UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
         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(UserStoragePreference.class,
 metaDataMap);
   }
 
@@ -159,7 +129,7 @@ public class UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
   }
 
   public UserStoragePreference(
-    String storageResourceId)
+    java.lang.String storageResourceId)
   {
     this();
     this.storageResourceId = storageResourceId;
@@ -195,11 +165,11 @@ public class UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
     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 UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
     }
   }
 
-  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 UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
     }
   }
 
-  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 UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
     }
   }
 
-  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 UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
     }
   }
 
-  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 UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
       if (value == null) {
         unsetLoginUserName();
       } else {
-        setLoginUserName((String)value);
+        setLoginUserName((java.lang.String)value);
       }
       break;
 
@@ -309,7 +279,7 @@ public class UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
       if (value == null) {
         unsetFileSystemRootLocation();
       } else {
-        setFileSystemRootLocation((String)value);
+        setFileSystemRootLocation((java.lang.String)value);
       }
       break;
 
@@ -317,14 +287,14 @@ public class UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
       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 UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
       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 UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
     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 UserStoragePreference)
@@ -373,6 +343,8 @@ public class UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
   public boolean equals(UserStoragePreference 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 UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
 
   @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 UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
 
     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 UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
         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 UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
         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 UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
         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 UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
   }
 
   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("UserStoragePreference(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new 
java.lang.StringBuilder("UserStoragePreference(");
     boolean first = true;
 
     sb.append("storageResourceId:");
@@ -566,7 +534,7 @@ public class UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
     }
   }
 
-  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 UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
     }
   }
 
-  private static class UserStoragePreferenceStandardSchemeFactory implements 
SchemeFactory {
+  private static class UserStoragePreferenceStandardSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public UserStoragePreferenceStandardScheme getScheme() {
       return new UserStoragePreferenceStandardScheme();
     }
   }
 
-  private static class UserStoragePreferenceStandardScheme extends 
StandardScheme<UserStoragePreference> {
+  private static class UserStoragePreferenceStandardScheme extends 
org.apache.thrift.scheme.StandardScheme<UserStoragePreference> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, 
UserStoragePreference struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -669,19 +637,19 @@ public class UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
 
   }
 
-  private static class UserStoragePreferenceTupleSchemeFactory implements 
SchemeFactory {
+  private static class UserStoragePreferenceTupleSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public UserStoragePreferenceTupleScheme getScheme() {
       return new UserStoragePreferenceTupleScheme();
     }
   }
 
-  private static class UserStoragePreferenceTupleScheme extends 
TupleScheme<UserStoragePreference> {
+  private static class UserStoragePreferenceTupleScheme extends 
org.apache.thrift.scheme.TupleScheme<UserStoragePreference> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, 
UserStoragePreference 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 UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, 
UserStoragePreference 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 UserStoragePreference implements 
org.apache.thrift.TBase<UserStorag
     }
   }
 
+  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/application/io/DataType.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/DataType.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/DataType.java
index 8bef839..565f03d 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/DataType.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/DataType.java
@@ -16,7 +16,7 @@
  */
 
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

Reply via email to