http://git-wip-us.apache.org/repos/asf/airavata/blob/8e775660/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
index 7b01741..7adceff 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.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.experiment;
 
-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"})
 /**
  * A structure holding the experiment metadata and its child models.
  * 
@@ -67,7 +40,7 @@ import org.slf4j.LoggerFactory;
  * experimentDescription:
  *    The verbose description of the experiment. This is an optional parameter.
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel, ExperimentModel._Fields>, 
java.io.Serializable, Cloneable, Comparable<ExperimentModel> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("ExperimentModel");
 
@@ -91,31 +64,28 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
   private static final org.apache.thrift.protocol.TField ERRORS_FIELD_DESC = 
new org.apache.thrift.protocol.TField("errors", 
org.apache.thrift.protocol.TType.LIST, (short)18);
   private static final org.apache.thrift.protocol.TField PROCESSES_FIELD_DESC 
= new org.apache.thrift.protocol.TField("processes", 
org.apache.thrift.protocol.TType.LIST, (short)19);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new 
ExperimentModelStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ExperimentModelTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new ExperimentModelStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new ExperimentModelTupleSchemeFactory();
 
-  private String experimentId; // required
-  private String projectId; // required
-  private String gatewayId; // required
+  private java.lang.String experimentId; // required
+  private java.lang.String projectId; // required
+  private java.lang.String gatewayId; // required
   private ExperimentType experimentType; // required
-  private String userName; // required
-  private String experimentName; // required
+  private java.lang.String userName; // required
+  private java.lang.String experimentName; // required
   private long creationTime; // optional
-  private String description; // optional
-  private String executionId; // optional
-  private String gatewayExecutionId; // optional
-  private String gatewayInstanceId; // optional
+  private java.lang.String description; // optional
+  private java.lang.String executionId; // optional
+  private java.lang.String gatewayExecutionId; // optional
+  private java.lang.String gatewayInstanceId; // optional
   private boolean enableEmailNotification; // optional
-  private List<String> emailAddresses; // optional
+  private java.util.List<java.lang.String> emailAddresses; // optional
   private UserConfigurationDataModel userConfigurationData; // optional
-  private List<org.apache.airavata.model.application.io.InputDataObjectType> 
experimentInputs; // optional
-  private List<org.apache.airavata.model.application.io.OutputDataObjectType> 
experimentOutputs; // optional
-  private List<org.apache.airavata.model.status.ExperimentStatus> 
experimentStatus; // optional
-  private List<org.apache.airavata.model.commons.ErrorModel> errors; // 
optional
-  private List<org.apache.airavata.model.process.ProcessModel> processes; // 
optional
+  private 
java.util.List<org.apache.airavata.model.application.io.InputDataObjectType> 
experimentInputs; // optional
+  private 
java.util.List<org.apache.airavata.model.application.io.OutputDataObjectType> 
experimentOutputs; // optional
+  private java.util.List<org.apache.airavata.model.status.ExperimentStatus> 
experimentStatus; // optional
+  private java.util.List<org.apache.airavata.model.commons.ErrorModel> errors; 
// optional
+  private java.util.List<org.apache.airavata.model.process.ProcessModel> 
processes; // 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 {
@@ -143,10 +113,10 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
     ERRORS((short)18, "errors"),
     PROCESSES((short)19, "processes");
 
-    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);
       }
     }
@@ -205,21 +175,21 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
      */
     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;
     }
@@ -228,7 +198,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -238,9 +208,9 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
   private static final int __ENABLEEMAILNOTIFICATION_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = 
{_Fields.CREATION_TIME,_Fields.DESCRIPTION,_Fields.EXECUTION_ID,_Fields.GATEWAY_EXECUTION_ID,_Fields.GATEWAY_INSTANCE_ID,_Fields.ENABLE_EMAIL_NOTIFICATION,_Fields.EMAIL_ADDRESSES,_Fields.USER_CONFIGURATION_DATA,_Fields.EXPERIMENT_INPUTS,_Fields.EXPERIMENT_OUTPUTS,_Fields.EXPERIMENT_STATUS,_Fields.ERRORS,_Fields.PROCESSES};
-  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.EXPERIMENT_ID, new 
org.apache.thrift.meta_data.FieldMetaData("experimentId", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.PROJECT_ID, new 
org.apache.thrift.meta_data.FieldMetaData("projectId", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
@@ -285,7 +255,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
     tmpMap.put(_Fields.PROCESSES, new 
org.apache.thrift.meta_data.FieldMetaData("processes", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new 
org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 org.apache.airavata.model.process.ProcessModel.class))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ExperimentModel.class,
 metaDataMap);
   }
 
