airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [19/51] [abbrv] [partial] airavata git commit: AIRAVATA-2505 Upgrade Airavata to Thrift 0.10.0
Date Mon, 07 Aug 2017 14:00:55 GMT
http://git-wip-us.apache.org/repos/asf/airavata/blob/14ff0916/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
index 70b7644..331935a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
@@ -16,42 +16,15 @@
  */
 
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.airavata.model.appcatalog.computeresource;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
 public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSubmission, GlobusJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<GlobusJobSubmission> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GlobusJobSubmission");
 
@@ -59,15 +32,12 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
   private static final org.apache.thrift.protocol.TField SECURITY_PROTOCOL_FIELD_DESC = new org.apache.thrift.protocol.TField("securityProtocol", org.apache.thrift.protocol.TType.I32, (short)2);
   private static final org.apache.thrift.protocol.TField GLOBUS_GATE_KEEPER_END_POINT_FIELD_DESC = new org.apache.thrift.protocol.TField("globusGateKeeperEndPoint", org.apache.thrift.protocol.TType.LIST, (short)3);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new GlobusJobSubmissionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new GlobusJobSubmissionTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new GlobusJobSubmissionStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new GlobusJobSubmissionTupleSchemeFactory();
 
-  private String jobSubmissionInterfaceId; // required
+  private java.lang.String jobSubmissionInterfaceId; // required
   private org.apache.airavata.model.data.movement.SecurityProtocol securityProtocol; // required
-  private List<String> globusGateKeeperEndPoint; // optional
+  private java.util.List<java.lang.String> globusGateKeeperEndPoint; // 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 {
@@ -79,10 +49,10 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
     SECURITY_PROTOCOL((short)2, "securityProtocol"),
     GLOBUS_GATE_KEEPER_END_POINT((short)3, "globusGateKeeperEndPoint");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -109,21 +79,21 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -132,16 +102,16 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
   private static final _Fields optionals[] = {_Fields.GLOBUS_GATE_KEEPER_END_POINT};
-  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.JOB_SUBMISSION_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("jobSubmissionInterfaceId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.SECURITY_PROTOCOL, new org.apache.thrift.meta_data.FieldMetaData("securityProtocol", org.apache.thrift.TFieldRequirementType.REQUIRED, 
@@ -149,7 +119,7 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
     tmpMap.put(_Fields.GLOBUS_GATE_KEEPER_END_POINT, new org.apache.thrift.meta_data.FieldMetaData("globusGateKeeperEndPoint", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             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(GlobusJobSubmission.class, metaDataMap);
   }
 
@@ -159,7 +129,7 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
   }
 
   public GlobusJobSubmission(
-    String jobSubmissionInterfaceId,
+    java.lang.String jobSubmissionInterfaceId,
     org.apache.airavata.model.data.movement.SecurityProtocol securityProtocol)
   {
     this();
@@ -178,7 +148,7 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
       this.securityProtocol = other.securityProtocol;
     }
     if (other.isSetGlobusGateKeeperEndPoint()) {
-      List<String> __this__globusGateKeeperEndPoint = new ArrayList<String>(other.globusGateKeeperEndPoint);
+      java.util.List<java.lang.String> __this__globusGateKeeperEndPoint = new java.util.ArrayList<java.lang.String>(other.globusGateKeeperEndPoint);
       this.globusGateKeeperEndPoint = __this__globusGateKeeperEndPoint;
     }
   }
@@ -195,11 +165,11 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
     this.globusGateKeeperEndPoint = null;
   }
 
