Return-Path: <commits-return-18125-archive-asf-public=cust-asf.ponee.io@airavata.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 64DF5200CFA
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Tue,  5 Sep 2017 22:44:14 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 636E31609EA; Tue,  5 Sep 2017 20:44:14 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id DF8B7161131
	for <archive-asf-public@cust-asf.ponee.io>; Tue,  5 Sep 2017 22:44:11 +0200 (CEST)
Received: (qmail 68823 invoked by uid 500); 5 Sep 2017 20:44:05 -0000
Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@airavata.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@airavata.apache.org>
List-Post: <mailto:commits@airavata.apache.org>
List-Id: <commits.airavata.apache.org>
Reply-To: dev@airavata.apache.org
Delivered-To: mailing list commits@airavata.apache.org
Received: (qmail 67693 invoked by uid 99); 5 Sep 2017 20:44:04 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Sep 2017 20:44:04 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id C76A3F56A5; Tue,  5 Sep 2017 20:44:03 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: machristie@apache.org
To: commits@airavata.apache.org
Date: Tue, 05 Sep 2017 20:44:16 -0000
Message-Id: <7a435023a79945449bf65edf7c5ff8ec@git.apache.org>
In-Reply-To: <5eb21ab29fee4bf3a05eb90d557ead83@git.apache.org>
References: <5eb21ab29fee4bf3a05eb90d557ead83@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [14/52] [partial] airavata git commit: AIRAVATA-2505 Upgrade Airavata
 to Thrift 0.10.0
archived-at: Tue, 05 Sep 2017 20:44:14 -0000

http://git-wip-us.apache.org/repos/asf/airavata/blob/8e775660/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
index 6308e58..48f45d8 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.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.application.io;
 
-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 Inputs. The paramters describe how inputs are passed to the application.
  * 
@@ -77,7 +50,7 @@ import org.slf4j.LoggerFactory;
  *   Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
 public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObjectType, InputDataObjectType._Fields>, java.io.Serializable, Cloneable, Comparable<InputDataObjectType> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InputDataObjectType");
 
@@ -95,24 +68,21 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
   private static final org.apache.thrift.protocol.TField STORAGE_RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("storageResourceId", org.apache.thrift.protocol.TType.STRING, (short)12);
   private static final org.apache.thrift.protocol.TField IS_READ_ONLY_FIELD_DESC = new org.apache.thrift.protocol.TField("isReadOnly", org.apache.thrift.protocol.TType.BOOL, (short)13);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new InputDataObjectTypeStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new InputDataObjectTypeTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new InputDataObjectTypeStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new InputDataObjectTypeTupleSchemeFactory();
 
-  private String name; // required
-  private String value; // optional
+  private java.lang.String name; // required
+  private java.lang.String value; // optional
   private DataType type; // optional
-  private String applicationArgument; // optional
+  private java.lang.String applicationArgument; // optional
   private boolean standardInput; // optional
-  private String userFriendlyDescription; // optional
-  private String metaData; // optional
+  private java.lang.String userFriendlyDescription; // optional
+  private java.lang.String metaData; // optional
   private int inputOrder; // optional
   private boolean isRequired; // optional
   private boolean requiredToAddedToCommandLine; // optional
   private boolean dataStaged; // optional
-  private String storageResourceId; // optional
+  private java.lang.String storageResourceId; // optional
   private boolean isReadOnly; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -135,10 +105,10 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
     STORAGE_RESOURCE_ID((short)12, "storageResourceId"),
     IS_READ_ONLY((short)13, "isReadOnly");
 
-    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);
       }
     }
@@ -185,21 +155,21 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
      */
     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;
     }
@@ -208,7 +178,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -222,9 +192,9 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
   private static final int __ISREADONLY_ISSET_ID = 5;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.VALUE,_Fields.TYPE,_Fields.APPLICATION_ARGUMENT,_Fields.STANDARD_INPUT,_Fields.USER_FRIENDLY_DESCRIPTION,_Fields.META_DATA,_Fields.INPUT_ORDER,_Fields.IS_REQUIRED,_Fields.REQUIRED_TO_ADDED_TO_COMMAND_LINE,_Fields.DATA_STAGED,_Fields.STORAGE_RESOURCE_ID,_Fields.IS_READ_ONLY};
-  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.OPTIONAL, 
@@ -251,7 +221,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.IS_READ_ONLY, new org.apache.thrift.meta_data.FieldMetaData("isReadOnly", 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(InputDataObjectType.class, metaDataMap);
   }
 
@@ -259,7 +229,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
   }
 
   public InputDataObjectType(
-    String name)
+    java.lang.String name)
   {
     this();
     this.name = name;
@@ -326,11 +296,11 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
     this.isReadOnly = false;
   }
 
-  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;
   }
 
@@ -349,11 +319,11 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
     }
   }
 
-  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;
   }
 
@@ -403,11 +373,11 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
     }
   }
 