@@ -297,12 +267,12 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
   }
 
   public ExperimentModel(
-    String experimentId,
-    String projectId,
-    String gatewayId,
+    java.lang.String experimentId,
+    java.lang.String projectId,
+    java.lang.String gatewayId,
     ExperimentType experimentType,
-    String userName,
-    String experimentName)
+    java.lang.String userName,
+    java.lang.String experimentName)
   {
     this();
     this.experimentId = experimentId;
@@ -351,42 +321,42 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
     }
     this.enableEmailNotification = other.enableEmailNotification;
     if (other.isSetEmailAddresses()) {
-      List<String> __this__emailAddresses = new 
ArrayList<String>(other.emailAddresses);
+      java.util.List<java.lang.String> __this__emailAddresses = new 
java.util.ArrayList<java.lang.String>(other.emailAddresses);
       this.emailAddresses = __this__emailAddresses;
     }
     if (other.isSetUserConfigurationData()) {
       this.userConfigurationData = new 
UserConfigurationDataModel(other.userConfigurationData);
     }
     if (other.isSetExperimentInputs()) {
-      List<org.apache.airavata.model.application.io.InputDataObjectType> 
__this__experimentInputs = new 
ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>(other.experimentInputs.size());
+      
java.util.List<org.apache.airavata.model.application.io.InputDataObjectType> 
__this__experimentInputs = new 
java.util.ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>(other.experimentInputs.size());
       for (org.apache.airavata.model.application.io.InputDataObjectType 
other_element : other.experimentInputs) {
         __this__experimentInputs.add(new 
org.apache.airavata.model.application.io.InputDataObjectType(other_element));
       }
       this.experimentInputs = __this__experimentInputs;
     }
     if (other.isSetExperimentOutputs()) {
-      List<org.apache.airavata.model.application.io.OutputDataObjectType> 
__this__experimentOutputs = new 
ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>(other.experimentOutputs.size());
+      
java.util.List<org.apache.airavata.model.application.io.OutputDataObjectType> 
__this__experimentOutputs = new 
java.util.ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>(other.experimentOutputs.size());
       for (org.apache.airavata.model.application.io.OutputDataObjectType 
other_element : other.experimentOutputs) {
         __this__experimentOutputs.add(new 
org.apache.airavata.model.application.io.OutputDataObjectType(other_element));
       }
       this.experimentOutputs = __this__experimentOutputs;
     }
     if (other.isSetExperimentStatus()) {
-      List<org.apache.airavata.model.status.ExperimentStatus> 
__this__experimentStatus = new 
ArrayList<org.apache.airavata.model.status.ExperimentStatus>(other.experimentStatus.size());
+      java.util.List<org.apache.airavata.model.status.ExperimentStatus> 
__this__experimentStatus = new 
java.util.ArrayList<org.apache.airavata.model.status.ExperimentStatus>(other.experimentStatus.size());
       for (org.apache.airavata.model.status.ExperimentStatus other_element : 
other.experimentStatus) {
         __this__experimentStatus.add(new 
org.apache.airavata.model.status.ExperimentStatus(other_element));
       }
       this.experimentStatus = __this__experimentStatus;
     }
     if (other.isSetErrors()) {
-      List<org.apache.airavata.model.commons.ErrorModel> __this__errors = new 
ArrayList<org.apache.airavata.model.commons.ErrorModel>(other.errors.size());
+      java.util.List<org.apache.airavata.model.commons.ErrorModel> 
__this__errors = new 
java.util.ArrayList<org.apache.airavata.model.commons.ErrorModel>(other.errors.size());
       for (org.apache.airavata.model.commons.ErrorModel other_element : 
other.errors) {
         __this__errors.add(new 
org.apache.airavata.model.commons.ErrorModel(other_element));
       }
       this.errors = __this__errors;
     }
     if (other.isSetProcesses()) {
-      List<org.apache.airavata.model.process.ProcessModel> __this__processes = 
new 
ArrayList<org.apache.airavata.model.process.ProcessModel>(other.processes.size());
+      java.util.List<org.apache.airavata.model.process.ProcessModel> 
__this__processes = new 
java.util.ArrayList<org.apache.airavata.model.process.ProcessModel>(other.processes.size());
       for (org.apache.airavata.model.process.ProcessModel other_element : 
other.processes) {
         __this__processes.add(new 
org.apache.airavata.model.process.ProcessModel(other_element));
       }
@@ -425,11 +395,11 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
     this.processes = null;
   }
 
-  public String getExperimentId() {
+  public java.lang.String getExperimentId() {
     return this.experimentId;
   }
 
-  public void setExperimentId(String experimentId) {
+  public void setExperimentId(java.lang.String experimentId) {
     this.experimentId = experimentId;
   }
 
@@ -448,11 +418,11 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
     }
   }
 
-  public String getProjectId() {
+  public java.lang.String getProjectId() {
     return this.projectId;
   }
 
-  public void setProjectId(String projectId) {
+  public void setProjectId(java.lang.String projectId) {
     this.projectId = projectId;
   }
 
@@ -471,11 +441,11 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
     }
   }
 
-  public String getGatewayId() {
+  public java.lang.String getGatewayId() {
     return this.gatewayId;
   }
 
-  public void setGatewayId(String gatewayId) {
+  public void setGatewayId(java.lang.String gatewayId) {
     this.gatewayId = gatewayId;
   }
 
@@ -525,11 +495,11 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
     }
   }
 
-  public String getUserName() {
+  public java.lang.String getUserName() {
     return this.userName;
   }
 
-  public void setUserName(String userName) {
+  public void setUserName(java.lang.String userName) {
     this.userName = userName;
   }
 
@@ -548,11 +518,11 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
     }
   }
 
