http://git-wip-us.apache.org/repos/asf/airavata/blob/8e775660/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/PasswordCredential.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/PasswordCredential.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/PasswordCredential.java
index f7d5db0..bb3d291 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/PasswordCredential.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/PasswordCredential.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.credential.store;
 
-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 PasswordCredential implements 
org.apache.thrift.TBase<PasswordCredential, PasswordCredential._Fields>, 
java.io.Serializable, Cloneable, Comparable<PasswordCredential> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("PasswordCredential");
 
@@ -63,19 +36,16 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
   private static final org.apache.thrift.protocol.TField 
PERSISTED_TIME_FIELD_DESC = new 
org.apache.thrift.protocol.TField("persistedTime", 
org.apache.thrift.protocol.TType.I64, (short)6);
   private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = 
new org.apache.thrift.protocol.TField("token", 
org.apache.thrift.protocol.TType.STRING, (short)7);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new 
PasswordCredentialStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new PasswordCredentialTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new PasswordCredentialStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new PasswordCredentialTupleSchemeFactory();
 
-  private String gatewayId; // required
-  private String portalUserName; // required
-  private String loginUserName; // required
-  private String password; // required
-  private String description; // optional
+  private java.lang.String gatewayId; // required
+  private java.lang.String portalUserName; // required
+  private java.lang.String loginUserName; // required
+  private java.lang.String password; // required
+  private java.lang.String description; // optional
   private long persistedTime; // optional
-  private String token; // optional
+  private java.lang.String token; // 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 {
@@ -87,10 +57,10 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
     PERSISTED_TIME((short)6, "persistedTime"),
     TOKEN((short)7, "token");
 
-    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);
       }
     }
@@ -125,21 +95,21 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
      */
     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;
     }
@@ -148,7 +118,7 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -157,9 +127,9 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
   private static final int __PERSISTEDTIME_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = 
{_Fields.DESCRIPTION,_Fields.PERSISTED_TIME,_Fields.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.PORTAL_USER_NAME, new 
org.apache.thrift.meta_data.FieldMetaData("portalUserName", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
@@ -174,7 +144,7 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     tmpMap.put(_Fields.TOKEN, new 
org.apache.thrift.meta_data.FieldMetaData("token", 
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(PasswordCredential.class,
 metaDataMap);
   }
 
@@ -182,10 +152,10 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
   }
 
   public PasswordCredential(
-    String gatewayId,
-    String portalUserName,
-    String loginUserName,
-    String password)
+    java.lang.String gatewayId,
+    java.lang.String portalUserName,
+    java.lang.String loginUserName,
+    java.lang.String password)
   {
     this();
     this.gatewayId = gatewayId;
@@ -236,11 +206,11 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
     this.token = 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;
   }
 
@@ -259,11 +229,11 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
     }
   }
 
-  public String getPortalUserName() {
+  public java.lang.String getPortalUserName() {
     return this.portalUserName;
   }
 
-  public void setPortalUserName(String portalUserName) {
+  public void setPortalUserName(java.lang.String portalUserName) {
     this.portalUserName = portalUserName;
   }
 
@@ -282,11 +252,11 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
     }
   }
 
-  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;
   }
 
@@ -305,11 +275,11 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
     }
   }
 
-  public String getPassword() {
+  public java.lang.String getPassword() {
     return this.password;
   }
 
-  public void setPassword(String password) {
+  public void setPassword(java.lang.String password) {
     this.password = password;
   }
 
@@ -328,11 +298,11 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
     }
   }
 
-  public String getDescription() {
+  public java.lang.String getDescription() {
     return this.description;
   }
 
-  public void setDescription(String description) {
+  public void setDescription(java.lang.String description) {
     this.description = description;
   }
 
@@ -361,23 +331,23 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
   }
 
   public void unsetPersistedTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__PERSISTEDTIME_ISSET_ID);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, 
__PERSISTEDTIME_ISSET_ID);
   }
 
   /** Returns true if field persistedTime is set (has been assigned a value) 
and false otherwise */
   public boolean isSetPersistedTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __PERSISTEDTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, 
__PERSISTEDTIME_ISSET_ID);
   }
 
   public void setPersistedTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__PERSISTEDTIME_ISSET_ID, value);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, 
__PERSISTEDTIME_ISSET_ID, value);
   }
 
-  public String getToken() {
+  public java.lang.String getToken() {
     return this.token;
   }
 
-  public void setToken(String token) {
+  public void setToken(java.lang.String token) {
     this.token = token;
   }
 
@@ -396,13 +366,13 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
     }
   }
 
-  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;
 