-  public String getApplicationArgument() {
+  public java.lang.String getApplicationArgument() {
     return this.applicationArgument;
   }
 
-  public void setApplicationArgument(String applicationArgument) {
+  public void setApplicationArgument(java.lang.String applicationArgument) {
     this.applicationArgument = applicationArgument;
   }
 
@@ -436,23 +406,23 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
   }
 
   public void unsetStandardInput() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STANDARDINPUT_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STANDARDINPUT_ISSET_ID);
   }
 
   /** Returns true if field standardInput is set (has been assigned a value) and false otherwise */
   public boolean isSetStandardInput() {
-    return EncodingUtils.testBit(__isset_bitfield, __STANDARDINPUT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STANDARDINPUT_ISSET_ID);
   }
 
   public void setStandardInputIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STANDARDINPUT_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STANDARDINPUT_ISSET_ID, value);
   }
 
-  public String getUserFriendlyDescription() {
+  public java.lang.String getUserFriendlyDescription() {
     return this.userFriendlyDescription;
   }
 
-  public void setUserFriendlyDescription(String userFriendlyDescription) {
+  public void setUserFriendlyDescription(java.lang.String userFriendlyDescription) {
     this.userFriendlyDescription = userFriendlyDescription;
   }
 
@@ -471,11 +441,11 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
     }
   }
 
-  public String getMetaData() {
+  public java.lang.String getMetaData() {
     return this.metaData;
   }
 
-  public void setMetaData(String metaData) {
+  public void setMetaData(java.lang.String metaData) {
     this.metaData = metaData;
   }
 
@@ -504,16 +474,16 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
   }
 
   public void unsetInputOrder() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __INPUTORDER_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __INPUTORDER_ISSET_ID);
   }
 
   /** Returns true if field inputOrder is set (has been assigned a value) and false otherwise */
   public boolean isSetInputOrder() {
-    return EncodingUtils.testBit(__isset_bitfield, __INPUTORDER_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __INPUTORDER_ISSET_ID);
   }
 
   public void setInputOrderIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __INPUTORDER_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __INPUTORDER_ISSET_ID, value);
   }
 
   public boolean isIsRequired() {
@@ -526,16 +496,16 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
   }
 
   public void unsetIsRequired() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISREQUIRED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISREQUIRED_ISSET_ID);
   }
 
   /** Returns true if field isRequired is set (has been assigned a value) and false otherwise */
   public boolean isSetIsRequired() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISREQUIRED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISREQUIRED_ISSET_ID);
   }
 
   public void setIsRequiredIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISREQUIRED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISREQUIRED_ISSET_ID, value);
   }
 
   public boolean isRequiredToAddedToCommandLine() {
@@ -548,16 +518,16 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
   }
 
   public void unsetRequiredToAddedToCommandLine() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __REQUIREDTOADDEDTOCOMMANDLINE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUIREDTOADDEDTOCOMMANDLINE_ISSET_ID);
   }
 
   /** Returns true if field requiredToAddedToCommandLine is set (has been assigned a value) and false otherwise */
   public boolean isSetRequiredToAddedToCommandLine() {
-    return EncodingUtils.testBit(__isset_bitfield, __REQUIREDTOADDEDTOCOMMANDLINE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUIREDTOADDEDTOCOMMANDLINE_ISSET_ID);
   }
 
   public void setRequiredToAddedToCommandLineIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __REQUIREDTOADDEDTOCOMMANDLINE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUIREDTOADDEDTOCOMMANDLINE_ISSET_ID, value);
   }
 
   public boolean isDataStaged() {
@@ -570,23 +540,23 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
   }
 
   public void unsetDataStaged() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __DATASTAGED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __DATASTAGED_ISSET_ID);
   }
 
   /** Returns true if field dataStaged is set (has been assigned a value) and false otherwise */
   public boolean isSetDataStaged() {
-    return EncodingUtils.testBit(__isset_bitfield, __DATASTAGED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __DATASTAGED_ISSET_ID);
   }
 
   public void setDataStagedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DATASTAGED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __DATASTAGED_ISSET_ID, value);
   }
 
-  public String getStorageResourceId() {
+  public java.lang.String getStorageResourceId() {
     return this.storageResourceId;
   }
 
-  public void setStorageResourceId(String storageResourceId) {
+  public void setStorageResourceId(java.lang.String storageResourceId) {
     this.storageResourceId = storageResourceId;
   }
 
@@ -615,25 +585,25 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
   }
 
   public void unsetIsReadOnly() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISREADONLY_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISREADONLY_ISSET_ID);
   }
 
   /** Returns true if field isReadOnly is set (has been assigned a value) and false otherwise */
   public boolean isSetIsReadOnly() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISREADONLY_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISREADONLY_ISSET_ID);
   }
 
   public void setIsReadOnlyIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISREADONLY_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISREADONLY_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;
 