-  public String getExperimentName() {
+  public java.lang.String getExperimentName() {
     return this.experimentName;
   }
 
-  public void setExperimentName(String experimentName) {
+  public void setExperimentName(java.lang.String experimentName) {
     this.experimentName = experimentName;
   }
 
@@ -581,23 +551,23 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
   }
 
   public void unsetCreationTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__CREATIONTIME_ISSET_ID);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, 
__CREATIONTIME_ISSET_ID);
   }
 
   /** Returns true if field creationTime is set (has been assigned a value) 
and false otherwise */
   public boolean isSetCreationTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __CREATIONTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, 
__CREATIONTIME_ISSET_ID);
   }
 
   public void setCreationTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__CREATIONTIME_ISSET_ID, value);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, 
__CREATIONTIME_ISSET_ID, value);
   }
 
-  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;
   }
 
@@ -616,11 +586,11 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
     }
   }
 
-  public String getExecutionId() {
+  public java.lang.String getExecutionId() {
     return this.executionId;
   }
 
-  public void setExecutionId(String executionId) {
+  public void setExecutionId(java.lang.String executionId) {
     this.executionId = executionId;
   }
 
@@ -639,11 +609,11 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
     }
   }
 
-  public String getGatewayExecutionId() {
+  public java.lang.String getGatewayExecutionId() {
     return this.gatewayExecutionId;
   }
 
-  public void setGatewayExecutionId(String gatewayExecutionId) {
+  public void setGatewayExecutionId(java.lang.String gatewayExecutionId) {
     this.gatewayExecutionId = gatewayExecutionId;
   }
 
@@ -662,11 +632,11 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
     }
   }
 
-  public String getGatewayInstanceId() {
+  public java.lang.String getGatewayInstanceId() {
     return this.gatewayInstanceId;
   }
 
-  public void setGatewayInstanceId(String gatewayInstanceId) {
+  public void setGatewayInstanceId(java.lang.String gatewayInstanceId) {
     this.gatewayInstanceId = gatewayInstanceId;
   }
 
@@ -695,38 +665,38 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
   }
 
   public void unsetEnableEmailNotification() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__ENABLEEMAILNOTIFICATION_ISSET_ID);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, 
__ENABLEEMAILNOTIFICATION_ISSET_ID);
   }
 
   /** Returns true if field enableEmailNotification is set (has been assigned 
a value) and false otherwise */
   public boolean isSetEnableEmailNotification() {
-    return EncodingUtils.testBit(__isset_bitfield, 
__ENABLEEMAILNOTIFICATION_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, 
__ENABLEEMAILNOTIFICATION_ISSET_ID);
   }
 
   public void setEnableEmailNotificationIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__ENABLEEMAILNOTIFICATION_ISSET_ID, value);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, 
__ENABLEEMAILNOTIFICATION_ISSET_ID, value);
   }
 
   public int getEmailAddressesSize() {
     return (this.emailAddresses == null) ? 0 : this.emailAddresses.size();
   }
 
