http://git-wip-us.apache.org/repos/asf/airavata/blob/8e775660/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
index 949692b..6262132 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.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;
 
-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 EdgeModel implements org.apache.thrift.TBase<EdgeModel, 
EdgeModel._Fields>, java.io.Serializable, Cloneable, Comparable<EdgeModel> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("EdgeModel");
 
@@ -60,16 +33,13 @@ public class EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
   private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = 
new org.apache.thrift.protocol.TField("status", 
org.apache.thrift.protocol.TType.STRUCT, (short)3);
   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)4);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new EdgeModelStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new EdgeModelTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new EdgeModelStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new EdgeModelTupleSchemeFactory();
 
-  private String edgeId; // required
-  private String name; // optional
+  private java.lang.String edgeId; // required
+  private java.lang.String name; // optional
   private ComponentStatus status; // optional
-  private String description; // optional
+  private java.lang.String description; // 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 EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
     STATUS((short)3, "status"),
     DESCRIPTION((short)4, "description");
 
-    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 EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
      */
     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 EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
   private static final _Fields optionals[] = 
{_Fields.NAME,_Fields.STATUS,_Fields.DESCRIPTION};
-  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.EDGE_ID, new 
org.apache.thrift.meta_data.FieldMetaData("edgeId", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.NAME, new 
org.apache.thrift.meta_data.FieldMetaData("name", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
@@ -151,7 +121,7 @@ public class EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
         new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 ComponentStatus.class)));
     tmpMap.put(_Fields.DESCRIPTION, new 
org.apache.thrift.meta_data.FieldMetaData("description", 
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(EdgeModel.class, 
metaDataMap);
   }
 
@@ -161,7 +131,7 @@ public class EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
   }
 
   public EdgeModel(
-    String edgeId)
+    java.lang.String edgeId)
   {
     this();
     this.edgeId = edgeId;
@@ -198,11 +168,11 @@ public class EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
     this.description = null;
   }
 
-  public String getEdgeId() {
+  public java.lang.String getEdgeId() {
     return this.edgeId;
   }
 
-  public void setEdgeId(String edgeId) {
+  public void setEdgeId(java.lang.String edgeId) {
     this.edgeId = edgeId;
   }
 
@@ -221,11 +191,11 @@ public class EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
     }
   }
 
-  public String getName() {
+  public java.lang.String getName() {
     return this.name;
   }
 
-  public void setName(String name) {
+  public void setName(java.lang.String name) {
     this.name = name;
   }
 
@@ -267,11 +237,11 @@ public class EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
     }
   }
 
-  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;
   }
 
@@ -290,13 +260,13 @@ public class EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case EDGE_ID:
       if (value == null) {
         unsetEdgeId();
       } else {
-        setEdgeId((String)value);
+        setEdgeId((java.lang.String)value);
       }
       break;
 
@@ -304,7 +274,7 @@ public class EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
       if (value == null) {
         unsetName();
       } else {
-        setName((String)value);
+        setName((java.lang.String)value);
       }
       break;
 
