http://git-wip-us.apache.org/repos/asf/airavata/blob/8e775660/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
index 45df73d..86e849f 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
@@ -16,41 +16,14 @@
  */
 
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.airavata.model.appcatalog.appdeployment;
 
-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"})
 /**
  * Job commands to be used in Pre Job, Post Job and Module Load Commands
  * 
@@ -60,20 +33,17 @@ import org.slf4j.LoggerFactory;
  * commandOrder:
  *   Order of the command in the multiple command situation
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class CommandObject implements org.apache.thrift.TBase<CommandObject, 
CommandObject._Fields>, java.io.Serializable, Cloneable, 
Comparable<CommandObject> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("CommandObject");
 
   private static final org.apache.thrift.protocol.TField COMMAND_FIELD_DESC = 
new org.apache.thrift.protocol.TField("command", 
org.apache.thrift.protocol.TType.STRING, (short)1);
   private static final org.apache.thrift.protocol.TField 
COMMAND_ORDER_FIELD_DESC = new 
org.apache.thrift.protocol.TField("commandOrder", 
org.apache.thrift.protocol.TType.I32, (short)2);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new 
CommandObjectStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new CommandObjectTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new CommandObjectStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new CommandObjectTupleSchemeFactory();
 
-  private String command; // required
+  private java.lang.String command; // required
   private int commandOrder; // optional
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
@@ -81,10 +51,10 @@ public class CommandObject implements 
org.apache.thrift.TBase<CommandObject, Com
     COMMAND((short)1, "command"),
     COMMAND_ORDER((short)2, "commandOrder");
 
-    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);
       }
     }
@@ -109,21 +79,21 @@ public class CommandObject implements 
org.apache.thrift.TBase<CommandObject, Com
      */
     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;
     }
@@ -132,7 +102,7 @@ public class CommandObject implements 
org.apache.thrift.TBase<CommandObject, Com
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -141,14 +111,14 @@ public class CommandObject implements 
org.apache.thrift.TBase<CommandObject, Com
   private static final int __COMMANDORDER_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.COMMAND_ORDER};
-  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.COMMAND, new 
org.apache.thrift.meta_data.FieldMetaData("command", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.COMMAND_ORDER, new 
org.apache.thrift.meta_data.FieldMetaData("commandOrder", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         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(CommandObject.class,
 metaDataMap);
   }
 
@@ -156,7 +126,7 @@ public class CommandObject implements 
org.apache.thrift.TBase<CommandObject, Com
   }
 
   public CommandObject(
-    String command)
+    java.lang.String command)
   {
     this();
     this.command = command;
@@ -184,11 +154,11 @@ public class CommandObject implements 
org.apache.thrift.TBase<CommandObject, Com
     this.commandOrder = 0;
   }
 
-  public String getCommand() {
+  public java.lang.String getCommand() {
     return this.command;
   }
 
-  public void setCommand(String command) {
+  public void setCommand(java.lang.String command) {
     this.command = command;
   }
 
@@ -217,25 +187,25 @@ public class CommandObject implements 
org.apache.thrift.TBase<CommandObject, Com
   }
 
   public void unsetCommandOrder() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__COMMANDORDER_ISSET_ID);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, 
__COMMANDORDER_ISSET_ID);
   }
 
   /** Returns true if field commandOrder is set (has been assigned a value) 
and false otherwise */
   public boolean isSetCommandOrder() {
-    return EncodingUtils.testBit(__isset_bitfield, __COMMANDORDER_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, 
__COMMANDORDER_ISSET_ID);
   }
 
   public void setCommandOrderIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__COMMANDORDER_ISSET_ID, value);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, 
__COMMANDORDER_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case COMMAND:
       if (value == null) {
         unsetCommand();
       } else {
-        setCommand((String)value);
+        setCommand((java.lang.String)value);
       }
       break;
 
@@ -243,14 +213,14 @@ public class CommandObject implements 
org.apache.thrift.TBase<CommandObject, Com
       if (value == null) {
         unsetCommandOrder();
       } else {
-        setCommandOrder((Integer)value);
+        setCommandOrder((java.lang.Integer)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case COMMAND:
       return getCommand();
@@ -259,13 +229,13 @@ public class CommandObject implements 
org.apache.thrift.TBase<CommandObject, Com
       return getCommandOrder();
 
     }
-    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) {
@@ -274,11 +244,11 @@ public class CommandObject implements 
org.apache.thrift.TBase<CommandObject, Com
     case COMMAND_ORDER:
       return isSetCommandOrder();
     }
