Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C56691857B for ; Fri, 12 Jun 2015 23:16:30 +0000 (UTC) Received: (qmail 4539 invoked by uid 500); 12 Jun 2015 23:16:30 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 4494 invoked by uid 500); 12 Jun 2015 23:16:30 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 4473 invoked by uid 99); 12 Jun 2015 23:16:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jun 2015 23:16:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 54550E005D; Fri, 12 Jun 2015 23:16:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shameera@apache.org To: commits@airavata.apache.org Date: Fri, 12 Jun 2015 23:16:30 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [01/31] airavata git commit: generated new data model classes. Repository: airavata Updated Branches: refs/heads/master c40488350 -> 51fa27b80 http://git-wip-us.apache.org/repos/asf/airavata/blob/51fa27b8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeStatus.java deleted file mode 100644 index ed7a3e2..0000000 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeStatus.java +++ /dev/null @@ -1,525 +0,0 @@ -/** - * 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.workspace.experiment; - -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-11") -public class WorkflowNodeStatus implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowNodeStatus"); - - private static final org.apache.thrift.protocol.TField WORKFLOW_NODE_STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("workflowNodeState", org.apache.thrift.protocol.TType.I32, (short)1); - private static final org.apache.thrift.protocol.TField TIME_OF_STATE_CHANGE_FIELD_DESC = new org.apache.thrift.protocol.TField("timeOfStateChange", org.apache.thrift.protocol.TType.I64, (short)2); - - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new WorkflowNodeStatusStandardSchemeFactory()); - schemes.put(TupleScheme.class, new WorkflowNodeStatusTupleSchemeFactory()); - } - - private WorkflowNodeState workflowNodeState; // required - private long timeOfStateChange; // 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 { - /** - * - * @see WorkflowNodeState - */ - WORKFLOW_NODE_STATE((short)1, "workflowNodeState"), - TIME_OF_STATE_CHANGE((short)2, "timeOfStateChange"); - - private static final Map byName = new HashMap(); - - 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: // WORKFLOW_NODE_STATE - return WORKFLOW_NODE_STATE; - case 2: // TIME_OF_STATE_CHANGE - return TIME_OF_STATE_CHANGE; - 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 - private static final int __TIMEOFSTATECHANGE_ISSET_ID = 0; - private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.TIME_OF_STATE_CHANGE}; - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; - static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.WORKFLOW_NODE_STATE, new org.apache.thrift.meta_data.FieldMetaData("workflowNodeState", org.apache.thrift.TFieldRequirementType.REQUIRED, - new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, WorkflowNodeState.class))); - tmpMap.put(_Fields.TIME_OF_STATE_CHANGE, new org.apache.thrift.meta_data.FieldMetaData("timeOfStateChange", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); - metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WorkflowNodeStatus.class, metaDataMap); - } - - public WorkflowNodeStatus() { - } - - public WorkflowNodeStatus( - WorkflowNodeState workflowNodeState) - { - this(); - this.workflowNodeState = workflowNodeState; - } - - /** - * Performs a deep copy on other. - */ - public WorkflowNodeStatus(WorkflowNodeStatus other) { - __isset_bitfield = other.__isset_bitfield; - if (other.isSetWorkflowNodeState()) { - this.workflowNodeState = other.workflowNodeState; - } - this.timeOfStateChange = other.timeOfStateChange; - } - - public WorkflowNodeStatus deepCopy() { - return new WorkflowNodeStatus(this); - } - - @Override - public void clear() { - this.workflowNodeState = null; - setTimeOfStateChangeIsSet(false); - this.timeOfStateChange = 0; - } - - /** - * - * @see WorkflowNodeState - */ - public WorkflowNodeState getWorkflowNodeState() { - return this.workflowNodeState; - } - - /** - * - * @see WorkflowNodeState - */ - public void setWorkflowNodeState(WorkflowNodeState workflowNodeState) { - this.workflowNodeState = workflowNodeState; - } - - public void unsetWorkflowNodeState() { - this.workflowNodeState = null; - } - - /** Returns true if field workflowNodeState is set (has been assigned a value) and false otherwise */ - public boolean isSetWorkflowNodeState() { - return this.workflowNodeState != null; - } - - public void setWorkflowNodeStateIsSet(boolean value) { - if (!value) { - this.workflowNodeState = null; - } - } - - public long getTimeOfStateChange() { - return this.timeOfStateChange; - } - - public void setTimeOfStateChange(long timeOfStateChange) { - this.timeOfStateChange = timeOfStateChange; - setTimeOfStateChangeIsSet(true); - } - - public void unsetTimeOfStateChange() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TIMEOFSTATECHANGE_ISSET_ID); - } - - /** Returns true if field timeOfStateChange is set (has been assigned a value) and false otherwise */ - public boolean isSetTimeOfStateChange() { - return EncodingUtils.testBit(__isset_bitfield, __TIMEOFSTATECHANGE_ISSET_ID); - } - - public void setTimeOfStateChangeIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TIMEOFSTATECHANGE_ISSET_ID, value); - } - - public void setFieldValue(_Fields field, Object value) { - switch (field) { - case WORKFLOW_NODE_STATE: - if (value == null) { - unsetWorkflowNodeState(); - } else { - setWorkflowNodeState((WorkflowNodeState)value); - } - break; - - case TIME_OF_STATE_CHANGE: - if (value == null) { - unsetTimeOfStateChange(); - } else { - setTimeOfStateChange((Long)value); - } - break; - - } - } - - public Object getFieldValue(_Fields field) { - switch (field) { - case WORKFLOW_NODE_STATE: - return getWorkflowNodeState(); - - case TIME_OF_STATE_CHANGE: - return Long.valueOf(getTimeOfStateChange()); - - } - 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 WORKFLOW_NODE_STATE: - return isSetWorkflowNodeState(); - case TIME_OF_STATE_CHANGE: - return isSetTimeOfStateChange(); - } - throw new IllegalStateException(); - } - - @Override - public boolean equals(Object that) { - if (that == null) - return false; - if (that instanceof WorkflowNodeStatus) - return this.equals((WorkflowNodeStatus)that); - return false; - } - - public boolean equals(WorkflowNodeStatus that) { - if (that == null) - return false; - - boolean this_present_workflowNodeState = true && this.isSetWorkflowNodeState(); - boolean that_present_workflowNodeState = true && that.isSetWorkflowNodeState(); - if (this_present_workflowNodeState || that_present_workflowNodeState) { - if (!(this_present_workflowNodeState && that_present_workflowNodeState)) - return false; - if (!this.workflowNodeState.equals(that.workflowNodeState)) - return false; - } - - boolean this_present_timeOfStateChange = true && this.isSetTimeOfStateChange(); - boolean that_present_timeOfStateChange = true && that.isSetTimeOfStateChange(); - if (this_present_timeOfStateChange || that_present_timeOfStateChange) { - if (!(this_present_timeOfStateChange && that_present_timeOfStateChange)) - return false; - if (this.timeOfStateChange != that.timeOfStateChange) - return false; - } - - return true; - } - - @Override - public int hashCode() { - List list = new ArrayList(); - - boolean present_workflowNodeState = true && (isSetWorkflowNodeState()); - list.add(present_workflowNodeState); - if (present_workflowNodeState) - list.add(workflowNodeState.getValue()); - - boolean present_timeOfStateChange = true && (isSetTimeOfStateChange()); - list.add(present_timeOfStateChange); - if (present_timeOfStateChange) - list.add(timeOfStateChange); - - return list.hashCode(); - } - - @Override - public int compareTo(WorkflowNodeStatus other) { - if (!getClass().equals(other.getClass())) { - return getClass().getName().compareTo(other.getClass().getName()); - } - - int lastComparison = 0; - - lastComparison = Boolean.valueOf(isSetWorkflowNodeState()).compareTo(other.isSetWorkflowNodeState()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetWorkflowNodeState()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.workflowNodeState, other.workflowNodeState); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetTimeOfStateChange()).compareTo(other.isSetTimeOfStateChange()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTimeOfStateChange()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timeOfStateChange, other.timeOfStateChange); - 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("WorkflowNodeStatus("); - boolean first = true; - - sb.append("workflowNodeState:"); - if (this.workflowNodeState == null) { - sb.append("null"); - } else { - sb.append(this.workflowNodeState); - } - first = false; - if (isSetTimeOfStateChange()) { - if (!first) sb.append(", "); - sb.append("timeOfStateChange:"); - sb.append(this.timeOfStateChange); - first = false; - } - sb.append(")"); - return sb.toString(); - } - - public void validate() throws org.apache.thrift.TException { - // check for required fields - if (!isSetWorkflowNodeState()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'workflowNodeState' is unset! Struct:" + toString()); - } - - // check for sub-struct validity - } - - private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { - try { - write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); - } - } - - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { - try { - // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. - __isset_bitfield = 0; - 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 WorkflowNodeStatusStandardSchemeFactory implements SchemeFactory { - public WorkflowNodeStatusStandardScheme getScheme() { - return new WorkflowNodeStatusStandardScheme(); - } - } - - private static class WorkflowNodeStatusStandardScheme extends StandardScheme { - - public void read(org.apache.thrift.protocol.TProtocol iprot, WorkflowNodeStatus 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: // WORKFLOW_NODE_STATE - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.workflowNodeState = org.apache.airavata.model.workspace.experiment.WorkflowNodeState.findByValue(iprot.readI32()); - struct.setWorkflowNodeStateIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 2: // TIME_OF_STATE_CHANGE - if (schemeField.type == org.apache.thrift.protocol.TType.I64) { - struct.timeOfStateChange = iprot.readI64(); - struct.setTimeOfStateChangeIsSet(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, WorkflowNodeStatus struct) throws org.apache.thrift.TException { - struct.validate(); - - oprot.writeStructBegin(STRUCT_DESC); - if (struct.workflowNodeState != null) { - oprot.writeFieldBegin(WORKFLOW_NODE_STATE_FIELD_DESC); - oprot.writeI32(struct.workflowNodeState.getValue()); - oprot.writeFieldEnd(); - } - if (struct.isSetTimeOfStateChange()) { - oprot.writeFieldBegin(TIME_OF_STATE_CHANGE_FIELD_DESC); - oprot.writeI64(struct.timeOfStateChange); - oprot.writeFieldEnd(); - } - oprot.writeFieldStop(); - oprot.writeStructEnd(); - } - - } - - private static class WorkflowNodeStatusTupleSchemeFactory implements SchemeFactory { - public WorkflowNodeStatusTupleScheme getScheme() { - return new WorkflowNodeStatusTupleScheme(); - } - } - - private static class WorkflowNodeStatusTupleScheme extends TupleScheme { - - @Override - public void write(org.apache.thrift.protocol.TProtocol prot, WorkflowNodeStatus struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - oprot.writeI32(struct.workflowNodeState.getValue()); - BitSet optionals = new BitSet(); - if (struct.isSetTimeOfStateChange()) { - optionals.set(0); - } - oprot.writeBitSet(optionals, 1); - if (struct.isSetTimeOfStateChange()) { - oprot.writeI64(struct.timeOfStateChange); - } - } - - @Override - public void read(org.apache.thrift.protocol.TProtocol prot, WorkflowNodeStatus struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - struct.workflowNodeState = org.apache.airavata.model.workspace.experiment.WorkflowNodeState.findByValue(iprot.readI32()); - struct.setWorkflowNodeStateIsSet(true); - BitSet incoming = iprot.readBitSet(1); - if (incoming.get(0)) { - struct.timeOfStateChange = iprot.readI64(); - struct.setTimeOfStateChangeIsSet(true); - } - } - } - -} - http://git-wip-us.apache.org/repos/asf/airavata/blob/51fa27b8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/experimentModelConstants.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/experimentModelConstants.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/experimentModelConstants.java deleted file mode 100644 index 388f571..0000000 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/experimentModelConstants.java +++ /dev/null @@ -1,60 +0,0 @@ -/** - * 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.1) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ -package org.apache.airavata.model.workspace.experiment; - -import org.apache.thrift.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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@SuppressWarnings("all") public class experimentModelConstants { - - public static final String DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS"; - - public static final String DEFAULT_PROJECT_NAME = "DEFAULT"; - - public static final String SINGLE_APP_NODE_NAME = "SINGLE_APP_NODE"; - -} http://git-wip-us.apache.org/repos/asf/airavata/blob/51fa27b8/thrift-interface-descriptions/airavata-api/airavata_data_models.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-api/airavata_data_models.thrift b/thrift-interface-descriptions/airavata-api/airavata_data_models.thrift index caa747f..349acc3 100644 --- a/thrift-interface-descriptions/airavata-api/airavata_data_models.thrift +++ b/thrift-interface-descriptions/airavata-api/airavata_data_models.thrift @@ -22,6 +22,9 @@ include "workspace_model.thrift" include "airavata_errors.thrift" include "messaging_events.thrift" include "security_model.thrift" +include "job_model.thrift" +include "task_model.thrift" +include "process_model.thrift" namespace java org.apache.airavata.model namespace php Airavata.Model