You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/11/23 20:22:05 UTC
[04/14] airavata git commit: moving data movement structs to common
thrift file
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/SCPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
deleted file mode 100644
index cce52b1..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
+++ /dev/null
@@ -1,746 +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 Secured Copy
- *
- * 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 SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, SCPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<SCPDataMovement> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SCPDataMovement");
-
- 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 ALTERNATIVE_SCPHOST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("alternativeSCPHostName", org.apache.thrift.protocol.TType.STRING, (short)3);
- private static final org.apache.thrift.protocol.TField SSH_PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("sshPort", org.apache.thrift.protocol.TType.I32, (short)4);
-
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new SCPDataMovementStandardSchemeFactory());
- schemes.put(TupleScheme.class, new SCPDataMovementTupleSchemeFactory());
- }
-
- private String dataMovementInterfaceId; // required
- private SecurityProtocol securityProtocol; // required
- private String alternativeSCPHostName; // optional
- private int sshPort; // 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 {
- DATA_MOVEMENT_INTERFACE_ID((short)1, "dataMovementInterfaceId"),
- /**
- *
- * @see SecurityProtocol
- */
- SECURITY_PROTOCOL((short)2, "securityProtocol"),
- ALTERNATIVE_SCPHOST_NAME((short)3, "alternativeSCPHostName"),
- SSH_PORT((short)4, "sshPort");
-
- 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: // ALTERNATIVE_SCPHOST_NAME
- return ALTERNATIVE_SCPHOST_NAME;
- case 4: // SSH_PORT
- return SSH_PORT;
- 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 __SSHPORT_ISSET_ID = 0;
- private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.ALTERNATIVE_SCPHOST_NAME,_Fields.SSH_PORT};
- 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.ALTERNATIVE_SCPHOST_NAME, new org.apache.thrift.meta_data.FieldMetaData("alternativeSCPHostName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.SSH_PORT, new org.apache.thrift.meta_data.FieldMetaData("sshPort", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SCPDataMovement.class, metaDataMap);
- }
-
- public SCPDataMovement() {
- this.dataMovementInterfaceId = "DO_NOT_SET_AT_CLIENTS";
-
- this.sshPort = 22;
-
- }
-
- public SCPDataMovement(
- String dataMovementInterfaceId,
- SecurityProtocol securityProtocol)
- {
- this();
- this.dataMovementInterfaceId = dataMovementInterfaceId;
- this.securityProtocol = securityProtocol;
- }
-
- /**
- * Performs a deep copy on <i>other</i>.
- */
- public SCPDataMovement(SCPDataMovement other) {
- __isset_bitfield = other.__isset_bitfield;
- if (other.isSetDataMovementInterfaceId()) {
- this.dataMovementInterfaceId = other.dataMovementInterfaceId;
- }
- if (other.isSetSecurityProtocol()) {
- this.securityProtocol = other.securityProtocol;
- }
- if (other.isSetAlternativeSCPHostName()) {
- this.alternativeSCPHostName = other.alternativeSCPHostName;
- }
- this.sshPort = other.sshPort;
- }
-
- public SCPDataMovement deepCopy() {
- return new SCPDataMovement(this);
- }
-
- @Override
- public void clear() {
- this.dataMovementInterfaceId = "DO_NOT_SET_AT_CLIENTS";
-
- this.securityProtocol = null;
- this.alternativeSCPHostName = null;
- this.sshPort = 22;
-
- }
-
- 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 String getAlternativeSCPHostName() {
- return this.alternativeSCPHostName;
- }
-
- public void setAlternativeSCPHostName(String alternativeSCPHostName) {
- this.alternativeSCPHostName = alternativeSCPHostName;
- }
-
- public void unsetAlternativeSCPHostName() {
- this.alternativeSCPHostName = null;
- }
-
- /** Returns true if field alternativeSCPHostName is set (has been assigned a value) and false otherwise */
- public boolean isSetAlternativeSCPHostName() {
- return this.alternativeSCPHostName != null;
- }
-
- public void setAlternativeSCPHostNameIsSet(boolean value) {
- if (!value) {
- this.alternativeSCPHostName = null;
- }
- }
-
- public int getSshPort() {
- return this.sshPort;
- }
-
- public void setSshPort(int sshPort) {
- this.sshPort = sshPort;
- setSshPortIsSet(true);
- }
-
- public void unsetSshPort() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SSHPORT_ISSET_ID);
- }
-
- /** Returns true if field sshPort is set (has been assigned a value) and false otherwise */
- public boolean isSetSshPort() {
- return EncodingUtils.testBit(__isset_bitfield, __SSHPORT_ISSET_ID);
- }
-
- public void setSshPortIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SSHPORT_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 SECURITY_PROTOCOL:
- if (value == null) {
- unsetSecurityProtocol();
- } else {
- setSecurityProtocol((SecurityProtocol)value);
- }
- break;
-
- case ALTERNATIVE_SCPHOST_NAME:
- if (value == null) {
- unsetAlternativeSCPHostName();
- } else {
- setAlternativeSCPHostName((String)value);
- }
- break;
-
- case SSH_PORT:
- if (value == null) {
- unsetSshPort();
- } else {
- setSshPort((Integer)value);
- }
- break;
-
- }
- }
-
- public Object getFieldValue(_Fields field) {
- switch (field) {
- case DATA_MOVEMENT_INTERFACE_ID:
- return getDataMovementInterfaceId();
-
- case SECURITY_PROTOCOL:
- return getSecurityProtocol();
-
- case ALTERNATIVE_SCPHOST_NAME:
- return getAlternativeSCPHostName();
-
- case SSH_PORT:
- return Integer.valueOf(getSshPort());
-
- }
- 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 ALTERNATIVE_SCPHOST_NAME:
- return isSetAlternativeSCPHostName();
- case SSH_PORT:
- return isSetSshPort();
- }
- throw new IllegalStateException();
- }
-
- @Override
- public boolean equals(Object that) {
- if (that == null)
- return false;
- if (that instanceof SCPDataMovement)
- return this.equals((SCPDataMovement)that);
- return false;
- }
-
- public boolean equals(SCPDataMovement 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_alternativeSCPHostName = true && this.isSetAlternativeSCPHostName();
- boolean that_present_alternativeSCPHostName = true && that.isSetAlternativeSCPHostName();
- if (this_present_alternativeSCPHostName || that_present_alternativeSCPHostName) {
- if (!(this_present_alternativeSCPHostName && that_present_alternativeSCPHostName))
- return false;
- if (!this.alternativeSCPHostName.equals(that.alternativeSCPHostName))
- return false;
- }
-
- boolean this_present_sshPort = true && this.isSetSshPort();
- boolean that_present_sshPort = true && that.isSetSshPort();
- if (this_present_sshPort || that_present_sshPort) {
- if (!(this_present_sshPort && that_present_sshPort))
- return false;
- if (this.sshPort != that.sshPort)
- 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_alternativeSCPHostName = true && (isSetAlternativeSCPHostName());
- list.add(present_alternativeSCPHostName);
- if (present_alternativeSCPHostName)
- list.add(alternativeSCPHostName);
-
- boolean present_sshPort = true && (isSetSshPort());
- list.add(present_sshPort);
- if (present_sshPort)
- list.add(sshPort);
-
- return list.hashCode();
- }
-
- @Override
- public int compareTo(SCPDataMovement 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(isSetAlternativeSCPHostName()).compareTo(other.isSetAlternativeSCPHostName());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetAlternativeSCPHostName()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.alternativeSCPHostName, other.alternativeSCPHostName);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetSshPort()).compareTo(other.isSetSshPort());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetSshPort()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sshPort, other.sshPort);
- 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("SCPDataMovement(");
- 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 (isSetAlternativeSCPHostName()) {
- if (!first) sb.append(", ");
- sb.append("alternativeSCPHostName:");
- if (this.alternativeSCPHostName == null) {
- sb.append("null");
- } else {
- sb.append(this.alternativeSCPHostName);
- }
- first = false;
- }
- if (isSetSshPort()) {
- if (!first) sb.append(", ");
- sb.append("sshPort:");
- sb.append(this.sshPort);
- 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());
- }
-
- // 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 SCPDataMovementStandardSchemeFactory implements SchemeFactory {
- public SCPDataMovementStandardScheme getScheme() {
- return new SCPDataMovementStandardScheme();
- }
- }
-
- private static class SCPDataMovementStandardScheme extends StandardScheme<SCPDataMovement> {
-
- public void read(org.apache.thrift.protocol.TProtocol iprot, SCPDataMovement 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: // ALTERNATIVE_SCPHOST_NAME
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.alternativeSCPHostName = iprot.readString();
- struct.setAlternativeSCPHostNameIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 4: // SSH_PORT
- if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.sshPort = iprot.readI32();
- struct.setSshPortIsSet(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, SCPDataMovement 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.alternativeSCPHostName != null) {
- if (struct.isSetAlternativeSCPHostName()) {
- oprot.writeFieldBegin(ALTERNATIVE_SCPHOST_NAME_FIELD_DESC);
- oprot.writeString(struct.alternativeSCPHostName);
- oprot.writeFieldEnd();
- }
- }
- if (struct.isSetSshPort()) {
- oprot.writeFieldBegin(SSH_PORT_FIELD_DESC);
- oprot.writeI32(struct.sshPort);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
- }
-
- }
-
- private static class SCPDataMovementTupleSchemeFactory implements SchemeFactory {
- public SCPDataMovementTupleScheme getScheme() {
- return new SCPDataMovementTupleScheme();
- }
- }
-
- private static class SCPDataMovementTupleScheme extends TupleScheme<SCPDataMovement> {
-
- @Override
- public void write(org.apache.thrift.protocol.TProtocol prot, SCPDataMovement struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
- oprot.writeString(struct.dataMovementInterfaceId);
- oprot.writeI32(struct.securityProtocol.getValue());
- BitSet optionals = new BitSet();
- if (struct.isSetAlternativeSCPHostName()) {
- optionals.set(0);
- }
- if (struct.isSetSshPort()) {
- optionals.set(1);
- }
- oprot.writeBitSet(optionals, 2);
- if (struct.isSetAlternativeSCPHostName()) {
- oprot.writeString(struct.alternativeSCPHostName);
- }
- if (struct.isSetSshPort()) {
- oprot.writeI32(struct.sshPort);
- }
- }
-
- @Override
- public void read(org.apache.thrift.protocol.TProtocol prot, SCPDataMovement 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);
- BitSet incoming = iprot.readBitSet(2);
- if (incoming.get(0)) {
- struct.alternativeSCPHostName = iprot.readString();
- struct.setAlternativeSCPHostNameIsSet(true);
- }
- if (incoming.get(1)) {
- struct.sshPort = iprot.readI32();
- struct.setSshPortIsSet(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/SSHJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
index 50fa41a..2b068ac 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
@@ -86,7 +86,7 @@ public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmissio
}
private String jobSubmissionInterfaceId; // required
- private SecurityProtocol securityProtocol; // required
+ private org.apache.airavata.model.data.movement.SecurityProtocol securityProtocol; // required
private ResourceJobManager resourceJobManager; // required
private String alternativeSSHHostName; // optional
private int sshPort; // optional
@@ -98,7 +98,7 @@ public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmissio
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"),
@@ -187,7 +187,7 @@ public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmissio
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)));
tmpMap.put(_Fields.ALTERNATIVE_SSHHOST_NAME, new org.apache.thrift.meta_data.FieldMetaData("alternativeSSHHostName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -212,7 +212,7 @@ public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmissio
public SSHJobSubmission(
String jobSubmissionInterfaceId,
- SecurityProtocol securityProtocol,
+ org.apache.airavata.model.data.movement.SecurityProtocol securityProtocol,
ResourceJobManager resourceJobManager)
{
this();
@@ -290,17 +290,17 @@ public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmissio
/**
*
- * @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;
}
@@ -470,7 +470,7 @@ public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmissio
if (value == null) {
unsetSecurityProtocol();
} else {
- setSecurityProtocol((SecurityProtocol)value);
+ setSecurityProtocol((org.apache.airavata.model.data.movement.SecurityProtocol)value);
}
break;
@@ -917,7 +917,7 @@ public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmissio
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);
@@ -959,13 +959,13 @@ public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmissio
case 7: // BATCH_QUEUE_EMAIL_SENDERS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list18 = iprot.readListBegin();
- struct.batchQueueEmailSenders = new ArrayList<String>(_list18.size);
- String _elem19;
- for (int _i20 = 0; _i20 < _list18.size; ++_i20)
+ org.apache.thrift.protocol.TList _list10 = iprot.readListBegin();
+ struct.batchQueueEmailSenders = new ArrayList<String>(_list10.size);
+ String _elem11;
+ for (int _i12 = 0; _i12 < _list10.size; ++_i12)
{
- _elem19 = iprot.readString();
- struct.batchQueueEmailSenders.add(_elem19);
+ _elem11 = iprot.readString();
+ struct.batchQueueEmailSenders.add(_elem11);
}
iprot.readListEnd();
}
@@ -1026,9 +1026,9 @@ public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmissio
oprot.writeFieldBegin(BATCH_QUEUE_EMAIL_SENDERS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.batchQueueEmailSenders.size()));
- for (String _iter21 : struct.batchQueueEmailSenders)
+ for (String _iter13 : struct.batchQueueEmailSenders)
{
- oprot.writeString(_iter21);
+ oprot.writeString(_iter13);
}
oprot.writeListEnd();
}
@@ -1081,9 +1081,9 @@ public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmissio
if (struct.isSetBatchQueueEmailSenders()) {
{
oprot.writeI32(struct.batchQueueEmailSenders.size());
- for (String _iter22 : struct.batchQueueEmailSenders)
+ for (String _iter14 : struct.batchQueueEmailSenders)
{
- oprot.writeString(_iter22);
+ oprot.writeString(_iter14);
}
}
}
@@ -1094,7 +1094,7 @@ public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmissio
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);
@@ -1114,13 +1114,13 @@ public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmissio
}
if (incoming.get(3)) {
{
- org.apache.thrift.protocol.TList _list23 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.batchQueueEmailSenders = new ArrayList<String>(_list23.size);
- String _elem24;
- for (int _i25 = 0; _i25 < _list23.size; ++_i25)
+ org.apache.thrift.protocol.TList _list15 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.batchQueueEmailSenders = new ArrayList<String>(_list15.size);
+ String _elem16;
+ for (int _i17 = 0; _i17 < _list15.size; ++_i17)
{
- _elem24 = iprot.readString();
- struct.batchQueueEmailSenders.add(_elem24);
+ _elem16 = iprot.readString();
+ struct.batchQueueEmailSenders.add(_elem16);
}
}
struct.setBatchQueueEmailSendersIsSet(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/SecurityProtocol.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SecurityProtocol.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SecurityProtocol.java
deleted file mode 100644
index e033812..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SecurityProtocol.java
+++ /dev/null
@@ -1,88 +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 security authentication and authorization mechanisms supported by Airavata. This enumeration just
- * describes the supported mechanism. The corresponding security credentials are registered with Airavata Credential
- * store.
- *
- * USERNAME_PASSWORD:
- * A User Name.
- *
- * SSH_KEYS:
- * SSH Keys
- *
- * FIXME: Change GSI to a more precise generic security protocol - X509
- *
- */
-public enum SecurityProtocol implements org.apache.thrift.TEnum {
- USERNAME_PASSWORD(0),
- SSH_KEYS(1),
- GSI(2),
- KERBEROS(3),
- OAUTH(4),
- LOCAL(5);
-
- private final int value;
-
- private SecurityProtocol(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 SecurityProtocol findByValue(int value) {
- switch (value) {
- case 0:
- return USERNAME_PASSWORD;
- case 1:
- return SSH_KEYS;
- case 2:
- return GSI;
- case 3:
- return KERBEROS;
- case 4:
- return OAUTH;
- case 5:
- return LOCAL;
- 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/UnicoreDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java
deleted file mode 100644
index 1cda4c3..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java
+++ /dev/null
@@ -1,629 +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 UnicoreStorage
- *
- * unicoreEndPointURL:
- * unicoreGateway End Point. The provider will query this service to fetch required service end points.
- */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-23")
-public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataMovement, UnicoreDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<UnicoreDataMovement> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnicoreDataMovement");
-
- 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 UNICORE_END_POINT_URL_FIELD_DESC = new org.apache.thrift.protocol.TField("unicoreEndPointURL", org.apache.thrift.protocol.TType.STRING, (short)3);
-
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new UnicoreDataMovementStandardSchemeFactory());
- schemes.put(TupleScheme.class, new UnicoreDataMovementTupleSchemeFactory());
- }
-
- private String dataMovementInterfaceId; // required
- private SecurityProtocol securityProtocol; // required
- private String unicoreEndPointURL; // 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"),
- UNICORE_END_POINT_URL((short)3, "unicoreEndPointURL");
-
- 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: // UNICORE_END_POINT_URL
- return UNICORE_END_POINT_URL;
- 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.UNICORE_END_POINT_URL, new org.apache.thrift.meta_data.FieldMetaData("unicoreEndPointURL", 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(UnicoreDataMovement.class, metaDataMap);
- }
-
- public UnicoreDataMovement() {
- this.dataMovementInterfaceId = "DO_NOT_SET_AT_CLIENTS";
-
- }
-
- public UnicoreDataMovement(
- String dataMovementInterfaceId,
- SecurityProtocol securityProtocol,
- String unicoreEndPointURL)
- {
- this();
- this.dataMovementInterfaceId = dataMovementInterfaceId;
- this.securityProtocol = securityProtocol;
- this.unicoreEndPointURL = unicoreEndPointURL;
- }
-
- /**
- * Performs a deep copy on <i>other</i>.
- */
- public UnicoreDataMovement(UnicoreDataMovement other) {
- if (other.isSetDataMovementInterfaceId()) {
- this.dataMovementInterfaceId = other.dataMovementInterfaceId;
- }
- if (other.isSetSecurityProtocol()) {
- this.securityProtocol = other.securityProtocol;
- }
- if (other.isSetUnicoreEndPointURL()) {
- this.unicoreEndPointURL = other.unicoreEndPointURL;
- }
- }
-
- public UnicoreDataMovement deepCopy() {
- return new UnicoreDataMovement(this);
- }
-
- @Override
- public void clear() {
- this.dataMovementInterfaceId = "DO_NOT_SET_AT_CLIENTS";
-
- this.securityProtocol = null;
- this.unicoreEndPointURL = 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 String getUnicoreEndPointURL() {
- return this.unicoreEndPointURL;
- }
-
- public void setUnicoreEndPointURL(String unicoreEndPointURL) {
- this.unicoreEndPointURL = unicoreEndPointURL;
- }
-
- public void unsetUnicoreEndPointURL() {
- this.unicoreEndPointURL = null;
- }
-
- /** Returns true if field unicoreEndPointURL is set (has been assigned a value) and false otherwise */
- public boolean isSetUnicoreEndPointURL() {
- return this.unicoreEndPointURL != null;
- }
-
- public void setUnicoreEndPointURLIsSet(boolean value) {
- if (!value) {
- this.unicoreEndPointURL = 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 UNICORE_END_POINT_URL:
- if (value == null) {
- unsetUnicoreEndPointURL();
- } else {
- setUnicoreEndPointURL((String)value);
- }
- break;
-
- }
- }
-
- public Object getFieldValue(_Fields field) {
- switch (field) {
- case DATA_MOVEMENT_INTERFACE_ID:
- return getDataMovementInterfaceId();
-
- case SECURITY_PROTOCOL:
- return getSecurityProtocol();
-
- case UNICORE_END_POINT_URL:
- return getUnicoreEndPointURL();
-
- }
- 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 UNICORE_END_POINT_URL:
- return isSetUnicoreEndPointURL();
- }
- throw new IllegalStateException();
- }
-
- @Override
- public boolean equals(Object that) {
- if (that == null)
- return false;
- if (that instanceof UnicoreDataMovement)
- return this.equals((UnicoreDataMovement)that);
- return false;
- }
-
- public boolean equals(UnicoreDataMovement 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_unicoreEndPointURL = true && this.isSetUnicoreEndPointURL();
- boolean that_present_unicoreEndPointURL = true && that.isSetUnicoreEndPointURL();
- if (this_present_unicoreEndPointURL || that_present_unicoreEndPointURL) {
- if (!(this_present_unicoreEndPointURL && that_present_unicoreEndPointURL))
- return false;
- if (!this.unicoreEndPointURL.equals(that.unicoreEndPointURL))
- 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_unicoreEndPointURL = true && (isSetUnicoreEndPointURL());
- list.add(present_unicoreEndPointURL);
- if (present_unicoreEndPointURL)
- list.add(unicoreEndPointURL);
-
- return list.hashCode();
- }
-
- @Override
- public int compareTo(UnicoreDataMovement 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(isSetUnicoreEndPointURL()).compareTo(other.isSetUnicoreEndPointURL());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetUnicoreEndPointURL()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.unicoreEndPointURL, other.unicoreEndPointURL);
- 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("UnicoreDataMovement(");
- 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("unicoreEndPointURL:");
- if (this.unicoreEndPointURL == null) {
- sb.append("null");
- } else {
- sb.append(this.unicoreEndPointURL);
- }
- 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 (!isSetUnicoreEndPointURL()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'unicoreEndPointURL' 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 UnicoreDataMovementStandardSchemeFactory implements SchemeFactory {
- public UnicoreDataMovementStandardScheme getScheme() {
- return new UnicoreDataMovementStandardScheme();
- }
- }
-
- private static class UnicoreDataMovementStandardScheme extends StandardScheme<UnicoreDataMovement> {
-
- public void read(org.apache.thrift.protocol.TProtocol iprot, UnicoreDataMovement 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: // UNICORE_END_POINT_URL
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.unicoreEndPointURL = iprot.readString();
- struct.setUnicoreEndPointURLIsSet(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, UnicoreDataMovement 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.unicoreEndPointURL != null) {
- oprot.writeFieldBegin(UNICORE_END_POINT_URL_FIELD_DESC);
- oprot.writeString(struct.unicoreEndPointURL);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
- }
-
- }
-
- private static class UnicoreDataMovementTupleSchemeFactory implements SchemeFactory {
- public UnicoreDataMovementTupleScheme getScheme() {
- return new UnicoreDataMovementTupleScheme();
- }
- }
-
- private static class UnicoreDataMovementTupleScheme extends TupleScheme<UnicoreDataMovement> {
-
- @Override
- public void write(org.apache.thrift.protocol.TProtocol prot, UnicoreDataMovement struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
- oprot.writeString(struct.dataMovementInterfaceId);
- oprot.writeI32(struct.securityProtocol.getValue());
- oprot.writeString(struct.unicoreEndPointURL);
- }
-
- @Override
- public void read(org.apache.thrift.protocol.TProtocol prot, UnicoreDataMovement 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);
- struct.unicoreEndPointURL = iprot.readString();
- struct.setUnicoreEndPointURLIsSet(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/UnicoreJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
index bbfe49d..3366055 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
@@ -74,7 +74,7 @@ public class UnicoreJobSubmission implements org.apache.thrift.TBase<UnicoreJobS
}
private String jobSubmissionInterfaceId; // required
- private SecurityProtocol securityProtocol; // required
+ private org.apache.airavata.model.data.movement.SecurityProtocol securityProtocol; // required
private String unicoreEndPointURL; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -82,7 +82,7 @@ public class UnicoreJobSubmission implements org.apache.thrift.TBase<UnicoreJobS
JOB_SUBMISSION_INTERFACE_ID((short)1, "jobSubmissionInterfaceId"),
/**
*
- * @see SecurityProtocol
+ * @see org.apache.airavata.model.data.movement.SecurityProtocol
*/
SECURITY_PROTOCOL((short)2, "securityProtocol"),
UNICORE_END_POINT_URL((short)3, "unicoreEndPointURL");
@@ -152,7 +152,7 @@ public class UnicoreJobSubmission implements org.apache.thrift.TBase<UnicoreJobS
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.UNICORE_END_POINT_URL, new org.apache.thrift.meta_data.FieldMetaData("unicoreEndPointURL", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -166,7 +166,7 @@ public class UnicoreJobSubmission implements org.apache.thrift.TBase<UnicoreJobS
public UnicoreJobSubmission(
String jobSubmissionInterfaceId,
- SecurityProtocol securityProtocol,
+ org.apache.airavata.model.data.movement.SecurityProtocol securityProtocol,
String unicoreEndPointURL)
{
this();
@@ -227,17 +227,17 @@ public class UnicoreJobSubmission implements org.apache.thrift.TBase<UnicoreJobS
/**
*
- * @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;
}
@@ -293,7 +293,7 @@ public class UnicoreJobSubmission implements org.apache.thrift.TBase<UnicoreJobS
if (value == null) {
unsetSecurityProtocol();
} else {
- setSecurityProtocol((SecurityProtocol)value);
+ setSecurityProtocol((org.apache.airavata.model.data.movement.SecurityProtocol)value);
}
break;
@@ -551,7 +551,7 @@ public class UnicoreJobSubmission implements org.apache.thrift.TBase<UnicoreJobS
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);
@@ -620,7 +620,7 @@ public class UnicoreJobSubmission implements org.apache.thrift.TBase<UnicoreJobS
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.unicoreEndPointURL = iprot.readString();
struct.setUnicoreEndPointURLIsSet(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/gatewayprofile/ComputeResourcePreference.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
index 1b39252..a85f81f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
@@ -109,7 +109,7 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
private boolean overridebyAiravata; // required
private String loginUserName; // optional
private org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol preferredJobSubmissionProtocol; // optional
- private org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol preferredDataMovementProtocol; // optional
+ private org.apache.airavata.model.data.movement.DataMovementProtocol preferredDataMovementProtocol; // optional
private String preferredBatchQueue; // optional
private String scratchLocation; // optional
private String allocationProjectNumber; // optional
@@ -127,7 +127,7 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
PREFERRED_JOB_SUBMISSION_PROTOCOL((short)4, "preferredJobSubmissionProtocol"),
/**
*
- * @see org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol
+ * @see org.apache.airavata.model.data.movement.DataMovementProtocol
*/
PREFERRED_DATA_MOVEMENT_PROTOCOL((short)5, "preferredDataMovementProtocol"),
PREFERRED_BATCH_QUEUE((short)6, "preferredBatchQueue"),
@@ -221,7 +221,7 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
tmpMap.put(_Fields.PREFERRED_JOB_SUBMISSION_PROTOCOL, new org.apache.thrift.meta_data.FieldMetaData("preferredJobSubmissionProtocol", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol.class)));
tmpMap.put(_Fields.PREFERRED_DATA_MOVEMENT_PROTOCOL, new org.apache.thrift.meta_data.FieldMetaData("preferredDataMovementProtocol", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol.class)));
+ new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.data.movement.DataMovementProtocol.class)));
tmpMap.put(_Fields.PREFERRED_BATCH_QUEUE, new org.apache.thrift.meta_data.FieldMetaData("preferredBatchQueue", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.SCRATCH_LOCATION, new org.apache.thrift.meta_data.FieldMetaData("scratchLocation", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -400,17 +400,17 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
/**
*
- * @see org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol
+ * @see org.apache.airavata.model.data.movement.DataMovementProtocol
*/
- public org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol getPreferredDataMovementProtocol() {
+ public org.apache.airavata.model.data.movement.DataMovementProtocol getPreferredDataMovementProtocol() {
return this.preferredDataMovementProtocol;
}
/**
*
- * @see org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol
+ * @see org.apache.airavata.model.data.movement.DataMovementProtocol
*/
- public void setPreferredDataMovementProtocol(org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol preferredDataMovementProtocol) {
+ public void setPreferredDataMovementProtocol(org.apache.airavata.model.data.movement.DataMovementProtocol preferredDataMovementProtocol) {
this.preferredDataMovementProtocol = preferredDataMovementProtocol;
}
@@ -559,7 +559,7 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
if (value == null) {
unsetPreferredDataMovementProtocol();
} else {
- setPreferredDataMovementProtocol((org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol)value);
+ setPreferredDataMovementProtocol((org.apache.airavata.model.data.movement.DataMovementProtocol)value);
}
break;
@@ -1095,7 +1095,7 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
break;
case 5: // PREFERRED_DATA_MOVEMENT_PROTOCOL
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.preferredDataMovementProtocol = org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol.findByValue(iprot.readI32());
+ struct.preferredDataMovementProtocol = org.apache.airavata.model.data.movement.DataMovementProtocol.findByValue(iprot.readI32());
struct.setPreferredDataMovementProtocolIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -1285,7 +1285,7 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
struct.setPreferredJobSubmissionProtocolIsSet(true);
}
if (incoming.get(2)) {
- struct.preferredDataMovementProtocol = org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol.findByValue(iprot.readI32());
+ struct.preferredDataMovementProtocol = org.apache.airavata.model.data.movement.DataMovementProtocol.findByValue(iprot.readI32());
struct.setPreferredDataMovementProtocolIsSet(true);
}
if (incoming.get(3)) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
index fdf5715..1c51654 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
@@ -88,7 +88,7 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora
private String hostName; // required
private String storageResourceDescription; // optional
private boolean enabled; // optional
- private List<org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface> dataMovementInterfaces; // optional
+ private List<org.apache.airavata.model.data.movement.DataMovementInterface> dataMovementInterfaces; // 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 {
@@ -177,7 +177,7 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
tmpMap.put(_Fields.DATA_MOVEMENT_INTERFACES, new org.apache.thrift.meta_data.FieldMetaData("dataMovementInterfaces", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface.class))));
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.data.movement.DataMovementInterface.class))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(StorageResourceDescription.class, metaDataMap);
}
@@ -212,9 +212,9 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora
}
this.enabled = other.enabled;
if (other.isSetDataMovementInterfaces()) {
- List<org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface> __this__dataMovementInterfaces = new ArrayList<org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface>(other.dataMovementInterfaces.size());
- for (org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface other_element : other.dataMovementInterfaces) {
- __this__dataMovementInterfaces.add(new org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface(other_element));
+ List<org.apache.airavata.model.data.movement.DataMovementInterface> __this__dataMovementInterfaces = new ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(other.dataMovementInterfaces.size());
+ for (org.apache.airavata.model.data.movement.DataMovementInterface other_element : other.dataMovementInterfaces) {
+ __this__dataMovementInterfaces.add(new org.apache.airavata.model.data.movement.DataMovementInterface(other_element));
}
this.dataMovementInterfaces = __this__dataMovementInterfaces;
}
@@ -330,22 +330,22 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora
return (this.dataMovementInterfaces == null) ? 0 : this.dataMovementInterfaces.size();
}
- public java.util.Iterator<org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface> getDataMovementInterfacesIterator() {
+ public java.util.Iterator<org.apache.airavata.model.data.movement.DataMovementInterface> getDataMovementInterfacesIterator() {
return (this.dataMovementInterfaces == null) ? null : this.dataMovementInterfaces.iterator();
}
- public void addToDataMovementInterfaces(org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface elem) {
+ public void addToDataMovementInterfaces(org.apache.airavata.model.data.movement.DataMovementInterface elem) {
if (this.dataMovementInterfaces == null) {
- this.dataMovementInterfaces = new ArrayList<org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface>();
+ this.dataMovementInterfaces = new ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>();
}
this.dataMovementInterfaces.add(elem);
}
- public List<org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface> getDataMovementInterfaces() {
+ public List<org.apache.airavata.model.data.movement.DataMovementInterface> getDataMovementInterfaces() {
return this.dataMovementInterfaces;
}
- public void setDataMovementInterfaces(List<org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface> dataMovementInterfaces) {
+ public void setDataMovementInterfaces(List<org.apache.airavata.model.data.movement.DataMovementInterface> dataMovementInterfaces) {
this.dataMovementInterfaces = dataMovementInterfaces;
}
@@ -402,7 +402,7 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora
if (value == null) {
unsetDataMovementInterfaces();
} else {
- setDataMovementInterfaces((List<org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface>)value);
+ setDataMovementInterfaces((List<org.apache.airavata.model.data.movement.DataMovementInterface>)value);
}
break;
@@ -752,11 +752,11 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
- struct.dataMovementInterfaces = new ArrayList<org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface>(_list0.size);
- org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface _elem1;
+ struct.dataMovementInterfaces = new ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(_list0.size);
+ org.apache.airavata.model.data.movement.DataMovementInterface _elem1;
for (int _i2 = 0; _i2 < _list0.size; ++_i2)
{
- _elem1 = new org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface();
+ _elem1 = new org.apache.airavata.model.data.movement.DataMovementInterface();
_elem1.read(iprot);
struct.dataMovementInterfaces.add(_elem1);
}
@@ -807,7 +807,7 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora
oprot.writeFieldBegin(DATA_MOVEMENT_INTERFACES_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.dataMovementInterfaces.size()));
- for (org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface _iter3 : struct.dataMovementInterfaces)
+ for (org.apache.airavata.model.data.movement.DataMovementInterface _iter3 : struct.dataMovementInterfaces)
{
_iter3.write(oprot);
}
@@ -855,7 +855,7 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora
if (struct.isSetDataMovementInterfaces()) {
{
oprot.writeI32(struct.dataMovementInterfaces.size());
- for (org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface _iter4 : struct.dataMovementInterfaces)
+ for (org.apache.airavata.model.data.movement.DataMovementInterface _iter4 : struct.dataMovementInterfaces)
{
_iter4.write(oprot);
}
@@ -882,11 +882,11 @@ public class StorageResourceDescription implements org.apache.thrift.TBase<Stora
if (incoming.get(2)) {
{
org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.dataMovementInterfaces = new ArrayList<org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface>(_list5.size);
- org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface _elem6;
+ struct.dataMovementInterfaces = new ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(_list5.size);
+ org.apache.airavata.model.data.movement.DataMovementInterface _elem6;
for (int _i7 = 0; _i7 < _list5.size; ++_i7)
{
- _elem6 = new org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface();
+ _elem6 = new org.apache.airavata.model.data.movement.DataMovementInterface();
_elem6.read(iprot);
struct.dataMovementInterfaces.add(_elem6);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DMType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DMType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DMType.java
new file mode 100644
index 0000000..d4dc712
--- /dev/null
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DMType.java
@@ -0,0 +1,62 @@
+/**
+ * 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.data.movement;
+
+
+import java.util.Map;
+import java.util.HashMap;
+import org.apache.thrift.TEnum;
+
+public enum DMType implements org.apache.thrift.TEnum {
+ COMPUTE_RESOURCE(0),
+ STORAGE_RESOURCE(1);
+
+ private final int value;
+
+ private DMType(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 DMType findByValue(int value) {
+ switch (value) {
+ case 0:
+ return COMPUTE_RESOURCE;
+ case 1:
+ return STORAGE_RESOURCE;
+ default:
+ return null;
+ }
+ }
+}