-  public String getJobSubmissionInterfaceId() {
+  public java.lang.String getJobSubmissionInterfaceId() {
     return this.jobSubmissionInterfaceId;
   }
 
-  public void setJobSubmissionInterfaceId(String jobSubmissionInterfaceId) {
+  public void setJobSubmissionInterfaceId(java.lang.String jobSubmissionInterfaceId) {
     this.jobSubmissionInterfaceId = jobSubmissionInterfaceId;
   }
 
@@ -253,22 +223,22 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
     return (this.globusGateKeeperEndPoint == null) ? 0 : this.globusGateKeeperEndPoint.size();
   }
 
-  public java.util.Iterator<String> getGlobusGateKeeperEndPointIterator() {
+  public java.util.Iterator<java.lang.String> getGlobusGateKeeperEndPointIterator() {
     return (this.globusGateKeeperEndPoint == null) ? null : this.globusGateKeeperEndPoint.iterator();
   }
 
-  public void addToGlobusGateKeeperEndPoint(String elem) {
+  public void addToGlobusGateKeeperEndPoint(java.lang.String elem) {
     if (this.globusGateKeeperEndPoint == null) {
-      this.globusGateKeeperEndPoint = new ArrayList<String>();
+      this.globusGateKeeperEndPoint = new java.util.ArrayList<java.lang.String>();
     }
     this.globusGateKeeperEndPoint.add(elem);
   }
 
-  public List<String> getGlobusGateKeeperEndPoint() {
+  public java.util.List<java.lang.String> getGlobusGateKeeperEndPoint() {
     return this.globusGateKeeperEndPoint;
   }
 
-  public void setGlobusGateKeeperEndPoint(List<String> globusGateKeeperEndPoint) {
+  public void setGlobusGateKeeperEndPoint(java.util.List<java.lang.String> globusGateKeeperEndPoint) {
     this.globusGateKeeperEndPoint = globusGateKeeperEndPoint;
   }
 
@@ -287,13 +257,13 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case JOB_SUBMISSION_INTERFACE_ID:
       if (value == null) {
         unsetJobSubmissionInterfaceId();
       } else {
-        setJobSubmissionInterfaceId((String)value);
+        setJobSubmissionInterfaceId((java.lang.String)value);
       }
       break;
 
@@ -309,14 +279,14 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
       if (value == null) {
         unsetGlobusGateKeeperEndPoint();
       } else {
-        setGlobusGateKeeperEndPoint((List<String>)value);
+        setGlobusGateKeeperEndPoint((java.util.List<java.lang.String>)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case JOB_SUBMISSION_INTERFACE_ID:
       return getJobSubmissionInterfaceId();
@@ -328,13 +298,13 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
       return getGlobusGateKeeperEndPoint();
 
     }
-    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) {
@@ -345,11 +315,11 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
     case GLOBUS_GATE_KEEPER_END_POINT:
       return isSetGlobusGateKeeperEndPoint();
     }
-    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 GlobusJobSubmission)
@@ -360,6 +330,8 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
   public boolean equals(GlobusJobSubmission that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_jobSubmissionInterfaceId = true && this.isSetJobSubmissionInterfaceId();
     boolean that_present_jobSubmissionInterfaceId = true && that.isSetJobSubmissionInterfaceId();
@@ -393,24 +365,21 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_jobSubmissionInterfaceId = true && (isSetJobSubmissionInterfaceId());
-    list.add(present_jobSubmissionInterfaceId);
-    if (present_jobSubmissionInterfaceId)
-      list.add(jobSubmissionInterfaceId);
+    hashCode = hashCode * 8191 + ((isSetJobSubmissionInterfaceId()) ? 131071 : 524287);
+    if (isSetJobSubmissionInterfaceId())
+      hashCode = hashCode * 8191 + jobSubmissionInterfaceId.hashCode();
 
-    boolean present_securityProtocol = true && (isSetSecurityProtocol());
-    list.add(present_securityProtocol);
-    if (present_securityProtocol)
-      list.add(securityProtocol.getValue());
+    hashCode = hashCode * 8191 + ((isSetSecurityProtocol()) ? 131071 : 524287);
+    if (isSetSecurityProtocol())
+      hashCode = hashCode * 8191 + securityProtocol.getValue();
 
-    boolean present_globusGateKeeperEndPoint = true && (isSetGlobusGateKeeperEndPoint());
-    list.add(present_globusGateKeeperEndPoint);
-    if (present_globusGateKeeperEndPoint)
-      list.add(globusGateKeeperEndPoint);
+    hashCode = hashCode * 8191 + ((isSetGlobusGateKeeperEndPoint()) ? 131071 : 524287);
+    if (isSetGlobusGateKeeperEndPoint())
+      hashCode = hashCode * 8191 + globusGateKeeperEndPoint.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -421,7 +390,7 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetJobSubmissionInterfaceId()).compareTo(other.isSetJobSubmissionInterfaceId());
+    lastComparison = java.lang.Boolean.valueOf(isSetJobSubmissionInterfaceId()).compareTo(other.isSetJobSubmissionInterfaceId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -431,7 +400,7 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSecurityProtocol()).compareTo(other.isSetSecurityProtocol());
+    lastComparison = java.lang.Boolean.valueOf(isSetSecurityProtocol()).compareTo(other.isSetSecurityProtocol());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -441,7 +410,7 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetGlobusGateKeeperEndPoint()).compareTo(other.isSetGlobusGateKeeperEndPoint());
+    lastComparison = java.lang.Boolean.valueOf(isSetGlobusGateKeeperEndPoint()).compareTo(other.isSetGlobusGateKeeperEndPoint());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -459,16 +428,16 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
   }
 
   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("GlobusJobSubmission(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("GlobusJobSubmission(");
     boolean first = true;
 
     sb.append("jobSubmissionInterfaceId:");
@@ -521,7 +490,7 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -529,13 +498,13 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
     }
   }
 
-  private static class GlobusJobSubmissionStandardSchemeFactory implements SchemeFactory {
+  private static class GlobusJobSubmissionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public GlobusJobSubmissionStandardScheme getScheme() {
       return new GlobusJobSubmissionStandardScheme();
     }
   }
 
-  private static class GlobusJobSubmissionStandardScheme extends StandardScheme<GlobusJobSubmission> {
+  private static class GlobusJobSubmissionStandardScheme extends org.apache.thrift.scheme.StandardScheme<GlobusJobSubmission> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, GlobusJobSubmission struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -567,8 +536,8 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list28 = iprot.readListBegin();
-                struct.globusGateKeeperEndPoint = new ArrayList<String>(_list28.size);
-                String _elem29;
+                struct.globusGateKeeperEndPoint = new java.util.ArrayList<java.lang.String>(_list28.size);
+                java.lang.String _elem29;
                 for (int _i30 = 0; _i30 < _list28.size; ++_i30)
                 {
                   _elem29 = iprot.readString();
@@ -609,7 +578,7 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
           oprot.writeFieldBegin(GLOBUS_GATE_KEEPER_END_POINT_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.globusGateKeeperEndPoint.size()));
-            for (String _iter31 : struct.globusGateKeeperEndPoint)
+            for (java.lang.String _iter31 : struct.globusGateKeeperEndPoint)
             {
               oprot.writeString(_iter31);
             }
@@ -624,20 +593,20 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
 
   }
 
-  private static class GlobusJobSubmissionTupleSchemeFactory implements SchemeFactory {
+  private static class GlobusJobSubmissionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public GlobusJobSubmissionTupleScheme getScheme() {
       return new GlobusJobSubmissionTupleScheme();
     }
   }
 
-  private static class GlobusJobSubmissionTupleScheme extends TupleScheme<GlobusJobSubmission> {
+  private static class GlobusJobSubmissionTupleScheme extends org.apache.thrift.scheme.TupleScheme<GlobusJobSubmission> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, GlobusJobSubmission 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.jobSubmissionInterfaceId);
       oprot.writeI32(struct.securityProtocol.getValue());
-      BitSet optionals = new BitSet();
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetGlobusGateKeeperEndPoint()) {
         optionals.set(0);
       }
@@ -645,7 +614,7 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
       if (struct.isSetGlobusGateKeeperEndPoint()) {
         {
           oprot.writeI32(struct.globusGateKeeperEndPoint.size());
-          for (String _iter32 : struct.globusGateKeeperEndPoint)
+          for (java.lang.String _iter32 : struct.globusGateKeeperEndPoint)
           {
             oprot.writeString(_iter32);
           }
@@ -655,17 +624,17 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, GlobusJobSubmission struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       struct.jobSubmissionInterfaceId = iprot.readString();
       struct.setJobSubmissionInterfaceIdIsSet(true);
       struct.securityProtocol = org.apache.airavata.model.data.movement.SecurityProtocol.findByValue(iprot.readI32());
       struct.setSecurityProtocolIsSet(true);
-      BitSet incoming = iprot.readBitSet(1);
+      java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         {
           org.apache.thrift.protocol.TList _list33 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.globusGateKeeperEndPoint = new ArrayList<String>(_list33.size);
-          String _elem34;
+          struct.globusGateKeeperEndPoint = new java.util.ArrayList<java.lang.String>(_list33.size);
+          java.lang.String _elem34;
           for (int _i35 = 0; _i35 < _list33.size; ++_i35)
           {
             _elem34 = iprot.readString();
@@ -677,5 +646,8 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
     }
   }
 
+  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/14ff0916/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobManagerCommand.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobManagerCommand.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobManagerCommand.java
index 673da16..ccb208a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobManagerCommand.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobManagerCommand.java
@@ -16,7 +16,7 @@
  */
 
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

http://git-wip-us.apache.org/repos/asf/airavata/blob/14ff0916/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
index b83cc4e..30c6183 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
@@ -16,41 +16,14 @@
  */
 
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.airavata.model.appcatalog.computeresource;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 /**
  * Job Submission Interfaces
  * 
@@ -61,7 +34,7 @@ import org.slf4j.LoggerFactory;
  *   Lower the numerical number, higher the priority
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
 public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmissionInterface, JobSubmissionInterface._Fields>, java.io.Serializable, Cloneable, Comparable<JobSubmissionInterface> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobSubmissionInterface");
 
@@ -69,13 +42,10 @@ public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmis
   private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_PROTOCOL_FIELD_DESC = new org.apache.thrift.protocol.TField("jobSubmissionProtocol", org.apache.thrift.protocol.TType.I32, (short)2);
   private static final org.apache.thrift.protocol.TField PRIORITY_ORDER_FIELD_DESC = new org.apache.thrift.protocol.TField("priorityOrder", org.apache.thrift.protocol.TType.I32, (short)3);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new JobSubmissionInterfaceStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new JobSubmissionInterfaceTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new JobSubmissionInterfaceStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new JobSubmissionInterfaceTupleSchemeFactory();
 
-  private String jobSubmissionInterfaceId; // required
+  private java.lang.String jobSubmissionInterfaceId; // required
   private JobSubmissionProtocol jobSubmissionProtocol; // required
   private int priorityOrder; // required
 
@@ -89,10 +59,10 @@ public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmis
     JOB_SUBMISSION_PROTOCOL((short)2, "jobSubmissionProtocol"),
     PRIORITY_ORDER((short)3, "priorityOrder");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -119,21 +89,21 @@ public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmis
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -142,7 +112,7 @@ public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmis
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -150,16 +120,16 @@ public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmis
   // isset id assignments
   private static final int __PRIORITYORDER_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.JOB_SUBMISSION_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("jobSubmissionInterfaceId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.JOB_SUBMISSION_PROTOCOL, new org.apache.thrift.meta_data.FieldMetaData("jobSubmissionProtocol", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, JobSubmissionProtocol.class)));
     tmpMap.put(_Fields.PRIORITY_ORDER, new org.apache.thrift.meta_data.FieldMetaData("priorityOrder", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(JobSubmissionInterface.class, metaDataMap);
   }
 
@@ -169,7 +139,7 @@ public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmis
   }
 
   public JobSubmissionInterface(
-    String jobSubmissionInterfaceId,
+    java.lang.String jobSubmissionInterfaceId,
     JobSubmissionProtocol jobSubmissionProtocol,
     int priorityOrder)
   {
@@ -206,11 +176,11 @@ public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmis
 
   }
 
-  public String getJobSubmissionInterfaceId() {
+  public java.lang.String getJobSubmissionInterfaceId() {
     return this.jobSubmissionInterfaceId;
   }
 
-  public void setJobSubmissionInterfaceId(String jobSubmissionInterfaceId) {
+  public void setJobSubmissionInterfaceId(java.lang.String jobSubmissionInterfaceId) {
     this.jobSubmissionInterfaceId = jobSubmissionInterfaceId;
   }
 
@@ -270,25 +240,25 @@ public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmis
   }
 
   public void unsetPriorityOrder() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PRIORITYORDER_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PRIORITYORDER_ISSET_ID);
   }
 
   /** Returns true if field priorityOrder is set (has been assigned a value) and false otherwise */
   public boolean isSetPriorityOrder() {
-    return EncodingUtils.testBit(__isset_bitfield, __PRIORITYORDER_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PRIORITYORDER_ISSET_ID);
   }
 
   public void setPriorityOrderIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PRIORITYORDER_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PRIORITYORDER_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case JOB_SUBMISSION_INTERFACE_ID:
       if (value == null) {
         unsetJobSubmissionInterfaceId();
       } else {
-        setJobSubmissionInterfaceId((String)value);
+        setJobSubmissionInterfaceId((java.lang.String)value);
       }
       break;
 
@@ -304,14 +274,14 @@ public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmis
       if (value == null) {
         unsetPriorityOrder();
       } else {
-        setPriorityOrder((Integer)value);
+        setPriorityOrder((java.lang.Integer)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case JOB_SUBMISSION_INTERFACE_ID:
       return getJobSubmissionInterfaceId();
@@ -323,13 +293,13 @@ public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmis
       return getPriorityOrder();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -340,11 +310,11 @@ public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmis
     case PRIORITY_ORDER:
       return isSetPriorityOrder();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof JobSubmissionInterface)
@@ -355,6 +325,8 @@ public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmis
   public boolean equals(JobSubmissionInterface that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_jobSubmissionInterfaceId = true && this.isSetJobSubmissionInterfaceId();
     boolean that_present_jobSubmissionInterfaceId = true && that.isSetJobSubmissionInterfaceId();
@@ -388,24 +360,19 @@ public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmis
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_jobSubmissionInterfaceId = true && (isSetJobSubmissionInterfaceId());
-    list.add(present_jobSubmissionInterfaceId);
-    if (present_jobSubmissionInterfaceId)
-      list.add(jobSubmissionInterfaceId);
+    hashCode = hashCode * 8191 + ((isSetJobSubmissionInterfaceId()) ? 131071 : 524287);
+    if (isSetJobSubmissionInterfaceId())
+      hashCode = hashCode * 8191 + jobSubmissionInterfaceId.hashCode();
 
-    boolean present_jobSubmissionProtocol = true && (isSetJobSubmissionProtocol());
-    list.add(present_jobSubmissionProtocol);
-    if (present_jobSubmissionProtocol)
-      list.add(jobSubmissionProtocol.getValue());
+    hashCode = hashCode * 8191 + ((isSetJobSubmissionProtocol()) ? 131071 : 524287);
+    if (isSetJobSubmissionProtocol())
+      hashCode = hashCode * 8191 + jobSubmissionProtocol.getValue();
 
-    boolean present_priorityOrder = true;
-    list.add(present_priorityOrder);
-    if (present_priorityOrder)
-      list.add(priorityOrder);
+    hashCode = hashCode * 8191 + priorityOrder;
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -416,7 +383,7 @@ public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmis
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetJobSubmissionInterfaceId()).compareTo(other.isSetJobSubmissionInterfaceId());
+    lastComparison = java.lang.Boolean.valueOf(isSetJobSubmissionInterfaceId()).compareTo(other.isSetJobSubmissionInterfaceId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -426,7 +393,7 @@ public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmis
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetJobSubmissionProtocol()).compareTo(other.isSetJobSubmissionProtocol());
+    lastComparison = java.lang.Boolean.valueOf(isSetJobSubmissionProtocol()).compareTo(other.isSetJobSubmissionProtocol());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -436,7 +403,7 @@ public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmis
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPriorityOrder()).compareTo(other.isSetPriorityOrder());
+    lastComparison = java.lang.Boolean.valueOf(isSetPriorityOrder()).compareTo(other.isSetPriorityOrder());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -454,16 +421,16 @@ public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmis
   }
 
   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("JobSubmissionInterface(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("JobSubmissionInterface(");
     boolean first = true;
 
     sb.append("jobSubmissionInterfaceId:");
@@ -514,7 +481,7 @@ public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmis
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -524,13 +491,13 @@ public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmis
     }
   }
 
-  private static class JobSubmissionInterfaceStandardSchemeFactory implements SchemeFactory {
+  private static class JobSubmissionInterfaceStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public JobSubmissionInterfaceStandardScheme getScheme() {
       return new JobSubmissionInterfaceStandardScheme();
     }
   }
 
-  private static class JobSubmissionInterfaceStandardScheme extends StandardScheme<JobSubmissionInterface> {
+  private static class JobSubmissionInterfaceStandardScheme extends org.apache.thrift.scheme.StandardScheme<JobSubmissionInterface> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, JobSubmissionInterface struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -598,17 +565,17 @@ public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmis
 
   }
 
-  private static class JobSubmissionInterfaceTupleSchemeFactory implements SchemeFactory {
+  private static class JobSubmissionInterfaceTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public JobSubmissionInterfaceTupleScheme getScheme() {
       return new JobSubmissionInterfaceTupleScheme();
     }
   }
 
-  private static class JobSubmissionInterfaceTupleScheme extends TupleScheme<JobSubmissionInterface> {
+  private static class JobSubmissionInterfaceTupleScheme extends org.apache.thrift.scheme.TupleScheme<JobSubmissionInterface> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, JobSubmissionInterface 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.jobSubmissionInterfaceId);
       oprot.writeI32(struct.jobSubmissionProtocol.getValue());
       oprot.writeI32(struct.priorityOrder);
@@ -616,7 +583,7 @@ public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmis
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, JobSubmissionInterface struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       struct.jobSubmissionInterfaceId = iprot.readString();
       struct.setJobSubmissionInterfaceIdIsSet(true);
       struct.jobSubmissionProtocol = org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol.findByValue(iprot.readI32());
@@ -626,5 +593,8 @@ public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmis
     }
   }
 