-    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 CommandObject)
@@ -289,6 +259,8 @@ public class CommandObject implements 
org.apache.thrift.TBase<CommandObject, Com
   public boolean equals(CommandObject that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_command = true && this.isSetCommand();
     boolean that_present_command = true && that.isSetCommand();
@@ -313,19 +285,17 @@ public class CommandObject implements 
org.apache.thrift.TBase<CommandObject, Com
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_command = true && (isSetCommand());
-    list.add(present_command);
-    if (present_command)
-      list.add(command);
+    hashCode = hashCode * 8191 + ((isSetCommand()) ? 131071 : 524287);
+    if (isSetCommand())
+      hashCode = hashCode * 8191 + command.hashCode();
 
-    boolean present_commandOrder = true && (isSetCommandOrder());
-    list.add(present_commandOrder);
-    if (present_commandOrder)
-      list.add(commandOrder);
+    hashCode = hashCode * 8191 + ((isSetCommandOrder()) ? 131071 : 524287);
+    if (isSetCommandOrder())
+      hashCode = hashCode * 8191 + commandOrder;
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -336,7 +306,7 @@ public class CommandObject implements 
org.apache.thrift.TBase<CommandObject, Com
 
     int lastComparison = 0;
 
-    lastComparison = 
Boolean.valueOf(isSetCommand()).compareTo(other.isSetCommand());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetCommand()).compareTo(other.isSetCommand());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -346,7 +316,7 @@ public class CommandObject implements 
org.apache.thrift.TBase<CommandObject, Com
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetCommandOrder()).compareTo(other.isSetCommandOrder());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetCommandOrder()).compareTo(other.isSetCommandOrder());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -364,16 +334,16 @@ public class CommandObject implements 
org.apache.thrift.TBase<CommandObject, Com
   }
 
   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("CommandObject(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("CommandObject(");
     boolean first = true;
 
     sb.append("command:");
@@ -410,7 +380,7 @@ public class CommandObject implements 
org.apache.thrift.TBase<CommandObject, Com
     }
   }
 
-  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;
@@ -420,13 +390,13 @@ public class CommandObject implements 
org.apache.thrift.TBase<CommandObject, Com
     }
   }
 
-  private static class CommandObjectStandardSchemeFactory implements 
SchemeFactory {
+  private static class CommandObjectStandardSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public CommandObjectStandardScheme getScheme() {
       return new CommandObjectStandardScheme();
     }
   }
 
-  private static class CommandObjectStandardScheme extends 
StandardScheme<CommandObject> {
+  private static class CommandObjectStandardScheme extends 
org.apache.thrift.scheme.StandardScheme<CommandObject> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, CommandObject 
struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -483,19 +453,19 @@ public class CommandObject implements 
org.apache.thrift.TBase<CommandObject, Com
 
   }
 
-  private static class CommandObjectTupleSchemeFactory implements 
SchemeFactory {
+  private static class CommandObjectTupleSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public CommandObjectTupleScheme getScheme() {
       return new CommandObjectTupleScheme();
     }
   }
 
-  private static class CommandObjectTupleScheme extends 
TupleScheme<CommandObject> {
+  private static class CommandObjectTupleScheme extends 
org.apache.thrift.scheme.TupleScheme<CommandObject> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, CommandObject 
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.command);
-      BitSet optionals = new BitSet();
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetCommandOrder()) {
         optionals.set(0);
       }
@@ -507,10 +477,10 @@ public class CommandObject implements 
org.apache.thrift.TBase<CommandObject, Com
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, CommandObject 
struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol iprot = 
(org.apache.thrift.protocol.TTupleProtocol) prot;
       struct.command = iprot.readString();
       struct.setCommandIsSet(true);
-      BitSet incoming = iprot.readBitSet(1);
+      java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         struct.commandOrder = iprot.readI32();
         struct.setCommandOrderIsSet(true);
@@ -518,5 +488,8 @@ public class CommandObject implements 
org.apache.thrift.TBase<CommandObject, Com
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S 
scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return 
(org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? 
STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/8e775660/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
index 392cc9e..91e3cc1 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
@@ -16,41 +16,14 @@
  */
 
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.airavata.model.appcatalog.appdeployment;
 
-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"})
 /**
  * Key Value pairs to be used to set environments
  * 
@@ -63,7 +36,7 @@ import org.slf4j.LoggerFactory;
  * envPathOrder:
  *   The order of the setting of the env variables when there are multiple env 
variables
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class SetEnvPaths implements org.apache.thrift.TBase<SetEnvPaths, 
SetEnvPaths._Fields>, java.io.Serializable, Cloneable, Comparable<SetEnvPaths> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("SetEnvPaths");
 
@@ -71,14 +44,11 @@ public class SetEnvPaths implements 
org.apache.thrift.TBase<SetEnvPaths, SetEnvP
   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)2);
   private static final org.apache.thrift.protocol.TField 
ENV_PATH_ORDER_FIELD_DESC = new 
org.apache.thrift.protocol.TField("envPathOrder", 
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 SetEnvPathsStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new SetEnvPathsTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new SetEnvPathsStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new SetEnvPathsTupleSchemeFactory();
 
-  private String name; // required
-  private String value; // required
+  private java.lang.String name; // required
+  private java.lang.String value; // required
   private int envPathOrder; // optional
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
@@ -87,10 +57,10 @@ public class SetEnvPaths implements 
org.apache.thrift.TBase<SetEnvPaths, SetEnvP
     VALUE((short)2, "value"),
     ENV_PATH_ORDER((short)3, "envPathOrder");
 
-    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);
       }
     }
@@ -117,21 +87,21 @@ public class SetEnvPaths implements 
org.apache.thrift.TBase<SetEnvPaths, SetEnvP
      */
     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;
     }
@@ -140,7 +110,7 @@ public class SetEnvPaths implements 
org.apache.thrift.TBase<SetEnvPaths, SetEnvP
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -149,16 +119,16 @@ public class SetEnvPaths implements 
org.apache.thrift.TBase<SetEnvPaths, SetEnvP
   private static final int __ENVPATHORDER_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.ENV_PATH_ORDER};