-  public java.util.Iterator<String> getEmailAddressesIterator() {
+  public java.util.Iterator<java.lang.String> getEmailAddressesIterator() {
     return (this.emailAddresses == null) ? null : 
this.emailAddresses.iterator();
   }
 
-  public void addToEmailAddresses(String elem) {
+  public void addToEmailAddresses(java.lang.String elem) {
     if (this.emailAddresses == null) {
-      this.emailAddresses = new ArrayList<String>();
+      this.emailAddresses = new java.util.ArrayList<java.lang.String>();
     }
     this.emailAddresses.add(elem);
   }
 
-  public List<String> getEmailAddresses() {
+  public java.util.List<java.lang.String> getEmailAddresses() {
     return this.emailAddresses;
   }
 
-  public void setEmailAddresses(List<String> emailAddresses) {
+  public void setEmailAddresses(java.util.List<java.lang.String> 
emailAddresses) {
     this.emailAddresses = emailAddresses;
   }
 
@@ -778,16 +748,16 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
 
   public void 
addToExperimentInputs(org.apache.airavata.model.application.io.InputDataObjectType
 elem) {
     if (this.experimentInputs == null) {
-      this.experimentInputs = new 
ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>();
+      this.experimentInputs = new 
java.util.ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>();
     }
     this.experimentInputs.add(elem);
   }
 
-  public List<org.apache.airavata.model.application.io.InputDataObjectType> 
getExperimentInputs() {
+  public 
java.util.List<org.apache.airavata.model.application.io.InputDataObjectType> 
getExperimentInputs() {
     return this.experimentInputs;
   }
 
-  public void 
setExperimentInputs(List<org.apache.airavata.model.application.io.InputDataObjectType>
 experimentInputs) {
+  public void 
setExperimentInputs(java.util.List<org.apache.airavata.model.application.io.InputDataObjectType>
 experimentInputs) {
     this.experimentInputs = experimentInputs;
   }
 
@@ -816,16 +786,16 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
 
   public void 
addToExperimentOutputs(org.apache.airavata.model.application.io.OutputDataObjectType
 elem) {
     if (this.experimentOutputs == null) {
-      this.experimentOutputs = new 
ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>();
+      this.experimentOutputs = new 
java.util.ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>();
     }
     this.experimentOutputs.add(elem);
   }
 
-  public List<org.apache.airavata.model.application.io.OutputDataObjectType> 
getExperimentOutputs() {
+  public 
java.util.List<org.apache.airavata.model.application.io.OutputDataObjectType> 
getExperimentOutputs() {
     return this.experimentOutputs;
   }
 
-  public void 
setExperimentOutputs(List<org.apache.airavata.model.application.io.OutputDataObjectType>
 experimentOutputs) {
+  public void 
setExperimentOutputs(java.util.List<org.apache.airavata.model.application.io.OutputDataObjectType>
 experimentOutputs) {
     this.experimentOutputs = experimentOutputs;
   }
 
@@ -854,16 +824,16 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
 
   public void 
addToExperimentStatus(org.apache.airavata.model.status.ExperimentStatus elem) {
     if (this.experimentStatus == null) {
-      this.experimentStatus = new 
ArrayList<org.apache.airavata.model.status.ExperimentStatus>();
+      this.experimentStatus = new 
java.util.ArrayList<org.apache.airavata.model.status.ExperimentStatus>();
     }
     this.experimentStatus.add(elem);
   }
 
-  public List<org.apache.airavata.model.status.ExperimentStatus> 
getExperimentStatus() {
+  public java.util.List<org.apache.airavata.model.status.ExperimentStatus> 
getExperimentStatus() {
     return this.experimentStatus;
   }
 
-  public void 
setExperimentStatus(List<org.apache.airavata.model.status.ExperimentStatus> 
experimentStatus) {
+  public void 
setExperimentStatus(java.util.List<org.apache.airavata.model.status.ExperimentStatus>
 experimentStatus) {
     this.experimentStatus = experimentStatus;
   }
 
@@ -892,16 +862,16 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
 
   public void addToErrors(org.apache.airavata.model.commons.ErrorModel elem) {
     if (this.errors == null) {
-      this.errors = new 
ArrayList<org.apache.airavata.model.commons.ErrorModel>();
+      this.errors = new 
java.util.ArrayList<org.apache.airavata.model.commons.ErrorModel>();
     }
     this.errors.add(elem);
   }
 
-  public List<org.apache.airavata.model.commons.ErrorModel> getErrors() {
+  public java.util.List<org.apache.airavata.model.commons.ErrorModel> 
getErrors() {
     return this.errors;
   }
 
-  public void setErrors(List<org.apache.airavata.model.commons.ErrorModel> 
errors) {
+  public void 
setErrors(java.util.List<org.apache.airavata.model.commons.ErrorModel> errors) {
     this.errors = errors;
   }
 
@@ -930,16 +900,16 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
 
   public void addToProcesses(org.apache.airavata.model.process.ProcessModel 
elem) {
     if (this.processes == null) {
-      this.processes = new 
ArrayList<org.apache.airavata.model.process.ProcessModel>();
+      this.processes = new 
java.util.ArrayList<org.apache.airavata.model.process.ProcessModel>();
     }
     this.processes.add(elem);
   }
 
-  public List<org.apache.airavata.model.process.ProcessModel> getProcesses() {
+  public java.util.List<org.apache.airavata.model.process.ProcessModel> 
getProcesses() {
     return this.processes;
   }
 
-  public void 
setProcesses(List<org.apache.airavata.model.process.ProcessModel> processes) {
+  public void 
setProcesses(java.util.List<org.apache.airavata.model.process.ProcessModel> 
processes) {
     this.processes = processes;
   }
 
@@ -958,13 +928,13 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case EXPERIMENT_ID:
       if (value == null) {
         unsetExperimentId();
       } else {
-        setExperimentId((String)value);
+        setExperimentId((java.lang.String)value);
       }
       break;
 
@@ -972,7 +942,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       if (value == null) {
         unsetProjectId();
       } else {
-        setProjectId((String)value);
+        setProjectId((java.lang.String)value);
       }
       break;
 
@@ -980,7 +950,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       if (value == null) {
         unsetGatewayId();
       } else {
-        setGatewayId((String)value);
+        setGatewayId((java.lang.String)value);
       }
       break;
 
@@ -996,7 +966,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       if (value == null) {
         unsetUserName();
       } else {
-        setUserName((String)value);
+        setUserName((java.lang.String)value);
       }
       break;
 
@@ -1004,7 +974,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       if (value == null) {
         unsetExperimentName();
       } else {
-        setExperimentName((String)value);
+        setExperimentName((java.lang.String)value);
       }
       break;
 
@@ -1012,7 +982,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       if (value == null) {
         unsetCreationTime();
       } else {
-        setCreationTime((Long)value);
+        setCreationTime((java.lang.Long)value);
       }
       break;
 
@@ -1020,7 +990,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       if (value == null) {
         unsetDescription();
       } else {
-        setDescription((String)value);
+        setDescription((java.lang.String)value);
       }
       break;
 
@@ -1028,7 +998,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       if (value == null) {
         unsetExecutionId();
       } else {
-        setExecutionId((String)value);
+        setExecutionId((java.lang.String)value);
       }
       break;
 
@@ -1036,7 +1006,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       if (value == null) {
         unsetGatewayExecutionId();
       } else {
-        setGatewayExecutionId((String)value);
+        setGatewayExecutionId((java.lang.String)value);
       }
       break;
 
@@ -1044,7 +1014,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       if (value == null) {
         unsetGatewayInstanceId();
       } else {
-        setGatewayInstanceId((String)value);
+        setGatewayInstanceId((java.lang.String)value);
       }
       break;
 
@@ -1052,7 +1022,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       if (value == null) {
         unsetEnableEmailNotification();
       } else {
-        setEnableEmailNotification((Boolean)value);
+        setEnableEmailNotification((java.lang.Boolean)value);
       }
       break;
 
@@ -1060,7 +1030,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       if (value == null) {
         unsetEmailAddresses();
       } else {
-        setEmailAddresses((List<String>)value);
+        setEmailAddresses((java.util.List<java.lang.String>)value);
       }
       break;
 
@@ -1076,7 +1046,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       if (value == null) {
         unsetExperimentInputs();
       } else {
-        
setExperimentInputs((List<org.apache.airavata.model.application.io.InputDataObjectType>)value);
+        
setExperimentInputs((java.util.List<org.apache.airavata.model.application.io.InputDataObjectType>)value);
       }
       break;
 
@@ -1084,7 +1054,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       if (value == null) {
         unsetExperimentOutputs();
       } else {
-        
setExperimentOutputs((List<org.apache.airavata.model.application.io.OutputDataObjectType>)value);
+        
setExperimentOutputs((java.util.List<org.apache.airavata.model.application.io.OutputDataObjectType>)value);
       }
       break;
 
@@ -1092,7 +1062,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       if (value == null) {
         unsetExperimentStatus();
       } else {
-        
setExperimentStatus((List<org.apache.airavata.model.status.ExperimentStatus>)value);
+        
setExperimentStatus((java.util.List<org.apache.airavata.model.status.ExperimentStatus>)value);
       }
       break;
 
@@ -1100,7 +1070,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       if (value == null) {
         unsetErrors();
       } else {
-        setErrors((List<org.apache.airavata.model.commons.ErrorModel>)value);
+        
setErrors((java.util.List<org.apache.airavata.model.commons.ErrorModel>)value);
       }
       break;
 
@@ -1108,14 +1078,14 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       if (value == null) {
         unsetProcesses();
       } else {
-        
setProcesses((List<org.apache.airavata.model.process.ProcessModel>)value);
+        
setProcesses((java.util.List<org.apache.airavata.model.process.ProcessModel>)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case EXPERIMENT_ID:
       return getExperimentId();
@@ -1175,13 +1145,13 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       return getProcesses();
 
     }
-    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) {
@@ -1224,11 +1194,11 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
     case PROCESSES:
       return isSetProcesses();
     }
-    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 ExperimentModel)
@@ -1239,6 +1209,8 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
   public boolean equals(ExperimentModel that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_experimentId = true && this.isSetExperimentId();
     boolean that_present_experimentId = true && that.isSetExperimentId();
@@ -1416,104 +1388,85 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_experimentId = true && (isSetExperimentId());
-    list.add(present_experimentId);
-    if (present_experimentId)
-      list.add(experimentId);
-
-    boolean present_projectId = true && (isSetProjectId());
-    list.add(present_projectId);
-    if (present_projectId)
-      list.add(projectId);
-
-    boolean present_gatewayId = true && (isSetGatewayId());
-    list.add(present_gatewayId);
-    if (present_gatewayId)
-      list.add(gatewayId);
-
-    boolean present_experimentType = true && (isSetExperimentType());
-    list.add(present_experimentType);
-    if (present_experimentType)
-      list.add(experimentType.getValue());
-
-    boolean present_userName = true && (isSetUserName());
-    list.add(present_userName);
-    if (present_userName)
-      list.add(userName);
-
-    boolean present_experimentName = true && (isSetExperimentName());
-    list.add(present_experimentName);
-    if (present_experimentName)
-      list.add(experimentName);
-
-    boolean present_creationTime = true && (isSetCreationTime());
-    list.add(present_creationTime);
-    if (present_creationTime)
-      list.add(creationTime);
-
-    boolean present_description = true && (isSetDescription());
-    list.add(present_description);
-    if (present_description)
-      list.add(description);
-
-    boolean present_executionId = true && (isSetExecutionId());
-    list.add(present_executionId);
-    if (present_executionId)
-      list.add(executionId);
-
-    boolean present_gatewayExecutionId = true && (isSetGatewayExecutionId());
-    list.add(present_gatewayExecutionId);
-    if (present_gatewayExecutionId)
-      list.add(gatewayExecutionId);
-
-    boolean present_gatewayInstanceId = true && (isSetGatewayInstanceId());
-    list.add(present_gatewayInstanceId);
-    if (present_gatewayInstanceId)
-      list.add(gatewayInstanceId);
-
-    boolean present_enableEmailNotification = true && 
(isSetEnableEmailNotification());
-    list.add(present_enableEmailNotification);
-    if (present_enableEmailNotification)
-      list.add(enableEmailNotification);
-
-    boolean present_emailAddresses = true && (isSetEmailAddresses());
-    list.add(present_emailAddresses);
-    if (present_emailAddresses)
-      list.add(emailAddresses);
-
-    boolean present_userConfigurationData = true && 
(isSetUserConfigurationData());
-    list.add(present_userConfigurationData);
-    if (present_userConfigurationData)
-      list.add(userConfigurationData);
-
-    boolean present_experimentInputs = true && (isSetExperimentInputs());
-    list.add(present_experimentInputs);
-    if (present_experimentInputs)
-      list.add(experimentInputs);
-
-    boolean present_experimentOutputs = true && (isSetExperimentOutputs());
-    list.add(present_experimentOutputs);
-    if (present_experimentOutputs)
-      list.add(experimentOutputs);
-
-    boolean present_experimentStatus = true && (isSetExperimentStatus());
-    list.add(present_experimentStatus);
-    if (present_experimentStatus)
-      list.add(experimentStatus);
-
-    boolean present_errors = true && (isSetErrors());
-    list.add(present_errors);
-    if (present_errors)
-      list.add(errors);
-
-    boolean present_processes = true && (isSetProcesses());
-    list.add(present_processes);
-    if (present_processes)
-      list.add(processes);
-
-    return list.hashCode();
+    int hashCode = 1;
+
+    hashCode = hashCode * 8191 + ((isSetExperimentId()) ? 131071 : 524287);
+    if (isSetExperimentId())
+      hashCode = hashCode * 8191 + experimentId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetProjectId()) ? 131071 : 524287);
+    if (isSetProjectId())
+      hashCode = hashCode * 8191 + projectId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetGatewayId()) ? 131071 : 524287);
+    if (isSetGatewayId())
+      hashCode = hashCode * 8191 + gatewayId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetExperimentType()) ? 131071 : 524287);
+    if (isSetExperimentType())
+      hashCode = hashCode * 8191 + experimentType.getValue();
+
+    hashCode = hashCode * 8191 + ((isSetUserName()) ? 131071 : 524287);
+    if (isSetUserName())
+      hashCode = hashCode * 8191 + userName.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetExperimentName()) ? 131071 : 524287);
+    if (isSetExperimentName())
+      hashCode = hashCode * 8191 + experimentName.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetCreationTime()) ? 131071 : 524287);
+    if (isSetCreationTime())
+      hashCode = hashCode * 8191 + 
org.apache.thrift.TBaseHelper.hashCode(creationTime);
+
+    hashCode = hashCode * 8191 + ((isSetDescription()) ? 131071 : 524287);
+    if (isSetDescription())
+      hashCode = hashCode * 8191 + description.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetExecutionId()) ? 131071 : 524287);
+    if (isSetExecutionId())
+      hashCode = hashCode * 8191 + executionId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetGatewayExecutionId()) ? 131071 : 
524287);
+    if (isSetGatewayExecutionId())
+      hashCode = hashCode * 8191 + gatewayExecutionId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetGatewayInstanceId()) ? 131071 : 
524287);
+    if (isSetGatewayInstanceId())
+      hashCode = hashCode * 8191 + gatewayInstanceId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetEnableEmailNotification()) ? 131071 : 
524287);
+    if (isSetEnableEmailNotification())
+      hashCode = hashCode * 8191 + ((enableEmailNotification) ? 131071 : 
524287);
+
+    hashCode = hashCode * 8191 + ((isSetEmailAddresses()) ? 131071 : 524287);
+    if (isSetEmailAddresses())
+      hashCode = hashCode * 8191 + emailAddresses.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetUserConfigurationData()) ? 131071 : 
524287);
+    if (isSetUserConfigurationData())
+      hashCode = hashCode * 8191 + userConfigurationData.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetExperimentInputs()) ? 131071 : 524287);
+    if (isSetExperimentInputs())
+      hashCode = hashCode * 8191 + experimentInputs.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetExperimentOutputs()) ? 131071 : 
524287);
+    if (isSetExperimentOutputs())
+      hashCode = hashCode * 8191 + experimentOutputs.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetExperimentStatus()) ? 131071 : 524287);
+    if (isSetExperimentStatus())
+      hashCode = hashCode * 8191 + experimentStatus.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetErrors()) ? 131071 : 524287);
+    if (isSetErrors())
+      hashCode = hashCode * 8191 + errors.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetProcesses()) ? 131071 : 524287);
+    if (isSetProcesses())
+      hashCode = hashCode * 8191 + processes.hashCode();
+
+    return hashCode;
   }
 
   @Override