@@ -410,7 +380,7 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
       if (value == null) {
         unsetPortalUserName();
       } else {
-        setPortalUserName((String)value);
+        setPortalUserName((java.lang.String)value);
       }
       break;
 
@@ -418,7 +388,7 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
       if (value == null) {
         unsetLoginUserName();
       } else {
-        setLoginUserName((String)value);
+        setLoginUserName((java.lang.String)value);
       }
       break;
 
@@ -426,7 +396,7 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
       if (value == null) {
         unsetPassword();
       } else {
-        setPassword((String)value);
+        setPassword((java.lang.String)value);
       }
       break;
 
@@ -434,7 +404,7 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
       if (value == null) {
         unsetDescription();
       } else {
-        setDescription((String)value);
+        setDescription((java.lang.String)value);
       }
       break;
 
@@ -442,7 +412,7 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
       if (value == null) {
         unsetPersistedTime();
       } else {
-        setPersistedTime((Long)value);
+        setPersistedTime((java.lang.Long)value);
       }
       break;
 
@@ -450,14 +420,14 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
       if (value == null) {
         unsetToken();
       } else {
-        setToken((String)value);
+        setToken((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case GATEWAY_ID:
       return getGatewayId();
@@ -481,13 +451,13 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
       return getToken();
 
     }
-    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) {
@@ -506,11 +476,11 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
     case TOKEN:
       return isSetToken();
     }
-    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 PasswordCredential)
@@ -521,6 +491,8 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
   public boolean equals(PasswordCredential 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();
@@ -590,44 +562,37 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
 
   @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_portalUserName = true && (isSetPortalUserName());
-    list.add(present_portalUserName);
-    if (present_portalUserName)
-      list.add(portalUserName);
-
-    boolean present_loginUserName = true && (isSetLoginUserName());
-    list.add(present_loginUserName);
-    if (present_loginUserName)
-      list.add(loginUserName);
-
-    boolean present_password = true && (isSetPassword());
-    list.add(present_password);
-    if (present_password)
-      list.add(password);
-
-    boolean present_description = true && (isSetDescription());
-    list.add(present_description);
-    if (present_description)
-      list.add(description);
-
-    boolean present_persistedTime = true && (isSetPersistedTime());
-    list.add(present_persistedTime);
-    if (present_persistedTime)
-      list.add(persistedTime);
-
-    boolean present_token = true && (isSetToken());
-    list.add(present_token);
-    if (present_token)
-      list.add(token);
-
-    return list.hashCode();
+    int hashCode = 1;
+
+    hashCode = hashCode * 8191 + ((isSetGatewayId()) ? 131071 : 524287);
+    if (isSetGatewayId())
+      hashCode = hashCode * 8191 + gatewayId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetPortalUserName()) ? 131071 : 524287);
+    if (isSetPortalUserName())
+      hashCode = hashCode * 8191 + portalUserName.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetLoginUserName()) ? 131071 : 524287);
+    if (isSetLoginUserName())
+      hashCode = hashCode * 8191 + loginUserName.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetPassword()) ? 131071 : 524287);
+    if (isSetPassword())
+      hashCode = hashCode * 8191 + password.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetDescription()) ? 131071 : 524287);
+    if (isSetDescription())
+      hashCode = hashCode * 8191 + description.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetPersistedTime()) ? 131071 : 524287);
+    if (isSetPersistedTime())
+      hashCode = hashCode * 8191 + 
org.apache.thrift.TBaseHelper.hashCode(persistedTime);
+
+    hashCode = hashCode * 8191 + ((isSetToken()) ? 131071 : 524287);
+    if (isSetToken())
+      hashCode = hashCode * 8191 + token.hashCode();
+
+    return hashCode;
   }
 
   @Override
@@ -638,7 +603,7 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
 
     int lastComparison = 0;
 
-    lastComparison = 
Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -648,7 +613,7 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetPortalUserName()).compareTo(other.isSetPortalUserName());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetPortalUserName()).compareTo(other.isSetPortalUserName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -658,7 +623,7 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetLoginUserName()).compareTo(other.isSetLoginUserName());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetLoginUserName()).compareTo(other.isSetLoginUserName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -668,7 +633,7 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetPassword()).compareTo(other.isSetPassword());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetPassword()).compareTo(other.isSetPassword());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -678,7 +643,7 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -688,7 +653,7 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetPersistedTime()).compareTo(other.isSetPersistedTime());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetPersistedTime()).compareTo(other.isSetPersistedTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -698,7 +663,7 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetToken()).compareTo(other.isSetToken());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetToken()).compareTo(other.isSetToken());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -716,16 +681,16 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
   }
 
   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("PasswordCredential(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new 
java.lang.StringBuilder("PasswordCredential(");
     boolean first = true;
 
     sb.append("gatewayId:");
@@ -818,7 +783,7 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
     }
   }
 