-  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.NAME, new 
org.apache.thrift.meta_data.FieldMetaData("name", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.VALUE, new 
org.apache.thrift.meta_data.FieldMetaData("value", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.ENV_PATH_ORDER, new 
org.apache.thrift.meta_data.FieldMetaData("envPathOrder", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         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(SetEnvPaths.class,
 metaDataMap);
   }
 
@@ -166,8 +136,8 @@ public class SetEnvPaths implements 
org.apache.thrift.TBase<SetEnvPaths, SetEnvP
   }
 
   public SetEnvPaths(
-    String name,
-    String value)
+    java.lang.String name,
+    java.lang.String value)
   {
     this();
     this.name = name;
@@ -200,11 +170,11 @@ public class SetEnvPaths implements 
org.apache.thrift.TBase<SetEnvPaths, SetEnvP
     this.envPathOrder = 0;
   }
 
-  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;
   }
 
@@ -223,11 +193,11 @@ public class SetEnvPaths implements 
org.apache.thrift.TBase<SetEnvPaths, SetEnvP
     }
   }
 
-  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;
   }
 
@@ -256,25 +226,25 @@ public class SetEnvPaths implements 
org.apache.thrift.TBase<SetEnvPaths, SetEnvP
   }
 
   public void unsetEnvPathOrder() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__ENVPATHORDER_ISSET_ID);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, 
__ENVPATHORDER_ISSET_ID);
   }
 
   /** Returns true if field envPathOrder is set (has been assigned a value) 
and false otherwise */
   public boolean isSetEnvPathOrder() {
-    return EncodingUtils.testBit(__isset_bitfield, __ENVPATHORDER_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, 
__ENVPATHORDER_ISSET_ID);
   }
 
   public void setEnvPathOrderIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__ENVPATHORDER_ISSET_ID, value);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, 
__ENVPATHORDER_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case NAME:
       if (value == null) {
         unsetName();
       } else {
-        setName((String)value);
+        setName((java.lang.String)value);
       }
       break;
 
@@ -282,7 +252,7 @@ public class SetEnvPaths implements 
org.apache.thrift.TBase<SetEnvPaths, SetEnvP
       if (value == null) {
         unsetValue();
       } else {
-        setValue((String)value);
+        setValue((java.lang.String)value);
       }
       break;
 
@@ -290,14 +260,14 @@ public class SetEnvPaths implements 
org.apache.thrift.TBase<SetEnvPaths, SetEnvP
       if (value == null) {
         unsetEnvPathOrder();
       } else {
-        setEnvPathOrder((Integer)value);
+        setEnvPathOrder((java.lang.Integer)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAME:
       return getName();
@@ -309,13 +279,13 @@ public class SetEnvPaths implements 
org.apache.thrift.TBase<SetEnvPaths, SetEnvP
       return getEnvPathOrder();
 
     }
-    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) {
@@ -326,11 +296,11 @@ public class SetEnvPaths implements 
org.apache.thrift.TBase<SetEnvPaths, SetEnvP
     case ENV_PATH_ORDER:
       return isSetEnvPathOrder();
     }
-    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 SetEnvPaths)
@@ -341,6 +311,8 @@ public class SetEnvPaths implements 
org.apache.thrift.TBase<SetEnvPaths, SetEnvP
   public boolean equals(SetEnvPaths that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_name = true && this.isSetName();
     boolean that_present_name = true && that.isSetName();
@@ -374,24 +346,21 @@ public class SetEnvPaths implements 
org.apache.thrift.TBase<SetEnvPaths, SetEnvP
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    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_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_envPathOrder = true && (isSetEnvPathOrder());
-    list.add(present_envPathOrder);
-    if (present_envPathOrder)
-      list.add(envPathOrder);
+    hashCode = hashCode * 8191 + ((isSetEnvPathOrder()) ? 131071 : 524287);
+    if (isSetEnvPathOrder())
+      hashCode = hashCode * 8191 + envPathOrder;
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -402,7 +371,7 @@ public class SetEnvPaths implements 
org.apache.thrift.TBase<SetEnvPaths, SetEnvP
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetName()).compareTo(other.isSetName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -412,7 +381,7 @@ public class SetEnvPaths implements 
org.apache.thrift.TBase<SetEnvPaths, SetEnvP
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -422,7 +391,7 @@ public class SetEnvPaths implements 
org.apache.thrift.TBase<SetEnvPaths, SetEnvP
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetEnvPathOrder()).compareTo(other.isSetEnvPathOrder());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetEnvPathOrder()).compareTo(other.isSetEnvPathOrder());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -440,16 +409,16 @@ public class SetEnvPaths implements 
org.apache.thrift.TBase<SetEnvPaths, SetEnvP
   }
 
   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("SetEnvPaths(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("SetEnvPaths(");
     boolean first = true;
 
     sb.append("name:");
@@ -498,7 +467,7 @@ public class SetEnvPaths implements 
org.apache.thrift.TBase<SetEnvPaths, SetEnvP
     }
   }
 
-  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;
@@ -508,13 +477,13 @@ public class SetEnvPaths implements 
org.apache.thrift.TBase<SetEnvPaths, SetEnvP
     }
   }
 
-  private static class SetEnvPathsStandardSchemeFactory implements 
SchemeFactory {
+  private static class SetEnvPathsStandardSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public SetEnvPathsStandardScheme getScheme() {
       return new SetEnvPathsStandardScheme();
     }
   }
 