@@ -1524,7 +1477,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
 
     int lastComparison = 0;
 
-    lastComparison = 
Boolean.valueOf(isSetExperimentId()).compareTo(other.isSetExperimentId());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetExperimentId()).compareTo(other.isSetExperimentId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1534,7 +1487,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetProjectId()).compareTo(other.isSetProjectId());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetProjectId()).compareTo(other.isSetProjectId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1544,7 +1497,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1554,7 +1507,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetExperimentType()).compareTo(other.isSetExperimentType());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetExperimentType()).compareTo(other.isSetExperimentType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1564,7 +1517,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetUserName()).compareTo(other.isSetUserName());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetUserName()).compareTo(other.isSetUserName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1574,7 +1527,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetExperimentName()).compareTo(other.isSetExperimentName());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetExperimentName()).compareTo(other.isSetExperimentName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1584,7 +1537,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetCreationTime()).compareTo(other.isSetCreationTime());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetCreationTime()).compareTo(other.isSetCreationTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1594,7 +1547,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1604,7 +1557,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetExecutionId()).compareTo(other.isSetExecutionId());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetExecutionId()).compareTo(other.isSetExecutionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1614,7 +1567,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetGatewayExecutionId()).compareTo(other.isSetGatewayExecutionId());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetGatewayExecutionId()).compareTo(other.isSetGatewayExecutionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1624,7 +1577,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetGatewayInstanceId()).compareTo(other.isSetGatewayInstanceId());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetGatewayInstanceId()).compareTo(other.isSetGatewayInstanceId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1634,7 +1587,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetEnableEmailNotification()).compareTo(other.isSetEnableEmailNotification());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetEnableEmailNotification()).compareTo(other.isSetEnableEmailNotification());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1644,7 +1597,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetEmailAddresses()).compareTo(other.isSetEmailAddresses());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetEmailAddresses()).compareTo(other.isSetEmailAddresses());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1654,7 +1607,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetUserConfigurationData()).compareTo(other.isSetUserConfigurationData());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetUserConfigurationData()).compareTo(other.isSetUserConfigurationData());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1664,7 +1617,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetExperimentInputs()).compareTo(other.isSetExperimentInputs());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetExperimentInputs()).compareTo(other.isSetExperimentInputs());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1674,7 +1627,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetExperimentOutputs()).compareTo(other.isSetExperimentOutputs());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetExperimentOutputs()).compareTo(other.isSetExperimentOutputs());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1684,7 +1637,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetExperimentStatus()).compareTo(other.isSetExperimentStatus());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetExperimentStatus()).compareTo(other.isSetExperimentStatus());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1694,7 +1647,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetErrors()).compareTo(other.isSetErrors());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetErrors()).compareTo(other.isSetErrors());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1704,7 +1657,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetProcesses()).compareTo(other.isSetProcesses());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetProcesses()).compareTo(other.isSetProcesses());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1722,16 +1675,16 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
   }
 
   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("ExperimentModel(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new 
java.lang.StringBuilder("ExperimentModel(");
     boolean first = true;
 
     sb.append("experimentId:");
@@ -1947,7 +1900,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
     }
   }
 