@@ -641,7 +611,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
       if (value == null) {
         unsetValue();
       } else {
-        setValue((String)value);
+        setValue((java.lang.String)value);
       }
       break;
 
@@ -657,7 +627,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
       if (value == null) {
         unsetApplicationArgument();
       } else {
-        setApplicationArgument((String)value);
+        setApplicationArgument((java.lang.String)value);
       }
       break;
 
@@ -665,7 +635,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
       if (value == null) {
         unsetStandardInput();
       } else {
-        setStandardInput((Boolean)value);
+        setStandardInput((java.lang.Boolean)value);
       }
       break;
 
@@ -673,7 +643,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
       if (value == null) {
         unsetUserFriendlyDescription();
       } else {
-        setUserFriendlyDescription((String)value);
+        setUserFriendlyDescription((java.lang.String)value);
       }
       break;
 
@@ -681,7 +651,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
       if (value == null) {
         unsetMetaData();
       } else {
-        setMetaData((String)value);
+        setMetaData((java.lang.String)value);
       }
       break;
 
@@ -689,7 +659,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
       if (value == null) {
         unsetInputOrder();
       } else {
-        setInputOrder((Integer)value);
+        setInputOrder((java.lang.Integer)value);
       }
       break;
 
@@ -697,7 +667,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
       if (value == null) {
         unsetIsRequired();
       } else {
-        setIsRequired((Boolean)value);
+        setIsRequired((java.lang.Boolean)value);
       }
       break;
 
@@ -705,7 +675,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
       if (value == null) {
         unsetRequiredToAddedToCommandLine();
       } else {
-        setRequiredToAddedToCommandLine((Boolean)value);
+        setRequiredToAddedToCommandLine((java.lang.Boolean)value);
       }
       break;
 
@@ -713,7 +683,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
       if (value == null) {
         unsetDataStaged();
       } else {
-        setDataStaged((Boolean)value);
+        setDataStaged((java.lang.Boolean)value);
       }
       break;
 
@@ -721,7 +691,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
       if (value == null) {
         unsetStorageResourceId();
       } else {
-        setStorageResourceId((String)value);
+        setStorageResourceId((java.lang.String)value);
       }
       break;
 
@@ -729,14 +699,14 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
       if (value == null) {
         unsetIsReadOnly();
       } else {
-        setIsReadOnly((Boolean)value);
+        setIsReadOnly((java.lang.Boolean)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAME:
       return getName();
@@ -778,13 +748,13 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
       return isIsReadOnly();
 
     }
-    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) {
@@ -815,11 +785,11 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
     case IS_READ_ONLY:
       return isSetIsReadOnly();
     }