-  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;
@@ -828,13 +793,13 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
     }
   }
 
-  private static class PasswordCredentialStandardSchemeFactory implements 
SchemeFactory {
+  private static class PasswordCredentialStandardSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public PasswordCredentialStandardScheme getScheme() {
       return new PasswordCredentialStandardScheme();
     }
   }
 
-  private static class PasswordCredentialStandardScheme extends 
StandardScheme<PasswordCredential> {
+  private static class PasswordCredentialStandardScheme extends 
org.apache.thrift.scheme.StandardScheme<PasswordCredential> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, 
PasswordCredential struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -960,22 +925,22 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
 
   }
 
-  private static class PasswordCredentialTupleSchemeFactory implements 
SchemeFactory {
+  private static class PasswordCredentialTupleSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public PasswordCredentialTupleScheme getScheme() {
       return new PasswordCredentialTupleScheme();
     }
   }
 
-  private static class PasswordCredentialTupleScheme extends 
TupleScheme<PasswordCredential> {
+  private static class PasswordCredentialTupleScheme extends 
org.apache.thrift.scheme.TupleScheme<PasswordCredential> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, 
PasswordCredential 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);
       oprot.writeString(struct.portalUserName);
       oprot.writeString(struct.loginUserName);
       oprot.writeString(struct.password);
-      BitSet optionals = new BitSet();
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetDescription()) {
         optionals.set(0);
       }
@@ -999,7 +964,7 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, 
PasswordCredential 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);
       struct.portalUserName = iprot.readString();
@@ -1008,7 +973,7 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
       struct.setLoginUserNameIsSet(true);
       struct.password = iprot.readString();
       struct.setPasswordIsSet(true);
-      BitSet incoming = iprot.readBitSet(3);
+      java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.description = iprot.readString();
         struct.setDescriptionIsSet(true);
@@ -1024,5 +989,8 @@ public class PasswordCredential implements 
org.apache.thrift.TBase<PasswordCrede
     }
   }
 
+  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/credential/store/SSHCredential.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/SSHCredential.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/SSHCredential.java
index 670fc7e..9fa86d3 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/SSHCredential.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/SSHCredential.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.credential.store;
 
-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 SSHCredential implements org.apache.thrift.TBase<SSHCredential, 
SSHCredential._Fields>, java.io.Serializable, Cloneable, 
Comparable<SSHCredential> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("SSHCredential");
 
@@ -65,20 +38,17 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
   private static final org.apache.thrift.protocol.TField 
DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", 
org.apache.thrift.protocol.TType.STRING, (short)8);
   private static final org.apache.thrift.protocol.TField 
CREDENTIAL_OWNER_TYPE_FIELD_DESC = new 
org.apache.thrift.protocol.TField("credentialOwnerType", 
org.apache.thrift.protocol.TType.I32, (short)9);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new 
SSHCredentialStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new SSHCredentialTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new SSHCredentialStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new SSHCredentialTupleSchemeFactory();
 
-  private String gatewayId; // required
-  private String username; // required
-  private String passphrase; // optional
-  private String publicKey; // optional
-  private String privateKey; // optional
+  private java.lang.String gatewayId; // required
+  private java.lang.String username; // required
+  private java.lang.String passphrase; // optional
+  private java.lang.String publicKey; // optional
+  private java.lang.String privateKey; // optional
   private long persistedTime; // optional
-  private String token; // optional
-  private String description; // optional
+  private java.lang.String token; // optional
+  private java.lang.String description; // optional
   private CredentialOwnerType credentialOwnerType; // optional
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
@@ -97,10 +67,10 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
      */
     CREDENTIAL_OWNER_TYPE((short)9, "credentialOwnerType");
 
-    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);
       }
     }
@@ -139,21 +109,21 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
      */
     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;
     }
@@ -162,7 +132,7 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -171,9 +141,9 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
   private static final int __PERSISTEDTIME_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = 
{_Fields.PASSPHRASE,_Fields.PUBLIC_KEY,_Fields.PRIVATE_KEY,_Fields.PERSISTED_TIME,_Fields.TOKEN,_Fields.DESCRIPTION,_Fields.CREDENTIAL_OWNER_TYPE};
-  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.USERNAME, new 
org.apache.thrift.meta_data.FieldMetaData("username", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
@@ -192,7 +162,7 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.CREDENTIAL_OWNER_TYPE, new 
org.apache.thrift.meta_data.FieldMetaData("credentialOwnerType", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new 
org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, 
CredentialOwnerType.class)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SSHCredential.class,
 metaDataMap);
   }
 
