http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentStatistics.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentStatistics.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentStatistics.java index d191249..20c8997 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentStatistics.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentStatistics.java @@ -14,25 +14,44 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.airavata.model.workspace.experiment; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.protocol.TTupleProtocol; 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 java.util.*; +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.2)", date = "2015-6-11") public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentStatistics, ExperimentStatistics._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatistics> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatistics"); @@ -51,14 +70,14 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS schemes.put(TupleScheme.class, new ExperimentStatisticsTupleSchemeFactory()); } - public int allExperimentCount; // required - public int completedExperimentCount; // required - public int cancelledExperimentCount; // optional - public int failedExperimentCount; // required - public List<ExperimentSummary> allExperiments; // required - public List<ExperimentSummary> completedExperiments; // optional - public List<ExperimentSummary> failedExperiments; // optional - public List<ExperimentSummary> cancelledExperiments; // optional + private int allExperimentCount; // required + private int completedExperimentCount; // required + private int cancelledExperimentCount; // optional + private int failedExperimentCount; // required + private List<ExperimentSummary> allExperiments; // required + private List<ExperimentSummary> completedExperiments; // optional + private List<ExperimentSummary> failedExperiments; // optional + private List<ExperimentSummary> cancelledExperiments; // 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 { @@ -145,7 +164,7 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS private static final int __CANCELLEDEXPERIMENTCOUNT_ISSET_ID = 2; private static final int __FAILEDEXPERIMENTCOUNT_ISSET_ID = 3; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.CANCELLED_EXPERIMENT_COUNT,_Fields.COMPLETED_EXPERIMENTS,_Fields.FAILED_EXPERIMENTS,_Fields.CANCELLED_EXPERIMENTS}; + private static final _Fields optionals[] = {_Fields.CANCELLED_EXPERIMENT_COUNT,_Fields.COMPLETED_EXPERIMENTS,_Fields.FAILED_EXPERIMENTS,_Fields.CANCELLED_EXPERIMENTS}; public static final 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); @@ -255,10 +274,9 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS return this.allExperimentCount; } - public ExperimentStatistics setAllExperimentCount(int allExperimentCount) { + public void setAllExperimentCount(int allExperimentCount) { this.allExperimentCount = allExperimentCount; setAllExperimentCountIsSet(true); - return this; } public void unsetAllExperimentCount() { @@ -278,10 +296,9 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS return this.completedExperimentCount; } - public ExperimentStatistics setCompletedExperimentCount(int completedExperimentCount) { + public void setCompletedExperimentCount(int completedExperimentCount) { this.completedExperimentCount = completedExperimentCount; setCompletedExperimentCountIsSet(true); - return this; } public void unsetCompletedExperimentCount() { @@ -301,10 +318,9 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS return this.cancelledExperimentCount; } - public ExperimentStatistics setCancelledExperimentCount(int cancelledExperimentCount) { + public void setCancelledExperimentCount(int cancelledExperimentCount) { this.cancelledExperimentCount = cancelledExperimentCount; setCancelledExperimentCountIsSet(true); - return this; } public void unsetCancelledExperimentCount() { @@ -324,10 +340,9 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS return this.failedExperimentCount; } - public ExperimentStatistics setFailedExperimentCount(int failedExperimentCount) { + public void setFailedExperimentCount(int failedExperimentCount) { this.failedExperimentCount = failedExperimentCount; setFailedExperimentCountIsSet(true); - return this; } public void unsetFailedExperimentCount() { @@ -362,9 +377,8 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS return this.allExperiments; } - public ExperimentStatistics setAllExperiments(List<ExperimentSummary> allExperiments) { + public void setAllExperiments(List<ExperimentSummary> allExperiments) { this.allExperiments = allExperiments; - return this; } public void unsetAllExperiments() { @@ -401,9 +415,8 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS return this.completedExperiments; } - public ExperimentStatistics setCompletedExperiments(List<ExperimentSummary> completedExperiments) { + public void setCompletedExperiments(List<ExperimentSummary> completedExperiments) { this.completedExperiments = completedExperiments; - return this; } public void unsetCompletedExperiments() { @@ -440,9 +453,8 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS return this.failedExperiments; } - public ExperimentStatistics setFailedExperiments(List<ExperimentSummary> failedExperiments) { + public void setFailedExperiments(List<ExperimentSummary> failedExperiments) { this.failedExperiments = failedExperiments; - return this; } public void unsetFailedExperiments() { @@ -479,9 +491,8 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS return this.cancelledExperiments; } - public ExperimentStatistics setCancelledExperiments(List<ExperimentSummary> cancelledExperiments) { + public void setCancelledExperiments(List<ExperimentSummary> cancelledExperiments) { this.cancelledExperiments = cancelledExperiments; - return this; } public void unsetCancelledExperiments() { @@ -715,7 +726,49 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_allExperimentCount = true; + list.add(present_allExperimentCount); + if (present_allExperimentCount) + list.add(allExperimentCount); + + boolean present_completedExperimentCount = true; + list.add(present_completedExperimentCount); + if (present_completedExperimentCount) + list.add(completedExperimentCount); + + boolean present_cancelledExperimentCount = true && (isSetCancelledExperimentCount()); + list.add(present_cancelledExperimentCount); + if (present_cancelledExperimentCount) + list.add(cancelledExperimentCount); + + boolean present_failedExperimentCount = true; + list.add(present_failedExperimentCount); + if (present_failedExperimentCount) + list.add(failedExperimentCount); + + boolean present_allExperiments = true && (isSetAllExperiments()); + list.add(present_allExperiments); + if (present_allExperiments) + list.add(allExperiments); + + boolean present_completedExperiments = true && (isSetCompletedExperiments()); + list.add(present_completedExperiments); + if (present_completedExperiments) + list.add(completedExperiments); + + boolean present_failedExperiments = true && (isSetFailedExperiments()); + list.add(present_failedExperiments); + if (present_failedExperiments) + list.add(failedExperiments); + + boolean present_cancelledExperiments = true && (isSetCancelledExperiments()); + list.add(present_cancelledExperiments); + if (present_cancelledExperiments) + list.add(cancelledExperiments); + + return list.hashCode(); } @Override @@ -813,11 +866,11 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { schemes.get(iprot.getScheme()).getScheme().read(iprot, this); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { schemes.get(oprot.getScheme()).getScheme().write(oprot, this); } @@ -885,21 +938,31 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS return sb.toString(); } - public void validate() throws TException { + public void validate() throws org.apache.thrift.TException { // check for required fields - // alas, we cannot check 'allExperimentCount' because it's a primitive and you chose the non-beans generator. - // alas, we cannot check 'completedExperimentCount' because it's a primitive and you chose the non-beans generator. - // alas, we cannot check 'failedExperimentCount' because it's a primitive and you chose the non-beans generator. - if (allExperiments == null) { - throw new TProtocolException("Required field 'allExperiments' was not present! Struct: " + toString()); + if (!isSetAllExperimentCount()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'allExperimentCount' is unset! Struct:" + toString()); + } + + if (!isSetCompletedExperimentCount()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'completedExperimentCount' is unset! Struct:" + toString()); + } + + if (!isSetFailedExperimentCount()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'failedExperimentCount' is unset! Struct:" + toString()); + } + + if (!isSetAllExperiments()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'allExperiments' is unset! Struct:" + toString()); } + // check for sub-struct validity } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (TException te) { + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } @@ -909,7 +972,7 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS // 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; read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (TException te) { + } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } @@ -922,7 +985,7 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS private static class ExperimentStatisticsStandardScheme extends StandardScheme<ExperimentStatistics> { - public void read(org.apache.thrift.protocol.TProtocol iprot, ExperimentStatistics struct) throws TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, ExperimentStatistics struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -969,12 +1032,12 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS { org.apache.thrift.protocol.TList _list152 = iprot.readListBegin(); struct.allExperiments = new ArrayList<ExperimentSummary>(_list152.size); - for (int _i153 = 0; _i153 < _list152.size; ++_i153) + ExperimentSummary _elem153; + for (int _i154 = 0; _i154 < _list152.size; ++_i154) { - ExperimentSummary _elem154; - _elem154 = new ExperimentSummary(); - _elem154.read(iprot); - struct.allExperiments.add(_elem154); + _elem153 = new ExperimentSummary(); + _elem153.read(iprot); + struct.allExperiments.add(_elem153); } iprot.readListEnd(); } @@ -988,12 +1051,12 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS { org.apache.thrift.protocol.TList _list155 = iprot.readListBegin(); struct.completedExperiments = new ArrayList<ExperimentSummary>(_list155.size); - for (int _i156 = 0; _i156 < _list155.size; ++_i156) + ExperimentSummary _elem156; + for (int _i157 = 0; _i157 < _list155.size; ++_i157) { - ExperimentSummary _elem157; - _elem157 = new ExperimentSummary(); - _elem157.read(iprot); - struct.completedExperiments.add(_elem157); + _elem156 = new ExperimentSummary(); + _elem156.read(iprot); + struct.completedExperiments.add(_elem156); } iprot.readListEnd(); } @@ -1007,12 +1070,12 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS { org.apache.thrift.protocol.TList _list158 = iprot.readListBegin(); struct.failedExperiments = new ArrayList<ExperimentSummary>(_list158.size); - for (int _i159 = 0; _i159 < _list158.size; ++_i159) + ExperimentSummary _elem159; + for (int _i160 = 0; _i160 < _list158.size; ++_i160) { - ExperimentSummary _elem160; - _elem160 = new ExperimentSummary(); - _elem160.read(iprot); - struct.failedExperiments.add(_elem160); + _elem159 = new ExperimentSummary(); + _elem159.read(iprot); + struct.failedExperiments.add(_elem159); } iprot.readListEnd(); } @@ -1026,12 +1089,12 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS { org.apache.thrift.protocol.TList _list161 = iprot.readListBegin(); struct.cancelledExperiments = new ArrayList<ExperimentSummary>(_list161.size); - for (int _i162 = 0; _i162 < _list161.size; ++_i162) + ExperimentSummary _elem162; + for (int _i163 = 0; _i163 < _list161.size; ++_i163) { - ExperimentSummary _elem163; - _elem163 = new ExperimentSummary(); - _elem163.read(iprot); - struct.cancelledExperiments.add(_elem163); + _elem162 = new ExperimentSummary(); + _elem162.read(iprot); + struct.cancelledExperiments.add(_elem162); } iprot.readListEnd(); } @@ -1046,21 +1109,10 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS iprot.readFieldEnd(); } iprot.readStructEnd(); - - // check for required fields of primitive type, which can't be checked in the validate method - if (!struct.isSetAllExperimentCount()) { - throw new TProtocolException("Required field 'allExperimentCount' was not found in serialized data! Struct: " + toString()); - } - if (!struct.isSetCompletedExperimentCount()) { - throw new TProtocolException("Required field 'completedExperimentCount' was not found in serialized data! Struct: " + toString()); - } - if (!struct.isSetFailedExperimentCount()) { - throw new TProtocolException("Required field 'failedExperimentCount' was not found in serialized data! Struct: " + toString()); - } struct.validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot, ExperimentStatistics struct) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, ExperimentStatistics struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -1147,7 +1199,7 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS private static class ExperimentStatisticsTupleScheme extends TupleScheme<ExperimentStatistics> { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, ExperimentStatistics struct) throws TException { + public void write(org.apache.thrift.protocol.TProtocol prot, ExperimentStatistics struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; oprot.writeI32(struct.allExperimentCount); oprot.writeI32(struct.completedExperimentCount); @@ -1206,7 +1258,7 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, ExperimentStatistics struct) throws TException { + public void read(org.apache.thrift.protocol.TProtocol prot, ExperimentStatistics struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; struct.allExperimentCount = iprot.readI32(); struct.setAllExperimentCountIsSet(true); @@ -1217,12 +1269,12 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS { org.apache.thrift.protocol.TList _list172 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.allExperiments = new ArrayList<ExperimentSummary>(_list172.size); - for (int _i173 = 0; _i173 < _list172.size; ++_i173) + ExperimentSummary _elem173; + for (int _i174 = 0; _i174 < _list172.size; ++_i174) { - ExperimentSummary _elem174; - _elem174 = new ExperimentSummary(); - _elem174.read(iprot); - struct.allExperiments.add(_elem174); + _elem173 = new ExperimentSummary(); + _elem173.read(iprot); + struct.allExperiments.add(_elem173); } } struct.setAllExperimentsIsSet(true); @@ -1235,12 +1287,12 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS { org.apache.thrift.protocol.TList _list175 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.completedExperiments = new ArrayList<ExperimentSummary>(_list175.size); - for (int _i176 = 0; _i176 < _list175.size; ++_i176) + ExperimentSummary _elem176; + for (int _i177 = 0; _i177 < _list175.size; ++_i177) { - ExperimentSummary _elem177; - _elem177 = new ExperimentSummary(); - _elem177.read(iprot); - struct.completedExperiments.add(_elem177); + _elem176 = new ExperimentSummary(); + _elem176.read(iprot); + struct.completedExperiments.add(_elem176); } } struct.setCompletedExperimentsIsSet(true); @@ -1249,12 +1301,12 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS { org.apache.thrift.protocol.TList _list178 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.failedExperiments = new ArrayList<ExperimentSummary>(_list178.size); - for (int _i179 = 0; _i179 < _list178.size; ++_i179) + ExperimentSummary _elem179; + for (int _i180 = 0; _i180 < _list178.size; ++_i180) { - ExperimentSummary _elem180; - _elem180 = new ExperimentSummary(); - _elem180.read(iprot); - struct.failedExperiments.add(_elem180); + _elem179 = new ExperimentSummary(); + _elem179.read(iprot); + struct.failedExperiments.add(_elem179); } } struct.setFailedExperimentsIsSet(true); @@ -1263,12 +1315,12 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS { org.apache.thrift.protocol.TList _list181 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.cancelledExperiments = new ArrayList<ExperimentSummary>(_list181.size); - for (int _i182 = 0; _i182 < _list181.size; ++_i182) + ExperimentSummary _elem182; + for (int _i183 = 0; _i183 < _list181.size; ++_i183) { - ExperimentSummary _elem183; - _elem183 = new ExperimentSummary(); - _elem183.read(iprot); - struct.cancelledExperiments.add(_elem183); + _elem182 = new ExperimentSummary(); + _elem182.read(iprot); + struct.cancelledExperiments.add(_elem182); } } struct.setCancelledExperimentsIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentStatus.java index 05663f8..5c2bb6b 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentStatus.java @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -46,10 +46,13 @@ 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("all") public class ExperimentStatus implements org.apache.thrift.TBase<ExperimentStatus, ExperimentStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatus> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11") +public class ExperimentStatus implements org.apache.thrift.TBase<ExperimentStatus, ExperimentStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatus"); private static final org.apache.thrift.protocol.TField EXPERIMENT_STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentState", org.apache.thrift.protocol.TType.I32, (short)1); @@ -65,7 +68,7 @@ import org.slf4j.LoggerFactory; private long timeOfStateChange; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { /** * * @see ExperimentState @@ -132,7 +135,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __TIMEOFSTATECHANGE_ISSET_ID = 0; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.TIME_OF_STATE_CHANGE}; + private static final _Fields optionals[] = {_Fields.TIME_OF_STATE_CHANGE}; public static final 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); @@ -313,7 +316,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_experimentState = true && (isSetExperimentState()); + list.add(present_experimentState); + if (present_experimentState) + list.add(experimentState.getValue()); + + boolean present_timeOfStateChange = true && (isSetTimeOfStateChange()); + list.add(present_timeOfStateChange); + if (present_timeOfStateChange) + list.add(timeOfStateChange); + + return list.hashCode(); } @Override @@ -428,7 +443,7 @@ import org.slf4j.LoggerFactory; switch (schemeField.id) { case 1: // EXPERIMENT_STATE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.experimentState = ExperimentState.findByValue(iprot.readI32()); + struct.experimentState = org.apache.airavata.model.workspace.experiment.ExperimentState.findByValue(iprot.readI32()); struct.setExperimentStateIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -496,7 +511,7 @@ import org.slf4j.LoggerFactory; @Override public void read(org.apache.thrift.protocol.TProtocol prot, ExperimentStatus struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - struct.experimentState = ExperimentState.findByValue(iprot.readI32()); + struct.experimentState = org.apache.airavata.model.workspace.experiment.ExperimentState.findByValue(iprot.readI32()); struct.setExperimentStateIsSet(true); BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentSummary.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentSummary.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentSummary.java index b1a1630..85ed22c 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentSummary.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentSummary.java @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -46,10 +46,13 @@ 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("all") public class ExperimentSummary implements org.apache.thrift.TBase<ExperimentSummary, ExperimentSummary._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentSummary> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11") +public class ExperimentSummary implements org.apache.thrift.TBase<ExperimentSummary, ExperimentSummary._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentSummary> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentSummary"); private static final org.apache.thrift.protocol.TField EXPERIMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentID", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -77,7 +80,7 @@ import org.slf4j.LoggerFactory; private ExperimentStatus experimentStatus; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { EXPERIMENT_ID((short)1, "experimentID"), PROJECT_ID((short)2, "projectID"), CREATION_TIME((short)3, "creationTime"), @@ -158,7 +161,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __CREATIONTIME_ISSET_ID = 0; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.CREATION_TIME,_Fields.DESCRIPTION,_Fields.APPLICATION_ID,_Fields.EXPERIMENT_STATUS}; + private static final _Fields optionals[] = {_Fields.CREATION_TIME,_Fields.DESCRIPTION,_Fields.APPLICATION_ID,_Fields.EXPERIMENT_STATUS}; public static final 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); @@ -643,7 +646,49 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_experimentID = true && (isSetExperimentID()); + list.add(present_experimentID); + if (present_experimentID) + list.add(experimentID); + + boolean present_projectID = true && (isSetProjectID()); + list.add(present_projectID); + if (present_projectID) + list.add(projectID); + + boolean present_creationTime = true && (isSetCreationTime()); + list.add(present_creationTime); + if (present_creationTime) + list.add(creationTime); + + boolean present_userName = true && (isSetUserName()); + list.add(present_userName); + if (present_userName) + list.add(userName); + + boolean present_name = true && (isSetName()); + list.add(present_name); + if (present_name) + list.add(name); + + boolean present_description = true && (isSetDescription()); + list.add(present_description); + if (present_description) + list.add(description); + + boolean present_applicationId = true && (isSetApplicationId()); + list.add(present_applicationId); + if (present_applicationId) + list.add(applicationId); + + boolean present_experimentStatus = true && (isSetExperimentStatus()); + list.add(present_experimentStatus); + if (present_experimentStatus) + list.add(experimentStatus); + + return list.hashCode(); } @Override http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobDetails.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobDetails.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobDetails.java index 10c70fe..5aa7091 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobDetails.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobDetails.java @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -46,10 +46,13 @@ 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("all") public class JobDetails implements org.apache.thrift.TBase<JobDetails, JobDetails._Fields>, java.io.Serializable, Cloneable, Comparable<JobDetails> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11") +public class JobDetails implements org.apache.thrift.TBase<JobDetails, JobDetails._Fields>, java.io.Serializable, Cloneable, Comparable<JobDetails> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobDetails"); private static final org.apache.thrift.protocol.TField JOB_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("jobID", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -79,7 +82,7 @@ import org.slf4j.LoggerFactory; private String workingDir; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { JOB_ID((short)1, "jobID"), JOB_DESCRIPTION((short)2, "jobDescription"), CREATION_TIME((short)3, "creationTime"), @@ -163,7 +166,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __CREATIONTIME_ISSET_ID = 0; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.CREATION_TIME,_Fields.JOB_STATUS,_Fields.APPLICATION_STATUS,_Fields.ERRORS,_Fields.COMPUTE_RESOURCE_CONSUMED,_Fields.JOB_NAME,_Fields.WORKING_DIR}; + private static final _Fields optionals[] = {_Fields.CREATION_TIME,_Fields.JOB_STATUS,_Fields.APPLICATION_STATUS,_Fields.ERRORS,_Fields.COMPUTE_RESOURCE_CONSUMED,_Fields.JOB_NAME,_Fields.WORKING_DIR}; public static final 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); @@ -718,7 +721,54 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_jobID = true && (isSetJobID()); + list.add(present_jobID); + if (present_jobID) + list.add(jobID); + + boolean present_jobDescription = true && (isSetJobDescription()); + list.add(present_jobDescription); + if (present_jobDescription) + list.add(jobDescription); + + boolean present_creationTime = true && (isSetCreationTime()); + list.add(present_creationTime); + if (present_creationTime) + list.add(creationTime); + + boolean present_jobStatus = true && (isSetJobStatus()); + list.add(present_jobStatus); + if (present_jobStatus) + list.add(jobStatus); + + boolean present_applicationStatus = true && (isSetApplicationStatus()); + list.add(present_applicationStatus); + if (present_applicationStatus) + list.add(applicationStatus); + + boolean present_errors = true && (isSetErrors()); + list.add(present_errors); + if (present_errors) + list.add(errors); + + boolean present_computeResourceConsumed = true && (isSetComputeResourceConsumed()); + list.add(present_computeResourceConsumed); + if (present_computeResourceConsumed) + list.add(computeResourceConsumed); + + boolean present_jobName = true && (isSetJobName()); + list.add(present_jobName); + if (present_jobName) + list.add(jobName); + + boolean present_workingDir = true && (isSetWorkingDir()); + list.add(present_workingDir); + if (present_workingDir) + list.add(workingDir); + + return list.hashCode(); } @Override @@ -1026,12 +1076,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list8 = iprot.readListBegin(); struct.errors = new ArrayList<ErrorDetails>(_list8.size); - for (int _i9 = 0; _i9 < _list8.size; ++_i9) + ErrorDetails _elem9; + for (int _i10 = 0; _i10 < _list8.size; ++_i10) { - ErrorDetails _elem10; - _elem10 = new ErrorDetails(); - _elem10.read(iprot); - struct.errors.add(_elem10); + _elem9 = new ErrorDetails(); + _elem9.read(iprot); + struct.errors.add(_elem9); } iprot.readListEnd(); } @@ -1238,12 +1288,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.errors = new ArrayList<ErrorDetails>(_list13.size); - for (int _i14 = 0; _i14 < _list13.size; ++_i14) + ErrorDetails _elem14; + for (int _i15 = 0; _i15 < _list13.size; ++_i15) { - ErrorDetails _elem15; - _elem15 = new ErrorDetails(); - _elem15.read(iprot); - struct.errors.add(_elem15); + _elem14 = new ErrorDetails(); + _elem14.read(iprot); + struct.errors.add(_elem14); } } struct.setErrorsIsSet(true); http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobState.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobState.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobState.java index c9a3cb0..458ec32 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobState.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobState.java @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -28,7 +28,7 @@ import java.util.Map; import java.util.HashMap; import org.apache.thrift.TEnum; -@SuppressWarnings("all") public enum JobState implements org.apache.thrift.TEnum { +public enum JobState implements org.apache.thrift.TEnum { SUBMITTED(0), UN_SUBMITTED(1), SETUP(2), http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobStatus.java index 38e64f7..e2e2761 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobStatus.java @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -46,10 +46,13 @@ 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("all") public class JobStatus implements org.apache.thrift.TBase<JobStatus, JobStatus._Fields>, java.io.Serializable, Cloneable, Comparable<JobStatus> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11") +public class JobStatus implements org.apache.thrift.TBase<JobStatus, JobStatus._Fields>, java.io.Serializable, Cloneable, Comparable<JobStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobStatus"); private static final org.apache.thrift.protocol.TField JOB_STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("jobState", org.apache.thrift.protocol.TType.I32, (short)1); @@ -65,7 +68,7 @@ import org.slf4j.LoggerFactory; private long timeOfStateChange; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { /** * * @see JobState @@ -132,7 +135,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __TIMEOFSTATECHANGE_ISSET_ID = 0; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.TIME_OF_STATE_CHANGE}; + private static final _Fields optionals[] = {_Fields.TIME_OF_STATE_CHANGE}; public static final 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); @@ -313,7 +316,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_jobState = true && (isSetJobState()); + list.add(present_jobState); + if (present_jobState) + list.add(jobState.getValue()); + + boolean present_timeOfStateChange = true && (isSetTimeOfStateChange()); + list.add(present_timeOfStateChange); + if (present_timeOfStateChange) + list.add(timeOfStateChange); + + return list.hashCode(); } @Override @@ -428,7 +443,7 @@ import org.slf4j.LoggerFactory; switch (schemeField.id) { case 1: // JOB_STATE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.jobState = JobState.findByValue(iprot.readI32()); + struct.jobState = org.apache.airavata.model.workspace.experiment.JobState.findByValue(iprot.readI32()); struct.setJobStateIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -496,7 +511,7 @@ import org.slf4j.LoggerFactory; @Override public void read(org.apache.thrift.protocol.TProtocol prot, JobStatus struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - struct.jobState = JobState.findByValue(iprot.readI32()); + struct.jobState = org.apache.airavata.model.workspace.experiment.JobState.findByValue(iprot.readI32()); struct.setJobStateIsSet(true); BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/QualityOfServiceParams.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/QualityOfServiceParams.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/QualityOfServiceParams.java index 8cbade2..15ca7d3 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/QualityOfServiceParams.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/QualityOfServiceParams.java @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -46,14 +46,17 @@ 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"}) /** * A structure holding Quality of Service Parameters. * */ -@SuppressWarnings("all") public class QualityOfServiceParams implements org.apache.thrift.TBase<QualityOfServiceParams, QualityOfServiceParams._Fields>, java.io.Serializable, Cloneable, Comparable<QualityOfServiceParams> { +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11") +public class QualityOfServiceParams implements org.apache.thrift.TBase<QualityOfServiceParams, QualityOfServiceParams._Fields>, java.io.Serializable, Cloneable, Comparable<QualityOfServiceParams> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("QualityOfServiceParams"); private static final org.apache.thrift.protocol.TField START_EXECUTION_AT_FIELD_DESC = new org.apache.thrift.protocol.TField("startExecutionAt", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -71,7 +74,7 @@ import org.slf4j.LoggerFactory; private int numberofRetries; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { START_EXECUTION_AT((short)1, "startExecutionAt"), EXECUTE_BEFORE((short)2, "executeBefore"), NUMBEROF_RETRIES((short)3, "numberofRetries"); @@ -137,7 +140,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __NUMBEROFRETRIES_ISSET_ID = 0; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.START_EXECUTION_AT,_Fields.EXECUTE_BEFORE,_Fields.NUMBEROF_RETRIES}; + private static final _Fields optionals[] = {_Fields.START_EXECUTION_AT,_Fields.EXECUTE_BEFORE,_Fields.NUMBEROF_RETRIES}; public static final 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); @@ -354,7 +357,24 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_startExecutionAt = true && (isSetStartExecutionAt()); + list.add(present_startExecutionAt); + if (present_startExecutionAt) + list.add(startExecutionAt); + + boolean present_executeBefore = true && (isSetExecuteBefore()); + list.add(present_executeBefore); + if (present_executeBefore) + list.add(executeBefore); + + boolean present_numberofRetries = true && (isSetNumberofRetries()); + list.add(present_numberofRetries); + if (present_numberofRetries) + list.add(numberofRetries); + + return list.hashCode(); } @Override http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskDetails.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskDetails.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskDetails.java index 7488f06..6278474 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskDetails.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskDetails.java @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -46,16 +46,19 @@ 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"}) /** * A structure holding the actual execution context decided based on user provided configuration data or system inferred * information from scheduling and QoS parameters. One experiment can have multiple tasks. Each tasks results in * data transfers and jobs * */ -@SuppressWarnings("all") public class TaskDetails implements org.apache.thrift.TBase<TaskDetails, TaskDetails._Fields>, java.io.Serializable, Cloneable, Comparable<TaskDetails> { +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11") +public class TaskDetails implements org.apache.thrift.TBase<TaskDetails, TaskDetails._Fields>, java.io.Serializable, Cloneable, Comparable<TaskDetails> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskDetails"); private static final org.apache.thrift.protocol.TField TASK_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("taskID", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -99,7 +102,7 @@ import org.slf4j.LoggerFactory; private List<String> emailAddresses; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TASK_ID((short)1, "taskID"), CREATION_TIME((short)2, "creationTime"), APPLICATION_ID((short)3, "applicationId"), @@ -205,7 +208,7 @@ import org.slf4j.LoggerFactory; private static final int __CREATIONTIME_ISSET_ID = 0; private static final int __ENABLEEMAILNOTIFICATION_ISSET_ID = 1; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.CREATION_TIME,_Fields.APPLICATION_ID,_Fields.APPLICATION_VERSION,_Fields.APPLICATION_DEPLOYMENT_ID,_Fields.APPLICATION_INPUTS,_Fields.APPLICATION_OUTPUTS,_Fields.TASK_SCHEDULING,_Fields.ADVANCED_INPUT_DATA_HANDLING,_Fields.ADVANCED_OUTPUT_DATA_HANDLING,_Fields.TASK_STATUS,_Fields.JOB_DETAILS_LIST,_Fields.DATA_TRANSFER_DETAILS_LIST,_Fields.ERRORS,_Fields.ENABLE_EMAIL_NOTIFICATION,_Fields.EMAIL_ADDRESSES}; + private static final _Fields optionals[] = {_Fields.CREATION_TIME,_Fields.APPLICATION_ID,_Fields.APPLICATION_VERSION,_Fields.APPLICATION_DEPLOYMENT_ID,_Fields.APPLICATION_INPUTS,_Fields.APPLICATION_OUTPUTS,_Fields.TASK_SCHEDULING,_Fields.ADVANCED_INPUT_DATA_HANDLING,_Fields.ADVANCED_OUTPUT_DATA_HANDLING,_Fields.TASK_STATUS,_Fields.JOB_DETAILS_LIST,_Fields.DATA_TRANSFER_DETAILS_LIST,_Fields.ERRORS,_Fields.ENABLE_EMAIL_NOTIFICATION,_Fields.EMAIL_ADDRESSES}; public static final 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); @@ -1210,7 +1213,89 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_taskID = true && (isSetTaskID()); + list.add(present_taskID); + if (present_taskID) + list.add(taskID); + + boolean present_creationTime = true && (isSetCreationTime()); + list.add(present_creationTime); + if (present_creationTime) + list.add(creationTime); + + boolean present_applicationId = true && (isSetApplicationId()); + list.add(present_applicationId); + if (present_applicationId) + list.add(applicationId); + + boolean present_applicationVersion = true && (isSetApplicationVersion()); + list.add(present_applicationVersion); + if (present_applicationVersion) + list.add(applicationVersion); + + boolean present_applicationDeploymentId = true && (isSetApplicationDeploymentId()); + list.add(present_applicationDeploymentId); + if (present_applicationDeploymentId) + list.add(applicationDeploymentId); + + boolean present_applicationInputs = true && (isSetApplicationInputs()); + list.add(present_applicationInputs); + if (present_applicationInputs) + list.add(applicationInputs); + + boolean present_applicationOutputs = true && (isSetApplicationOutputs()); + list.add(present_applicationOutputs); + if (present_applicationOutputs) + list.add(applicationOutputs); + + boolean present_taskScheduling = true && (isSetTaskScheduling()); + list.add(present_taskScheduling); + if (present_taskScheduling) + list.add(taskScheduling); + + boolean present_advancedInputDataHandling = true && (isSetAdvancedInputDataHandling()); + list.add(present_advancedInputDataHandling); + if (present_advancedInputDataHandling) + list.add(advancedInputDataHandling); + + boolean present_advancedOutputDataHandling = true && (isSetAdvancedOutputDataHandling()); + list.add(present_advancedOutputDataHandling); + if (present_advancedOutputDataHandling) + list.add(advancedOutputDataHandling); + + boolean present_taskStatus = true && (isSetTaskStatus()); + list.add(present_taskStatus); + if (present_taskStatus) + list.add(taskStatus); + + boolean present_jobDetailsList = true && (isSetJobDetailsList()); + list.add(present_jobDetailsList); + if (present_jobDetailsList) + list.add(jobDetailsList); + + boolean present_dataTransferDetailsList = true && (isSetDataTransferDetailsList()); + list.add(present_dataTransferDetailsList); + if (present_dataTransferDetailsList) + list.add(dataTransferDetailsList); + + boolean present_errors = true && (isSetErrors()); + list.add(present_errors); + if (present_errors) + list.add(errors); + + boolean present_enableEmailNotification = true && (isSetEnableEmailNotification()); + list.add(present_enableEmailNotification); + if (present_enableEmailNotification) + list.add(enableEmailNotification); + + boolean present_emailAddresses = true && (isSetEmailAddresses()); + list.add(present_emailAddresses); + if (present_emailAddresses) + list.add(emailAddresses); + + return list.hashCode(); } @Override @@ -1656,12 +1741,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list16 = iprot.readListBegin(); struct.applicationInputs = new ArrayList<org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType>(_list16.size); - for (int _i17 = 0; _i17 < _list16.size; ++_i17) + org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType _elem17; + for (int _i18 = 0; _i18 < _list16.size; ++_i18) { - org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType _elem18; - _elem18 = new org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType(); - _elem18.read(iprot); - struct.applicationInputs.add(_elem18); + _elem17 = new org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType(); + _elem17.read(iprot); + struct.applicationInputs.add(_elem17); } iprot.readListEnd(); } @@ -1675,12 +1760,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list19 = iprot.readListBegin(); struct.applicationOutputs = new ArrayList<org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType>(_list19.size); - for (int _i20 = 0; _i20 < _list19.size; ++_i20) + org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType _elem20; + for (int _i21 = 0; _i21 < _list19.size; ++_i21) { - org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType _elem21; - _elem21 = new org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType(); - _elem21.read(iprot); - struct.applicationOutputs.add(_elem21); + _elem20 = new org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType(); + _elem20.read(iprot); + struct.applicationOutputs.add(_elem20); } iprot.readListEnd(); } @@ -1730,12 +1815,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list22 = iprot.readListBegin(); struct.jobDetailsList = new ArrayList<JobDetails>(_list22.size); - for (int _i23 = 0; _i23 < _list22.size; ++_i23) + JobDetails _elem23; + for (int _i24 = 0; _i24 < _list22.size; ++_i24) { - JobDetails _elem24; - _elem24 = new JobDetails(); - _elem24.read(iprot); - struct.jobDetailsList.add(_elem24); + _elem23 = new JobDetails(); + _elem23.read(iprot); + struct.jobDetailsList.add(_elem23); } iprot.readListEnd(); } @@ -1749,12 +1834,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list25 = iprot.readListBegin(); struct.dataTransferDetailsList = new ArrayList<DataTransferDetails>(_list25.size); - for (int _i26 = 0; _i26 < _list25.size; ++_i26) + DataTransferDetails _elem26; + for (int _i27 = 0; _i27 < _list25.size; ++_i27) { - DataTransferDetails _elem27; - _elem27 = new DataTransferDetails(); - _elem27.read(iprot); - struct.dataTransferDetailsList.add(_elem27); + _elem26 = new DataTransferDetails(); + _elem26.read(iprot); + struct.dataTransferDetailsList.add(_elem26); } iprot.readListEnd(); } @@ -1768,12 +1853,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list28 = iprot.readListBegin(); struct.errors = new ArrayList<ErrorDetails>(_list28.size); - for (int _i29 = 0; _i29 < _list28.size; ++_i29) + ErrorDetails _elem29; + for (int _i30 = 0; _i30 < _list28.size; ++_i30) { - ErrorDetails _elem30; - _elem30 = new ErrorDetails(); - _elem30.read(iprot); - struct.errors.add(_elem30); + _elem29 = new ErrorDetails(); + _elem29.read(iprot); + struct.errors.add(_elem29); } iprot.readListEnd(); } @@ -1795,11 +1880,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list31 = iprot.readListBegin(); struct.emailAddresses = new ArrayList<String>(_list31.size); - for (int _i32 = 0; _i32 < _list31.size; ++_i32) + String _elem32; + for (int _i33 = 0; _i33 < _list31.size; ++_i33) { - String _elem33; - _elem33 = iprot.readString(); - struct.emailAddresses.add(_elem33); + _elem32 = iprot.readString(); + struct.emailAddresses.add(_elem32); } iprot.readListEnd(); } @@ -2143,12 +2228,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list46 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.applicationInputs = new ArrayList<org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType>(_list46.size); - for (int _i47 = 0; _i47 < _list46.size; ++_i47) + org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType _elem47; + for (int _i48 = 0; _i48 < _list46.size; ++_i48) { - org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType _elem48; - _elem48 = new org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType(); - _elem48.read(iprot); - struct.applicationInputs.add(_elem48); + _elem47 = new org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType(); + _elem47.read(iprot); + struct.applicationInputs.add(_elem47); } } struct.setApplicationInputsIsSet(true); @@ -2157,12 +2242,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list49 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.applicationOutputs = new ArrayList<org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType>(_list49.size); - for (int _i50 = 0; _i50 < _list49.size; ++_i50) + org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType _elem50; + for (int _i51 = 0; _i51 < _list49.size; ++_i51) { - org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType _elem51; - _elem51 = new org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType(); - _elem51.read(iprot); - struct.applicationOutputs.add(_elem51); + _elem50 = new org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType(); + _elem50.read(iprot); + struct.applicationOutputs.add(_elem50); } } struct.setApplicationOutputsIsSet(true); @@ -2191,12 +2276,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list52 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.jobDetailsList = new ArrayList<JobDetails>(_list52.size); - for (int _i53 = 0; _i53 < _list52.size; ++_i53) + JobDetails _elem53; + for (int _i54 = 0; _i54 < _list52.size; ++_i54) { - JobDetails _elem54; - _elem54 = new JobDetails(); - _elem54.read(iprot); - struct.jobDetailsList.add(_elem54); + _elem53 = new JobDetails(); + _elem53.read(iprot); + struct.jobDetailsList.add(_elem53); } } struct.setJobDetailsListIsSet(true); @@ -2205,12 +2290,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list55 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.dataTransferDetailsList = new ArrayList<DataTransferDetails>(_list55.size); - for (int _i56 = 0; _i56 < _list55.size; ++_i56) + DataTransferDetails _elem56; + for (int _i57 = 0; _i57 < _list55.size; ++_i57) { - DataTransferDetails _elem57; - _elem57 = new DataTransferDetails(); - _elem57.read(iprot); - struct.dataTransferDetailsList.add(_elem57); + _elem56 = new DataTransferDetails(); + _elem56.read(iprot); + struct.dataTransferDetailsList.add(_elem56); } } struct.setDataTransferDetailsListIsSet(true); @@ -2219,12 +2304,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list58 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.errors = new ArrayList<ErrorDetails>(_list58.size); - for (int _i59 = 0; _i59 < _list58.size; ++_i59) + ErrorDetails _elem59; + for (int _i60 = 0; _i60 < _list58.size; ++_i60) { - ErrorDetails _elem60; - _elem60 = new ErrorDetails(); - _elem60.read(iprot); - struct.errors.add(_elem60); + _elem59 = new ErrorDetails(); + _elem59.read(iprot); + struct.errors.add(_elem59); } } struct.setErrorsIsSet(true); @@ -2237,11 +2322,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list61 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.emailAddresses = new ArrayList<String>(_list61.size); - for (int _i62 = 0; _i62 < _list61.size; ++_i62) + String _elem62; + for (int _i63 = 0; _i63 < _list61.size; ++_i63) { - String _elem63; - _elem63 = iprot.readString(); - struct.emailAddresses.add(_elem63); + _elem62 = iprot.readString(); + struct.emailAddresses.add(_elem62); } } struct.setEmailAddressesIsSet(true); http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskState.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskState.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskState.java index b9c3e80..a5fb605 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskState.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskState.java @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -28,7 +28,7 @@ import java.util.Map; import java.util.HashMap; import org.apache.thrift.TEnum; -@SuppressWarnings("all") public enum TaskState implements org.apache.thrift.TEnum { +public enum TaskState implements org.apache.thrift.TEnum { WAITING(0), STARTED(1), PRE_PROCESSING(2), http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskStatus.java index 6a51eca..ca8a3ce 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskStatus.java @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -46,10 +46,13 @@ 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("all") public class TaskStatus implements org.apache.thrift.TBase<TaskStatus, TaskStatus._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatus> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11") +public class TaskStatus implements org.apache.thrift.TBase<TaskStatus, TaskStatus._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatus"); private static final org.apache.thrift.protocol.TField EXECUTION_STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("executionState", org.apache.thrift.protocol.TType.I32, (short)1); @@ -65,7 +68,7 @@ import org.slf4j.LoggerFactory; private long timeOfStateChange; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { /** * * @see TaskState @@ -132,7 +135,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __TIMEOFSTATECHANGE_ISSET_ID = 0; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.TIME_OF_STATE_CHANGE}; + private static final _Fields optionals[] = {_Fields.TIME_OF_STATE_CHANGE}; public static final 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); @@ -313,7 +316,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_executionState = true && (isSetExecutionState()); + list.add(present_executionState); + if (present_executionState) + list.add(executionState.getValue()); + + boolean present_timeOfStateChange = true && (isSetTimeOfStateChange()); + list.add(present_timeOfStateChange); + if (present_timeOfStateChange) + list.add(timeOfStateChange); + + return list.hashCode(); } @Override @@ -428,7 +443,7 @@ import org.slf4j.LoggerFactory; switch (schemeField.id) { case 1: // EXECUTION_STATE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.executionState = TaskState.findByValue(iprot.readI32()); + struct.executionState = org.apache.airavata.model.workspace.experiment.TaskState.findByValue(iprot.readI32()); struct.setExecutionStateIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -496,7 +511,7 @@ import org.slf4j.LoggerFactory; @Override public void read(org.apache.thrift.protocol.TProtocol prot, TaskStatus struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - struct.executionState = TaskState.findByValue(iprot.readI32()); + struct.executionState = org.apache.airavata.model.workspace.experiment.TaskState.findByValue(iprot.readI32()); struct.setExecutionStateIsSet(true); BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TransferState.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TransferState.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TransferState.java index e7e08b0..9fafc51 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TransferState.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TransferState.java @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -28,7 +28,7 @@ import java.util.Map; import java.util.HashMap; import org.apache.thrift.TEnum; -@SuppressWarnings("all") public enum TransferState implements org.apache.thrift.TEnum { +public enum TransferState implements org.apache.thrift.TEnum { DIRECTORY_SETUP(0), UPLOAD(1), DOWNLOAD(2), http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TransferStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TransferStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TransferStatus.java index 1467ba0..e4c0d88 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TransferStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TransferStatus.java @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -46,10 +46,13 @@ 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("all") public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, TransferStatus._Fields>, java.io.Serializable, Cloneable, Comparable<TransferStatus> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11") +public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, TransferStatus._Fields>, java.io.Serializable, Cloneable, Comparable<TransferStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TransferStatus"); private static final org.apache.thrift.protocol.TField TRANSFER_STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("transferState", org.apache.thrift.protocol.TType.I32, (short)1); @@ -65,7 +68,7 @@ import org.slf4j.LoggerFactory; private long timeOfStateChange; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { /** * * @see TransferState @@ -132,7 +135,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __TIMEOFSTATECHANGE_ISSET_ID = 0; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.TIME_OF_STATE_CHANGE}; + private static final _Fields optionals[] = {_Fields.TIME_OF_STATE_CHANGE}; public static final 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); @@ -313,7 +316,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_transferState = true && (isSetTransferState()); + list.add(present_transferState); + if (present_transferState) + list.add(transferState.getValue()); + + boolean present_timeOfStateChange = true && (isSetTimeOfStateChange()); + list.add(present_timeOfStateChange); + if (present_timeOfStateChange) + list.add(timeOfStateChange); + + return list.hashCode(); } @Override @@ -428,7 +443,7 @@ import org.slf4j.LoggerFactory; switch (schemeField.id) { case 1: // TRANSFER_STATE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.transferState = TransferState.findByValue(iprot.readI32()); + struct.transferState = org.apache.airavata.model.workspace.experiment.TransferState.findByValue(iprot.readI32()); struct.setTransferStateIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -496,7 +511,7 @@ import org.slf4j.LoggerFactory; @Override public void read(org.apache.thrift.protocol.TProtocol prot, TransferStatus struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - struct.transferState = TransferState.findByValue(iprot.readI32()); + struct.transferState = org.apache.airavata.model.workspace.experiment.TransferState.findByValue(iprot.readI32()); struct.setTransferStateIsSet(true); BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/UserConfigurationData.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/UserConfigurationData.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/UserConfigurationData.java index c9531ea..4b57f85 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/UserConfigurationData.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/UserConfigurationData.java @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -46,15 +46,18 @@ 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"}) /** * A structure holding the experiment configuration. * * */ -@SuppressWarnings("all") public class UserConfigurationData implements org.apache.thrift.TBase<UserConfigurationData, UserConfigurationData._Fields>, java.io.Serializable, Cloneable, Comparable<UserConfigurationData> { +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11") +public class UserConfigurationData implements org.apache.thrift.TBase<UserConfigurationData, UserConfigurationData._Fields>, java.io.Serializable, Cloneable, Comparable<UserConfigurationData> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserConfigurationData"); private static final org.apache.thrift.protocol.TField AIRAVATA_AUTO_SCHEDULE_FIELD_DESC = new org.apache.thrift.protocol.TField("airavataAutoSchedule", org.apache.thrift.protocol.TType.BOOL, (short)1); @@ -86,7 +89,7 @@ import org.slf4j.LoggerFactory; private boolean generateCert; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { AIRAVATA_AUTO_SCHEDULE((short)1, "airavataAutoSchedule"), OVERRIDE_MANUAL_SCHEDULED_PARAMS((short)2, "overrideManualScheduledParams"), SHARE_EXPERIMENT_PUBLICLY((short)3, "shareExperimentPublicly"), @@ -177,7 +180,7 @@ import org.slf4j.LoggerFactory; private static final int __THROTTLERESOURCES_ISSET_ID = 3; private static final int __GENERATECERT_ISSET_ID = 4; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.SHARE_EXPERIMENT_PUBLICLY,_Fields.COMPUTATIONAL_RESOURCE_SCHEDULING,_Fields.ADVANCE_INPUT_DATA_HANDLING,_Fields.ADVANCE_OUTPUT_DATA_HANDLING,_Fields.QOS_PARAMS,_Fields.THROTTLE_RESOURCES,_Fields.USER_DN,_Fields.GENERATE_CERT}; + private static final _Fields optionals[] = {_Fields.SHARE_EXPERIMENT_PUBLICLY,_Fields.COMPUTATIONAL_RESOURCE_SCHEDULING,_Fields.ADVANCE_INPUT_DATA_HANDLING,_Fields.ADVANCE_OUTPUT_DATA_HANDLING,_Fields.QOS_PARAMS,_Fields.THROTTLE_RESOURCES,_Fields.USER_DN,_Fields.GENERATE_CERT}; public static final 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); @@ -764,7 +767,59 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_airavataAutoSchedule = true; + list.add(present_airavataAutoSchedule); + if (present_airavataAutoSchedule) + list.add(airavataAutoSchedule); + + boolean present_overrideManualScheduledParams = true; + list.add(present_overrideManualScheduledParams); + if (present_overrideManualScheduledParams) + list.add(overrideManualScheduledParams); + + boolean present_shareExperimentPublicly = true && (isSetShareExperimentPublicly()); + list.add(present_shareExperimentPublicly); + if (present_shareExperimentPublicly) + list.add(shareExperimentPublicly); + + boolean present_computationalResourceScheduling = true && (isSetComputationalResourceScheduling()); + list.add(present_computationalResourceScheduling); + if (present_computationalResourceScheduling) + list.add(computationalResourceScheduling); + + boolean present_advanceInputDataHandling = true && (isSetAdvanceInputDataHandling()); + list.add(present_advanceInputDataHandling); + if (present_advanceInputDataHandling) + list.add(advanceInputDataHandling); + + boolean present_advanceOutputDataHandling = true && (isSetAdvanceOutputDataHandling()); + list.add(present_advanceOutputDataHandling); + if (present_advanceOutputDataHandling) + list.add(advanceOutputDataHandling); + + boolean present_qosParams = true && (isSetQosParams()); + list.add(present_qosParams); + if (present_qosParams) + list.add(qosParams); + + boolean present_throttleResources = true && (isSetThrottleResources()); + list.add(present_throttleResources); + if (present_throttleResources) + list.add(throttleResources); + + boolean present_userDN = true && (isSetUserDN()); + list.add(present_userDN); + if (present_userDN) + list.add(userDN); + + boolean present_generateCert = true && (isSetGenerateCert()); + list.add(present_generateCert); + if (present_generateCert) + list.add(generateCert); + + return list.hashCode(); } @Override