-    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 InputDataObjectType)
@@ -830,6 +800,8 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
   public boolean equals(InputDataObjectType 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();
@@ -953,74 +925,61 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_name = true && (isSetName());
-    list.add(present_name);
-    if (present_name)
-      list.add(name);
-
-    boolean present_value = true && (isSetValue());
-    list.add(present_value);
-    if (present_value)
-      list.add(value);
-
-    boolean present_type = true && (isSetType());
-    list.add(present_type);
-    if (present_type)
-      list.add(type.getValue());
-
-    boolean present_applicationArgument = true && (isSetApplicationArgument());
-    list.add(present_applicationArgument);
-    if (present_applicationArgument)
-      list.add(applicationArgument);
-
-    boolean present_standardInput = true && (isSetStandardInput());
-    list.add(present_standardInput);
-    if (present_standardInput)
-      list.add(standardInput);
-
-    boolean present_userFriendlyDescription = true && (isSetUserFriendlyDescription());
-    list.add(present_userFriendlyDescription);
-    if (present_userFriendlyDescription)
-      list.add(userFriendlyDescription);
-
-    boolean present_metaData = true && (isSetMetaData());
-    list.add(present_metaData);
-    if (present_metaData)
-      list.add(metaData);
-
-    boolean present_inputOrder = true && (isSetInputOrder());
-    list.add(present_inputOrder);
-    if (present_inputOrder)
-      list.add(inputOrder);
-
-    boolean present_isRequired = true && (isSetIsRequired());
-    list.add(present_isRequired);
-    if (present_isRequired)
-      list.add(isRequired);
-
-    boolean present_requiredToAddedToCommandLine = true && (isSetRequiredToAddedToCommandLine());
-    list.add(present_requiredToAddedToCommandLine);
-    if (present_requiredToAddedToCommandLine)
-      list.add(requiredToAddedToCommandLine);
-
-    boolean present_dataStaged = true && (isSetDataStaged());
-    list.add(present_dataStaged);
-    if (present_dataStaged)
-      list.add(dataStaged);
-
-    boolean present_storageResourceId = true && (isSetStorageResourceId());
-    list.add(present_storageResourceId);
-    if (present_storageResourceId)
-      list.add(storageResourceId);
-
-    boolean present_isReadOnly = true && (isSetIsReadOnly());
-    list.add(present_isReadOnly);
-    if (present_isReadOnly)
-      list.add(isReadOnly);
-
-    return list.hashCode();
+    int hashCode = 1;
+
+    hashCode = hashCode * 8191 + ((isSetName()) ? 131071 : 524287);
+    if (isSetName())
+      hashCode = hashCode * 8191 + name.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetValue()) ? 131071 : 524287);
+    if (isSetValue())
+      hashCode = hashCode * 8191 + value.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetType()) ? 131071 : 524287);
+    if (isSetType())
+      hashCode = hashCode * 8191 + type.getValue();
+
+    hashCode = hashCode * 8191 + ((isSetApplicationArgument()) ? 131071 : 524287);
+    if (isSetApplicationArgument())
+      hashCode = hashCode * 8191 + applicationArgument.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetStandardInput()) ? 131071 : 524287);
+    if (isSetStandardInput())
+      hashCode = hashCode * 8191 + ((standardInput) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isSetUserFriendlyDescription()) ? 131071 : 524287);
+    if (isSetUserFriendlyDescription())
+      hashCode = hashCode * 8191 + userFriendlyDescription.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetMetaData()) ? 131071 : 524287);
+    if (isSetMetaData())
+      hashCode = hashCode * 8191 + metaData.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetInputOrder()) ? 131071 : 524287);
+    if (isSetInputOrder())
+      hashCode = hashCode * 8191 + inputOrder;
+
+    hashCode = hashCode * 8191 + ((isSetIsRequired()) ? 131071 : 524287);
+    if (isSetIsRequired())
+      hashCode = hashCode * 8191 + ((isRequired) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isSetRequiredToAddedToCommandLine()) ? 131071 : 524287);
+    if (isSetRequiredToAddedToCommandLine())
+      hashCode = hashCode * 8191 + ((requiredToAddedToCommandLine) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isSetDataStaged()) ? 131071 : 524287);
+    if (isSetDataStaged())
+      hashCode = hashCode * 8191 + ((dataStaged) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isSetStorageResourceId()) ? 131071 : 524287);
+    if (isSetStorageResourceId())
+      hashCode = hashCode * 8191 + storageResourceId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetIsReadOnly()) ? 131071 : 524287);
+    if (isSetIsReadOnly())
+      hashCode = hashCode * 8191 + ((isReadOnly) ? 131071 : 524287);
+
+    return hashCode;
   }
 
   @Override
@@ -1031,7 +990,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
+    lastComparison = java.lang.Boolean.valueOf(isSetName()).compareTo(other.isSetName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1041,7 +1000,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
+    lastComparison = java.lang.Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1051,7 +1010,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetType()).compareTo(other.isSetType());
+    lastComparison = java.lang.Boolean.valueOf(isSetType()).compareTo(other.isSetType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1061,7 +1020,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetApplicationArgument()).compareTo(other.isSetApplicationArgument());
+    lastComparison = java.lang.Boolean.valueOf(isSetApplicationArgument()).compareTo(other.isSetApplicationArgument());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1071,7 +1030,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStandardInput()).compareTo(other.isSetStandardInput());
+    lastComparison = java.lang.Boolean.valueOf(isSetStandardInput()).compareTo(other.isSetStandardInput());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1081,7 +1040,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUserFriendlyDescription()).compareTo(other.isSetUserFriendlyDescription());
+    lastComparison = java.lang.Boolean.valueOf(isSetUserFriendlyDescription()).compareTo(other.isSetUserFriendlyDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1091,7 +1050,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMetaData()).compareTo(other.isSetMetaData());
+    lastComparison = java.lang.Boolean.valueOf(isSetMetaData()).compareTo(other.isSetMetaData());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1101,7 +1060,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetInputOrder()).compareTo(other.isSetInputOrder());
+    lastComparison = java.lang.Boolean.valueOf(isSetInputOrder()).compareTo(other.isSetInputOrder());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1111,7 +1070,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIsRequired()).compareTo(other.isSetIsRequired());
+    lastComparison = java.lang.Boolean.valueOf(isSetIsRequired()).compareTo(other.isSetIsRequired());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1121,7 +1080,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRequiredToAddedToCommandLine()).compareTo(other.isSetRequiredToAddedToCommandLine());
+    lastComparison = java.lang.Boolean.valueOf(isSetRequiredToAddedToCommandLine()).compareTo(other.isSetRequiredToAddedToCommandLine());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1131,7 +1090,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDataStaged()).compareTo(other.isSetDataStaged());
+    lastComparison = java.lang.Boolean.valueOf(isSetDataStaged()).compareTo(other.isSetDataStaged());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1141,7 +1100,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStorageResourceId()).compareTo(other.isSetStorageResourceId());
+    lastComparison = java.lang.Boolean.valueOf(isSetStorageResourceId()).compareTo(other.isSetStorageResourceId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1151,7 +1110,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIsReadOnly()).compareTo(other.isSetIsReadOnly());
+    lastComparison = java.lang.Boolean.valueOf(isSetIsReadOnly()).compareTo(other.isSetIsReadOnly());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1169,16 +1128,16 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
   }
 
   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("InputDataObjectType(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("InputDataObjectType(");
     boolean first = true;
 
     sb.append("name:");
@@ -1305,7 +1264,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
     }
   }
 