-  private static class SetEnvPathsStandardScheme extends 
StandardScheme<SetEnvPaths> {
+  private static class SetEnvPathsStandardScheme extends 
org.apache.thrift.scheme.StandardScheme<SetEnvPaths> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, SetEnvPaths 
struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -584,20 +553,20 @@ public class SetEnvPaths implements 
org.apache.thrift.TBase<SetEnvPaths, SetEnvP
 
   }
 
-  private static class SetEnvPathsTupleSchemeFactory implements SchemeFactory {
+  private static class SetEnvPathsTupleSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public SetEnvPathsTupleScheme getScheme() {
       return new SetEnvPathsTupleScheme();
     }
   }
 
-  private static class SetEnvPathsTupleScheme extends TupleScheme<SetEnvPaths> 
{
+  private static class SetEnvPathsTupleScheme extends 
org.apache.thrift.scheme.TupleScheme<SetEnvPaths> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, SetEnvPaths 
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.name);
       oprot.writeString(struct.value);
-      BitSet optionals = new BitSet();
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetEnvPathOrder()) {
         optionals.set(0);
       }
@@ -609,12 +578,12 @@ public class SetEnvPaths implements 
org.apache.thrift.TBase<SetEnvPaths, SetEnvP
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SetEnvPaths 
struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol iprot = 
(org.apache.thrift.protocol.TTupleProtocol) prot;
       struct.name = iprot.readString();
       struct.setNameIsSet(true);
       struct.value = iprot.readString();
       struct.setValueIsSet(true);
-      BitSet incoming = iprot.readBitSet(1);
+      java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         struct.envPathOrder = iprot.readI32();
         struct.setEnvPathOrderIsSet(true);
@@ -622,5 +591,8 @@ public class SetEnvPaths implements 
org.apache.thrift.TBase<SetEnvPaths, SetEnvP
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S 
scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return 
(org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? 
STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/8e775660/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
index e832256..061da15 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
@@ -16,41 +16,14 @@
  */
 
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.airavata.model.appcatalog.appinterface;
 
-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"})
 /**
  * Application Interface Description
  * 
@@ -64,7 +37,7 @@ import org.slf4j.LoggerFactory;
  *   Outputs generated from the application
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<ApplicationInterfaceDescription, 
ApplicationInterfaceDescription._Fields>, java.io.Serializable, Cloneable, 
Comparable<ApplicationInterfaceDescription> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("ApplicationInterfaceDescription");
 
@@ -77,18 +50,15 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
   private static final org.apache.thrift.protocol.TField 
ARCHIVE_WORKING_DIRECTORY_FIELD_DESC = new 
org.apache.thrift.protocol.TField("archiveWorkingDirectory", 
org.apache.thrift.protocol.TType.BOOL, (short)7);
   private static final org.apache.thrift.protocol.TField 
HAS_OPTIONAL_FILE_INPUTS_FIELD_DESC = new 
org.apache.thrift.protocol.TField("hasOptionalFileInputs", 
org.apache.thrift.protocol.TType.BOOL, (short)8);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new 
ApplicationInterfaceDescriptionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new 
ApplicationInterfaceDescriptionTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new 
ApplicationInterfaceDescriptionStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new ApplicationInterfaceDescriptionTupleSchemeFactory();
 
-  private String applicationInterfaceId; // required
-  private String applicationName; // required
-  private String applicationDescription; // optional
-  private List<String> applicationModules; // optional
-  private List<org.apache.airavata.model.application.io.InputDataObjectType> 
applicationInputs; // optional
-  private List<org.apache.airavata.model.application.io.OutputDataObjectType> 
applicationOutputs; // optional
+  private java.lang.String applicationInterfaceId; // required
+  private java.lang.String applicationName; // required
+  private java.lang.String applicationDescription; // optional
+  private java.util.List<java.lang.String> applicationModules; // optional
+  private 
java.util.List<org.apache.airavata.model.application.io.InputDataObjectType> 
applicationInputs; // optional
+  private 
java.util.List<org.apache.airavata.model.application.io.OutputDataObjectType> 
applicationOutputs; // optional
   private boolean archiveWorkingDirectory; // optional
   private boolean hasOptionalFileInputs; // optional
 
@@ -103,10 +73,10 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
     ARCHIVE_WORKING_DIRECTORY((short)7, "archiveWorkingDirectory"),
     HAS_OPTIONAL_FILE_INPUTS((short)8, "hasOptionalFileInputs");
 
-    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);
       }
     }
@@ -143,21 +113,21 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
      */
     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;
     }