@@ -320,14 +290,14 @@ public class EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
       if (value == null) {
         unsetDescription();
       } else {
-        setDescription((String)value);
+        setDescription((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case EDGE_ID:
       return getEdgeId();
@@ -342,13 +312,13 @@ public class EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
       return getDescription();
 
     }
-    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) {
@@ -361,11 +331,11 @@ public class EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
     case DESCRIPTION:
       return isSetDescription();
     }
-    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 EdgeModel)
@@ -376,6 +346,8 @@ public class EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
   public boolean equals(EdgeModel that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_edgeId = true && this.isSetEdgeId();
     boolean that_present_edgeId = true && that.isSetEdgeId();
@@ -418,29 +390,25 @@ public class EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_edgeId = true && (isSetEdgeId());
-    list.add(present_edgeId);
-    if (present_edgeId)
-      list.add(edgeId);
+    hashCode = hashCode * 8191 + ((isSetEdgeId()) ? 131071 : 524287);
+    if (isSetEdgeId())
+      hashCode = hashCode * 8191 + edgeId.hashCode();
 
-    boolean present_name = true && (isSetName());
-    list.add(present_name);
-    if (present_name)
-      list.add(name);
+    hashCode = hashCode * 8191 + ((isSetName()) ? 131071 : 524287);
+    if (isSetName())
+      hashCode = hashCode * 8191 + name.hashCode();
 
-    boolean present_status = true && (isSetStatus());
-    list.add(present_status);
-    if (present_status)
-      list.add(status);
+    hashCode = hashCode * 8191 + ((isSetStatus()) ? 131071 : 524287);
+    if (isSetStatus())
+      hashCode = hashCode * 8191 + status.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();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -451,7 +419,7 @@ public class EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
 
     int lastComparison = 0;
 
-    lastComparison = 
Boolean.valueOf(isSetEdgeId()).compareTo(other.isSetEdgeId());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetEdgeId()).compareTo(other.isSetEdgeId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -461,7 +429,7 @@ public class EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetName()).compareTo(other.isSetName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -471,7 +439,7 @@ public class EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetStatus()).compareTo(other.isSetStatus());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetStatus()).compareTo(other.isSetStatus());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -481,7 +449,7 @@ public class EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -499,16 +467,16 @@ public class EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
   }
 
   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("EdgeModel(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("EdgeModel(");
     boolean first = true;
 
     sb.append("edgeId:");
@@ -572,7 +540,7 @@ public class EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
     }
   }
 
-  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) {
@@ -580,13 +548,13 @@ public class EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
     }
   }
 
-  private static class EdgeModelStandardSchemeFactory implements SchemeFactory 
{
+  private static class EdgeModelStandardSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public EdgeModelStandardScheme getScheme() {
       return new EdgeModelStandardScheme();
     }
   }
 
-  private static class EdgeModelStandardScheme extends 
StandardScheme<EdgeModel> {
+  private static class EdgeModelStandardScheme extends 
org.apache.thrift.scheme.StandardScheme<EdgeModel> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, EdgeModel 
struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -676,19 +644,19 @@ public class EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
 
   }
 
-  private static class EdgeModelTupleSchemeFactory implements SchemeFactory {
+  private static class EdgeModelTupleSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public EdgeModelTupleScheme getScheme() {
       return new EdgeModelTupleScheme();
     }
   }
 
-  private static class EdgeModelTupleScheme extends TupleScheme<EdgeModel> {
+  private static class EdgeModelTupleScheme extends 
org.apache.thrift.scheme.TupleScheme<EdgeModel> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, EdgeModel 
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.edgeId);
-      BitSet optionals = new BitSet();
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetName()) {
         optionals.set(0);
       }
@@ -712,10 +680,10 @@ public class EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, EdgeModel 
struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol iprot = 
(org.apache.thrift.protocol.TTupleProtocol) prot;
       struct.edgeId = iprot.readString();
       struct.setEdgeIdIsSet(true);
-      BitSet incoming = iprot.readBitSet(3);
+      java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.name = iprot.readString();
         struct.setNameIsSet(true);
@@ -732,5 +700,8 @@ public class EdgeModel implements 
org.apache.thrift.TBase<EdgeModel, EdgeModel._
     }
   }
 
+  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/NodeModel.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
index ea24faa..9063a00 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.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;
 
-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 NodeModel implements org.apache.thrift.TBase<NodeModel, 
NodeModel._Fields>, java.io.Serializable, Cloneable, Comparable<NodeModel> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("NodeModel");
 
@@ -62,18 +35,15 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
   private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = 
new org.apache.thrift.protocol.TField("status", 
org.apache.thrift.protocol.TType.STRUCT, (short)5);
   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)6);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new NodeModelStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new NodeModelTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new NodeModelStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new NodeModelTupleSchemeFactory();
 
-  private String nodeId; // required
-  private String name; // optional
-  private String applicationId; // optional
-  private String applicationName; // optional
+  private java.lang.String nodeId; // required
+  private java.lang.String name; // optional
+  private java.lang.String applicationId; // optional
+  private java.lang.String applicationName; // optional
   private ComponentStatus status; // optional