-  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;
@@ -1315,13 +1274,13 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
     }
   }
 
-  private static class InputDataObjectTypeStandardSchemeFactory implements SchemeFactory {
+  private static class InputDataObjectTypeStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public InputDataObjectTypeStandardScheme getScheme() {
       return new InputDataObjectTypeStandardScheme();
     }
   }
 
-  private static class InputDataObjectTypeStandardScheme extends StandardScheme<InputDataObjectType> {
+  private static class InputDataObjectTypeStandardScheme extends org.apache.thrift.scheme.StandardScheme<InputDataObjectType> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, InputDataObjectType struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -1533,19 +1492,19 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
 
   }
 
-  private static class InputDataObjectTypeTupleSchemeFactory implements SchemeFactory {
+  private static class InputDataObjectTypeTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public InputDataObjectTypeTupleScheme getScheme() {
       return new InputDataObjectTypeTupleScheme();
     }
   }
 
-  private static class InputDataObjectTypeTupleScheme extends TupleScheme<InputDataObjectType> {
+  private static class InputDataObjectTypeTupleScheme extends org.apache.thrift.scheme.TupleScheme<InputDataObjectType> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, InputDataObjectType 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);
-      BitSet optionals = new BitSet();
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetValue()) {
         optionals.set(0);
       }
@@ -1623,10 +1582,10 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, InputDataObjectType 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);
-      BitSet incoming = iprot.readBitSet(12);
+      java.util.BitSet incoming = iprot.readBitSet(12);
       if (incoming.get(0)) {
         struct.value = iprot.readString();
         struct.setValueIsSet(true);
@@ -1678,5 +1637,8 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/8e775660/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
index 19df1e3..1c24ed1 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.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.application.io;
 
-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 Outputs. The paramters describe how outputs generated by the application.
  * 
@@ -77,7 +50,7 @@ import org.slf4j.LoggerFactory;
  *   Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
 public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataObjectType, OutputDataObjectType._Fields>, java.io.Serializable, Cloneable, Comparable<OutputDataObjectType> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OutputDataObjectType");
 
@@ -93,23 +66,20 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
   private static final org.apache.thrift.protocol.TField OUTPUT_STREAMING_FIELD_DESC = new org.apache.thrift.protocol.TField("outputStreaming", org.apache.thrift.protocol.TType.BOOL, (short)10);
   private static final org.apache.thrift.protocol.TField STORAGE_RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("storageResourceId", org.apache.thrift.protocol.TType.STRING, (short)11);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new OutputDataObjectTypeStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new OutputDataObjectTypeTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new OutputDataObjectTypeStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new OutputDataObjectTypeTupleSchemeFactory();
 
-  private String name; // required
-  private String value; // optional
+  private java.lang.String name; // required
+  private java.lang.String value; // optional
   private DataType type; // optional
-  private String applicationArgument; // optional
+  private java.lang.String applicationArgument; // optional
   private boolean isRequired; // optional
   private boolean requiredToAddedToCommandLine; // optional
   private boolean dataMovement; // optional
-  private String location; // optional
-  private String searchQuery; // optional
+  private java.lang.String location; // optional
+  private java.lang.String searchQuery; // optional
   private boolean outputStreaming; // optional
-  private String storageResourceId; // optional
+  private java.lang.String storageResourceId; // 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 {
@@ -129,10 +99,10 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
     OUTPUT_STREAMING((short)10, "outputStreaming"),
     STORAGE_RESOURCE_ID((short)11, "storageResourceId");
 
-    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);
       }
     }
@@ -175,21 +145,21 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
      */
     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;
     }
@@ -198,7 +168,7 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -210,9 +180,9 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
   private static final int __OUTPUTSTREAMING_ISSET_ID = 3;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.VALUE,_Fields.TYPE,_Fields.APPLICATION_ARGUMENT,_Fields.IS_REQUIRED,_Fields.REQUIRED_TO_ADDED_TO_COMMAND_LINE,_Fields.DATA_MOVEMENT,_Fields.LOCATION,_Fields.SEARCH_QUERY,_Fields.OUTPUT_STREAMING,_Fields.STORAGE_RESOURCE_ID};