+  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/14ff0916/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionProtocol.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionProtocol.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionProtocol.java
index 7c2d3e2..73f0fd3 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionProtocol.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionProtocol.java
@@ -16,7 +16,7 @@
  */
 
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

http://git-wip-us.apache.org/repos/asf/airavata/blob/14ff0916/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
index 907f427..fe95140 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
@@ -16,41 +16,14 @@
  */
 
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.airavata.model.appcatalog.computeresource;
 
-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"})
 /**
  * Locally Fork Jobs as OS processes
  * 
@@ -60,7 +33,7 @@ import org.slf4j.LoggerFactory;
  * sshPort:
  *  If a non-default port needs to used, specify it.
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
 public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission, LOCALSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALSubmission> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LOCALSubmission");
 
@@ -68,13 +41,10 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission,
   private static final org.apache.thrift.protocol.TField RESOURCE_JOB_MANAGER_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceJobManager", org.apache.thrift.protocol.TType.STRUCT, (short)2);
   private static final org.apache.thrift.protocol.TField SECURITY_PROTOCOL_FIELD_DESC = new org.apache.thrift.protocol.TField("securityProtocol", org.apache.thrift.protocol.TType.I32, (short)3);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new LOCALSubmissionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new LOCALSubmissionTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LOCALSubmissionStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LOCALSubmissionTupleSchemeFactory();
 
-  private String jobSubmissionInterfaceId; // required
+  private java.lang.String jobSubmissionInterfaceId; // required
   private ResourceJobManager resourceJobManager; // required
   private org.apache.airavata.model.data.movement.SecurityProtocol securityProtocol; // required
 
@@ -88,10 +58,10 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission,
      */
     SECURITY_PROTOCOL((short)3, "securityProtocol");
 
