Repository: airavata Updated Branches: refs/heads/develop ef5756d71 -> c116140c8
http://git-wip-us.apache.org/repos/asf/airavata/blob/c116140c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java index f17b3be..aae42f4 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java @@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory; * User friendly reason on how the state is inferred. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-12") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17") 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"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c116140c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java index 807f854..dfeda72 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-12") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17") 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"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c116140c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java index bf1bca2..7f21e00 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-12") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17") public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, ProcessStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatus"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c116140c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java index 0c8636d..36bc28e 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-12") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17") 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"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c116140c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java index 0eaf63c..4d5217e 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-12") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17") public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStagingTaskModel, DataStagingTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataStagingTaskModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataStagingTaskModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c116140c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java index f489571..9299020 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java @@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory; * EnvironmentSetupTaskModel: A structure holding the environment creation task details * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-12") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17") public class EnvironmentSetupTaskModel implements org.apache.thrift.TBase<EnvironmentSetupTaskModel, EnvironmentSetupTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<EnvironmentSetupTaskModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EnvironmentSetupTaskModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c116140c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java index 36d90d8..282fef8 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-12") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17") public class JobSubmissionTaskModel implements org.apache.thrift.TBase<JobSubmissionTaskModel, JobSubmissionTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<JobSubmissionTaskModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobSubmissionTaskModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c116140c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java index 405a127..d1afb7c 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-12") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17") public class MonitorTaskModel implements org.apache.thrift.TBase<MonitorTaskModel, MonitorTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<MonitorTaskModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MonitorTaskModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c116140c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java index 6ab0319..edf65d3 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * subTaskModel: * A generic byte object for the Task developer to store internal serialized data into registry catalogs. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-12") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17") public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<TaskModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskModel"); @@ -73,6 +73,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._ private static final org.apache.thrift.protocol.TField TASK_DETAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("taskDetail", org.apache.thrift.protocol.TType.STRING, (short)7); private static final org.apache.thrift.protocol.TField SUB_TASK_MODEL_FIELD_DESC = new org.apache.thrift.protocol.TField("subTaskModel", org.apache.thrift.protocol.TType.STRING, (short)8); private static final org.apache.thrift.protocol.TField TASK_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("taskError", org.apache.thrift.protocol.TType.STRUCT, (short)9); + private static final org.apache.thrift.protocol.TField JOBS_FIELD_DESC = new org.apache.thrift.protocol.TField("jobs", org.apache.thrift.protocol.TType.LIST, (short)10); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -89,6 +90,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._ private String taskDetail; // optional private ByteBuffer subTaskModel; // optional private org.apache.airavata.model.commons.ErrorModel taskError; // optional + private List<org.apache.airavata.model.job.JobModel> jobs; // 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 { @@ -104,7 +106,8 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._ TASK_STATUS((short)6, "taskStatus"), TASK_DETAIL((short)7, "taskDetail"), SUB_TASK_MODEL((short)8, "subTaskModel"), - TASK_ERROR((short)9, "taskError"); + TASK_ERROR((short)9, "taskError"), + JOBS((short)10, "jobs"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -137,6 +140,8 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._ return SUB_TASK_MODEL; case 9: // TASK_ERROR return TASK_ERROR; + case 10: // JOBS + return JOBS; default: return null; } @@ -180,7 +185,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._ private static final int __CREATIONTIME_ISSET_ID = 0; private static final int __LASTUPDATETIME_ISSET_ID = 1; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.TASK_DETAIL,_Fields.SUB_TASK_MODEL,_Fields.TASK_ERROR}; + private static final _Fields optionals[] = {_Fields.TASK_DETAIL,_Fields.SUB_TASK_MODEL,_Fields.TASK_ERROR,_Fields.JOBS}; 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); @@ -202,6 +207,9 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))); tmpMap.put(_Fields.TASK_ERROR, new org.apache.thrift.meta_data.FieldMetaData("taskError", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.commons.ErrorModel.class))); + tmpMap.put(_Fields.JOBS, new org.apache.thrift.meta_data.FieldMetaData("jobs", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.job.JobModel.class)))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TaskModel.class, metaDataMap); } @@ -258,6 +266,13 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._ if (other.isSetTaskError()) { this.taskError = new org.apache.airavata.model.commons.ErrorModel(other.taskError); } + if (other.isSetJobs()) { + List<org.apache.airavata.model.job.JobModel> __this__jobs = new ArrayList<org.apache.airavata.model.job.JobModel>(other.jobs.size()); + for (org.apache.airavata.model.job.JobModel other_element : other.jobs) { + __this__jobs.add(new org.apache.airavata.model.job.JobModel(other_element)); + } + this.jobs = __this__jobs; + } } public TaskModel deepCopy() { @@ -278,6 +293,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._ this.taskDetail = null; this.subTaskModel = null; this.taskError = null; + this.jobs = null; } public String getTaskId() { @@ -502,6 +518,44 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._ } } + public int getJobsSize() { + return (this.jobs == null) ? 0 : this.jobs.size(); + } + + public java.util.Iterator<org.apache.airavata.model.job.JobModel> getJobsIterator() { + return (this.jobs == null) ? null : this.jobs.iterator(); + } + + public void addToJobs(org.apache.airavata.model.job.JobModel elem) { + if (this.jobs == null) { + this.jobs = new ArrayList<org.apache.airavata.model.job.JobModel>(); + } + this.jobs.add(elem); + } + + public List<org.apache.airavata.model.job.JobModel> getJobs() { + return this.jobs; + } + + public void setJobs(List<org.apache.airavata.model.job.JobModel> jobs) { + this.jobs = jobs; + } + + public void unsetJobs() { + this.jobs = null; + } + + /** Returns true if field jobs is set (has been assigned a value) and false otherwise */ + public boolean isSetJobs() { + return this.jobs != null; + } + + public void setJobsIsSet(boolean value) { + if (!value) { + this.jobs = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case TASK_ID: @@ -576,6 +630,14 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._ } break; + case JOBS: + if (value == null) { + unsetJobs(); + } else { + setJobs((List<org.apache.airavata.model.job.JobModel>)value); + } + break; + } } @@ -608,6 +670,9 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._ case TASK_ERROR: return getTaskError(); + case JOBS: + return getJobs(); + } throw new IllegalStateException(); } @@ -637,6 +702,8 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._ return isSetSubTaskModel(); case TASK_ERROR: return isSetTaskError(); + case JOBS: + return isSetJobs(); } throw new IllegalStateException(); } @@ -735,6 +802,15 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._ return false; } + boolean this_present_jobs = true && this.isSetJobs(); + boolean that_present_jobs = true && that.isSetJobs(); + if (this_present_jobs || that_present_jobs) { + if (!(this_present_jobs && that_present_jobs)) + return false; + if (!this.jobs.equals(that.jobs)) + return false; + } + return true; } @@ -787,6 +863,11 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._ if (present_taskError) list.add(taskError); + boolean present_jobs = true && (isSetJobs()); + list.add(present_jobs); + if (present_jobs) + list.add(jobs); + return list.hashCode(); } @@ -888,6 +969,16 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._ return lastComparison; } } + lastComparison = Boolean.valueOf(isSetJobs()).compareTo(other.isSetJobs()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetJobs()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jobs, other.jobs); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -977,6 +1068,16 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._ } first = false; } + if (isSetJobs()) { + if (!first) sb.append(", "); + sb.append("jobs:"); + if (this.jobs == null) { + sb.append("null"); + } else { + sb.append(this.jobs); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -1126,6 +1227,25 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 10: // JOBS + if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { + { + org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); + struct.jobs = new ArrayList<org.apache.airavata.model.job.JobModel>(_list0.size); + org.apache.airavata.model.job.JobModel _elem1; + for (int _i2 = 0; _i2 < _list0.size; ++_i2) + { + _elem1 = new org.apache.airavata.model.job.JobModel(); + _elem1.read(iprot); + struct.jobs.add(_elem1); + } + iprot.readListEnd(); + } + struct.setJobsIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1186,6 +1306,20 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._ oprot.writeFieldEnd(); } } + if (struct.jobs != null) { + if (struct.isSetJobs()) { + oprot.writeFieldBegin(JOBS_FIELD_DESC); + { + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.jobs.size())); + for (org.apache.airavata.model.job.JobModel _iter3 : struct.jobs) + { + _iter3.write(oprot); + } + oprot.writeListEnd(); + } + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -1219,7 +1353,10 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._ if (struct.isSetTaskError()) { optionals.set(2); } - oprot.writeBitSet(optionals, 3); + if (struct.isSetJobs()) { + optionals.set(3); + } + oprot.writeBitSet(optionals, 4); if (struct.isSetTaskDetail()) { oprot.writeString(struct.taskDetail); } @@ -1229,6 +1366,15 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._ if (struct.isSetTaskError()) { struct.taskError.write(oprot); } + if (struct.isSetJobs()) { + { + oprot.writeI32(struct.jobs.size()); + for (org.apache.airavata.model.job.JobModel _iter4 : struct.jobs) + { + _iter4.write(oprot); + } + } + } } @Override @@ -1247,7 +1393,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._ struct.taskStatus = new org.apache.airavata.model.status.TaskStatus(); struct.taskStatus.read(iprot); struct.setTaskStatusIsSet(true); - BitSet incoming = iprot.readBitSet(3); + BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.taskDetail = iprot.readString(); struct.setTaskDetailIsSet(true); @@ -1261,6 +1407,20 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._ struct.taskError.read(iprot); struct.setTaskErrorIsSet(true); } + if (incoming.get(3)) { + { + org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.jobs = new ArrayList<org.apache.airavata.model.job.JobModel>(_list5.size); + org.apache.airavata.model.job.JobModel _elem6; + for (int _i7 = 0; _i7 < _list5.size; ++_i7) + { + _elem6 = new org.apache.airavata.model.job.JobModel(); + _elem6.read(iprot); + struct.jobs.add(_elem6); + } + } + struct.setJobsIsSet(true); + } } } http://git-wip-us.apache.org/repos/asf/airavata/blob/c116140c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java index a8bd80e..c1433ee 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-12") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17") public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields>, java.io.Serializable, Cloneable, Comparable<Gateway> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Gateway"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c116140c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java index 0d1d9b1..b67a07a 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-12") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17") public class Group implements org.apache.thrift.TBase<Group, Group._Fields>, java.io.Serializable, Cloneable, Comparable<Group> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Group"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c116140c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java index 47f7742..146453d 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-12") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17") public class Project implements org.apache.thrift.TBase<Project, Project._Fields>, java.io.Serializable, Cloneable, Comparable<Project> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Project"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c116140c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java index 5bd28f1..992b95f 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-12") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17") public class User implements org.apache.thrift.TBase<User, User._Fields>, java.io.Serializable, Cloneable, Comparable<User> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("User");