@@ -166,7 +136,7 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -176,9 +146,9 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
   private static final int __HASOPTIONALFILEINPUTS_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = 
{_Fields.APPLICATION_DESCRIPTION,_Fields.APPLICATION_MODULES,_Fields.APPLICATION_INPUTS,_Fields.APPLICATION_OUTPUTS,_Fields.ARCHIVE_WORKING_DIRECTORY,_Fields.HAS_OPTIONAL_FILE_INPUTS};
-  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.APPLICATION_INTERFACE_ID, new 
org.apache.thrift.meta_data.FieldMetaData("applicationInterfaceId", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.APPLICATION_NAME, new 
org.apache.thrift.meta_data.FieldMetaData("applicationName", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
@@ -198,7 +168,7 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     tmpMap.put(_Fields.HAS_OPTIONAL_FILE_INPUTS, new 
org.apache.thrift.meta_data.FieldMetaData("hasOptionalFileInputs", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ApplicationInterfaceDescription.class,
 metaDataMap);
   }
 
@@ -210,8 +180,8 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
   }
 
   public ApplicationInterfaceDescription(
-    String applicationInterfaceId,
-    String applicationName)
+    java.lang.String applicationInterfaceId,
+    java.lang.String applicationName)
   {
     this();
     this.applicationInterfaceId = applicationInterfaceId;
@@ -233,18 +203,18 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
       this.applicationDescription = other.applicationDescription;
     }
     if (other.isSetApplicationModules()) {
-      List<String> __this__applicationModules = new 
ArrayList<String>(other.applicationModules);
+      java.util.List<java.lang.String> __this__applicationModules = new 
java.util.ArrayList<java.lang.String>(other.applicationModules);
       this.applicationModules = __this__applicationModules;
     }
     if (other.isSetApplicationInputs()) {
-      List<org.apache.airavata.model.application.io.InputDataObjectType> 
__this__applicationInputs = new 
ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>(other.applicationInputs.size());
+      
java.util.List<org.apache.airavata.model.application.io.InputDataObjectType> 
__this__applicationInputs = new 
java.util.ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>(other.applicationInputs.size());
       for (org.apache.airavata.model.application.io.InputDataObjectType 
other_element : other.applicationInputs) {
         __this__applicationInputs.add(new 
org.apache.airavata.model.application.io.InputDataObjectType(other_element));
       }
       this.applicationInputs = __this__applicationInputs;
     }
     if (other.isSetApplicationOutputs()) {
-      List<org.apache.airavata.model.application.io.OutputDataObjectType> 
__this__applicationOutputs = new 
ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>(other.applicationOutputs.size());
+      
java.util.List<org.apache.airavata.model.application.io.OutputDataObjectType> 
__this__applicationOutputs = new 
java.util.ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>(other.applicationOutputs.size());
       for (org.apache.airavata.model.application.io.OutputDataObjectType 
other_element : other.applicationOutputs) {
         __this__applicationOutputs.add(new 
org.apache.airavata.model.application.io.OutputDataObjectType(other_element));
       }
@@ -273,11 +243,11 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
     this.hasOptionalFileInputs = false;
   }
 
-  public String getApplicationInterfaceId() {
+  public java.lang.String getApplicationInterfaceId() {
     return this.applicationInterfaceId;
   }
 
-  public void setApplicationInterfaceId(String applicationInterfaceId) {
+  public void setApplicationInterfaceId(java.lang.String 
applicationInterfaceId) {
     this.applicationInterfaceId = applicationInterfaceId;
   }
 
@@ -296,11 +266,11 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
     }
   }
 
-  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;
   }
 
@@ -319,11 +289,11 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
     }
   }
 
-  public String getApplicationDescription() {
+  public java.lang.String getApplicationDescription() {
     return this.applicationDescription;
   }
 
-  public void setApplicationDescription(String applicationDescription) {
+  public void setApplicationDescription(java.lang.String 
applicationDescription) {
     this.applicationDescription = applicationDescription;
   }
 
@@ -346,22 +316,22 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
     return (this.applicationModules == null) ? 0 : 
this.applicationModules.size();
   }
 
-  public java.util.Iterator<String> getApplicationModulesIterator() {
+  public java.util.Iterator<java.lang.String> getApplicationModulesIterator() {
     return (this.applicationModules == null) ? null : 
this.applicationModules.iterator();
   }
 
-  public void addToApplicationModules(String elem) {
+  public void addToApplicationModules(java.lang.String elem) {
     if (this.applicationModules == null) {
-      this.applicationModules = new ArrayList<String>();
+      this.applicationModules = new java.util.ArrayList<java.lang.String>();
     }
     this.applicationModules.add(elem);
   }
 
-  public List<String> getApplicationModules() {
+  public java.util.List<java.lang.String> getApplicationModules() {
     return this.applicationModules;
   }
 
-  public void setApplicationModules(List<String> applicationModules) {
+  public void setApplicationModules(java.util.List<java.lang.String> 
applicationModules) {
     this.applicationModules = applicationModules;
   }
 
@@ -390,16 +360,16 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
 
   public void 
addToApplicationInputs(org.apache.airavata.model.application.io.InputDataObjectType
 elem) {
     if (this.applicationInputs == null) {
-      this.applicationInputs = new 
ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>();
+      this.applicationInputs = new 
java.util.ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>();
     }
     this.applicationInputs.add(elem);
   }
 
-  public List<org.apache.airavata.model.application.io.InputDataObjectType> 
getApplicationInputs() {
+  public 
java.util.List<org.apache.airavata.model.application.io.InputDataObjectType> 
getApplicationInputs() {
     return this.applicationInputs;
   }
 
-  public void 
setApplicationInputs(List<org.apache.airavata.model.application.io.InputDataObjectType>
 applicationInputs) {
+  public void 
setApplicationInputs(java.util.List<org.apache.airavata.model.application.io.InputDataObjectType>
 applicationInputs) {
     this.applicationInputs = applicationInputs;
   }
 
@@ -428,16 +398,16 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
 
   public void 
addToApplicationOutputs(org.apache.airavata.model.application.io.OutputDataObjectType
 elem) {
     if (this.applicationOutputs == null) {
-      this.applicationOutputs = new 
ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>();
+      this.applicationOutputs = new 
java.util.ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>();
     }
     this.applicationOutputs.add(elem);
   }
 
-  public List<org.apache.airavata.model.application.io.OutputDataObjectType> 
getApplicationOutputs() {
+  public 
java.util.List<org.apache.airavata.model.application.io.OutputDataObjectType> 
getApplicationOutputs() {
     return this.applicationOutputs;
   }
 
-  public void 
setApplicationOutputs(List<org.apache.airavata.model.application.io.OutputDataObjectType>
 applicationOutputs) {
+  public void 
setApplicationOutputs(java.util.List<org.apache.airavata.model.application.io.OutputDataObjectType>
 applicationOutputs) {
     this.applicationOutputs = applicationOutputs;
   }
 
@@ -466,16 +436,16 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
   }
 
   public void unsetArchiveWorkingDirectory() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__ARCHIVEWORKINGDIRECTORY_ISSET_ID);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, 
__ARCHIVEWORKINGDIRECTORY_ISSET_ID);
   }
 
   /** Returns true if field archiveWorkingDirectory is set (has been assigned 
a value) and false otherwise */
   public boolean isSetArchiveWorkingDirectory() {
-    return EncodingUtils.testBit(__isset_bitfield, 
__ARCHIVEWORKINGDIRECTORY_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, 
__ARCHIVEWORKINGDIRECTORY_ISSET_ID);
   }
 
   public void setArchiveWorkingDirectoryIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__ARCHIVEWORKINGDIRECTORY_ISSET_ID, value);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, 
__ARCHIVEWORKINGDIRECTORY_ISSET_ID, value);
   }
 
   public boolean isHasOptionalFileInputs() {
@@ -488,25 +458,25 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
   }
 
   public void unsetHasOptionalFileInputs() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__HASOPTIONALFILEINPUTS_ISSET_ID);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, 
__HASOPTIONALFILEINPUTS_ISSET_ID);
   }
 
   /** Returns true if field hasOptionalFileInputs is set (has been assigned a 
value) and false otherwise */
   public boolean isSetHasOptionalFileInputs() {
-    return EncodingUtils.testBit(__isset_bitfield, 
__HASOPTIONALFILEINPUTS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, 
__HASOPTIONALFILEINPUTS_ISSET_ID);
   }
 
   public void setHasOptionalFileInputsIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__HASOPTIONALFILEINPUTS_ISSET_ID, value);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, 