@@ -202,8 +172,8 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
   }
 
   public SSHCredential(
-    String gatewayId,
-    String username)
+    java.lang.String gatewayId,
+    java.lang.String username)
   {
     this();
     this.gatewayId = gatewayId;
@@ -261,11 +231,11 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
 
   }
 
-  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;
   }
 
@@ -284,11 +254,11 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
     }
   }
 
-  public String getUsername() {
+  public java.lang.String getUsername() {
     return this.username;
   }
 
-  public void setUsername(String username) {
+  public void setUsername(java.lang.String username) {
     this.username = username;
   }
 
@@ -307,11 +277,11 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
     }
   }
 
-  public String getPassphrase() {
+  public java.lang.String getPassphrase() {
     return this.passphrase;
   }
 
-  public void setPassphrase(String passphrase) {
+  public void setPassphrase(java.lang.String passphrase) {
     this.passphrase = passphrase;
   }
 
@@ -330,11 +300,11 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
     }
   }
 
-  public String getPublicKey() {
+  public java.lang.String getPublicKey() {
     return this.publicKey;
   }
 
-  public void setPublicKey(String publicKey) {
+  public void setPublicKey(java.lang.String publicKey) {
     this.publicKey = publicKey;
   }
 
@@ -353,11 +323,11 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
     }
   }
 
-  public String getPrivateKey() {
+  public java.lang.String getPrivateKey() {
     return this.privateKey;
   }
 
-  public void setPrivateKey(String privateKey) {
+  public void setPrivateKey(java.lang.String privateKey) {
     this.privateKey = privateKey;
   }
 
@@ -386,23 +356,23 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
   }
 
   public void unsetPersistedTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__PERSISTEDTIME_ISSET_ID);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, 
__PERSISTEDTIME_ISSET_ID);
   }
 
   /** Returns true if field persistedTime is set (has been assigned a value) 
and false otherwise */
   public boolean isSetPersistedTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __PERSISTEDTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, 
__PERSISTEDTIME_ISSET_ID);
   }
 
   public void setPersistedTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__PERSISTEDTIME_ISSET_ID, value);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, 
__PERSISTEDTIME_ISSET_ID, value);
   }
 
-  public String getToken() {
+  public java.lang.String getToken() {
     return this.token;
   }
 
-  public void setToken(String token) {
+  public void setToken(java.lang.String token) {
     this.token = token;
   }
 
@@ -421,11 +391,11 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
     }
   }
 
-  public String getDescription() {
+  public java.lang.String getDescription() {
     return this.description;
   }
 
-  public void setDescription(String description) {
+  public void setDescription(java.lang.String description) {
     this.description = description;
   }
 
@@ -475,13 +445,13 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
     }
   }
 
-  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;
 
@@ -489,7 +459,7 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
       if (value == null) {
         unsetUsername();
       } else {
-        setUsername((String)value);
+        setUsername((java.lang.String)value);
       }
       break;
 
@@ -497,7 +467,7 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
       if (value == null) {
         unsetPassphrase();
       } else {
-        setPassphrase((String)value);
+        setPassphrase((java.lang.String)value);
       }
       break;
 
@@ -505,7 +475,7 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
       if (value == null) {
         unsetPublicKey();
       } else {
-        setPublicKey((String)value);
+        setPublicKey((java.lang.String)value);
       }
       break;
 
@@ -513,7 +483,7 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
       if (value == null) {
         unsetPrivateKey();
       } else {
-        setPrivateKey((String)value);
+        setPrivateKey((java.lang.String)value);
       }
       break;
 
@@ -521,7 +491,7 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
       if (value == null) {
         unsetPersistedTime();
       } else {
-        setPersistedTime((Long)value);
+        setPersistedTime((java.lang.Long)value);
       }
       break;
 
@@ -529,7 +499,7 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
       if (value == null) {
         unsetToken();
       } else {
-        setToken((String)value);
+        setToken((java.lang.String)value);
       }
       break;
 
@@ -537,7 +507,7 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
       if (value == null) {
         unsetDescription();
       } else {
-        setDescription((String)value);
+        setDescription((java.lang.String)value);
       }
       break;
 
@@ -552,7 +522,7 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case GATEWAY_ID:
       return getGatewayId();
@@ -582,13 +552,13 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
       return getCredentialOwnerType();
 
     }
-    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) {
@@ -611,11 +581,11 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
     case CREDENTIAL_OWNER_TYPE:
       return isSetCredentialOwnerType();
     }