-  private String description; // optional
+  private java.lang.String description; // 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 {
@@ -84,10 +54,10 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
     STATUS((short)5, "status"),
     DESCRIPTION((short)6, "description");
 
-    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);
       }
     }
@@ -120,21 +90,21 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
      */
     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;
     }
@@ -143,16 +113,16 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
   private static final _Fields optionals[] = 
{_Fields.NAME,_Fields.APPLICATION_ID,_Fields.APPLICATION_NAME,_Fields.STATUS,_Fields.DESCRIPTION};
-  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.NODE_ID, new 
org.apache.thrift.meta_data.FieldMetaData("nodeId", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.NAME, new 
org.apache.thrift.meta_data.FieldMetaData("name", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
@@ -165,7 +135,7 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
         new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 ComponentStatus.class)));
     tmpMap.put(_Fields.DESCRIPTION, new 
org.apache.thrift.meta_data.FieldMetaData("description", 
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(NodeModel.class, 
metaDataMap);
   }
 
@@ -175,7 +145,7 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
   }
 
   public NodeModel(
-    String nodeId)
+    java.lang.String nodeId)
   {
     this();
     this.nodeId = nodeId;
@@ -220,11 +190,11 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
     this.description = null;
   }
 
-  public String getNodeId() {
+  public java.lang.String getNodeId() {
     return this.nodeId;
   }
 
-  public void setNodeId(String nodeId) {
+  public void setNodeId(java.lang.String nodeId) {
     this.nodeId = nodeId;
   }
 
@@ -243,11 +213,11 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
     }
   }
 
-  public String getName() {
+  public java.lang.String getName() {
     return this.name;
   }
 
-  public void setName(String name) {
+  public void setName(java.lang.String name) {
     this.name = name;
   }
 
@@ -266,11 +236,11 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
     }
   }
 
-  public String getApplicationId() {
+  public java.lang.String getApplicationId() {
     return this.applicationId;
   }
 
-  public void setApplicationId(String applicationId) {
+  public void setApplicationId(java.lang.String applicationId) {
     this.applicationId = applicationId;
   }
 
@@ -289,11 +259,11 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
     }
   }
 
-  public String getApplicationName() {
+  public java.lang.String getApplicationName() {
     return this.applicationName;
   }
 
-  public void setApplicationName(String applicationName) {
+  public void setApplicationName(java.lang.String applicationName) {
     this.applicationName = applicationName;
   }
 
@@ -335,11 +305,11 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
     }
   }
 
-  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;
   }
 
@@ -358,13 +328,13 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case NODE_ID:
       if (value == null) {
         unsetNodeId();
       } else {
-        setNodeId((String)value);
+        setNodeId((java.lang.String)value);
       }
       break;
 
@@ -372,7 +342,7 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
       if (value == null) {
         unsetName();
       } else {
-        setName((String)value);
+        setName((java.lang.String)value);
       }
       break;
 
@@ -380,7 +350,7 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
       if (value == null) {
         unsetApplicationId();
       } else {
-        setApplicationId((String)value);
+        setApplicationId((java.lang.String)value);
       }
       break;
 
@@ -388,7 +358,7 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
       if (value == null) {
         unsetApplicationName();
       } else {
-        setApplicationName((String)value);
+        setApplicationName((java.lang.String)value);
       }
       break;
 
