Repository: airavata Updated Branches: refs/heads/master 9ee0df7c1 -> aec8f411d
http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java new file mode 100644 index 0000000..5d8255c --- /dev/null +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java @@ -0,0 +1,524 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * 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.messaging.event; + +import org.apache.thrift.scheme.IScheme; +import org.apache.thrift.scheme.SchemeFactory; +import org.apache.thrift.scheme.StandardScheme; + +import org.apache.thrift.scheme.TupleScheme; +import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; +import java.util.List; +import java.util.ArrayList; +import java.util.Map; +import java.util.HashMap; +import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; +import java.util.EnumSet; +import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import javax.annotation.Generated; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23") +public class ProcessStatusChangeEvent implements org.apache.thrift.TBase<ProcessStatusChangeEvent, ProcessStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessStatusChangeEvent> { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatusChangeEvent"); + + private static final org.apache.thrift.protocol.TField STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("state", org.apache.thrift.protocol.TType.I32, (short)1); + private static final org.apache.thrift.protocol.TField PROCESS_IDENTITY_FIELD_DESC = new org.apache.thrift.protocol.TField("processIdentity", org.apache.thrift.protocol.TType.STRUCT, (short)2); + + private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new ProcessStatusChangeEventStandardSchemeFactory()); + schemes.put(TupleScheme.class, new ProcessStatusChangeEventTupleSchemeFactory()); + } + + private org.apache.airavata.model.status.ProcessState state; // required + private ProcessIdentifier processIdentity; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + /** + * + * @see org.apache.airavata.model.status.ProcessState + */ + STATE((short)1, "state"), + PROCESS_IDENTITY((short)2, "processIdentity"); + + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 1: // STATE + return STATE; + case 2: // PROCESS_IDENTITY + return PROCESS_IDENTITY; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + 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); + tmpMap.put(_Fields.STATE, new org.apache.thrift.meta_data.FieldMetaData("state", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.status.ProcessState.class))); + tmpMap.put(_Fields.PROCESS_IDENTITY, new org.apache.thrift.meta_data.FieldMetaData("processIdentity", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ProcessIdentifier.class))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ProcessStatusChangeEvent.class, metaDataMap); + } + + public ProcessStatusChangeEvent() { + } + + public ProcessStatusChangeEvent( + org.apache.airavata.model.status.ProcessState state, + ProcessIdentifier processIdentity) + { + this(); + this.state = state; + this.processIdentity = processIdentity; + } + + /** + * Performs a deep copy on <i>other</i>. + */ + public ProcessStatusChangeEvent(ProcessStatusChangeEvent other) { + if (other.isSetState()) { + this.state = other.state; + } + if (other.isSetProcessIdentity()) { + this.processIdentity = new ProcessIdentifier(other.processIdentity); + } + } + + public ProcessStatusChangeEvent deepCopy() { + return new ProcessStatusChangeEvent(this); + } + + @Override + public void clear() { + this.state = null; + this.processIdentity = null; + } + + /** + * + * @see org.apache.airavata.model.status.ProcessState + */ + public org.apache.airavata.model.status.ProcessState getState() { + return this.state; + } + + /** + * + * @see org.apache.airavata.model.status.ProcessState + */ + public void setState(org.apache.airavata.model.status.ProcessState state) { + this.state = state; + } + + public void unsetState() { + this.state = null; + } + + /** Returns true if field state is set (has been assigned a value) and false otherwise */ + public boolean isSetState() { + return this.state != null; + } + + public void setStateIsSet(boolean value) { + if (!value) { + this.state = null; + } + } + + public ProcessIdentifier getProcessIdentity() { + return this.processIdentity; + } + + public void setProcessIdentity(ProcessIdentifier processIdentity) { + this.processIdentity = processIdentity; + } + + public void unsetProcessIdentity() { + this.processIdentity = null; + } + + /** Returns true if field processIdentity is set (has been assigned a value) and false otherwise */ + public boolean isSetProcessIdentity() { + return this.processIdentity != null; + } + + public void setProcessIdentityIsSet(boolean value) { + if (!value) { + this.processIdentity = null; + } + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case STATE: + if (value == null) { + unsetState(); + } else { + setState((org.apache.airavata.model.status.ProcessState)value); + } + break; + + case PROCESS_IDENTITY: + if (value == null) { + unsetProcessIdentity(); + } else { + setProcessIdentity((ProcessIdentifier)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case STATE: + return getState(); + + case PROCESS_IDENTITY: + return getProcessIdentity(); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case STATE: + return isSetState(); + case PROCESS_IDENTITY: + return isSetProcessIdentity(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof ProcessStatusChangeEvent) + return this.equals((ProcessStatusChangeEvent)that); + return false; + } + + public boolean equals(ProcessStatusChangeEvent that) { + if (that == null) + return false; + + boolean this_present_state = true && this.isSetState(); + boolean that_present_state = true && that.isSetState(); + if (this_present_state || that_present_state) { + if (!(this_present_state && that_present_state)) + return false; + if (!this.state.equals(that.state)) + return false; + } + + boolean this_present_processIdentity = true && this.isSetProcessIdentity(); + boolean that_present_processIdentity = true && that.isSetProcessIdentity(); + if (this_present_processIdentity || that_present_processIdentity) { + if (!(this_present_processIdentity && that_present_processIdentity)) + return false; + if (!this.processIdentity.equals(that.processIdentity)) + return false; + } + + return true; + } + + @Override + public int hashCode() { + List<Object> list = new ArrayList<Object>(); + + boolean present_state = true && (isSetState()); + list.add(present_state); + if (present_state) + list.add(state.getValue()); + + boolean present_processIdentity = true && (isSetProcessIdentity()); + list.add(present_processIdentity); + if (present_processIdentity) + list.add(processIdentity); + + return list.hashCode(); + } + + @Override + public int compareTo(ProcessStatusChangeEvent other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetState()).compareTo(other.isSetState()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetState()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.state, other.state); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetProcessIdentity()).compareTo(other.isSetProcessIdentity()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetProcessIdentity()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.processIdentity, other.processIdentity); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + 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 org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("ProcessStatusChangeEvent("); + boolean first = true; + + sb.append("state:"); + if (this.state == null) { + sb.append("null"); + } else { + sb.append(this.state); + } + first = false; + if (!first) sb.append(", "); + sb.append("processIdentity:"); + if (this.processIdentity == null) { + sb.append("null"); + } else { + sb.append(this.processIdentity); + } + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + if (!isSetState()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'state' is unset! Struct:" + toString()); + } + + if (!isSetProcessIdentity()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'processIdentity' is unset! Struct:" + toString()); + } + + // check for sub-struct validity + if (processIdentity != null) { + processIdentity.validate(); + } + } + + 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 (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class ProcessStatusChangeEventStandardSchemeFactory implements SchemeFactory { + public ProcessStatusChangeEventStandardScheme getScheme() { + return new ProcessStatusChangeEventStandardScheme(); + } + } + + private static class ProcessStatusChangeEventStandardScheme extends StandardScheme<ProcessStatusChangeEvent> { + + public void read(org.apache.thrift.protocol.TProtocol iprot, ProcessStatusChangeEvent struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 1: // STATE + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + struct.state = org.apache.airavata.model.status.ProcessState.findByValue(iprot.readI32()); + struct.setStateIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 2: // PROCESS_IDENTITY + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.processIdentity = new ProcessIdentifier(); + struct.processIdentity.read(iprot); + struct.setProcessIdentityIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, ProcessStatusChangeEvent struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.state != null) { + oprot.writeFieldBegin(STATE_FIELD_DESC); + oprot.writeI32(struct.state.getValue()); + oprot.writeFieldEnd(); + } + if (struct.processIdentity != null) { + oprot.writeFieldBegin(PROCESS_IDENTITY_FIELD_DESC); + struct.processIdentity.write(oprot); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class ProcessStatusChangeEventTupleSchemeFactory implements SchemeFactory { + public ProcessStatusChangeEventTupleScheme getScheme() { + return new ProcessStatusChangeEventTupleScheme(); + } + } + + private static class ProcessStatusChangeEventTupleScheme extends TupleScheme<ProcessStatusChangeEvent> { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, ProcessStatusChangeEvent struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + oprot.writeI32(struct.state.getValue()); + struct.processIdentity.write(oprot); + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, ProcessStatusChangeEvent struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + struct.state = org.apache.airavata.model.status.ProcessState.findByValue(iprot.readI32()); + struct.setStateIsSet(true); + struct.processIdentity = new ProcessIdentifier(); + struct.processIdentity.read(iprot); + struct.setProcessIdentityIsSet(true); + } + } + +} + http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java new file mode 100644 index 0000000..0d002e5 --- /dev/null +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java @@ -0,0 +1,524 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * 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.messaging.event; + +import org.apache.thrift.scheme.IScheme; +import org.apache.thrift.scheme.SchemeFactory; +import org.apache.thrift.scheme.StandardScheme; + +import org.apache.thrift.scheme.TupleScheme; +import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; +import java.util.List; +import java.util.ArrayList; +import java.util.Map; +import java.util.HashMap; +import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; +import java.util.EnumSet; +import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import javax.annotation.Generated; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23") +public class ProcessStatusChangeRequestEvent implements org.apache.thrift.TBase<ProcessStatusChangeRequestEvent, ProcessStatusChangeRequestEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessStatusChangeRequestEvent> { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatusChangeRequestEvent"); + + private static final org.apache.thrift.protocol.TField STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("state", org.apache.thrift.protocol.TType.I32, (short)1); + private static final org.apache.thrift.protocol.TField PROCESS_IDENTITY_FIELD_DESC = new org.apache.thrift.protocol.TField("processIdentity", org.apache.thrift.protocol.TType.STRUCT, (short)2); + + private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new ProcessStatusChangeRequestEventStandardSchemeFactory()); + schemes.put(TupleScheme.class, new ProcessStatusChangeRequestEventTupleSchemeFactory()); + } + + private org.apache.airavata.model.status.TaskState state; // required + private ProcessIdentifier processIdentity; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + /** + * + * @see org.apache.airavata.model.status.TaskState + */ + STATE((short)1, "state"), + PROCESS_IDENTITY((short)2, "processIdentity"); + + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 1: // STATE + return STATE; + case 2: // PROCESS_IDENTITY + return PROCESS_IDENTITY; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + 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); + tmpMap.put(_Fields.STATE, new org.apache.thrift.meta_data.FieldMetaData("state", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.status.TaskState.class))); + tmpMap.put(_Fields.PROCESS_IDENTITY, new org.apache.thrift.meta_data.FieldMetaData("processIdentity", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ProcessIdentifier.class))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ProcessStatusChangeRequestEvent.class, metaDataMap); + } + + public ProcessStatusChangeRequestEvent() { + } + + public ProcessStatusChangeRequestEvent( + org.apache.airavata.model.status.TaskState state, + ProcessIdentifier processIdentity) + { + this(); + this.state = state; + this.processIdentity = processIdentity; + } + + /** + * Performs a deep copy on <i>other</i>. + */ + public ProcessStatusChangeRequestEvent(ProcessStatusChangeRequestEvent other) { + if (other.isSetState()) { + this.state = other.state; + } + if (other.isSetProcessIdentity()) { + this.processIdentity = new ProcessIdentifier(other.processIdentity); + } + } + + public ProcessStatusChangeRequestEvent deepCopy() { + return new ProcessStatusChangeRequestEvent(this); + } + + @Override + public void clear() { + this.state = null; + this.processIdentity = null; + } + + /** + * + * @see org.apache.airavata.model.status.TaskState + */ + public org.apache.airavata.model.status.TaskState getState() { + return this.state; + } + + /** + * + * @see org.apache.airavata.model.status.TaskState + */ + public void setState(org.apache.airavata.model.status.TaskState state) { + this.state = state; + } + + public void unsetState() { + this.state = null; + } + + /** Returns true if field state is set (has been assigned a value) and false otherwise */ + public boolean isSetState() { + return this.state != null; + } + + public void setStateIsSet(boolean value) { + if (!value) { + this.state = null; + } + } + + public ProcessIdentifier getProcessIdentity() { + return this.processIdentity; + } + + public void setProcessIdentity(ProcessIdentifier processIdentity) { + this.processIdentity = processIdentity; + } + + public void unsetProcessIdentity() { + this.processIdentity = null; + } + + /** Returns true if field processIdentity is set (has been assigned a value) and false otherwise */ + public boolean isSetProcessIdentity() { + return this.processIdentity != null; + } + + public void setProcessIdentityIsSet(boolean value) { + if (!value) { + this.processIdentity = null; + } + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case STATE: + if (value == null) { + unsetState(); + } else { + setState((org.apache.airavata.model.status.TaskState)value); + } + break; + + case PROCESS_IDENTITY: + if (value == null) { + unsetProcessIdentity(); + } else { + setProcessIdentity((ProcessIdentifier)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case STATE: + return getState(); + + case PROCESS_IDENTITY: + return getProcessIdentity(); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case STATE: + return isSetState(); + case PROCESS_IDENTITY: + return isSetProcessIdentity(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof ProcessStatusChangeRequestEvent) + return this.equals((ProcessStatusChangeRequestEvent)that); + return false; + } + + public boolean equals(ProcessStatusChangeRequestEvent that) { + if (that == null) + return false; + + boolean this_present_state = true && this.isSetState(); + boolean that_present_state = true && that.isSetState(); + if (this_present_state || that_present_state) { + if (!(this_present_state && that_present_state)) + return false; + if (!this.state.equals(that.state)) + return false; + } + + boolean this_present_processIdentity = true && this.isSetProcessIdentity(); + boolean that_present_processIdentity = true && that.isSetProcessIdentity(); + if (this_present_processIdentity || that_present_processIdentity) { + if (!(this_present_processIdentity && that_present_processIdentity)) + return false; + if (!this.processIdentity.equals(that.processIdentity)) + return false; + } + + return true; + } + + @Override + public int hashCode() { + List<Object> list = new ArrayList<Object>(); + + boolean present_state = true && (isSetState()); + list.add(present_state); + if (present_state) + list.add(state.getValue()); + + boolean present_processIdentity = true && (isSetProcessIdentity()); + list.add(present_processIdentity); + if (present_processIdentity) + list.add(processIdentity); + + return list.hashCode(); + } + + @Override + public int compareTo(ProcessStatusChangeRequestEvent other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetState()).compareTo(other.isSetState()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetState()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.state, other.state); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetProcessIdentity()).compareTo(other.isSetProcessIdentity()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetProcessIdentity()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.processIdentity, other.processIdentity); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + 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 org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("ProcessStatusChangeRequestEvent("); + boolean first = true; + + sb.append("state:"); + if (this.state == null) { + sb.append("null"); + } else { + sb.append(this.state); + } + first = false; + if (!first) sb.append(", "); + sb.append("processIdentity:"); + if (this.processIdentity == null) { + sb.append("null"); + } else { + sb.append(this.processIdentity); + } + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + if (!isSetState()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'state' is unset! Struct:" + toString()); + } + + if (!isSetProcessIdentity()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'processIdentity' is unset! Struct:" + toString()); + } + + // check for sub-struct validity + if (processIdentity != null) { + processIdentity.validate(); + } + } + + 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 (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class ProcessStatusChangeRequestEventStandardSchemeFactory implements SchemeFactory { + public ProcessStatusChangeRequestEventStandardScheme getScheme() { + return new ProcessStatusChangeRequestEventStandardScheme(); + } + } + + private static class ProcessStatusChangeRequestEventStandardScheme extends StandardScheme<ProcessStatusChangeRequestEvent> { + + public void read(org.apache.thrift.protocol.TProtocol iprot, ProcessStatusChangeRequestEvent struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 1: // STATE + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + struct.state = org.apache.airavata.model.status.TaskState.findByValue(iprot.readI32()); + struct.setStateIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 2: // PROCESS_IDENTITY + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.processIdentity = new ProcessIdentifier(); + struct.processIdentity.read(iprot); + struct.setProcessIdentityIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, ProcessStatusChangeRequestEvent struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.state != null) { + oprot.writeFieldBegin(STATE_FIELD_DESC); + oprot.writeI32(struct.state.getValue()); + oprot.writeFieldEnd(); + } + if (struct.processIdentity != null) { + oprot.writeFieldBegin(PROCESS_IDENTITY_FIELD_DESC); + struct.processIdentity.write(oprot); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class ProcessStatusChangeRequestEventTupleSchemeFactory implements SchemeFactory { + public ProcessStatusChangeRequestEventTupleScheme getScheme() { + return new ProcessStatusChangeRequestEventTupleScheme(); + } + } + + private static class ProcessStatusChangeRequestEventTupleScheme extends TupleScheme<ProcessStatusChangeRequestEvent> { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, ProcessStatusChangeRequestEvent struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + oprot.writeI32(struct.state.getValue()); + struct.processIdentity.write(oprot); + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, ProcessStatusChangeRequestEvent struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + struct.state = org.apache.airavata.model.status.TaskState.findByValue(iprot.readI32()); + struct.setStateIsSet(true); + struct.processIdentity = new ProcessIdentifier(); + struct.processIdentity.read(iprot); + struct.setProcessIdentityIsSet(true); + } + } + +} + http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java index e6bc73f..ee1db51 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.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-6-18") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23") public class ProcessSubmitEvent implements org.apache.thrift.TBase<ProcessSubmitEvent, ProcessSubmitEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessSubmitEvent> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessSubmitEvent"); http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java index 4d1429e..f400b0d 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java @@ -51,12 +51,12 @@ 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-18") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23") public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, TaskIdentifier._Fields>, java.io.Serializable, Cloneable, Comparable<TaskIdentifier> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskIdentifier"); 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); - private static final org.apache.thrift.protocol.TField WORKFLOW_NODE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("workflowNodeId", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField PROCESS_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("processId", org.apache.thrift.protocol.TType.STRING, (short)2); 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)3); private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)4); @@ -67,14 +67,14 @@ public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, T } private String taskId; // required - private String workflowNodeId; // required + private String processId; // required private String experimentId; // required private String gatewayId; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { TASK_ID((short)1, "taskId"), - WORKFLOW_NODE_ID((short)2, "workflowNodeId"), + PROCESS_ID((short)2, "processId"), EXPERIMENT_ID((short)3, "experimentId"), GATEWAY_ID((short)4, "gatewayId"); @@ -93,8 +93,8 @@ public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, T switch(fieldId) { case 1: // TASK_ID return TASK_ID; - case 2: // WORKFLOW_NODE_ID - return WORKFLOW_NODE_ID; + case 2: // PROCESS_ID + return PROCESS_ID; case 3: // EXPERIMENT_ID return EXPERIMENT_ID; case 4: // GATEWAY_ID @@ -144,7 +144,7 @@ public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, T Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.TASK_ID, new org.apache.thrift.meta_data.FieldMetaData("taskId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.WORKFLOW_NODE_ID, new org.apache.thrift.meta_data.FieldMetaData("workflowNodeId", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.PROCESS_ID, new org.apache.thrift.meta_data.FieldMetaData("processId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.EXPERIMENT_ID, new org.apache.thrift.meta_data.FieldMetaData("experimentId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); @@ -159,13 +159,13 @@ public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, T public TaskIdentifier( String taskId, - String workflowNodeId, + String processId, String experimentId, String gatewayId) { this(); this.taskId = taskId; - this.workflowNodeId = workflowNodeId; + this.processId = processId; this.experimentId = experimentId; this.gatewayId = gatewayId; } @@ -177,8 +177,8 @@ public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, T if (other.isSetTaskId()) { this.taskId = other.taskId; } - if (other.isSetWorkflowNodeId()) { - this.workflowNodeId = other.workflowNodeId; + if (other.isSetProcessId()) { + this.processId = other.processId; } if (other.isSetExperimentId()) { this.experimentId = other.experimentId; @@ -195,7 +195,7 @@ public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, T @Override public void clear() { this.taskId = null; - this.workflowNodeId = null; + this.processId = null; this.experimentId = null; this.gatewayId = null; } @@ -223,26 +223,26 @@ public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, T } } - public String getWorkflowNodeId() { - return this.workflowNodeId; + public String getProcessId() { + return this.processId; } - public void setWorkflowNodeId(String workflowNodeId) { - this.workflowNodeId = workflowNodeId; + public void setProcessId(String processId) { + this.processId = processId; } - public void unsetWorkflowNodeId() { - this.workflowNodeId = null; + public void unsetProcessId() { + this.processId = null; } - /** Returns true if field workflowNodeId is set (has been assigned a value) and false otherwise */ - public boolean isSetWorkflowNodeId() { - return this.workflowNodeId != null; + /** Returns true if field processId is set (has been assigned a value) and false otherwise */ + public boolean isSetProcessId() { + return this.processId != null; } - public void setWorkflowNodeIdIsSet(boolean value) { + public void setProcessIdIsSet(boolean value) { if (!value) { - this.workflowNodeId = null; + this.processId = null; } } @@ -302,11 +302,11 @@ public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, T } break; - case WORKFLOW_NODE_ID: + case PROCESS_ID: if (value == null) { - unsetWorkflowNodeId(); + unsetProcessId(); } else { - setWorkflowNodeId((String)value); + setProcessId((String)value); } break; @@ -334,8 +334,8 @@ public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, T case TASK_ID: return getTaskId(); - case WORKFLOW_NODE_ID: - return getWorkflowNodeId(); + case PROCESS_ID: + return getProcessId(); case EXPERIMENT_ID: return getExperimentId(); @@ -356,8 +356,8 @@ public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, T switch (field) { case TASK_ID: return isSetTaskId(); - case WORKFLOW_NODE_ID: - return isSetWorkflowNodeId(); + case PROCESS_ID: + return isSetProcessId(); case EXPERIMENT_ID: return isSetExperimentId(); case GATEWAY_ID: @@ -388,12 +388,12 @@ public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, T return false; } - boolean this_present_workflowNodeId = true && this.isSetWorkflowNodeId(); - boolean that_present_workflowNodeId = true && that.isSetWorkflowNodeId(); - if (this_present_workflowNodeId || that_present_workflowNodeId) { - if (!(this_present_workflowNodeId && that_present_workflowNodeId)) + boolean this_present_processId = true && this.isSetProcessId(); + boolean that_present_processId = true && that.isSetProcessId(); + if (this_present_processId || that_present_processId) { + if (!(this_present_processId && that_present_processId)) return false; - if (!this.workflowNodeId.equals(that.workflowNodeId)) + if (!this.processId.equals(that.processId)) return false; } @@ -427,10 +427,10 @@ public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, T if (present_taskId) list.add(taskId); - boolean present_workflowNodeId = true && (isSetWorkflowNodeId()); - list.add(present_workflowNodeId); - if (present_workflowNodeId) - list.add(workflowNodeId); + boolean present_processId = true && (isSetProcessId()); + list.add(present_processId); + if (present_processId) + list.add(processId); boolean present_experimentId = true && (isSetExperimentId()); list.add(present_experimentId); @@ -463,12 +463,12 @@ public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, T return lastComparison; } } - lastComparison = Boolean.valueOf(isSetWorkflowNodeId()).compareTo(other.isSetWorkflowNodeId()); + lastComparison = Boolean.valueOf(isSetProcessId()).compareTo(other.isSetProcessId()); if (lastComparison != 0) { return lastComparison; } - if (isSetWorkflowNodeId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.workflowNodeId, other.workflowNodeId); + if (isSetProcessId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.processId, other.processId); if (lastComparison != 0) { return lastComparison; } @@ -521,11 +521,11 @@ public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, T } first = false; if (!first) sb.append(", "); - sb.append("workflowNodeId:"); - if (this.workflowNodeId == null) { + sb.append("processId:"); + if (this.processId == null) { sb.append("null"); } else { - sb.append(this.workflowNodeId); + sb.append(this.processId); } first = false; if (!first) sb.append(", "); @@ -554,8 +554,8 @@ public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, T throw new org.apache.thrift.protocol.TProtocolException("Required field 'taskId' is unset! Struct:" + toString()); } - if (!isSetWorkflowNodeId()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'workflowNodeId' is unset! Struct:" + toString()); + if (!isSetProcessId()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'processId' is unset! Struct:" + toString()); } if (!isSetExperimentId()) { @@ -611,10 +611,10 @@ public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, T org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // WORKFLOW_NODE_ID + case 2: // PROCESS_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.workflowNodeId = iprot.readString(); - struct.setWorkflowNodeIdIsSet(true); + struct.processId = iprot.readString(); + struct.setProcessIdIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -653,9 +653,9 @@ public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, T oprot.writeString(struct.taskId); oprot.writeFieldEnd(); } - if (struct.workflowNodeId != null) { - oprot.writeFieldBegin(WORKFLOW_NODE_ID_FIELD_DESC); - oprot.writeString(struct.workflowNodeId); + if (struct.processId != null) { + oprot.writeFieldBegin(PROCESS_ID_FIELD_DESC); + oprot.writeString(struct.processId); oprot.writeFieldEnd(); } if (struct.experimentId != null) { @@ -686,7 +686,7 @@ public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, T public void write(org.apache.thrift.protocol.TProtocol prot, TaskIdentifier struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; oprot.writeString(struct.taskId); - oprot.writeString(struct.workflowNodeId); + oprot.writeString(struct.processId); oprot.writeString(struct.experimentId); oprot.writeString(struct.gatewayId); } @@ -696,8 +696,8 @@ public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, T TTupleProtocol iprot = (TTupleProtocol) prot; struct.taskId = iprot.readString(); struct.setTaskIdIsSet(true); - struct.workflowNodeId = iprot.readString(); - struct.setWorkflowNodeIdIsSet(true); + struct.processId = iprot.readString(); + struct.setProcessIdIsSet(true); struct.experimentId = iprot.readString(); struct.setExperimentIdIsSet(true); struct.gatewayId = iprot.readString(); http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java index 53e2833..1e67e54 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.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-6-18") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23") public class TaskOutputChangeEvent implements org.apache.thrift.TBase<TaskOutputChangeEvent, TaskOutputChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskOutputChangeEvent> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskOutputChangeEvent"); http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java index ddd7a39..59673aa 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.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-6-18") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23") public class TaskStatusChangeEvent implements org.apache.thrift.TBase<TaskStatusChangeEvent, TaskStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatusChangeEvent> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatusChangeEvent"); http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java index 3f039e8..4f2ed69 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.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-6-18") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23") public class TaskStatusChangeRequestEvent implements org.apache.thrift.TBase<TaskStatusChangeRequestEvent, TaskStatusChangeRequestEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatusChangeRequestEvent> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatusChangeRequestEvent"); http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskSubmitEvent.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskSubmitEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskSubmitEvent.java index 8c9cada..6118429 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskSubmitEvent.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskSubmitEvent.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-6-18") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23") public class TaskSubmitEvent implements org.apache.thrift.TBase<TaskSubmitEvent, TaskSubmitEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskSubmitEvent> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskSubmitEvent"); http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskTerminateEvent.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskTerminateEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskTerminateEvent.java index 6e766c8..7d31cc9 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskTerminateEvent.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskTerminateEvent.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-6-18") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23") public class TaskTerminateEvent implements org.apache.thrift.TBase<TaskTerminateEvent, TaskTerminateEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskTerminateEvent> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskTerminateEvent"); http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java index 407a0f2..582d3b9 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23") public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, ProcessModel._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java index 244fd31..fbb318e 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java @@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory; * * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23") public class ComputationalResourceSchedulingModel implements org.apache.thrift.TBase<ComputationalResourceSchedulingModel, ComputationalResourceSchedulingModel._Fields>, java.io.Serializable, Cloneable, Comparable<ComputationalResourceSchedulingModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputationalResourceSchedulingModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java index 3ddc7c0..35524bb 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.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-6-18") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23") public class AuthzToken implements org.apache.thrift.TBase<AuthzToken, AuthzToken._Fields>, java.io.Serializable, Cloneable, Comparable<AuthzToken> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthzToken"); http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/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 780e879..712bc61 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-6-18") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23") 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/aec8f411/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 6896ec2..a333e52 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-6-18") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23") 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/aec8f411/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 4b55123..aee590d 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-6-18") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23") 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/aec8f411/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 fe01c79..8c933c2 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-6-18") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23") 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/aec8f411/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 ea951a9..8004e76 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 @@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory; * A friendly description of the task, usally used to communicate information to users. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23") 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/aec8f411/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 ca555b7..563da06 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; * taskInternalStore: * 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-6-18") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23") 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"); http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/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 ad3a254..fd6c631 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-6-18") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23") 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/aec8f411/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 d431e0e..39a08be 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-6-18") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23") 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/aec8f411/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 a7cfd40..fa52def 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-6-18") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23") 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/aec8f411/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 108ece3..4fdd074 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-6-18") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23") 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"); http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java ---------------------------------------------------------------------- diff --git a/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java b/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java index 955feed..301934b 100644 --- a/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java +++ b/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java @@ -123,7 +123,7 @@ public class RabbitMQListener { } catch (TException e) { logger.error(e.getMessage(), e); } - }else if (message.getType().equals(MessageType.WORKFLOWNODE)){ + }else if (message.getType().equals(MessageType.PROCESS)){ /*try { WorkflowNodeStatusChangeEvent event = new WorkflowNodeStatusChangeEvent(); TBase messageEvent = message.getEvent(); http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQStatusPublisher.java ---------------------------------------------------------------------- diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQStatusPublisher.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQStatusPublisher.java index a578148..cebbed4 100644 --- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQStatusPublisher.java +++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQStatusPublisher.java @@ -73,20 +73,20 @@ public class RabbitMQStatusPublisher implements Publisher { } else if (msgCtx.getType() == MessageType.TASK) { TaskStatusChangeEvent event = (TaskStatusChangeEvent) msgCtx.getEvent(); routingKey = gatewayId + "." + event.getTaskIdentity().getExperimentId() + "." + - event.getTaskIdentity().getWorkflowNodeId() + "." + event.getTaskIdentity().getTaskId(); + event.getTaskIdentity().getProcessId() + "." + event.getTaskIdentity().getTaskId(); } else if (msgCtx.getType() == MessageType.TASKOUTPUT) { TaskOutputChangeEvent event = (TaskOutputChangeEvent) msgCtx.getEvent(); routingKey = gatewayId + "." + event.getTaskIdentity().getExperimentId() + "." + - event.getTaskIdentity().getWorkflowNodeId() + "." + event.getTaskIdentity().getTaskId(); - } else if (msgCtx.getType() == MessageType.WORKFLOWNODE) { - /*WorkflowNodeStatusChangeEvent event = (WorkflowNodeStatusChangeEvent) msgCtx.getEvent(); - WorkflowIdentifier workflowNodeIdentity = event.getWorkflowNodeIdentity(); - routingKey = gatewayId + "." + workflowNodeIdentity.getExperimentId() + "." + workflowNodeIdentity.getWorkflowNodeId();*/ + event.getTaskIdentity().getProcessId() + "." + event.getTaskIdentity().getTaskId(); + } else if (msgCtx.getType() == MessageType.PROCESS) { + ProcessStatusChangeEvent event = (ProcessStatusChangeEvent) msgCtx.getEvent(); + ProcessIdentifier processIdentifier = event.getProcessIdentity(); + routingKey = gatewayId + "." + processIdentifier.getExperimentId() + "." + processIdentifier.getProcessId(); } else if (msgCtx.getType() == MessageType.JOB) { JobStatusChangeEvent event = (JobStatusChangeEvent) msgCtx.getEvent(); JobIdentifier identity = event.getJobIdentity(); routingKey = gatewayId + "." + identity.getExperimentId() + "." + - identity.getWorkflowNodeId() + "." + + identity.getProcessId() + "." + identity.getTaskId() + "." + identity.getJobId(); } http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/thrift-interface-descriptions/airavata-api/messaging_events.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-api/messaging_events.thrift b/thrift-interface-descriptions/airavata-api/messaging_events.thrift index 3c55e92..b391ed7 100644 --- a/thrift-interface-descriptions/airavata-api/messaging_events.thrift +++ b/thrift-interface-descriptions/airavata-api/messaging_events.thrift @@ -38,7 +38,7 @@ enum MessageLevel { enum MessageType { EXPERIMENT, TASK, - WORKFLOWNODE, + PROCESS, JOB, LAUNCHTASK, TERMINATETASK, @@ -51,9 +51,15 @@ struct ExperimentStatusChangeEvent { 3: required string gatewayId; } +struct ProcessIdentifier { + 1: required string processId; + 2: required string experimentId; + 3: required string gatewayId; +} + struct TaskIdentifier { 1: required string taskId; - 2: required string workflowNodeId; + 2: required string processId; 3: required string experimentId; 4: required string gatewayId; } @@ -68,6 +74,16 @@ struct TaskStatusChangeRequestEvent { 2: required TaskIdentifier taskIdentity; } +struct ProcessStatusChangeEvent { + 1: required status_models.ProcessState state; + 2: required ProcessIdentifier processIdentity; +} + +struct ProcessStatusChangeRequestEvent { + 1: required status_models.TaskState state; + 2: required ProcessIdentifier processIdentity; +} + struct TaskOutputChangeEvent { 1: required list<application_io_models.OutputDataObjectType> output; 2: required TaskIdentifier taskIdentity; @@ -76,7 +92,7 @@ struct TaskOutputChangeEvent { struct JobIdentifier { 1: required string jobId; 2: required string taskId; - 3: required string workflowNodeId; + 3: required string processId; 4: required string experimentId; 5: required string gatewayId; }