-    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 SSHCredential)
@@ -626,6 +596,8 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
   public boolean equals(SSHCredential 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();
@@ -713,54 +685,45 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    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_username = true && (isSetUsername());
-    list.add(present_username);
-    if (present_username)
-      list.add(username);
+    hashCode = hashCode * 8191 + ((isSetUsername()) ? 131071 : 524287);
+    if (isSetUsername())
+      hashCode = hashCode * 8191 + username.hashCode();
 
-    boolean present_passphrase = true && (isSetPassphrase());
-    list.add(present_passphrase);
-    if (present_passphrase)
-      list.add(passphrase);
+    hashCode = hashCode * 8191 + ((isSetPassphrase()) ? 131071 : 524287);
+    if (isSetPassphrase())
+      hashCode = hashCode * 8191 + passphrase.hashCode();
 
-    boolean present_publicKey = true && (isSetPublicKey());
-    list.add(present_publicKey);
-    if (present_publicKey)
-      list.add(publicKey);
+    hashCode = hashCode * 8191 + ((isSetPublicKey()) ? 131071 : 524287);
+    if (isSetPublicKey())
+      hashCode = hashCode * 8191 + publicKey.hashCode();
 
-    boolean present_privateKey = true && (isSetPrivateKey());
-    list.add(present_privateKey);
-    if (present_privateKey)
-      list.add(privateKey);
+    hashCode = hashCode * 8191 + ((isSetPrivateKey()) ? 131071 : 524287);
+    if (isSetPrivateKey())
+      hashCode = hashCode * 8191 + privateKey.hashCode();
 
-    boolean present_persistedTime = true && (isSetPersistedTime());
-    list.add(present_persistedTime);
-    if (present_persistedTime)
-      list.add(persistedTime);
+    hashCode = hashCode * 8191 + ((isSetPersistedTime()) ? 131071 : 524287);
+    if (isSetPersistedTime())
+      hashCode = hashCode * 8191 + 
org.apache.thrift.TBaseHelper.hashCode(persistedTime);
 
-    boolean present_token = true && (isSetToken());
-    list.add(present_token);
-    if (present_token)
-      list.add(token);
+    hashCode = hashCode * 8191 + ((isSetToken()) ? 131071 : 524287);
+    if (isSetToken())
+      hashCode = hashCode * 8191 + token.hashCode();
 
-    boolean present_description = true && (isSetDescription());
-    list.add(present_description);
-    if (present_description)
-      list.add(description);
+    hashCode = hashCode * 8191 + ((isSetDescription()) ? 131071 : 524287);
+    if (isSetDescription())
+      hashCode = hashCode * 8191 + description.hashCode();
 
-    boolean present_credentialOwnerType = true && (isSetCredentialOwnerType());
-    list.add(present_credentialOwnerType);
-    if (present_credentialOwnerType)
-      list.add(credentialOwnerType.getValue());
+    hashCode = hashCode * 8191 + ((isSetCredentialOwnerType()) ? 131071 : 
524287);
+    if (isSetCredentialOwnerType())
+      hashCode = hashCode * 8191 + credentialOwnerType.getValue();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -771,7 +734,7 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
 
     int lastComparison = 0;
 
-    lastComparison = 
Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -781,7 +744,7 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetUsername()).compareTo(other.isSetUsername());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetUsername()).compareTo(other.isSetUsername());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -791,7 +754,7 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetPassphrase()).compareTo(other.isSetPassphrase());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetPassphrase()).compareTo(other.isSetPassphrase());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -801,7 +764,7 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetPublicKey()).compareTo(other.isSetPublicKey());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetPublicKey()).compareTo(other.isSetPublicKey());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -811,7 +774,7 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetPrivateKey()).compareTo(other.isSetPrivateKey());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetPrivateKey()).compareTo(other.isSetPrivateKey());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -821,7 +784,7 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetPersistedTime()).compareTo(other.isSetPersistedTime());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetPersistedTime()).compareTo(other.isSetPersistedTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -831,7 +794,7 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetToken()).compareTo(other.isSetToken());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetToken()).compareTo(other.isSetToken());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -841,7 +804,7 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -851,7 +814,7 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetCredentialOwnerType()).compareTo(other.isSetCredentialOwnerType());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetCredentialOwnerType()).compareTo(other.isSetCredentialOwnerType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -869,16 +832,16 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
   }
 
   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("SSHCredential(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("SSHCredential(");
     boolean first = true;
 
     sb.append("gatewayId:");
@@ -987,7 +950,7 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
     }
   }
 
-  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;
@@ -997,13 +960,13 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
     }
   }
 
-  private static class SSHCredentialStandardSchemeFactory implements 
SchemeFactory {
+  private static class SSHCredentialStandardSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public SSHCredentialStandardScheme getScheme() {
       return new SSHCredentialStandardScheme();
     }
   }
 
