http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java deleted file mode 100644 index 4a657b0..0000000 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java +++ /dev/null @@ -1,630 +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.appcatalog.computeresource; - -import org.apache.thrift.scheme.IScheme; -import org.apache.thrift.scheme.SchemeFactory; -import org.apache.thrift.scheme.StandardScheme; - -import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import org.apache.thrift.async.AsyncMethodCallback; -import org.apache.thrift.server.AbstractNonblockingServer.*; -import java.util.List; -import java.util.ArrayList; -import java.util.Map; -import java.util.HashMap; -import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; -import java.util.EnumSet; -import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import javax.annotation.Generated; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -/** - * Data Movement Interfaces - * - * dataMovementInterfaceId: The Data Movement Interface has to be previously registered and referenced here. - * - * priorityOrder: - * For resources with multiple interfaces, the priority order should be selected. - * Lower the numerical number, higher the priority - * - */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-23") -public class DataMovementInterface implements org.apache.thrift.TBase<DataMovementInterface, DataMovementInterface._Fields>, java.io.Serializable, Cloneable, Comparable<DataMovementInterface> { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataMovementInterface"); - - private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovementInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_PROTOCOL_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovementProtocol", org.apache.thrift.protocol.TType.I32, (short)2); - private static final org.apache.thrift.protocol.TField PRIORITY_ORDER_FIELD_DESC = new org.apache.thrift.protocol.TField("priorityOrder", org.apache.thrift.protocol.TType.I32, (short)3); - - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new DataMovementInterfaceStandardSchemeFactory()); - schemes.put(TupleScheme.class, new DataMovementInterfaceTupleSchemeFactory()); - } - - private String dataMovementInterfaceId; // required - private DataMovementProtocol dataMovementProtocol; // required - private int priorityOrder; // 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 { - DATA_MOVEMENT_INTERFACE_ID((short)1, "dataMovementInterfaceId"), - /** - * - * @see DataMovementProtocol - */ - DATA_MOVEMENT_PROTOCOL((short)2, "dataMovementProtocol"), - PRIORITY_ORDER((short)3, "priorityOrder"); - - 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: // DATA_MOVEMENT_INTERFACE_ID - return DATA_MOVEMENT_INTERFACE_ID; - case 2: // DATA_MOVEMENT_PROTOCOL - return DATA_MOVEMENT_PROTOCOL; - case 3: // PRIORITY_ORDER - return PRIORITY_ORDER; - 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 __PRIORITYORDER_ISSET_ID = 0; - private byte __isset_bitfield = 0; - 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.DATA_MOVEMENT_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("dataMovementInterfaceId", org.apache.thrift.TFieldRequirementType.REQUIRED, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.DATA_MOVEMENT_PROTOCOL, new org.apache.thrift.meta_data.FieldMetaData("dataMovementProtocol", org.apache.thrift.TFieldRequirementType.REQUIRED, - new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, DataMovementProtocol.class))); - tmpMap.put(_Fields.PRIORITY_ORDER, new org.apache.thrift.meta_data.FieldMetaData("priorityOrder", org.apache.thrift.TFieldRequirementType.REQUIRED, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DataMovementInterface.class, metaDataMap); - } - - public DataMovementInterface() { - this.priorityOrder = 0; - - } - - public DataMovementInterface( - String dataMovementInterfaceId, - DataMovementProtocol dataMovementProtocol, - int priorityOrder) - { - this(); - this.dataMovementInterfaceId = dataMovementInterfaceId; - this.dataMovementProtocol = dataMovementProtocol; - this.priorityOrder = priorityOrder; - setPriorityOrderIsSet(true); - } - - /** - * Performs a deep copy on <i>other</i>. - */ - public DataMovementInterface(DataMovementInterface other) { - __isset_bitfield = other.__isset_bitfield; - if (other.isSetDataMovementInterfaceId()) { - this.dataMovementInterfaceId = other.dataMovementInterfaceId; - } - if (other.isSetDataMovementProtocol()) { - this.dataMovementProtocol = other.dataMovementProtocol; - } - this.priorityOrder = other.priorityOrder; - } - - public DataMovementInterface deepCopy() { - return new DataMovementInterface(this); - } - - @Override - public void clear() { - this.dataMovementInterfaceId = null; - this.dataMovementProtocol = null; - this.priorityOrder = 0; - - } - - public String getDataMovementInterfaceId() { - return this.dataMovementInterfaceId; - } - - public void setDataMovementInterfaceId(String dataMovementInterfaceId) { - this.dataMovementInterfaceId = dataMovementInterfaceId; - } - - public void unsetDataMovementInterfaceId() { - this.dataMovementInterfaceId = null; - } - - /** Returns true if field dataMovementInterfaceId is set (has been assigned a value) and false otherwise */ - public boolean isSetDataMovementInterfaceId() { - return this.dataMovementInterfaceId != null; - } - - public void setDataMovementInterfaceIdIsSet(boolean value) { - if (!value) { - this.dataMovementInterfaceId = null; - } - } - - /** - * - * @see DataMovementProtocol - */ - public DataMovementProtocol getDataMovementProtocol() { - return this.dataMovementProtocol; - } - - /** - * - * @see DataMovementProtocol - */ - public void setDataMovementProtocol(DataMovementProtocol dataMovementProtocol) { - this.dataMovementProtocol = dataMovementProtocol; - } - - public void unsetDataMovementProtocol() { - this.dataMovementProtocol = null; - } - - /** Returns true if field dataMovementProtocol is set (has been assigned a value) and false otherwise */ - public boolean isSetDataMovementProtocol() { - return this.dataMovementProtocol != null; - } - - public void setDataMovementProtocolIsSet(boolean value) { - if (!value) { - this.dataMovementProtocol = null; - } - } - - public int getPriorityOrder() { - return this.priorityOrder; - } - - public void setPriorityOrder(int priorityOrder) { - this.priorityOrder = priorityOrder; - setPriorityOrderIsSet(true); - } - - public void unsetPriorityOrder() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PRIORITYORDER_ISSET_ID); - } - - /** Returns true if field priorityOrder is set (has been assigned a value) and false otherwise */ - public boolean isSetPriorityOrder() { - return EncodingUtils.testBit(__isset_bitfield, __PRIORITYORDER_ISSET_ID); - } - - public void setPriorityOrderIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PRIORITYORDER_ISSET_ID, value); - } - - public void setFieldValue(_Fields field, Object value) { - switch (field) { - case DATA_MOVEMENT_INTERFACE_ID: - if (value == null) { - unsetDataMovementInterfaceId(); - } else { - setDataMovementInterfaceId((String)value); - } - break; - - case DATA_MOVEMENT_PROTOCOL: - if (value == null) { - unsetDataMovementProtocol(); - } else { - setDataMovementProtocol((DataMovementProtocol)value); - } - break; - - case PRIORITY_ORDER: - if (value == null) { - unsetPriorityOrder(); - } else { - setPriorityOrder((Integer)value); - } - break; - - } - } - - public Object getFieldValue(_Fields field) { - switch (field) { - case DATA_MOVEMENT_INTERFACE_ID: - return getDataMovementInterfaceId(); - - case DATA_MOVEMENT_PROTOCOL: - return getDataMovementProtocol(); - - case PRIORITY_ORDER: - return Integer.valueOf(getPriorityOrder()); - - } - 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 DATA_MOVEMENT_INTERFACE_ID: - return isSetDataMovementInterfaceId(); - case DATA_MOVEMENT_PROTOCOL: - return isSetDataMovementProtocol(); - case PRIORITY_ORDER: - return isSetPriorityOrder(); - } - throw new IllegalStateException(); - } - - @Override - public boolean equals(Object that) { - if (that == null) - return false; - if (that instanceof DataMovementInterface) - return this.equals((DataMovementInterface)that); - return false; - } - - public boolean equals(DataMovementInterface that) { - if (that == null) - return false; - - boolean this_present_dataMovementInterfaceId = true && this.isSetDataMovementInterfaceId(); - boolean that_present_dataMovementInterfaceId = true && that.isSetDataMovementInterfaceId(); - if (this_present_dataMovementInterfaceId || that_present_dataMovementInterfaceId) { - if (!(this_present_dataMovementInterfaceId && that_present_dataMovementInterfaceId)) - return false; - if (!this.dataMovementInterfaceId.equals(that.dataMovementInterfaceId)) - return false; - } - - boolean this_present_dataMovementProtocol = true && this.isSetDataMovementProtocol(); - boolean that_present_dataMovementProtocol = true && that.isSetDataMovementProtocol(); - if (this_present_dataMovementProtocol || that_present_dataMovementProtocol) { - if (!(this_present_dataMovementProtocol && that_present_dataMovementProtocol)) - return false; - if (!this.dataMovementProtocol.equals(that.dataMovementProtocol)) - return false; - } - - boolean this_present_priorityOrder = true; - boolean that_present_priorityOrder = true; - if (this_present_priorityOrder || that_present_priorityOrder) { - if (!(this_present_priorityOrder && that_present_priorityOrder)) - return false; - if (this.priorityOrder != that.priorityOrder) - return false; - } - - return true; - } - - @Override - public int hashCode() { - List<Object> list = new ArrayList<Object>(); - - boolean present_dataMovementInterfaceId = true && (isSetDataMovementInterfaceId()); - list.add(present_dataMovementInterfaceId); - if (present_dataMovementInterfaceId) - list.add(dataMovementInterfaceId); - - boolean present_dataMovementProtocol = true && (isSetDataMovementProtocol()); - list.add(present_dataMovementProtocol); - if (present_dataMovementProtocol) - list.add(dataMovementProtocol.getValue()); - - boolean present_priorityOrder = true; - list.add(present_priorityOrder); - if (present_priorityOrder) - list.add(priorityOrder); - - return list.hashCode(); - } - - @Override - public int compareTo(DataMovementInterface other) { - if (!getClass().equals(other.getClass())) { - return getClass().getName().compareTo(other.getClass().getName()); - } - - int lastComparison = 0; - - lastComparison = Boolean.valueOf(isSetDataMovementInterfaceId()).compareTo(other.isSetDataMovementInterfaceId()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetDataMovementInterfaceId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataMovementInterfaceId, other.dataMovementInterfaceId); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetDataMovementProtocol()).compareTo(other.isSetDataMovementProtocol()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetDataMovementProtocol()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataMovementProtocol, other.dataMovementProtocol); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetPriorityOrder()).compareTo(other.isSetPriorityOrder()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetPriorityOrder()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.priorityOrder, other.priorityOrder); - 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("DataMovementInterface("); - boolean first = true; - - sb.append("dataMovementInterfaceId:"); - if (this.dataMovementInterfaceId == null) { - sb.append("null"); - } else { - sb.append(this.dataMovementInterfaceId); - } - first = false; - if (!first) sb.append(", "); - sb.append("dataMovementProtocol:"); - if (this.dataMovementProtocol == null) { - sb.append("null"); - } else { - sb.append(this.dataMovementProtocol); - } - first = false; - if (!first) sb.append(", "); - sb.append("priorityOrder:"); - sb.append(this.priorityOrder); - first = false; - sb.append(")"); - return sb.toString(); - } - - public void validate() throws org.apache.thrift.TException { - // check for required fields - if (!isSetDataMovementInterfaceId()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'dataMovementInterfaceId' is unset! Struct:" + toString()); - } - - if (!isSetDataMovementProtocol()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'dataMovementProtocol' is unset! Struct:" + toString()); - } - - if (!isSetPriorityOrder()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'priorityOrder' 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 DataMovementInterfaceStandardSchemeFactory implements SchemeFactory { - public DataMovementInterfaceStandardScheme getScheme() { - return new DataMovementInterfaceStandardScheme(); - } - } - - private static class DataMovementInterfaceStandardScheme extends StandardScheme<DataMovementInterface> { - - public void read(org.apache.thrift.protocol.TProtocol iprot, DataMovementInterface 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: // DATA_MOVEMENT_INTERFACE_ID - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.dataMovementInterfaceId = iprot.readString(); - struct.setDataMovementInterfaceIdIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 2: // DATA_MOVEMENT_PROTOCOL - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.dataMovementProtocol = org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol.findByValue(iprot.readI32()); - struct.setDataMovementProtocolIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 3: // PRIORITY_ORDER - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.priorityOrder = iprot.readI32(); - struct.setPriorityOrderIsSet(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, DataMovementInterface struct) throws org.apache.thrift.TException { - struct.validate(); - - oprot.writeStructBegin(STRUCT_DESC); - if (struct.dataMovementInterfaceId != null) { - oprot.writeFieldBegin(DATA_MOVEMENT_INTERFACE_ID_FIELD_DESC); - oprot.writeString(struct.dataMovementInterfaceId); - oprot.writeFieldEnd(); - } - if (struct.dataMovementProtocol != null) { - oprot.writeFieldBegin(DATA_MOVEMENT_PROTOCOL_FIELD_DESC); - oprot.writeI32(struct.dataMovementProtocol.getValue()); - oprot.writeFieldEnd(); - } - oprot.writeFieldBegin(PRIORITY_ORDER_FIELD_DESC); - oprot.writeI32(struct.priorityOrder); - oprot.writeFieldEnd(); - oprot.writeFieldStop(); - oprot.writeStructEnd(); - } - - } - - private static class DataMovementInterfaceTupleSchemeFactory implements SchemeFactory { - public DataMovementInterfaceTupleScheme getScheme() { - return new DataMovementInterfaceTupleScheme(); - } - } - - private static class DataMovementInterfaceTupleScheme extends TupleScheme<DataMovementInterface> { - - @Override - public void write(org.apache.thrift.protocol.TProtocol prot, DataMovementInterface struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - oprot.writeString(struct.dataMovementInterfaceId); - oprot.writeI32(struct.dataMovementProtocol.getValue()); - oprot.writeI32(struct.priorityOrder); - } - - @Override - public void read(org.apache.thrift.protocol.TProtocol prot, DataMovementInterface struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - struct.dataMovementInterfaceId = iprot.readString(); - struct.setDataMovementInterfaceIdIsSet(true); - struct.dataMovementProtocol = org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol.findByValue(iprot.readI32()); - struct.setDataMovementProtocolIsSet(true); - struct.priorityOrder = iprot.readI32(); - struct.setPriorityOrderIsSet(true); - } - } - -} -
http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementProtocol.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementProtocol.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementProtocol.java deleted file mode 100644 index 7c5ea86..0000000 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementProtocol.java +++ /dev/null @@ -1,87 +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.appcatalog.computeresource; - - -import java.util.Map; -import java.util.HashMap; -import org.apache.thrift.TEnum; - -/** - * Enumeration of data movement supported by Airavata - * - * SCP: - * Job manager supporting the Portal Batch System (PBS) protocol. Some examples include TORQUE, PBSPro, Grid Engine. - * - * SFTP: - * The Simple Linux Utility for Resource Management is a open source workload manager. - * - * GridFTP: - * Globus File Transfer Protocol - * - * UNICORE_STORAGE_SERVICE: - * Storage Service Provided by Unicore - * - */ -public enum DataMovementProtocol implements org.apache.thrift.TEnum { - LOCAL(0), - SCP(1), - SFTP(2), - GridFTP(3), - UNICORE_STORAGE_SERVICE(4); - - private final int value; - - private DataMovementProtocol(int value) { - this.value = value; - } - - /** - * Get the integer value of this enum value, as defined in the Thrift IDL. - */ - public int getValue() { - return value; - } - - /** - * Find a the enum type by its integer value, as defined in the Thrift IDL. - * @return null if the value is not found. - */ - public static DataMovementProtocol findByValue(int value) { - switch (value) { - case 0: - return LOCAL; - case 1: - return SCP; - case 2: - return SFTP; - case 3: - return GridFTP; - case 4: - return UNICORE_STORAGE_SERVICE; - default: - return null; - } - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java index 8f72433..90e2298 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java @@ -66,7 +66,7 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub } private String jobSubmissionInterfaceId; // required - private SecurityProtocol securityProtocol; // required + private org.apache.airavata.model.data.movement.SecurityProtocol securityProtocol; // required private List<String> globusGateKeeperEndPoint; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @@ -74,7 +74,7 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub JOB_SUBMISSION_INTERFACE_ID((short)1, "jobSubmissionInterfaceId"), /** * - * @see SecurityProtocol + * @see org.apache.airavata.model.data.movement.SecurityProtocol */ SECURITY_PROTOCOL((short)2, "securityProtocol"), GLOBUS_GATE_KEEPER_END_POINT((short)3, "globusGateKeeperEndPoint"); @@ -145,7 +145,7 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub tmpMap.put(_Fields.JOB_SUBMISSION_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("jobSubmissionInterfaceId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.SECURITY_PROTOCOL, new org.apache.thrift.meta_data.FieldMetaData("securityProtocol", org.apache.thrift.TFieldRequirementType.REQUIRED, - new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, SecurityProtocol.class))); + new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.data.movement.SecurityProtocol.class))); tmpMap.put(_Fields.GLOBUS_GATE_KEEPER_END_POINT, new org.apache.thrift.meta_data.FieldMetaData("globusGateKeeperEndPoint", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); @@ -160,7 +160,7 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub public GlobusJobSubmission( String jobSubmissionInterfaceId, - SecurityProtocol securityProtocol) + org.apache.airavata.model.data.movement.SecurityProtocol securityProtocol) { this(); this.jobSubmissionInterfaceId = jobSubmissionInterfaceId; @@ -220,17 +220,17 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub /** * - * @see SecurityProtocol + * @see org.apache.airavata.model.data.movement.SecurityProtocol */ - public SecurityProtocol getSecurityProtocol() { + public org.apache.airavata.model.data.movement.SecurityProtocol getSecurityProtocol() { return this.securityProtocol; } /** * - * @see SecurityProtocol + * @see org.apache.airavata.model.data.movement.SecurityProtocol */ - public void setSecurityProtocol(SecurityProtocol securityProtocol) { + public void setSecurityProtocol(org.apache.airavata.model.data.movement.SecurityProtocol securityProtocol) { this.securityProtocol = securityProtocol; } @@ -301,7 +301,7 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub if (value == null) { unsetSecurityProtocol(); } else { - setSecurityProtocol((SecurityProtocol)value); + setSecurityProtocol((org.apache.airavata.model.data.movement.SecurityProtocol)value); } break; @@ -557,7 +557,7 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub break; case 2: // SECURITY_PROTOCOL if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.securityProtocol = org.apache.airavata.model.appcatalog.computeresource.SecurityProtocol.findByValue(iprot.readI32()); + struct.securityProtocol = org.apache.airavata.model.data.movement.SecurityProtocol.findByValue(iprot.readI32()); struct.setSecurityProtocolIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -566,13 +566,13 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub case 3: // GLOBUS_GATE_KEEPER_END_POINT if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list26 = iprot.readListBegin(); - struct.globusGateKeeperEndPoint = new ArrayList<String>(_list26.size); - String _elem27; - for (int _i28 = 0; _i28 < _list26.size; ++_i28) + org.apache.thrift.protocol.TList _list18 = iprot.readListBegin(); + struct.globusGateKeeperEndPoint = new ArrayList<String>(_list18.size); + String _elem19; + for (int _i20 = 0; _i20 < _list18.size; ++_i20) { - _elem27 = iprot.readString(); - struct.globusGateKeeperEndPoint.add(_elem27); + _elem19 = iprot.readString(); + struct.globusGateKeeperEndPoint.add(_elem19); } iprot.readListEnd(); } @@ -609,9 +609,9 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub oprot.writeFieldBegin(GLOBUS_GATE_KEEPER_END_POINT_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.globusGateKeeperEndPoint.size())); - for (String _iter29 : struct.globusGateKeeperEndPoint) + for (String _iter21 : struct.globusGateKeeperEndPoint) { - oprot.writeString(_iter29); + oprot.writeString(_iter21); } oprot.writeListEnd(); } @@ -645,9 +645,9 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub if (struct.isSetGlobusGateKeeperEndPoint()) { { oprot.writeI32(struct.globusGateKeeperEndPoint.size()); - for (String _iter30 : struct.globusGateKeeperEndPoint) + for (String _iter22 : struct.globusGateKeeperEndPoint) { - oprot.writeString(_iter30); + oprot.writeString(_iter22); } } } @@ -658,18 +658,18 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub TTupleProtocol iprot = (TTupleProtocol) prot; struct.jobSubmissionInterfaceId = iprot.readString(); struct.setJobSubmissionInterfaceIdIsSet(true); - struct.securityProtocol = org.apache.airavata.model.appcatalog.computeresource.SecurityProtocol.findByValue(iprot.readI32()); + struct.securityProtocol = org.apache.airavata.model.data.movement.SecurityProtocol.findByValue(iprot.readI32()); struct.setSecurityProtocolIsSet(true); BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list31 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.globusGateKeeperEndPoint = new ArrayList<String>(_list31.size); - String _elem32; - for (int _i33 = 0; _i33 < _list31.size; ++_i33) + org.apache.thrift.protocol.TList _list23 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.globusGateKeeperEndPoint = new ArrayList<String>(_list23.size); + String _elem24; + for (int _i25 = 0; _i25 < _list23.size; ++_i25) { - _elem32 = iprot.readString(); - struct.globusGateKeeperEndPoint.add(_elem32); + _elem24 = iprot.readString(); + struct.globusGateKeeperEndPoint.add(_elem24); } } struct.setGlobusGateKeeperEndPointIsSet(true); http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java deleted file mode 100644 index 64190b4..0000000 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java +++ /dev/null @@ -1,681 +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.appcatalog.computeresource; - -import org.apache.thrift.scheme.IScheme; -import org.apache.thrift.scheme.SchemeFactory; -import org.apache.thrift.scheme.StandardScheme; - -import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import org.apache.thrift.async.AsyncMethodCallback; -import org.apache.thrift.server.AbstractNonblockingServer.*; -import java.util.List; -import java.util.ArrayList; -import java.util.Map; -import java.util.HashMap; -import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; -import java.util.EnumSet; -import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import javax.annotation.Generated; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -/** - * Data Movement through GridFTP - * - * alternativeSCPHostName: - * If the login to scp is different than the hostname itself, specify it here - * - * sshPort: - * If a non-default port needs to used, specify it. - */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-23") -public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataMovement, GridFTPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<GridFTPDataMovement> { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GridFTPDataMovement"); - - private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovementInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField SECURITY_PROTOCOL_FIELD_DESC = new org.apache.thrift.protocol.TField("securityProtocol", org.apache.thrift.protocol.TType.I32, (short)2); - private static final org.apache.thrift.protocol.TField GRID_FTPEND_POINTS_FIELD_DESC = new org.apache.thrift.protocol.TField("gridFTPEndPoints", org.apache.thrift.protocol.TType.LIST, (short)3); - - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new GridFTPDataMovementStandardSchemeFactory()); - schemes.put(TupleScheme.class, new GridFTPDataMovementTupleSchemeFactory()); - } - - private String dataMovementInterfaceId; // required - private SecurityProtocol securityProtocol; // required - private List<String> gridFTPEndPoints; // 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 { - DATA_MOVEMENT_INTERFACE_ID((short)1, "dataMovementInterfaceId"), - /** - * - * @see SecurityProtocol - */ - SECURITY_PROTOCOL((short)2, "securityProtocol"), - GRID_FTPEND_POINTS((short)3, "gridFTPEndPoints"); - - 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: // DATA_MOVEMENT_INTERFACE_ID - return DATA_MOVEMENT_INTERFACE_ID; - case 2: // SECURITY_PROTOCOL - return SECURITY_PROTOCOL; - case 3: // GRID_FTPEND_POINTS - return GRID_FTPEND_POINTS; - 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.DATA_MOVEMENT_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("dataMovementInterfaceId", org.apache.thrift.TFieldRequirementType.REQUIRED, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.SECURITY_PROTOCOL, new org.apache.thrift.meta_data.FieldMetaData("securityProtocol", org.apache.thrift.TFieldRequirementType.REQUIRED, - new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, SecurityProtocol.class))); - tmpMap.put(_Fields.GRID_FTPEND_POINTS, new org.apache.thrift.meta_data.FieldMetaData("gridFTPEndPoints", org.apache.thrift.TFieldRequirementType.REQUIRED, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); - metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GridFTPDataMovement.class, metaDataMap); - } - - public GridFTPDataMovement() { - this.dataMovementInterfaceId = "DO_NOT_SET_AT_CLIENTS"; - - } - - public GridFTPDataMovement( - String dataMovementInterfaceId, - SecurityProtocol securityProtocol, - List<String> gridFTPEndPoints) - { - this(); - this.dataMovementInterfaceId = dataMovementInterfaceId; - this.securityProtocol = securityProtocol; - this.gridFTPEndPoints = gridFTPEndPoints; - } - - /** - * Performs a deep copy on <i>other</i>. - */ - public GridFTPDataMovement(GridFTPDataMovement other) { - if (other.isSetDataMovementInterfaceId()) { - this.dataMovementInterfaceId = other.dataMovementInterfaceId; - } - if (other.isSetSecurityProtocol()) { - this.securityProtocol = other.securityProtocol; - } - if (other.isSetGridFTPEndPoints()) { - List<String> __this__gridFTPEndPoints = new ArrayList<String>(other.gridFTPEndPoints); - this.gridFTPEndPoints = __this__gridFTPEndPoints; - } - } - - public GridFTPDataMovement deepCopy() { - return new GridFTPDataMovement(this); - } - - @Override - public void clear() { - this.dataMovementInterfaceId = "DO_NOT_SET_AT_CLIENTS"; - - this.securityProtocol = null; - this.gridFTPEndPoints = null; - } - - public String getDataMovementInterfaceId() { - return this.dataMovementInterfaceId; - } - - public void setDataMovementInterfaceId(String dataMovementInterfaceId) { - this.dataMovementInterfaceId = dataMovementInterfaceId; - } - - public void unsetDataMovementInterfaceId() { - this.dataMovementInterfaceId = null; - } - - /** Returns true if field dataMovementInterfaceId is set (has been assigned a value) and false otherwise */ - public boolean isSetDataMovementInterfaceId() { - return this.dataMovementInterfaceId != null; - } - - public void setDataMovementInterfaceIdIsSet(boolean value) { - if (!value) { - this.dataMovementInterfaceId = null; - } - } - - /** - * - * @see SecurityProtocol - */ - public SecurityProtocol getSecurityProtocol() { - return this.securityProtocol; - } - - /** - * - * @see SecurityProtocol - */ - public void setSecurityProtocol(SecurityProtocol securityProtocol) { - this.securityProtocol = securityProtocol; - } - - public void unsetSecurityProtocol() { - this.securityProtocol = null; - } - - /** Returns true if field securityProtocol is set (has been assigned a value) and false otherwise */ - public boolean isSetSecurityProtocol() { - return this.securityProtocol != null; - } - - public void setSecurityProtocolIsSet(boolean value) { - if (!value) { - this.securityProtocol = null; - } - } - - public int getGridFTPEndPointsSize() { - return (this.gridFTPEndPoints == null) ? 0 : this.gridFTPEndPoints.size(); - } - - public java.util.Iterator<String> getGridFTPEndPointsIterator() { - return (this.gridFTPEndPoints == null) ? null : this.gridFTPEndPoints.iterator(); - } - - public void addToGridFTPEndPoints(String elem) { - if (this.gridFTPEndPoints == null) { - this.gridFTPEndPoints = new ArrayList<String>(); - } - this.gridFTPEndPoints.add(elem); - } - - public List<String> getGridFTPEndPoints() { - return this.gridFTPEndPoints; - } - - public void setGridFTPEndPoints(List<String> gridFTPEndPoints) { - this.gridFTPEndPoints = gridFTPEndPoints; - } - - public void unsetGridFTPEndPoints() { - this.gridFTPEndPoints = null; - } - - /** Returns true if field gridFTPEndPoints is set (has been assigned a value) and false otherwise */ - public boolean isSetGridFTPEndPoints() { - return this.gridFTPEndPoints != null; - } - - public void setGridFTPEndPointsIsSet(boolean value) { - if (!value) { - this.gridFTPEndPoints = null; - } - } - - public void setFieldValue(_Fields field, Object value) { - switch (field) { - case DATA_MOVEMENT_INTERFACE_ID: - if (value == null) { - unsetDataMovementInterfaceId(); - } else { - setDataMovementInterfaceId((String)value); - } - break; - - case SECURITY_PROTOCOL: - if (value == null) { - unsetSecurityProtocol(); - } else { - setSecurityProtocol((SecurityProtocol)value); - } - break; - - case GRID_FTPEND_POINTS: - if (value == null) { - unsetGridFTPEndPoints(); - } else { - setGridFTPEndPoints((List<String>)value); - } - break; - - } - } - - public Object getFieldValue(_Fields field) { - switch (field) { - case DATA_MOVEMENT_INTERFACE_ID: - return getDataMovementInterfaceId(); - - case SECURITY_PROTOCOL: - return getSecurityProtocol(); - - case GRID_FTPEND_POINTS: - return getGridFTPEndPoints(); - - } - 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 DATA_MOVEMENT_INTERFACE_ID: - return isSetDataMovementInterfaceId(); - case SECURITY_PROTOCOL: - return isSetSecurityProtocol(); - case GRID_FTPEND_POINTS: - return isSetGridFTPEndPoints(); - } - throw new IllegalStateException(); - } - - @Override - public boolean equals(Object that) { - if (that == null) - return false; - if (that instanceof GridFTPDataMovement) - return this.equals((GridFTPDataMovement)that); - return false; - } - - public boolean equals(GridFTPDataMovement that) { - if (that == null) - return false; - - boolean this_present_dataMovementInterfaceId = true && this.isSetDataMovementInterfaceId(); - boolean that_present_dataMovementInterfaceId = true && that.isSetDataMovementInterfaceId(); - if (this_present_dataMovementInterfaceId || that_present_dataMovementInterfaceId) { - if (!(this_present_dataMovementInterfaceId && that_present_dataMovementInterfaceId)) - return false; - if (!this.dataMovementInterfaceId.equals(that.dataMovementInterfaceId)) - return false; - } - - boolean this_present_securityProtocol = true && this.isSetSecurityProtocol(); - boolean that_present_securityProtocol = true && that.isSetSecurityProtocol(); - if (this_present_securityProtocol || that_present_securityProtocol) { - if (!(this_present_securityProtocol && that_present_securityProtocol)) - return false; - if (!this.securityProtocol.equals(that.securityProtocol)) - return false; - } - - boolean this_present_gridFTPEndPoints = true && this.isSetGridFTPEndPoints(); - boolean that_present_gridFTPEndPoints = true && that.isSetGridFTPEndPoints(); - if (this_present_gridFTPEndPoints || that_present_gridFTPEndPoints) { - if (!(this_present_gridFTPEndPoints && that_present_gridFTPEndPoints)) - return false; - if (!this.gridFTPEndPoints.equals(that.gridFTPEndPoints)) - return false; - } - - return true; - } - - @Override - public int hashCode() { - List<Object> list = new ArrayList<Object>(); - - boolean present_dataMovementInterfaceId = true && (isSetDataMovementInterfaceId()); - list.add(present_dataMovementInterfaceId); - if (present_dataMovementInterfaceId) - list.add(dataMovementInterfaceId); - - boolean present_securityProtocol = true && (isSetSecurityProtocol()); - list.add(present_securityProtocol); - if (present_securityProtocol) - list.add(securityProtocol.getValue()); - - boolean present_gridFTPEndPoints = true && (isSetGridFTPEndPoints()); - list.add(present_gridFTPEndPoints); - if (present_gridFTPEndPoints) - list.add(gridFTPEndPoints); - - return list.hashCode(); - } - - @Override - public int compareTo(GridFTPDataMovement other) { - if (!getClass().equals(other.getClass())) { - return getClass().getName().compareTo(other.getClass().getName()); - } - - int lastComparison = 0; - - lastComparison = Boolean.valueOf(isSetDataMovementInterfaceId()).compareTo(other.isSetDataMovementInterfaceId()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetDataMovementInterfaceId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataMovementInterfaceId, other.dataMovementInterfaceId); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetSecurityProtocol()).compareTo(other.isSetSecurityProtocol()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetSecurityProtocol()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.securityProtocol, other.securityProtocol); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetGridFTPEndPoints()).compareTo(other.isSetGridFTPEndPoints()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetGridFTPEndPoints()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gridFTPEndPoints, other.gridFTPEndPoints); - 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("GridFTPDataMovement("); - boolean first = true; - - sb.append("dataMovementInterfaceId:"); - if (this.dataMovementInterfaceId == null) { - sb.append("null"); - } else { - sb.append(this.dataMovementInterfaceId); - } - first = false; - if (!first) sb.append(", "); - sb.append("securityProtocol:"); - if (this.securityProtocol == null) { - sb.append("null"); - } else { - sb.append(this.securityProtocol); - } - first = false; - if (!first) sb.append(", "); - sb.append("gridFTPEndPoints:"); - if (this.gridFTPEndPoints == null) { - sb.append("null"); - } else { - sb.append(this.gridFTPEndPoints); - } - first = false; - sb.append(")"); - return sb.toString(); - } - - public void validate() throws org.apache.thrift.TException { - // check for required fields - if (!isSetDataMovementInterfaceId()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'dataMovementInterfaceId' is unset! Struct:" + toString()); - } - - if (!isSetSecurityProtocol()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'securityProtocol' is unset! Struct:" + toString()); - } - - if (!isSetGridFTPEndPoints()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'gridFTPEndPoints' 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 { - 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 GridFTPDataMovementStandardSchemeFactory implements SchemeFactory { - public GridFTPDataMovementStandardScheme getScheme() { - return new GridFTPDataMovementStandardScheme(); - } - } - - private static class GridFTPDataMovementStandardScheme extends StandardScheme<GridFTPDataMovement> { - - public void read(org.apache.thrift.protocol.TProtocol iprot, GridFTPDataMovement 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: // DATA_MOVEMENT_INTERFACE_ID - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.dataMovementInterfaceId = iprot.readString(); - struct.setDataMovementInterfaceIdIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 2: // SECURITY_PROTOCOL - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.securityProtocol = org.apache.airavata.model.appcatalog.computeresource.SecurityProtocol.findByValue(iprot.readI32()); - struct.setSecurityProtocolIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 3: // GRID_FTPEND_POINTS - if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { - { - org.apache.thrift.protocol.TList _list10 = iprot.readListBegin(); - struct.gridFTPEndPoints = new ArrayList<String>(_list10.size); - String _elem11; - for (int _i12 = 0; _i12 < _list10.size; ++_i12) - { - _elem11 = iprot.readString(); - struct.gridFTPEndPoints.add(_elem11); - } - iprot.readListEnd(); - } - struct.setGridFTPEndPointsIsSet(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, GridFTPDataMovement struct) throws org.apache.thrift.TException { - struct.validate(); - - oprot.writeStructBegin(STRUCT_DESC); - if (struct.dataMovementInterfaceId != null) { - oprot.writeFieldBegin(DATA_MOVEMENT_INTERFACE_ID_FIELD_DESC); - oprot.writeString(struct.dataMovementInterfaceId); - oprot.writeFieldEnd(); - } - if (struct.securityProtocol != null) { - oprot.writeFieldBegin(SECURITY_PROTOCOL_FIELD_DESC); - oprot.writeI32(struct.securityProtocol.getValue()); - oprot.writeFieldEnd(); - } - if (struct.gridFTPEndPoints != null) { - oprot.writeFieldBegin(GRID_FTPEND_POINTS_FIELD_DESC); - { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.gridFTPEndPoints.size())); - for (String _iter13 : struct.gridFTPEndPoints) - { - oprot.writeString(_iter13); - } - oprot.writeListEnd(); - } - oprot.writeFieldEnd(); - } - oprot.writeFieldStop(); - oprot.writeStructEnd(); - } - - } - - private static class GridFTPDataMovementTupleSchemeFactory implements SchemeFactory { - public GridFTPDataMovementTupleScheme getScheme() { - return new GridFTPDataMovementTupleScheme(); - } - } - - private static class GridFTPDataMovementTupleScheme extends TupleScheme<GridFTPDataMovement> { - - @Override - public void write(org.apache.thrift.protocol.TProtocol prot, GridFTPDataMovement struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - oprot.writeString(struct.dataMovementInterfaceId); - oprot.writeI32(struct.securityProtocol.getValue()); - { - oprot.writeI32(struct.gridFTPEndPoints.size()); - for (String _iter14 : struct.gridFTPEndPoints) - { - oprot.writeString(_iter14); - } - } - } - - @Override - public void read(org.apache.thrift.protocol.TProtocol prot, GridFTPDataMovement struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - struct.dataMovementInterfaceId = iprot.readString(); - struct.setDataMovementInterfaceIdIsSet(true); - struct.securityProtocol = org.apache.airavata.model.appcatalog.computeresource.SecurityProtocol.findByValue(iprot.readI32()); - struct.setSecurityProtocolIsSet(true); - { - org.apache.thrift.protocol.TList _list15 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.gridFTPEndPoints = new ArrayList<String>(_list15.size); - String _elem16; - for (int _i17 = 0; _i17 < _list15.size; ++_i17) - { - _elem16 = iprot.readString(); - struct.gridFTPEndPoints.add(_elem16); - } - } - struct.setGridFTPEndPointsIsSet(true); - } - } - -} - http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java deleted file mode 100644 index f492096..0000000 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java +++ /dev/null @@ -1,418 +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.appcatalog.computeresource; - -import org.apache.thrift.scheme.IScheme; -import org.apache.thrift.scheme.SchemeFactory; -import org.apache.thrift.scheme.StandardScheme; - -import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import org.apache.thrift.async.AsyncMethodCallback; -import org.apache.thrift.server.AbstractNonblockingServer.*; -import java.util.List; -import java.util.ArrayList; -import java.util.Map; -import java.util.HashMap; -import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; -import java.util.EnumSet; -import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import javax.annotation.Generated; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -/** - * LOCAL - * - * alternativeSCPHostName: - * If the login to scp is different than the hostname itself, specify it here - * - * sshPort: - * If a non-defualt port needs to used, specify it. - */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-23") -public class LOCALDataMovement implements org.apache.thrift.TBase<LOCALDataMovement, LOCALDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALDataMovement> { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LOCALDataMovement"); - - private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovementInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1); - - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new LOCALDataMovementStandardSchemeFactory()); - schemes.put(TupleScheme.class, new LOCALDataMovementTupleSchemeFactory()); - } - - private String dataMovementInterfaceId; // 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 { - DATA_MOVEMENT_INTERFACE_ID((short)1, "dataMovementInterfaceId"); - - 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: // DATA_MOVEMENT_INTERFACE_ID - return DATA_MOVEMENT_INTERFACE_ID; - 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.DATA_MOVEMENT_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("dataMovementInterfaceId", org.apache.thrift.TFieldRequirementType.REQUIRED, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LOCALDataMovement.class, metaDataMap); - } - - public LOCALDataMovement() { - this.dataMovementInterfaceId = "DO_NOT_SET_AT_CLIENTS"; - - } - - public LOCALDataMovement( - String dataMovementInterfaceId) - { - this(); - this.dataMovementInterfaceId = dataMovementInterfaceId; - } - - /** - * Performs a deep copy on <i>other</i>. - */ - public LOCALDataMovement(LOCALDataMovement other) { - if (other.isSetDataMovementInterfaceId()) { - this.dataMovementInterfaceId = other.dataMovementInterfaceId; - } - } - - public LOCALDataMovement deepCopy() { - return new LOCALDataMovement(this); - } - - @Override - public void clear() { - this.dataMovementInterfaceId = "DO_NOT_SET_AT_CLIENTS"; - - } - - public String getDataMovementInterfaceId() { - return this.dataMovementInterfaceId; - } - - public void setDataMovementInterfaceId(String dataMovementInterfaceId) { - this.dataMovementInterfaceId = dataMovementInterfaceId; - } - - public void unsetDataMovementInterfaceId() { - this.dataMovementInterfaceId = null; - } - - /** Returns true if field dataMovementInterfaceId is set (has been assigned a value) and false otherwise */ - public boolean isSetDataMovementInterfaceId() { - return this.dataMovementInterfaceId != null; - } - - public void setDataMovementInterfaceIdIsSet(boolean value) { - if (!value) { - this.dataMovementInterfaceId = null; - } - } - - public void setFieldValue(_Fields field, Object value) { - switch (field) { - case DATA_MOVEMENT_INTERFACE_ID: - if (value == null) { - unsetDataMovementInterfaceId(); - } else { - setDataMovementInterfaceId((String)value); - } - break; - - } - } - - public Object getFieldValue(_Fields field) { - switch (field) { - case DATA_MOVEMENT_INTERFACE_ID: - return getDataMovementInterfaceId(); - - } - 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 DATA_MOVEMENT_INTERFACE_ID: - return isSetDataMovementInterfaceId(); - } - throw new IllegalStateException(); - } - - @Override - public boolean equals(Object that) { - if (that == null) - return false; - if (that instanceof LOCALDataMovement) - return this.equals((LOCALDataMovement)that); - return false; - } - - public boolean equals(LOCALDataMovement that) { - if (that == null) - return false; - - boolean this_present_dataMovementInterfaceId = true && this.isSetDataMovementInterfaceId(); - boolean that_present_dataMovementInterfaceId = true && that.isSetDataMovementInterfaceId(); - if (this_present_dataMovementInterfaceId || that_present_dataMovementInterfaceId) { - if (!(this_present_dataMovementInterfaceId && that_present_dataMovementInterfaceId)) - return false; - if (!this.dataMovementInterfaceId.equals(that.dataMovementInterfaceId)) - return false; - } - - return true; - } - - @Override - public int hashCode() { - List<Object> list = new ArrayList<Object>(); - - boolean present_dataMovementInterfaceId = true && (isSetDataMovementInterfaceId()); - list.add(present_dataMovementInterfaceId); - if (present_dataMovementInterfaceId) - list.add(dataMovementInterfaceId); - - return list.hashCode(); - } - - @Override - public int compareTo(LOCALDataMovement other) { - if (!getClass().equals(other.getClass())) { - return getClass().getName().compareTo(other.getClass().getName()); - } - - int lastComparison = 0; - - lastComparison = Boolean.valueOf(isSetDataMovementInterfaceId()).compareTo(other.isSetDataMovementInterfaceId()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetDataMovementInterfaceId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataMovementInterfaceId, other.dataMovementInterfaceId); - 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("LOCALDataMovement("); - boolean first = true; - - sb.append("dataMovementInterfaceId:"); - if (this.dataMovementInterfaceId == null) { - sb.append("null"); - } else { - sb.append(this.dataMovementInterfaceId); - } - first = false; - sb.append(")"); - return sb.toString(); - } - - public void validate() throws org.apache.thrift.TException { - // check for required fields - if (!isSetDataMovementInterfaceId()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'dataMovementInterfaceId' 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 { - 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 LOCALDataMovementStandardSchemeFactory implements SchemeFactory { - public LOCALDataMovementStandardScheme getScheme() { - return new LOCALDataMovementStandardScheme(); - } - } - - private static class LOCALDataMovementStandardScheme extends StandardScheme<LOCALDataMovement> { - - public void read(org.apache.thrift.protocol.TProtocol iprot, LOCALDataMovement 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: // DATA_MOVEMENT_INTERFACE_ID - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.dataMovementInterfaceId = iprot.readString(); - struct.setDataMovementInterfaceIdIsSet(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, LOCALDataMovement struct) throws org.apache.thrift.TException { - struct.validate(); - - oprot.writeStructBegin(STRUCT_DESC); - if (struct.dataMovementInterfaceId != null) { - oprot.writeFieldBegin(DATA_MOVEMENT_INTERFACE_ID_FIELD_DESC); - oprot.writeString(struct.dataMovementInterfaceId); - oprot.writeFieldEnd(); - } - oprot.writeFieldStop(); - oprot.writeStructEnd(); - } - - } - - private static class LOCALDataMovementTupleSchemeFactory implements SchemeFactory { - public LOCALDataMovementTupleScheme getScheme() { - return new LOCALDataMovementTupleScheme(); - } - } - - private static class LOCALDataMovementTupleScheme extends TupleScheme<LOCALDataMovement> { - - @Override - public void write(org.apache.thrift.protocol.TProtocol prot, LOCALDataMovement struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - oprot.writeString(struct.dataMovementInterfaceId); - } - - @Override - public void read(org.apache.thrift.protocol.TProtocol prot, LOCALDataMovement struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - struct.dataMovementInterfaceId = iprot.readString(); - struct.setDataMovementInterfaceIdIsSet(true); - } - } - -} - http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java index b78268f..12d49e2 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java @@ -75,7 +75,7 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission, } private String jobSubmissionInterfaceId; // required - private SecurityProtocol securityProtocol; // required + private org.apache.airavata.model.data.movement.SecurityProtocol securityProtocol; // required private ResourceJobManager resourceJobManager; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @@ -83,7 +83,7 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission, JOB_SUBMISSION_INTERFACE_ID((short)1, "jobSubmissionInterfaceId"), /** * - * @see SecurityProtocol + * @see org.apache.airavata.model.data.movement.SecurityProtocol */ SECURITY_PROTOCOL((short)2, "securityProtocol"), RESOURCE_JOB_MANAGER((short)3, "resourceJobManager"); @@ -153,7 +153,7 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission, tmpMap.put(_Fields.JOB_SUBMISSION_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("jobSubmissionInterfaceId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.SECURITY_PROTOCOL, new org.apache.thrift.meta_data.FieldMetaData("securityProtocol", org.apache.thrift.TFieldRequirementType.REQUIRED, - new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, SecurityProtocol.class))); + new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.data.movement.SecurityProtocol.class))); tmpMap.put(_Fields.RESOURCE_JOB_MANAGER, new org.apache.thrift.meta_data.FieldMetaData("resourceJobManager", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ResourceJobManager.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); @@ -167,7 +167,7 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission, public LOCALSubmission( String jobSubmissionInterfaceId, - SecurityProtocol securityProtocol, + org.apache.airavata.model.data.movement.SecurityProtocol securityProtocol, ResourceJobManager resourceJobManager) { this(); @@ -228,17 +228,17 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission, /** * - * @see SecurityProtocol + * @see org.apache.airavata.model.data.movement.SecurityProtocol */ - public SecurityProtocol getSecurityProtocol() { + public org.apache.airavata.model.data.movement.SecurityProtocol getSecurityProtocol() { return this.securityProtocol; } /** * - * @see SecurityProtocol + * @see org.apache.airavata.model.data.movement.SecurityProtocol */ - public void setSecurityProtocol(SecurityProtocol securityProtocol) { + public void setSecurityProtocol(org.apache.airavata.model.data.movement.SecurityProtocol securityProtocol) { this.securityProtocol = securityProtocol; } @@ -294,7 +294,7 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission, if (value == null) { unsetSecurityProtocol(); } else { - setSecurityProtocol((SecurityProtocol)value); + setSecurityProtocol((org.apache.airavata.model.data.movement.SecurityProtocol)value); } break; @@ -555,7 +555,7 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission, break; case 2: // SECURITY_PROTOCOL if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.securityProtocol = org.apache.airavata.model.appcatalog.computeresource.SecurityProtocol.findByValue(iprot.readI32()); + struct.securityProtocol = org.apache.airavata.model.data.movement.SecurityProtocol.findByValue(iprot.readI32()); struct.setSecurityProtocolIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -625,7 +625,7 @@ public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission, TTupleProtocol iprot = (TTupleProtocol) prot; struct.jobSubmissionInterfaceId = iprot.readString(); struct.setJobSubmissionInterfaceIdIsSet(true); - struct.securityProtocol = org.apache.airavata.model.appcatalog.computeresource.SecurityProtocol.findByValue(iprot.readI32()); + struct.securityProtocol = org.apache.airavata.model.data.movement.SecurityProtocol.findByValue(iprot.readI32()); struct.setSecurityProtocolIsSet(true); struct.resourceJobManager = new ResourceJobManager(); struct.resourceJobManager.read(iprot);