__HASOPTIONALFILEINPUTS_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case APPLICATION_INTERFACE_ID:
       if (value == null) {
         unsetApplicationInterfaceId();
       } else {
-        setApplicationInterfaceId((String)value);
+        setApplicationInterfaceId((java.lang.String)value);
       }
       break;
 
@@ -514,7 +484,7 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
       if (value == null) {
         unsetApplicationName();
       } else {
-        setApplicationName((String)value);
+        setApplicationName((java.lang.String)value);
       }
       break;
 
@@ -522,7 +492,7 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
       if (value == null) {
         unsetApplicationDescription();
       } else {
-        setApplicationDescription((String)value);
+        setApplicationDescription((java.lang.String)value);
       }
       break;
 
@@ -530,7 +500,7 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
       if (value == null) {
         unsetApplicationModules();
       } else {
-        setApplicationModules((List<String>)value);
+        setApplicationModules((java.util.List<java.lang.String>)value);
       }
       break;
 
@@ -538,7 +508,7 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
       if (value == null) {
         unsetApplicationInputs();
       } else {
-        
setApplicationInputs((List<org.apache.airavata.model.application.io.InputDataObjectType>)value);
+        
setApplicationInputs((java.util.List<org.apache.airavata.model.application.io.InputDataObjectType>)value);
       }
       break;
 
@@ -546,7 +516,7 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
       if (value == null) {
         unsetApplicationOutputs();
       } else {
-        
setApplicationOutputs((List<org.apache.airavata.model.application.io.OutputDataObjectType>)value);
+        
setApplicationOutputs((java.util.List<org.apache.airavata.model.application.io.OutputDataObjectType>)value);
       }
       break;
 
@@ -554,7 +524,7 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
       if (value == null) {
         unsetArchiveWorkingDirectory();
       } else {
-        setArchiveWorkingDirectory((Boolean)value);
+        setArchiveWorkingDirectory((java.lang.Boolean)value);
       }
       break;
 
@@ -562,14 +532,14 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
       if (value == null) {
         unsetHasOptionalFileInputs();
       } else {
-        setHasOptionalFileInputs((Boolean)value);
+        setHasOptionalFileInputs((java.lang.Boolean)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case APPLICATION_INTERFACE_ID:
       return getApplicationInterfaceId();
@@ -596,13 +566,13 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
       return isHasOptionalFileInputs();
 
     }
-    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) {
@@ -623,11 +593,11 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
     case HAS_OPTIONAL_FILE_INPUTS:
       return isSetHasOptionalFileInputs();
     }