-  private static class SSHCredentialStandardScheme extends 
StandardScheme<SSHCredential> {
+  private static class SSHCredentialStandardScheme extends 
org.apache.thrift.scheme.StandardScheme<SSHCredential> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, SSHCredential 
struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -1163,20 +1126,20 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
 
   }
 
-  private static class SSHCredentialTupleSchemeFactory implements 
SchemeFactory {
+  private static class SSHCredentialTupleSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public SSHCredentialTupleScheme getScheme() {
       return new SSHCredentialTupleScheme();
     }
   }
 
-  private static class SSHCredentialTupleScheme extends 
TupleScheme<SSHCredential> {
+  private static class SSHCredentialTupleScheme extends 
org.apache.thrift.scheme.TupleScheme<SSHCredential> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, SSHCredential 
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);
       oprot.writeString(struct.username);
-      BitSet optionals = new BitSet();
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetPassphrase()) {
         optionals.set(0);
       }
@@ -1224,12 +1187,12 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SSHCredential 
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);
       struct.username = iprot.readString();
       struct.setUsernameIsSet(true);
-      BitSet incoming = iprot.readBitSet(7);
+      java.util.BitSet incoming = iprot.readBitSet(7);
       if (incoming.get(0)) {
         struct.passphrase = iprot.readString();
         struct.setPassphraseIsSet(true);
@@ -1261,5 +1224,8 @@ public class SSHCredential implements 
org.apache.thrift.TBase<SSHCredential, SSH
     }
   }
 
+  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/credential/store/SummaryType.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/SummaryType.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/SummaryType.java
index 7451f89..240dec7 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/SummaryType.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/SummaryType.java
@@ -16,7 +16,7 @@
  */
 
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

http://git-wip-us.apache.org/repos/asf/airavata/blob/8e775660/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/credential_store_data_modelsConstants.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/credential_store_data_modelsConstants.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/credential_store_data_modelsConstants.java
index d4b1dd0..73ad1fb 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/credential_store_data_modelsConstants.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/credential_store_data_modelsConstants.java
@@ -16,43 +16,16 @@
  */
 
 /**
- * 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.credential.store;
 
-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"})
 public class credential_store_data_modelsConstants {
 
-  public static final String DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS";
+  public static final java.lang.String DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS";
 
 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/8e775660/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DMType.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DMType.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DMType.java
index 5ff84bd..1dc9d36 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DMType.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DMType.java
@@ -16,7 +16,7 @@
  */
 
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

http://git-wip-us.apache.org/repos/asf/airavata/blob/8e775660/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
index b9678e0..3c50586 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
@@ -16,41 +16,14 @@
  */
 
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.airavata.model.data.movement;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 /**
  * Data Movement Interfaces
  * 
@@ -61,7 +34,7 @@ import org.slf4j.LoggerFactory;
  *   Lower the numerical number, higher the priority
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class DataMovementInterface implements 
org.apache.thrift.TBase<DataMovementInterface, DataMovementInterface._Fields>, 
java.io.Serializable, Cloneable, Comparable<DataMovementInterface> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("DataMovementInterface");
 
@@ -69,13 +42,10 @@ public class DataMovementInterface implements 
org.apache.thrift.TBase<DataMoveme
   private static final org.apache.thrift.protocol.TField 
DATA_MOVEMENT_PROTOCOL_FIELD_DESC = new 
org.apache.thrift.protocol.TField("dataMovementProtocol", 
org.apache.thrift.protocol.TType.I32, (short)2);
   private static final org.apache.thrift.protocol.TField 
PRIORITY_ORDER_FIELD_DESC = new 
org.apache.thrift.protocol.TField("priorityOrder", 
org.apache.thrift.protocol.TType.I32, (short)3);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new 
DataMovementInterfaceStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new 
DataMovementInterfaceTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new DataMovementInterfaceStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new DataMovementInterfaceTupleSchemeFactory();
 
-  private String dataMovementInterfaceId; // required
+  private java.lang.String dataMovementInterfaceId; // required
   private DataMovementProtocol dataMovementProtocol; // required
   private int priorityOrder; // required
 
@@ -89,10 +59,10 @@ public class DataMovementInterface implements 
org.apache.thrift.TBase<DataMoveme
     DATA_MOVEMENT_PROTOCOL((short)2, "dataMovementProtocol"),
     PRIORITY_ORDER((short)3, "priorityOrder");
 
-    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);
       }
     }
@@ -119,21 +89,21 @@ public class DataMovementInterface implements 
org.apache.thrift.TBase<DataMoveme
      */
     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;
     }