-    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);
       }
     }
@@ -118,21 +88,21 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission,
      */
     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;
     }
@@ -141,22 +111,22 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission,
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  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.JOB_SUBMISSION_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("jobSubmissionInterfaceId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.RESOURCE_JOB_MANAGER, new org.apache.thrift.meta_data.FieldMetaData("resourceJobManager", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ResourceJobManager.class)));
     tmpMap.put(_Fields.SECURITY_PROTOCOL, new org.apache.thrift.meta_data.FieldMetaData("securityProtocol", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.data.movement.SecurityProtocol.class)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LOCALSubmission.class, metaDataMap);
   }
 
@@ -166,7 +136,7 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission,
   }
 
   public LOCALSubmission(
-    String jobSubmissionInterfaceId,
+    java.lang.String jobSubmissionInterfaceId,
     ResourceJobManager resourceJobManager,
     org.apache.airavata.model.data.movement.SecurityProtocol securityProtocol)
   {
@@ -203,11 +173,11 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission,
     this.securityProtocol = null;
   }
 
-  public String getJobSubmissionInterfaceId() {
+  public java.lang.String getJobSubmissionInterfaceId() {
     return this.jobSubmissionInterfaceId;
   }
 
-  public void setJobSubmissionInterfaceId(String jobSubmissionInterfaceId) {
+  public void setJobSubmissionInterfaceId(java.lang.String jobSubmissionInterfaceId) {
     this.jobSubmissionInterfaceId = jobSubmissionInterfaceId;
   }
 
@@ -280,13 +250,13 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission,
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case JOB_SUBMISSION_INTERFACE_ID:
       if (value == null) {
         unsetJobSubmissionInterfaceId();
       } else {
-        setJobSubmissionInterfaceId((String)value);
+        setJobSubmissionInterfaceId((java.lang.String)value);
       }
       break;
 
@@ -309,7 +279,7 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission,
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case JOB_SUBMISSION_INTERFACE_ID:
       return getJobSubmissionInterfaceId();
@@ -321,13 +291,13 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission,
       return getSecurityProtocol();
 
     }
-    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) {
@@ -338,11 +308,11 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission,
     case SECURITY_PROTOCOL:
       return isSetSecurityProtocol();
     }