-  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;
@@ -1957,13 +1910,13 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
     }
   }
 
-  private static class ExperimentModelStandardSchemeFactory implements 
SchemeFactory {
+  private static class ExperimentModelStandardSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public ExperimentModelStandardScheme getScheme() {
       return new ExperimentModelStandardScheme();
     }
   }
 
-  private static class ExperimentModelStandardScheme extends 
StandardScheme<ExperimentModel> {
+  private static class ExperimentModelStandardScheme extends 
org.apache.thrift.scheme.StandardScheme<ExperimentModel> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, 
ExperimentModel struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -2075,8 +2028,8 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list0 = 
iprot.readListBegin();
-                struct.emailAddresses = new ArrayList<String>(_list0.size);
-                String _elem1;
+                struct.emailAddresses = new 
java.util.ArrayList<java.lang.String>(_list0.size);
+                java.lang.String _elem1;
                 for (int _i2 = 0; _i2 < _list0.size; ++_i2)
                 {
                   _elem1 = iprot.readString();
@@ -2102,7 +2055,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list3 = 
iprot.readListBegin();
-                struct.experimentInputs = new 
ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>(_list3.size);
+                struct.experimentInputs = 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)
                 {
@@ -2121,7 +2074,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list6 = 
iprot.readListBegin();
-                struct.experimentOutputs = new 
ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>(_list6.size);
+                struct.experimentOutputs = 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)
                 {
@@ -2140,7 +2093,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list9 = 
iprot.readListBegin();
-                struct.experimentStatus = new 
ArrayList<org.apache.airavata.model.status.ExperimentStatus>(_list9.size);
+                struct.experimentStatus = new 
java.util.ArrayList<org.apache.airavata.model.status.ExperimentStatus>(_list9.size);
                 org.apache.airavata.model.status.ExperimentStatus _elem10;
                 for (int _i11 = 0; _i11 < _list9.size; ++_i11)
                 {
@@ -2159,7 +2112,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list12 = 
iprot.readListBegin();
-                struct.errors = new 
ArrayList<org.apache.airavata.model.commons.ErrorModel>(_list12.size);
+                struct.errors = new 
java.util.ArrayList<org.apache.airavata.model.commons.ErrorModel>(_list12.size);
                 org.apache.airavata.model.commons.ErrorModel _elem13;
                 for (int _i14 = 0; _i14 < _list12.size; ++_i14)
                 {
@@ -2178,7 +2131,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list15 = 
iprot.readListBegin();
-                struct.processes = new 
ArrayList<org.apache.airavata.model.process.ProcessModel>(_list15.size);
+                struct.processes = new 
java.util.ArrayList<org.apache.airavata.model.process.ProcessModel>(_list15.size);
                 org.apache.airavata.model.process.ProcessModel _elem16;
                 for (int _i17 = 0; _i17 < _list15.size; ++_i17)
                 {
@@ -2279,7 +2232,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
           oprot.writeFieldBegin(EMAIL_ADDRESSES_FIELD_DESC);
           {
             oprot.writeListBegin(new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
struct.emailAddresses.size()));
-            for (String _iter18 : struct.emailAddresses)
+            for (java.lang.String _iter18 : struct.emailAddresses)
             {
               oprot.writeString(_iter18);
             }
@@ -2371,24 +2324,24 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
 
   }
 
-  private static class ExperimentModelTupleSchemeFactory implements 
SchemeFactory {
+  private static class ExperimentModelTupleSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public ExperimentModelTupleScheme getScheme() {
       return new ExperimentModelTupleScheme();
     }
   }
 
-  private static class ExperimentModelTupleScheme extends 
TupleScheme<ExperimentModel> {
+  private static class ExperimentModelTupleScheme extends 
org.apache.thrift.scheme.TupleScheme<ExperimentModel> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, 
ExperimentModel 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.experimentId);
       oprot.writeString(struct.projectId);
       oprot.writeString(struct.gatewayId);
       oprot.writeI32(struct.experimentType.getValue());
       oprot.writeString(struct.userName);
       oprot.writeString(struct.experimentName);
-      BitSet optionals = new BitSet();
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetCreationTime()) {
         optionals.set(0);
       }
@@ -2450,7 +2403,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       if (struct.isSetEmailAddresses()) {
         {
           oprot.writeI32(struct.emailAddresses.size());
-          for (String _iter24 : struct.emailAddresses)
+          for (java.lang.String _iter24 : struct.emailAddresses)
           {
             oprot.writeString(_iter24);
           }
@@ -2508,7 +2461,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, 
ExperimentModel struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol iprot = 
(org.apache.thrift.protocol.TTupleProtocol) prot;
       struct.experimentId = iprot.readString();
       struct.setExperimentIdIsSet(true);
       struct.projectId = iprot.readString();
@@ -2521,7 +2474,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       struct.setUserNameIsSet(true);
       struct.experimentName = iprot.readString();
       struct.setExperimentNameIsSet(true);
-      BitSet incoming = iprot.readBitSet(13);
+      java.util.BitSet incoming = iprot.readBitSet(13);
       if (incoming.get(0)) {
         struct.creationTime = iprot.readI64();
         struct.setCreationTimeIsSet(true);
@@ -2549,8 +2502,8 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       if (incoming.get(6)) {
         {
           org.apache.thrift.protocol.TList _list30 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
iprot.readI32());
-          struct.emailAddresses = new ArrayList<String>(_list30.size);
-          String _elem31;
+          struct.emailAddresses = new 
java.util.ArrayList<java.lang.String>(_list30.size);
+          java.lang.String _elem31;
           for (int _i32 = 0; _i32 < _list30.size; ++_i32)
           {
             _elem31 = iprot.readString();
@@ -2567,7 +2520,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       if (incoming.get(8)) {
         {
           org.apache.thrift.protocol.TList _list33 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, 
iprot.readI32());
-          struct.experimentInputs = new 
ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>(_list33.size);
+          struct.experimentInputs = new 
java.util.ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>(_list33.size);
           org.apache.airavata.model.application.io.InputDataObjectType _elem34;
           for (int _i35 = 0; _i35 < _list33.size; ++_i35)
           {
@@ -2581,7 +2534,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       if (incoming.get(9)) {
         {
           org.apache.thrift.protocol.TList _list36 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, 
iprot.readI32());
-          struct.experimentOutputs = new 
ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>(_list36.size);
+          struct.experimentOutputs = new 
java.util.ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>(_list36.size);
           org.apache.airavata.model.application.io.OutputDataObjectType 
_elem37;
           for (int _i38 = 0; _i38 < _list36.size; ++_i38)
           {
@@ -2595,7 +2548,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       if (incoming.get(10)) {
         {
           org.apache.thrift.protocol.TList _list39 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, 
iprot.readI32());
-          struct.experimentStatus = new 
ArrayList<org.apache.airavata.model.status.ExperimentStatus>(_list39.size);
+          struct.experimentStatus = new 
java.util.ArrayList<org.apache.airavata.model.status.ExperimentStatus>(_list39.size);
           org.apache.airavata.model.status.ExperimentStatus _elem40;
           for (int _i41 = 0; _i41 < _list39.size; ++_i41)
           {
@@ -2609,7 +2562,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       if (incoming.get(11)) {
         {
           org.apache.thrift.protocol.TList _list42 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, 
iprot.readI32());
-          struct.errors = new 
ArrayList<org.apache.airavata.model.commons.ErrorModel>(_list42.size);
+          struct.errors = new 
java.util.ArrayList<org.apache.airavata.model.commons.ErrorModel>(_list42.size);
           org.apache.airavata.model.commons.ErrorModel _elem43;
           for (int _i44 = 0; _i44 < _list42.size; ++_i44)
           {
@@ -2623,7 +2576,7 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
       if (incoming.get(12)) {
         {
           org.apache.thrift.protocol.TList _list45 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, 
iprot.readI32());
-          struct.processes = new 
ArrayList<org.apache.airavata.model.process.ProcessModel>(_list45.size);
+          struct.processes = new 
java.util.ArrayList<org.apache.airavata.model.process.ProcessModel>(_list45.size);
           org.apache.airavata.model.process.ProcessModel _elem46;
           for (int _i47 = 0; _i47 < _list45.size; ++_i47)
           {
@@ -2637,5 +2590,8 @@ public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel,
     }
   }
 
+  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/experiment/ExperimentSearchFields.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSearchFields.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSearchFields.java
index 84a0a6b..efe72e3 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSearchFields.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSearchFields.java
@@ -16,7 +16,7 @@
  */
 
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

Reply via email to