-  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.OPTIONAL, 
@@ -235,7 +205,7 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     tmpMap.put(_Fields.STORAGE_RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("storageResourceId", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(OutputDataObjectType.class, metaDataMap);
   }
 
@@ -243,7 +213,7 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
   }
 
   public OutputDataObjectType(
-    String name)
+    java.lang.String name)
   {
     this();
     this.name = name;
@@ -304,11 +274,11 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
     this.storageResourceId = null;
   }
 
-  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;
   }
 
@@ -327,11 +297,11 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
     }
   }
 
-  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;
   }
 
@@ -381,11 +351,11 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
     }
   }
 
-  public String getApplicationArgument() {
+  public java.lang.String getApplicationArgument() {
     return this.applicationArgument;
   }
 
-  public void setApplicationArgument(String applicationArgument) {
+  public void setApplicationArgument(java.lang.String applicationArgument) {
     this.applicationArgument = applicationArgument;
   }
 
@@ -414,16 +384,16 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
   }
 
   public void unsetIsRequired() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISREQUIRED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISREQUIRED_ISSET_ID);
   }
 
   /** Returns true if field isRequired is set (has been assigned a value) and false otherwise */
   public boolean isSetIsRequired() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISREQUIRED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISREQUIRED_ISSET_ID);
   }
 
   public void setIsRequiredIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISREQUIRED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISREQUIRED_ISSET_ID, value);
   }
 
   public boolean isRequiredToAddedToCommandLine() {
@@ -436,16 +406,16 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
   }
 
   public void unsetRequiredToAddedToCommandLine() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __REQUIREDTOADDEDTOCOMMANDLINE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUIREDTOADDEDTOCOMMANDLINE_ISSET_ID);
   }
 
   /** Returns true if field requiredToAddedToCommandLine is set (has been assigned a value) and false otherwise */
   public boolean isSetRequiredToAddedToCommandLine() {
-    return EncodingUtils.testBit(__isset_bitfield, __REQUIREDTOADDEDTOCOMMANDLINE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUIREDTOADDEDTOCOMMANDLINE_ISSET_ID);
   }
 
   public void setRequiredToAddedToCommandLineIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __REQUIREDTOADDEDTOCOMMANDLINE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUIREDTOADDEDTOCOMMANDLINE_ISSET_ID, value);
   }
 
   public boolean isDataMovement() {
@@ -458,23 +428,23 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
   }
 
   public void unsetDataMovement() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __DATAMOVEMENT_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __DATAMOVEMENT_ISSET_ID);
   }
 
   /** Returns true if field dataMovement is set (has been assigned a value) and false otherwise */
   public boolean isSetDataMovement() {
-    return EncodingUtils.testBit(__isset_bitfield, __DATAMOVEMENT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __DATAMOVEMENT_ISSET_ID);
   }
 
   public void setDataMovementIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DATAMOVEMENT_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __DATAMOVEMENT_ISSET_ID, value);
   }
 
-  public String getLocation() {
+  public java.lang.String getLocation() {
     return this.location;
   }
 
-  public void setLocation(String location) {
+  public void setLocation(java.lang.String location) {
     this.location = location;
   }
 
@@ -493,11 +463,11 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
     }
   }
 
-  public String getSearchQuery() {
+  public java.lang.String getSearchQuery() {
     return this.searchQuery;
   }
 
-  public void setSearchQuery(String searchQuery) {
+  public void setSearchQuery(java.lang.String searchQuery) {
     this.searchQuery = searchQuery;
   }
 
@@ -526,23 +496,23 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
   }
 
   public void unsetOutputStreaming() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __OUTPUTSTREAMING_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __OUTPUTSTREAMING_ISSET_ID);
   }
 
   /** Returns true if field outputStreaming is set (has been assigned a value) and false otherwise */
   public boolean isSetOutputStreaming() {
-    return EncodingUtils.testBit(__isset_bitfield, __OUTPUTSTREAMING_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __OUTPUTSTREAMING_ISSET_ID);
   }
 
   public void setOutputStreamingIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __OUTPUTSTREAMING_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __OUTPUTSTREAMING_ISSET_ID, value);
   }
 
-  public String getStorageResourceId() {
+  public java.lang.String getStorageResourceId() {
     return this.storageResourceId;
   }
 
-  public void setStorageResourceId(String storageResourceId) {
+  public void setStorageResourceId(java.lang.String storageResourceId) {
     this.storageResourceId = storageResourceId;
   }
 
@@ -561,13 +531,13 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
     }
   }
 
-  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;
 
@@ -575,7 +545,7 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
       if (value == null) {
         unsetValue();
       } else {
-        setValue((String)value);
+        setValue((java.lang.String)value);
       }
       break;
 
@@ -591,7 +561,7 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
       if (value == null) {
         unsetApplicationArgument();
       } else {
-        setApplicationArgument((String)value);
+        setApplicationArgument((java.lang.String)value);
       }
       break;
 
@@ -599,7 +569,7 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
       if (value == null) {
         unsetIsRequired();
       } else {
-        setIsRequired((Boolean)value);
+        setIsRequired((java.lang.Boolean)value);
       }
       break;
 