-    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 LOCALSubmission)
@@ -353,6 +323,8 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission,
   public boolean equals(LOCALSubmission that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_jobSubmissionInterfaceId = true && this.isSetJobSubmissionInterfaceId();
     boolean that_present_jobSubmissionInterfaceId = true && that.isSetJobSubmissionInterfaceId();
@@ -386,24 +358,21 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission,
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_jobSubmissionInterfaceId = true && (isSetJobSubmissionInterfaceId());
-    list.add(present_jobSubmissionInterfaceId);
-    if (present_jobSubmissionInterfaceId)
-      list.add(jobSubmissionInterfaceId);
+    hashCode = hashCode * 8191 + ((isSetJobSubmissionInterfaceId()) ? 131071 : 524287);
+    if (isSetJobSubmissionInterfaceId())
+      hashCode = hashCode * 8191 + jobSubmissionInterfaceId.hashCode();
 
-    boolean present_resourceJobManager = true && (isSetResourceJobManager());
-    list.add(present_resourceJobManager);
-    if (present_resourceJobManager)
-      list.add(resourceJobManager);
+    hashCode = hashCode * 8191 + ((isSetResourceJobManager()) ? 131071 : 524287);
+    if (isSetResourceJobManager())
+      hashCode = hashCode * 8191 + resourceJobManager.hashCode();
 
-    boolean present_securityProtocol = true && (isSetSecurityProtocol());
-    list.add(present_securityProtocol);
-    if (present_securityProtocol)
-      list.add(securityProtocol.getValue());
+    hashCode = hashCode * 8191 + ((isSetSecurityProtocol()) ? 131071 : 524287);
+    if (isSetSecurityProtocol())
+      hashCode = hashCode * 8191 + securityProtocol.getValue();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -414,7 +383,7 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission,
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetJobSubmissionInterfaceId()).compareTo(other.isSetJobSubmissionInterfaceId());
+    lastComparison = java.lang.Boolean.valueOf(isSetJobSubmissionInterfaceId()).compareTo(other.isSetJobSubmissionInterfaceId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -424,7 +393,7 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetResourceJobManager()).compareTo(other.isSetResourceJobManager());
+    lastComparison = java.lang.Boolean.valueOf(isSetResourceJobManager()).compareTo(other.isSetResourceJobManager());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -434,7 +403,7 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSecurityProtocol()).compareTo(other.isSetSecurityProtocol());
+    lastComparison = java.lang.Boolean.valueOf(isSetSecurityProtocol()).compareTo(other.isSetSecurityProtocol());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -452,16 +421,16 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission,
   }
 
   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("LOCALSubmission(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("LOCALSubmission(");
     boolean first = true;
 
     sb.append("jobSubmissionInterfaceId:");
@@ -519,7 +488,7 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission,
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -527,13 +496,13 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission,
     }
   }
 