-    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 ApplicationInterfaceDescription)
@@ -638,6 +608,8 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
   public boolean equals(ApplicationInterfaceDescription that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_applicationInterfaceId = true && 
this.isSetApplicationInterfaceId();
     boolean that_present_applicationInterfaceId = true && 
that.isSetApplicationInterfaceId();
@@ -716,49 +688,41 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_applicationInterfaceId = true && 
(isSetApplicationInterfaceId());
-    list.add(present_applicationInterfaceId);
-    if (present_applicationInterfaceId)
-      list.add(applicationInterfaceId);
+    hashCode = hashCode * 8191 + ((isSetApplicationInterfaceId()) ? 131071 : 
524287);
+    if (isSetApplicationInterfaceId())
+      hashCode = hashCode * 8191 + applicationInterfaceId.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_applicationDescription = true && 
(isSetApplicationDescription());
-    list.add(present_applicationDescription);
-    if (present_applicationDescription)
-      list.add(applicationDescription);
+    hashCode = hashCode * 8191 + ((isSetApplicationDescription()) ? 131071 : 
524287);
+    if (isSetApplicationDescription())
+      hashCode = hashCode * 8191 + applicationDescription.hashCode();
 
-    boolean present_applicationModules = true && (isSetApplicationModules());
-    list.add(present_applicationModules);
-    if (present_applicationModules)
-      list.add(applicationModules);
+    hashCode = hashCode * 8191 + ((isSetApplicationModules()) ? 131071 : 
524287);
+    if (isSetApplicationModules())
+      hashCode = hashCode * 8191 + applicationModules.hashCode();
 
-    boolean present_applicationInputs = true && (isSetApplicationInputs());
-    list.add(present_applicationInputs);
-    if (present_applicationInputs)
-      list.add(applicationInputs);
+    hashCode = hashCode * 8191 + ((isSetApplicationInputs()) ? 131071 : 
524287);
+    if (isSetApplicationInputs())
+      hashCode = hashCode * 8191 + applicationInputs.hashCode();
 
-    boolean present_applicationOutputs = true && (isSetApplicationOutputs());
-    list.add(present_applicationOutputs);
-    if (present_applicationOutputs)
-      list.add(applicationOutputs);
+    hashCode = hashCode * 8191 + ((isSetApplicationOutputs()) ? 131071 : 
524287);
+    if (isSetApplicationOutputs())
+      hashCode = hashCode * 8191 + applicationOutputs.hashCode();
 
-    boolean present_archiveWorkingDirectory = true && 
(isSetArchiveWorkingDirectory());
-    list.add(present_archiveWorkingDirectory);
-    if (present_archiveWorkingDirectory)
-      list.add(archiveWorkingDirectory);
+    hashCode = hashCode * 8191 + ((isSetArchiveWorkingDirectory()) ? 131071 : 
524287);
+    if (isSetArchiveWorkingDirectory())
+      hashCode = hashCode * 8191 + ((archiveWorkingDirectory) ? 131071 : 
524287);
 
-    boolean present_hasOptionalFileInputs = true && 
(isSetHasOptionalFileInputs());
-    list.add(present_hasOptionalFileInputs);
-    if (present_hasOptionalFileInputs)
-      list.add(hasOptionalFileInputs);
+    hashCode = hashCode * 8191 + ((isSetHasOptionalFileInputs()) ? 131071 : 
524287);
+    if (isSetHasOptionalFileInputs())
+      hashCode = hashCode * 8191 + ((hasOptionalFileInputs) ? 131071 : 524287);
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -769,7 +733,7 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
 
     int lastComparison = 0;
 
-    lastComparison = 
Boolean.valueOf(isSetApplicationInterfaceId()).compareTo(other.isSetApplicationInterfaceId());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetApplicationInterfaceId()).compareTo(other.isSetApplicationInterfaceId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -779,7 +743,7 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetApplicationName()).compareTo(other.isSetApplicationName());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetApplicationName()).compareTo(other.isSetApplicationName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -789,7 +753,7 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetApplicationDescription()).compareTo(other.isSetApplicationDescription());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetApplicationDescription()).compareTo(other.isSetApplicationDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -799,7 +763,7 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetApplicationModules()).compareTo(other.isSetApplicationModules());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetApplicationModules()).compareTo(other.isSetApplicationModules());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -809,7 +773,7 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetApplicationInputs()).compareTo(other.isSetApplicationInputs());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetApplicationInputs()).compareTo(other.isSetApplicationInputs());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -819,7 +783,7 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetApplicationOutputs()).compareTo(other.isSetApplicationOutputs());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetApplicationOutputs()).compareTo(other.isSetApplicationOutputs());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -829,7 +793,7 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetArchiveWorkingDirectory()).compareTo(other.isSetArchiveWorkingDirectory());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetArchiveWorkingDirectory()).compareTo(other.isSetArchiveWorkingDirectory());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -839,7 +803,7 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetHasOptionalFileInputs()).compareTo(other.isSetHasOptionalFileInputs());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetHasOptionalFileInputs()).compareTo(other.isSetHasOptionalFileInputs());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -857,16 +821,16 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
   }
 
   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("ApplicationInterfaceDescription(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new 
java.lang.StringBuilder("ApplicationInterfaceDescription(");
     boolean first = true;
 
     sb.append("applicationInterfaceId:");
@@ -961,7 +925,7 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
     }
   }
 
-  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;
@@ -971,13 +935,13 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
     }
   }
 