@@ -404,14 +374,14 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
       if (value == null) {
         unsetDescription();
       } else {
-        setDescription((String)value);
+        setDescription((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NODE_ID:
       return getNodeId();
@@ -432,13 +402,13 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
       return getDescription();
 
     }
-    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) {
@@ -455,11 +425,11 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
     case DESCRIPTION:
       return isSetDescription();
     }
-    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 NodeModel)
@@ -470,6 +440,8 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
   public boolean equals(NodeModel that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_nodeId = true && this.isSetNodeId();
     boolean that_present_nodeId = true && that.isSetNodeId();
@@ -530,39 +502,33 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_nodeId = true && (isSetNodeId());
-    list.add(present_nodeId);
-    if (present_nodeId)
-      list.add(nodeId);
+    hashCode = hashCode * 8191 + ((isSetNodeId()) ? 131071 : 524287);
+    if (isSetNodeId())
+      hashCode = hashCode * 8191 + nodeId.hashCode();
 
-    boolean present_name = true && (isSetName());
-    list.add(present_name);
-    if (present_name)
-      list.add(name);
+    hashCode = hashCode * 8191 + ((isSetName()) ? 131071 : 524287);
+    if (isSetName())
+      hashCode = hashCode * 8191 + name.hashCode();
 
-    boolean present_applicationId = true && (isSetApplicationId());
-    list.add(present_applicationId);
-    if (present_applicationId)
-      list.add(applicationId);
+    hashCode = hashCode * 8191 + ((isSetApplicationId()) ? 131071 : 524287);
+    if (isSetApplicationId())
+      hashCode = hashCode * 8191 + applicationId.hashCode();
 
-    boolean present_applicationName = true && (isSetApplicationName());
-    list.add(present_applicationName);
-    if (present_applicationName)
-      list.add(applicationName);
+    hashCode = hashCode * 8191 + ((isSetApplicationName()) ? 131071 : 524287);
+    if (isSetApplicationName())
+      hashCode = hashCode * 8191 + applicationName.hashCode();
 
-    boolean present_status = true && (isSetStatus());
-    list.add(present_status);
-    if (present_status)
-      list.add(status);
+    hashCode = hashCode * 8191 + ((isSetStatus()) ? 131071 : 524287);
+    if (isSetStatus())
+      hashCode = hashCode * 8191 + status.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();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -573,7 +539,7 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
 
     int lastComparison = 0;
 
-    lastComparison = 
Boolean.valueOf(isSetNodeId()).compareTo(other.isSetNodeId());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetNodeId()).compareTo(other.isSetNodeId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -583,7 +549,7 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetName()).compareTo(other.isSetName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -593,7 +559,7 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetApplicationId()).compareTo(other.isSetApplicationId());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetApplicationId()).compareTo(other.isSetApplicationId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -603,7 +569,7 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetApplicationName()).compareTo(other.isSetApplicationName());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetApplicationName()).compareTo(other.isSetApplicationName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -613,7 +579,7 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetStatus()).compareTo(other.isSetStatus());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetStatus()).compareTo(other.isSetStatus());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -623,7 +589,7 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -641,16 +607,16 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
   }
 
   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("NodeModel(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("NodeModel(");
     boolean first = true;
 
     sb.append("nodeId:");
@@ -734,7 +700,7 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
     }
   }
 
-  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) {
@@ -742,13 +708,13 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
     }
   }
 
-  private static class NodeModelStandardSchemeFactory implements SchemeFactory 
{
+  private static class NodeModelStandardSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public NodeModelStandardScheme getScheme() {
       return new NodeModelStandardScheme();
     }
   }
 
-  private static class NodeModelStandardScheme extends 
StandardScheme<NodeModel> {
+  private static class NodeModelStandardScheme extends 
org.apache.thrift.scheme.StandardScheme<NodeModel> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, NodeModel 
struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -868,19 +834,19 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
 
   }
 
-  private static class NodeModelTupleSchemeFactory implements SchemeFactory {
+  private static class NodeModelTupleSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public NodeModelTupleScheme getScheme() {
       return new NodeModelTupleScheme();
     }
   }
 
-  private static class NodeModelTupleScheme extends TupleScheme<NodeModel> {
+  private static class NodeModelTupleScheme extends 
org.apache.thrift.scheme.TupleScheme<NodeModel> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, NodeModel 
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.nodeId);
-      BitSet optionals = new BitSet();
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetName()) {
         optionals.set(0);
       }
@@ -916,10 +882,10 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, NodeModel 
struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol iprot = 
(org.apache.thrift.protocol.TTupleProtocol) prot;
       struct.nodeId = iprot.readString();
       struct.setNodeIdIsSet(true);