@@ -142,7 +112,7 @@ public class DataMovementInterface implements 
org.apache.thrift.TBase<DataMoveme
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -150,16 +120,16 @@ public class DataMovementInterface implements 
org.apache.thrift.TBase<DataMoveme
   // isset id assignments
   private static final int __PRIORITYORDER_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
+  public static final java.util.Map<_Fields, 
org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = 
new java.util.EnumMap<_Fields, 
org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.DATA_MOVEMENT_INTERFACE_ID, new 
org.apache.thrift.meta_data.FieldMetaData("dataMovementInterfaceId", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.DATA_MOVEMENT_PROTOCOL, new 
org.apache.thrift.meta_data.FieldMetaData("dataMovementProtocol", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new 
org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, 
DataMovementProtocol.class)));
     tmpMap.put(_Fields.PRIORITY_ORDER, new 
org.apache.thrift.meta_data.FieldMetaData("priorityOrder", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DataMovementInterface.class,
 metaDataMap);
   }
 
@@ -169,7 +139,7 @@ public class DataMovementInterface implements 
org.apache.thrift.TBase<DataMoveme
   }
 
   public DataMovementInterface(
-    String dataMovementInterfaceId,
+    java.lang.String dataMovementInterfaceId,
     DataMovementProtocol dataMovementProtocol,
     int priorityOrder)
   {
@@ -206,11 +176,11 @@ public class DataMovementInterface implements 
org.apache.thrift.TBase<DataMoveme
 
   }
 
-  public String getDataMovementInterfaceId() {
+  public java.lang.String getDataMovementInterfaceId() {
     return this.dataMovementInterfaceId;
   }
 
-  public void setDataMovementInterfaceId(String dataMovementInterfaceId) {
+  public void setDataMovementInterfaceId(java.lang.String 
dataMovementInterfaceId) {
     this.dataMovementInterfaceId = dataMovementInterfaceId;
   }
 
@@ -270,25 +240,25 @@ public class DataMovementInterface implements 
org.apache.thrift.TBase<DataMoveme
   }
 
   public void unsetPriorityOrder() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__PRIORITYORDER_ISSET_ID);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, 
__PRIORITYORDER_ISSET_ID);
   }
 
   /** Returns true if field priorityOrder is set (has been assigned a value) 
and false otherwise */
   public boolean isSetPriorityOrder() {
-    return EncodingUtils.testBit(__isset_bitfield, __PRIORITYORDER_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, 
__PRIORITYORDER_ISSET_ID);
   }
 
   public void setPriorityOrderIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__PRIORITYORDER_ISSET_ID, value);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, 
__PRIORITYORDER_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case DATA_MOVEMENT_INTERFACE_ID:
       if (value == null) {
         unsetDataMovementInterfaceId();
       } else {
-        setDataMovementInterfaceId((String)value);
+        setDataMovementInterfaceId((java.lang.String)value);
       }
       break;
 
@@ -304,14 +274,14 @@ public class DataMovementInterface implements 
org.apache.thrift.TBase<DataMoveme
       if (value == null) {
         unsetPriorityOrder();
       } else {
-        setPriorityOrder((Integer)value);
+        setPriorityOrder((java.lang.Integer)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DATA_MOVEMENT_INTERFACE_ID:
       return getDataMovementInterfaceId();
@@ -323,13 +293,13 @@ public class DataMovementInterface implements 
org.apache.thrift.TBase<DataMoveme
       return getPriorityOrder();
 
     }
-    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) {
@@ -340,11 +310,11 @@ public class DataMovementInterface implements 
org.apache.thrift.TBase<DataMoveme
     case PRIORITY_ORDER:
       return isSetPriorityOrder();
     }