-  private static class ApplicationInterfaceDescriptionStandardSchemeFactory 
implements SchemeFactory {
+  private static class ApplicationInterfaceDescriptionStandardSchemeFactory 
implements org.apache.thrift.scheme.SchemeFactory {
     public ApplicationInterfaceDescriptionStandardScheme getScheme() {
       return new ApplicationInterfaceDescriptionStandardScheme();
     }
   }
 
-  private static class ApplicationInterfaceDescriptionStandardScheme extends 
StandardScheme<ApplicationInterfaceDescription> {
+  private static class ApplicationInterfaceDescriptionStandardScheme extends 
org.apache.thrift.scheme.StandardScheme<ApplicationInterfaceDescription> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, 
ApplicationInterfaceDescription struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -1017,8 +981,8 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list0 = 
iprot.readListBegin();
-                struct.applicationModules = new ArrayList<String>(_list0.size);
-                String _elem1;
+                struct.applicationModules = new 
java.util.ArrayList<java.lang.String>(_list0.size);
+                java.lang.String _elem1;
                 for (int _i2 = 0; _i2 < _list0.size; ++_i2)
                 {
                   _elem1 = iprot.readString();
@@ -1035,7 +999,7 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list3 = 
iprot.readListBegin();
-                struct.applicationInputs = new 
ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>(_list3.size);
+                struct.applicationInputs = new 
java.util.ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>(_list3.size);
                 org.apache.airavata.model.application.io.InputDataObjectType 
_elem4;
                 for (int _i5 = 0; _i5 < _list3.size; ++_i5)
                 {
@@ -1054,7 +1018,7 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list6 = 
iprot.readListBegin();
-                struct.applicationOutputs = new 
ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>(_list6.size);
+                struct.applicationOutputs = new 
java.util.ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>(_list6.size);
                 org.apache.airavata.model.application.io.OutputDataObjectType 
_elem7;
                 for (int _i8 = 0; _i8 < _list6.size; ++_i8)
                 {
@@ -1120,7 +1084,7 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
           oprot.writeFieldBegin(APPLICATION_MODULES_FIELD_DESC);
           {
             oprot.writeListBegin(new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
struct.applicationModules.size()));
-            for (String _iter9 : struct.applicationModules)
+            for (java.lang.String _iter9 : struct.applicationModules)
             {
               oprot.writeString(_iter9);
             }
@@ -1173,20 +1137,20 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
 
   }
 
-  private static class ApplicationInterfaceDescriptionTupleSchemeFactory 
implements SchemeFactory {
+  private static class ApplicationInterfaceDescriptionTupleSchemeFactory 
implements org.apache.thrift.scheme.SchemeFactory {
     public ApplicationInterfaceDescriptionTupleScheme getScheme() {
       return new ApplicationInterfaceDescriptionTupleScheme();
     }
   }
 
-  private static class ApplicationInterfaceDescriptionTupleScheme extends 
TupleScheme<ApplicationInterfaceDescription> {
+  private static class ApplicationInterfaceDescriptionTupleScheme extends 
org.apache.thrift.scheme.TupleScheme<ApplicationInterfaceDescription> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, 
ApplicationInterfaceDescription 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.applicationInterfaceId);
       oprot.writeString(struct.applicationName);
-      BitSet optionals = new BitSet();
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetApplicationDescription()) {
         optionals.set(0);
       }
@@ -1212,7 +1176,7 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
       if (struct.isSetApplicationModules()) {
         {
           oprot.writeI32(struct.applicationModules.size());
-          for (String _iter12 : struct.applicationModules)
+          for (java.lang.String _iter12 : struct.applicationModules)
           {
             oprot.writeString(_iter12);
           }
@@ -1246,12 +1210,12 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, 
ApplicationInterfaceDescription struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol iprot = 
(org.apache.thrift.protocol.TTupleProtocol) prot;
       struct.applicationInterfaceId = iprot.readString();
       struct.setApplicationInterfaceIdIsSet(true);
       struct.applicationName = iprot.readString();
       struct.setApplicationNameIsSet(true);
-      BitSet incoming = iprot.readBitSet(6);
+      java.util.BitSet incoming = iprot.readBitSet(6);
       if (incoming.get(0)) {
         struct.applicationDescription = iprot.readString();
         struct.setApplicationDescriptionIsSet(true);
@@ -1259,8 +1223,8 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
       if (incoming.get(1)) {
         {
           org.apache.thrift.protocol.TList _list15 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
iprot.readI32());
-          struct.applicationModules = new ArrayList<String>(_list15.size);
-          String _elem16;
+          struct.applicationModules = new 
java.util.ArrayList<java.lang.String>(_list15.size);
+          java.lang.String _elem16;
           for (int _i17 = 0; _i17 < _list15.size; ++_i17)
           {
             _elem16 = iprot.readString();
@@ -1272,7 +1236,7 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
       if (incoming.get(2)) {
         {
           org.apache.thrift.protocol.TList _list18 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, 
iprot.readI32());
-          struct.applicationInputs = new 
ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>(_list18.size);
+          struct.applicationInputs = new 
java.util.ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>(_list18.size);
           org.apache.airavata.model.application.io.InputDataObjectType _elem19;
           for (int _i20 = 0; _i20 < _list18.size; ++_i20)
           {
@@ -1286,7 +1250,7 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
       if (incoming.get(3)) {
         {
           org.apache.thrift.protocol.TList _list21 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, 
iprot.readI32());
-          struct.applicationOutputs = new 
ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>(_list21.size);
+          struct.applicationOutputs = new 
java.util.ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>(_list21.size);
           org.apache.airavata.model.application.io.OutputDataObjectType 
_elem22;
           for (int _i23 = 0; _i23 < _list21.size; ++_i23)
           {
@@ -1308,5 +1272,8 @@ public class ApplicationInterfaceDescription implements 
org.apache.thrift.TBase<
     }
   }
 
+  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