-      BitSet incoming = iprot.readBitSet(5);
+      java.util.BitSet incoming = iprot.readBitSet(5);
       if (incoming.get(0)) {
         struct.name = iprot.readString();
         struct.setNameIsSet(true);
@@ -944,5 +910,8 @@ public class NodeModel implements 
org.apache.thrift.TBase<NodeModel, NodeModel._
     }
   }
 
+  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/PortModel.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
index 54b3391..f619cbf 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.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;
 
-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 PortModel implements org.apache.thrift.TBase<PortModel, 
PortModel._Fields>, java.io.Serializable, Cloneable, Comparable<PortModel> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("PortModel");
 
@@ -61,17 +34,14 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
   private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = 
new org.apache.thrift.protocol.TField("value", 
org.apache.thrift.protocol.TType.STRING, (short)4);
   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)5);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new PortModelStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new PortModelTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new PortModelStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new PortModelTupleSchemeFactory();
 
-  private String portId; // required
-  private String name; // optional
+  private java.lang.String portId; // required
+  private java.lang.String name; // optional
   private ComponentStatus status; // optional
-  private String value; // optional
-  private String description; // optional
+  private java.lang.String value; // optional
+  private java.lang.String description; // 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 {
@@ -81,10 +51,10 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
     VALUE((short)4, "value"),
     DESCRIPTION((short)5, "description");
 
-    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);
       }
     }
@@ -115,21 +85,21 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
      */
     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;
     }
@@ -138,16 +108,16 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
   private static final _Fields optionals[] = 
{_Fields.NAME,_Fields.STATUS,_Fields.VALUE,_Fields.DESCRIPTION};
-  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.PORT_ID, new 
org.apache.thrift.meta_data.FieldMetaData("portId", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.NAME, new 
org.apache.thrift.meta_data.FieldMetaData("name", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
@@ -158,7 +128,7 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.DESCRIPTION, new 
org.apache.thrift.meta_data.FieldMetaData("description", 
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(PortModel.class, 
metaDataMap);
   }
 
@@ -168,7 +138,7 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
   }
 
   public PortModel(
-    String portId)
+    java.lang.String portId)
   {
     this();
     this.portId = portId;
@@ -209,11 +179,11 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
     this.description = null;
   }
 
-  public String getPortId() {
+  public java.lang.String getPortId() {
     return this.portId;
   }
 
-  public void setPortId(String portId) {
+  public void setPortId(java.lang.String portId) {
     this.portId = portId;
   }
 
@@ -232,11 +202,11 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
     }
   }
 
-  public String getName() {
+  public java.lang.String getName() {
     return this.name;
   }
 
-  public void setName(String name) {
+  public void setName(java.lang.String name) {
     this.name = name;
   }
 
@@ -278,11 +248,11 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
     }
   }
 
-  public String getValue() {
+  public java.lang.String getValue() {
     return this.value;
   }
 
-  public void setValue(String value) {
+  public void setValue(java.lang.String value) {
     this.value = value;
   }
 
@@ -301,11 +271,11 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
     }
   }
 
-  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;
   }
 
@@ -324,13 +294,13 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case PORT_ID:
       if (value == null) {
         unsetPortId();
       } else {
-        setPortId((String)value);
+        setPortId((java.lang.String)value);
       }
       break;
 
@@ -338,7 +308,7 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
       if (value == null) {
         unsetName();
       } else {
-        setName((String)value);
+        setName((java.lang.String)value);
       }
       break;
 
@@ -354,7 +324,7 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
       if (value == null) {
         unsetValue();
       } else {
-        setValue((String)value);
+        setValue((java.lang.String)value);
       }
       break;
 