@@ -607,7 +577,7 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
       if (value == null) {
         unsetRequiredToAddedToCommandLine();
       } else {
-        setRequiredToAddedToCommandLine((Boolean)value);
+        setRequiredToAddedToCommandLine((java.lang.Boolean)value);
       }
       break;
 
@@ -615,7 +585,7 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
       if (value == null) {
         unsetDataMovement();
       } else {
-        setDataMovement((Boolean)value);
+        setDataMovement((java.lang.Boolean)value);
       }
       break;
 
@@ -623,7 +593,7 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
       if (value == null) {
         unsetLocation();
       } else {
-        setLocation((String)value);
+        setLocation((java.lang.String)value);
       }
       break;
 
@@ -631,7 +601,7 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
       if (value == null) {
         unsetSearchQuery();
       } else {
-        setSearchQuery((String)value);
+        setSearchQuery((java.lang.String)value);
       }
       break;
 
@@ -639,7 +609,7 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
       if (value == null) {
         unsetOutputStreaming();
       } else {
-        setOutputStreaming((Boolean)value);
+        setOutputStreaming((java.lang.Boolean)value);
       }
       break;
 
@@ -647,14 +617,14 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
       if (value == null) {
         unsetStorageResourceId();
       } else {
-        setStorageResourceId((String)value);
+        setStorageResourceId((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NAME:
       return getName();
@@ -690,13 +660,13 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
       return getStorageResourceId();
 
     }
-    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) {
@@ -723,11 +693,11 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
     case STORAGE_RESOURCE_ID:
       return isSetStorageResourceId();
     }
-    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 OutputDataObjectType)
@@ -738,6 +708,8 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
   public boolean equals(OutputDataObjectType 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();
@@ -843,64 +815,53 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_name = true && (isSetName());
-    list.add(present_name);
-    if (present_name)
-      list.add(name);
-
-    boolean present_value = true && (isSetValue());
-    list.add(present_value);
-    if (present_value)
-      list.add(value);
-
-    boolean present_type = true && (isSetType());
-    list.add(present_type);
-    if (present_type)
-      list.add(type.getValue());
-
-    boolean present_applicationArgument = true && (isSetApplicationArgument());
-    list.add(present_applicationArgument);
-    if (present_applicationArgument)
-      list.add(applicationArgument);
-
-    boolean present_isRequired = true && (isSetIsRequired());
-    list.add(present_isRequired);
-    if (present_isRequired)
-      list.add(isRequired);
-
-    boolean present_requiredToAddedToCommandLine = true && (isSetRequiredToAddedToCommandLine());
-    list.add(present_requiredToAddedToCommandLine);
-    if (present_requiredToAddedToCommandLine)
-      list.add(requiredToAddedToCommandLine);
-
-    boolean present_dataMovement = true && (isSetDataMovement());
-    list.add(present_dataMovement);
-    if (present_dataMovement)
-      list.add(dataMovement);
-
-    boolean present_location = true && (isSetLocation());
-    list.add(present_location);
-    if (present_location)
-      list.add(location);
-
-    boolean present_searchQuery = true && (isSetSearchQuery());
-    list.add(present_searchQuery);
-    if (present_searchQuery)
-      list.add(searchQuery);
-
-    boolean present_outputStreaming = true && (isSetOutputStreaming());
-    list.add(present_outputStreaming);
-    if (present_outputStreaming)
-      list.add(outputStreaming);
-
-    boolean present_storageResourceId = true && (isSetStorageResourceId());
-    list.add(present_storageResourceId);
-    if (present_storageResourceId)
-      list.add(storageResourceId);
-
-    return list.hashCode();
+    int hashCode = 1;
+
+    hashCode = hashCode * 8191 + ((isSetName()) ? 131071 : 524287);
+    if (isSetName())
+      hashCode = hashCode * 8191 + name.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetValue()) ? 131071 : 524287);
+    if (isSetValue())
+      hashCode = hashCode * 8191 + value.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetType()) ? 131071 : 524287);
+    if (isSetType())
+      hashCode = hashCode * 8191 + type.getValue();
+
+    hashCode = hashCode * 8191 + ((isSetApplicationArgument()) ? 131071 : 524287);
+    if (isSetApplicationArgument())
+      hashCode = hashCode * 8191 + applicationArgument.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetIsRequired()) ? 131071 : 524287);
+    if (isSetIsRequired())
+      hashCode = hashCode * 8191 + ((isRequired) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isSetRequiredToAddedToCommandLine()) ? 131071 : 524287);
+    if (isSetRequiredToAddedToCommandLine())
+      hashCode = hashCode * 8191 + ((requiredToAddedToCommandLine) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isSetDataMovement()) ? 131071 : 524287);
+    if (isSetDataMovement())
+      hashCode = hashCode * 8191 + ((dataMovement) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isSetLocation()) ? 131071 : 524287);
+    if (isSetLocation())
+      hashCode = hashCode * 8191 + location.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetSearchQuery()) ? 131071 : 524287);
+    if (isSetSearchQuery())
+      hashCode = hashCode * 8191 + searchQuery.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetOutputStreaming()) ? 131071 : 524287);
+    if (isSetOutputStreaming())
+      hashCode = hashCode * 8191 + ((outputStreaming) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isSetStorageResourceId()) ? 131071 : 524287);
+    if (isSetStorageResourceId())
+      hashCode = hashCode * 8191 + storageResourceId.hashCode();
+
+    return hashCode;
   }
 
   @Override