-  private static class LOCALSubmissionStandardSchemeFactory implements SchemeFactory {
+  private static class LOCALSubmissionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public LOCALSubmissionStandardScheme getScheme() {
       return new LOCALSubmissionStandardScheme();
     }
   }
 
-  private static class LOCALSubmissionStandardScheme extends StandardScheme<LOCALSubmission> {
+  private static class LOCALSubmissionStandardScheme extends org.apache.thrift.scheme.StandardScheme<LOCALSubmission> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, LOCALSubmission struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -604,17 +573,17 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission,
 
   }
 
-  private static class LOCALSubmissionTupleSchemeFactory implements SchemeFactory {
+  private static class LOCALSubmissionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public LOCALSubmissionTupleScheme getScheme() {
       return new LOCALSubmissionTupleScheme();
     }
   }
 
-  private static class LOCALSubmissionTupleScheme extends TupleScheme<LOCALSubmission> {
+  private static class LOCALSubmissionTupleScheme extends org.apache.thrift.scheme.TupleScheme<LOCALSubmission> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, LOCALSubmission 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.jobSubmissionInterfaceId);
       struct.resourceJobManager.write(oprot);
       oprot.writeI32(struct.securityProtocol.getValue());
@@ -622,7 +591,7 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission,
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, LOCALSubmission struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       struct.jobSubmissionInterfaceId = iprot.readString();
       struct.setJobSubmissionInterfaceIdIsSet(true);
       struct.resourceJobManager = new ResourceJobManager();
@@ -633,5 +602,8 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission,
     }
   }
 
+  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/14ff0916/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/MonitorMode.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/MonitorMode.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/MonitorMode.java
index 8526dff..1a10508 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/MonitorMode.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/MonitorMode.java
@@ -16,7 +16,7 @@
  */
 
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

http://git-wip-us.apache.org/repos/asf/airavata/blob/14ff0916/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ProviderName.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ProviderName.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ProviderName.java
index 34b85a4..c6bc082 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ProviderName.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ProviderName.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


Mime
View raw message