-    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 DataMovementInterface)
@@ -355,6 +325,8 @@ public class DataMovementInterface implements 
org.apache.thrift.TBase<DataMoveme
   public boolean equals(DataMovementInterface that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_dataMovementInterfaceId = true && 
this.isSetDataMovementInterfaceId();
     boolean that_present_dataMovementInterfaceId = true && 
that.isSetDataMovementInterfaceId();
@@ -388,24 +360,19 @@ public class DataMovementInterface implements 
org.apache.thrift.TBase<DataMoveme
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_dataMovementInterfaceId = true && 
(isSetDataMovementInterfaceId());
-    list.add(present_dataMovementInterfaceId);
-    if (present_dataMovementInterfaceId)
-      list.add(dataMovementInterfaceId);
+    hashCode = hashCode * 8191 + ((isSetDataMovementInterfaceId()) ? 131071 : 
524287);
+    if (isSetDataMovementInterfaceId())
+      hashCode = hashCode * 8191 + dataMovementInterfaceId.hashCode();
 
-    boolean present_dataMovementProtocol = true && 
(isSetDataMovementProtocol());
-    list.add(present_dataMovementProtocol);
-    if (present_dataMovementProtocol)
-      list.add(dataMovementProtocol.getValue());
+    hashCode = hashCode * 8191 + ((isSetDataMovementProtocol()) ? 131071 : 
524287);
+    if (isSetDataMovementProtocol())
+      hashCode = hashCode * 8191 + dataMovementProtocol.getValue();
 
-    boolean present_priorityOrder = true;
-    list.add(present_priorityOrder);
-    if (present_priorityOrder)
-      list.add(priorityOrder);
+    hashCode = hashCode * 8191 + priorityOrder;
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -416,7 +383,7 @@ public class DataMovementInterface implements 
org.apache.thrift.TBase<DataMoveme
 
     int lastComparison = 0;
 
-    lastComparison = 
Boolean.valueOf(isSetDataMovementInterfaceId()).compareTo(other.isSetDataMovementInterfaceId());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetDataMovementInterfaceId()).compareTo(other.isSetDataMovementInterfaceId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -426,7 +393,7 @@ public class DataMovementInterface implements 
org.apache.thrift.TBase<DataMoveme
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetDataMovementProtocol()).compareTo(other.isSetDataMovementProtocol());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetDataMovementProtocol()).compareTo(other.isSetDataMovementProtocol());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -436,7 +403,7 @@ public class DataMovementInterface implements 
org.apache.thrift.TBase<DataMoveme
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetPriorityOrder()).compareTo(other.isSetPriorityOrder());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetPriorityOrder()).compareTo(other.isSetPriorityOrder());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -454,16 +421,16 @@ public class DataMovementInterface implements 
org.apache.thrift.TBase<DataMoveme
   }
 
   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("DataMovementInterface(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new 
java.lang.StringBuilder("DataMovementInterface(");
     boolean first = true;
 
     sb.append("dataMovementInterfaceId:");
@@ -514,7 +481,7 @@ public class DataMovementInterface implements 
org.apache.thrift.TBase<DataMoveme
     }
   }
 
-  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;
@@ -524,13 +491,13 @@ public class DataMovementInterface implements 
org.apache.thrift.TBase<DataMoveme
     }
   }
 
-  private static class DataMovementInterfaceStandardSchemeFactory implements 
SchemeFactory {
+  private static class DataMovementInterfaceStandardSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public DataMovementInterfaceStandardScheme getScheme() {
       return new DataMovementInterfaceStandardScheme();
     }
   }
 
-  private static class DataMovementInterfaceStandardScheme extends 
StandardScheme<DataMovementInterface> {
+  private static class DataMovementInterfaceStandardScheme extends 
org.apache.thrift.scheme.StandardScheme<DataMovementInterface> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, 
DataMovementInterface struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -598,17 +565,17 @@ public class DataMovementInterface implements 
org.apache.thrift.TBase<DataMoveme
 
   }
 
-  private static class DataMovementInterfaceTupleSchemeFactory implements 
SchemeFactory {
+  private static class DataMovementInterfaceTupleSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public DataMovementInterfaceTupleScheme getScheme() {
       return new DataMovementInterfaceTupleScheme();
     }
   }
 
-  private static class DataMovementInterfaceTupleScheme extends 
TupleScheme<DataMovementInterface> {
+  private static class DataMovementInterfaceTupleScheme extends 
org.apache.thrift.scheme.TupleScheme<DataMovementInterface> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, 
DataMovementInterface struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol oprot = 
(org.apache.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.dataMovementInterfaceId);
       oprot.writeI32(struct.dataMovementProtocol.getValue());
       oprot.writeI32(struct.priorityOrder);
@@ -616,7 +583,7 @@ public class DataMovementInterface implements 
org.apache.thrift.TBase<DataMoveme
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, 
DataMovementInterface struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol iprot = 
(org.apache.thrift.protocol.TTupleProtocol) prot;
       struct.dataMovementInterfaceId = iprot.readString();
       struct.setDataMovementInterfaceIdIsSet(true);
       struct.dataMovementProtocol = 
org.apache.airavata.model.data.movement.DataMovementProtocol.findByValue(iprot.readI32());
@@ -626,5 +593,8 @@ public class DataMovementInterface implements 
org.apache.thrift.TBase<DataMoveme
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S 
scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return 
(org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? 
STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/8e775660/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementProtocol.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementProtocol.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementProtocol.java
index 627b91b..127b4fa 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementProtocol.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementProtocol.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