@@ -362,14 +332,14 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
       if (value == null) {
         unsetDescription();
       } else {
-        setDescription((String)value);
+        setDescription((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PORT_ID:
       return getPortId();
@@ -387,13 +357,13 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
       return getDescription();
 
     }
-    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) {
@@ -408,11 +378,11 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
     case DESCRIPTION:
       return isSetDescription();
     }
-    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 PortModel)
@@ -423,6 +393,8 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
   public boolean equals(PortModel that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_portId = true && this.isSetPortId();
     boolean that_present_portId = true && that.isSetPortId();
@@ -474,34 +446,29 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_portId = true && (isSetPortId());
-    list.add(present_portId);
-    if (present_portId)
-      list.add(portId);
+    hashCode = hashCode * 8191 + ((isSetPortId()) ? 131071 : 524287);
+    if (isSetPortId())
+      hashCode = hashCode * 8191 + portId.hashCode();
 
-    boolean present_name = true && (isSetName());
-    list.add(present_name);
-    if (present_name)
-      list.add(name);
+    hashCode = hashCode * 8191 + ((isSetName()) ? 131071 : 524287);
+    if (isSetName())
+      hashCode = hashCode * 8191 + name.hashCode();
 
-    boolean present_status = true && (isSetStatus());
-    list.add(present_status);
-    if (present_status)
-      list.add(status);
+    hashCode = hashCode * 8191 + ((isSetStatus()) ? 131071 : 524287);
+    if (isSetStatus())
+      hashCode = hashCode * 8191 + status.hashCode();
 
-    boolean present_value = true && (isSetValue());
-    list.add(present_value);
-    if (present_value)
-      list.add(value);
+    hashCode = hashCode * 8191 + ((isSetValue()) ? 131071 : 524287);
+    if (isSetValue())
+      hashCode = hashCode * 8191 + value.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();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -512,7 +479,7 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
 
     int lastComparison = 0;
 
-    lastComparison = 
Boolean.valueOf(isSetPortId()).compareTo(other.isSetPortId());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetPortId()).compareTo(other.isSetPortId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -522,7 +489,7 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetName()).compareTo(other.isSetName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -532,7 +499,7 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetStatus()).compareTo(other.isSetStatus());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetStatus()).compareTo(other.isSetStatus());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -542,7 +509,7 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -552,7 +519,7 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -570,16 +537,16 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
   }
 
   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("PortModel(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("PortModel(");
     boolean first = true;
 
     sb.append("portId:");
@@ -653,7 +620,7 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
     }
   }
 
-  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) {
@@ -661,13 +628,13 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
     }
   }
 
-  private static class PortModelStandardSchemeFactory implements SchemeFactory 
{
+  private static class PortModelStandardSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public PortModelStandardScheme getScheme() {
       return new PortModelStandardScheme();
     }
   }
 
-  private static class PortModelStandardScheme extends 
StandardScheme<PortModel> {
+  private static class PortModelStandardScheme extends 
org.apache.thrift.scheme.StandardScheme<PortModel> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, PortModel 
struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -772,19 +739,19 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
 
   }
 
-  private static class PortModelTupleSchemeFactory implements SchemeFactory {
+  private static class PortModelTupleSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public PortModelTupleScheme getScheme() {
       return new PortModelTupleScheme();
     }
   }
 
-  private static class PortModelTupleScheme extends TupleScheme<PortModel> {
+  private static class PortModelTupleScheme extends 
org.apache.thrift.scheme.TupleScheme<PortModel> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, PortModel 
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.portId);
-      BitSet optionals = new BitSet();
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetName()) {
         optionals.set(0);
       }
@@ -814,10 +781,10 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PortModel 
struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol iprot = 
(org.apache.thrift.protocol.TTupleProtocol) prot;
       struct.portId = iprot.readString();
       struct.setPortIdIsSet(true);
-      BitSet incoming = iprot.readBitSet(4);
+      java.util.BitSet incoming = iprot.readBitSet(4);
       if (incoming.get(0)) {
         struct.name = iprot.readString();
         struct.setNameIsSet(true);
@@ -838,5 +805,8 @@ public class PortModel implements 
org.apache.thrift.TBase<PortModel, PortModel._
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S 
scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return 
(org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? 
STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 

Reply via email to