@@ -911,7 +872,7 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
+    lastComparison = java.lang.Boolean.valueOf(isSetName()).compareTo(other.isSetName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -921,7 +882,7 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
+    lastComparison = java.lang.Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -931,7 +892,7 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetType()).compareTo(other.isSetType());
+    lastComparison = java.lang.Boolean.valueOf(isSetType()).compareTo(other.isSetType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -941,7 +902,7 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetApplicationArgument()).compareTo(other.isSetApplicationArgument());
+    lastComparison = java.lang.Boolean.valueOf(isSetApplicationArgument()).compareTo(other.isSetApplicationArgument());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -951,7 +912,7 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIsRequired()).compareTo(other.isSetIsRequired());
+    lastComparison = java.lang.Boolean.valueOf(isSetIsRequired()).compareTo(other.isSetIsRequired());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -961,7 +922,7 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRequiredToAddedToCommandLine()).compareTo(other.isSetRequiredToAddedToCommandLine());
+    lastComparison = java.lang.Boolean.valueOf(isSetRequiredToAddedToCommandLine()).compareTo(other.isSetRequiredToAddedToCommandLine());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -971,7 +932,7 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDataMovement()).compareTo(other.isSetDataMovement());
+    lastComparison = java.lang.Boolean.valueOf(isSetDataMovement()).compareTo(other.isSetDataMovement());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -981,7 +942,7 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLocation()).compareTo(other.isSetLocation());
+    lastComparison = java.lang.Boolean.valueOf(isSetLocation()).compareTo(other.isSetLocation());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -991,7 +952,7 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSearchQuery()).compareTo(other.isSetSearchQuery());
+    lastComparison = java.lang.Boolean.valueOf(isSetSearchQuery()).compareTo(other.isSetSearchQuery());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1001,7 +962,7 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOutputStreaming()).compareTo(other.isSetOutputStreaming());
+    lastComparison = java.lang.Boolean.valueOf(isSetOutputStreaming()).compareTo(other.isSetOutputStreaming());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1011,7 +972,7 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStorageResourceId()).compareTo(other.isSetStorageResourceId());
+    lastComparison = java.lang.Boolean.valueOf(isSetStorageResourceId()).compareTo(other.isSetStorageResourceId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1029,16 +990,16 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
   }
 
   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("OutputDataObjectType(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("OutputDataObjectType(");
     boolean first = true;
 
     sb.append("name:");
@@ -1153,7 +1114,7 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
     }
   }
 
-  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;
@@ -1163,13 +1124,13 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
     }
   }
 
-  private static class OutputDataObjectTypeStandardSchemeFactory implements SchemeFactory {
+  private static class OutputDataObjectTypeStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public OutputDataObjectTypeStandardScheme getScheme() {
       return new OutputDataObjectTypeStandardScheme();
     }
   }
 
-  private static class OutputDataObjectTypeStandardScheme extends StandardScheme<OutputDataObjectType> {
+  private static class OutputDataObjectTypeStandardScheme extends org.apache.thrift.scheme.StandardScheme<OutputDataObjectType> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, OutputDataObjectType struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -1355,19 +1316,19 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
 
   }
 
-  private static class OutputDataObjectTypeTupleSchemeFactory implements SchemeFactory {
+  private static class OutputDataObjectTypeTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public OutputDataObjectTypeTupleScheme getScheme() {
       return new OutputDataObjectTypeTupleScheme();
     }
   }
 
-  private static class OutputDataObjectTypeTupleScheme extends TupleScheme<OutputDataObjectType> {
+  private static class OutputDataObjectTypeTupleScheme extends org.apache.thrift.scheme.TupleScheme<OutputDataObjectType> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, OutputDataObjectType 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);
-      BitSet optionals = new BitSet();
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetValue()) {
         optionals.set(0);
       }
@@ -1433,10 +1394,10 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, OutputDataObjectType 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);
-      BitSet incoming = iprot.readBitSet(10);
+      java.util.BitSet incoming = iprot.readBitSet(10);
       if (incoming.get(0)) {
         struct.value = iprot.readString();
         struct.setValueIsSet(true);
@@ -1480,5 +1441,8 @@ public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataO
     }
   }
 
+  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();
+  }
 }