You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2014/05/20 15:23:11 UTC
[1/3] generating code
Repository: airavata
Updated Branches:
refs/heads/master 3049a0b17 -> 23c118418
http://git-wip-us.apache.org/repos/asf/airavata/blob/23c11841/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/GlobusJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/GlobusJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/GlobusJobSubmission.java
index 5eae704..db7485c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/GlobusJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/GlobusJobSubmission.java
@@ -51,10 +51,10 @@ import org.slf4j.LoggerFactory;
@SuppressWarnings("all") public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSubmission, GlobusJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<GlobusJobSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GlobusJobSubmission");
- private static final org.apache.thrift.protocol.TField GLOBUS_JOB_SUBMISSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("globusJobSubmissionID", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_DATA_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("jobSubmissionDataID", 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 RESOURCE_JOB_MANAGER_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceJobManager", org.apache.thrift.protocol.TType.I32, (short)3);
- private static final org.apache.thrift.protocol.TField GLOBUS_GATE_KEEPER_END_POINT_FIELD_DESC = new org.apache.thrift.protocol.TField("globusGateKeeperEndPoint", org.apache.thrift.protocol.TType.STRING, (short)4);
+ private static final org.apache.thrift.protocol.TField GLOBUS_GATE_KEEPER_END_POINT_FIELD_DESC = new org.apache.thrift.protocol.TField("globusGateKeeperEndPoint", org.apache.thrift.protocol.TType.LIST, (short)4);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -62,14 +62,14 @@ import org.slf4j.LoggerFactory;
schemes.put(TupleScheme.class, new GlobusJobSubmissionTupleSchemeFactory());
}
- private String globusJobSubmissionID; // required
+ private String jobSubmissionDataID; // required
private SecurityProtocol securityProtocol; // required
private ResourceJobManager resourceJobManager; // required
- private String globusGateKeeperEndPoint; // optional
+ private List<String> globusGateKeeperEndPoint; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
- GLOBUS_JOB_SUBMISSION_ID((short)1, "globusJobSubmissionID"),
+ JOB_SUBMISSION_DATA_ID((short)1, "jobSubmissionDataID"),
/**
*
* @see SecurityProtocol
@@ -95,8 +95,8 @@ import org.slf4j.LoggerFactory;
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
- case 1: // GLOBUS_JOB_SUBMISSION_ID
- return GLOBUS_JOB_SUBMISSION_ID;
+ case 1: // JOB_SUBMISSION_DATA_ID
+ return JOB_SUBMISSION_DATA_ID;
case 2: // SECURITY_PROTOCOL
return SECURITY_PROTOCOL;
case 3: // RESOURCE_JOB_MANAGER
@@ -147,30 +147,31 @@ import org.slf4j.LoggerFactory;
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.GLOBUS_JOB_SUBMISSION_ID, new org.apache.thrift.meta_data.FieldMetaData("globusJobSubmissionID", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.JOB_SUBMISSION_DATA_ID, new org.apache.thrift.meta_data.FieldMetaData("jobSubmissionDataID", 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.RESOURCE_JOB_MANAGER, new org.apache.thrift.meta_data.FieldMetaData("resourceJobManager", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ResourceJobManager.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.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ 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(GlobusJobSubmission.class, metaDataMap);
}
public GlobusJobSubmission() {
- this.globusJobSubmissionID = "DO_NOT_SET_AT_CLIENTS";
+ this.jobSubmissionDataID = "DO_NOT_SET_AT_CLIENTS";
}
public GlobusJobSubmission(
- String globusJobSubmissionID,
+ String jobSubmissionDataID,
SecurityProtocol securityProtocol,
ResourceJobManager resourceJobManager)
{
this();
- this.globusJobSubmissionID = globusJobSubmissionID;
+ this.jobSubmissionDataID = jobSubmissionDataID;
this.securityProtocol = securityProtocol;
this.resourceJobManager = resourceJobManager;
}
@@ -179,8 +180,8 @@ import org.slf4j.LoggerFactory;
* Performs a deep copy on <i>other</i>.
*/
public GlobusJobSubmission(GlobusJobSubmission other) {
- if (other.isSetGlobusJobSubmissionID()) {
- this.globusJobSubmissionID = other.globusJobSubmissionID;
+ if (other.isSetJobSubmissionDataID()) {
+ this.jobSubmissionDataID = other.jobSubmissionDataID;
}
if (other.isSetSecurityProtocol()) {
this.securityProtocol = other.securityProtocol;
@@ -189,7 +190,8 @@ import org.slf4j.LoggerFactory;
this.resourceJobManager = other.resourceJobManager;
}
if (other.isSetGlobusGateKeeperEndPoint()) {
- this.globusGateKeeperEndPoint = other.globusGateKeeperEndPoint;
+ List<String> __this__globusGateKeeperEndPoint = new ArrayList<String>(other.globusGateKeeperEndPoint);
+ this.globusGateKeeperEndPoint = __this__globusGateKeeperEndPoint;
}
}
@@ -199,33 +201,33 @@ import org.slf4j.LoggerFactory;
@Override
public void clear() {
- this.globusJobSubmissionID = "DO_NOT_SET_AT_CLIENTS";
+ this.jobSubmissionDataID = "DO_NOT_SET_AT_CLIENTS";
this.securityProtocol = null;
this.resourceJobManager = null;
this.globusGateKeeperEndPoint = null;
}
- public String getGlobusJobSubmissionID() {
- return this.globusJobSubmissionID;
+ public String getJobSubmissionDataID() {
+ return this.jobSubmissionDataID;
}
- public void setGlobusJobSubmissionID(String globusJobSubmissionID) {
- this.globusJobSubmissionID = globusJobSubmissionID;
+ public void setJobSubmissionDataID(String jobSubmissionDataID) {
+ this.jobSubmissionDataID = jobSubmissionDataID;
}
- public void unsetGlobusJobSubmissionID() {
- this.globusJobSubmissionID = null;
+ public void unsetJobSubmissionDataID() {
+ this.jobSubmissionDataID = null;
}
- /** Returns true if field globusJobSubmissionID is set (has been assigned a value) and false otherwise */
- public boolean isSetGlobusJobSubmissionID() {
- return this.globusJobSubmissionID != null;
+ /** Returns true if field jobSubmissionDataID is set (has been assigned a value) and false otherwise */
+ public boolean isSetJobSubmissionDataID() {
+ return this.jobSubmissionDataID != null;
}
- public void setGlobusJobSubmissionIDIsSet(boolean value) {
+ public void setJobSubmissionDataIDIsSet(boolean value) {
if (!value) {
- this.globusJobSubmissionID = null;
+ this.jobSubmissionDataID = null;
}
}
@@ -291,11 +293,26 @@ import org.slf4j.LoggerFactory;
}
}
- public String getGlobusGateKeeperEndPoint() {
+ public int getGlobusGateKeeperEndPointSize() {
+ return (this.globusGateKeeperEndPoint == null) ? 0 : this.globusGateKeeperEndPoint.size();
+ }
+
+ public java.util.Iterator<String> getGlobusGateKeeperEndPointIterator() {
+ return (this.globusGateKeeperEndPoint == null) ? null : this.globusGateKeeperEndPoint.iterator();
+ }
+
+ public void addToGlobusGateKeeperEndPoint(String elem) {
+ if (this.globusGateKeeperEndPoint == null) {
+ this.globusGateKeeperEndPoint = new ArrayList<String>();
+ }
+ this.globusGateKeeperEndPoint.add(elem);
+ }
+
+ public List<String> getGlobusGateKeeperEndPoint() {
return this.globusGateKeeperEndPoint;
}
- public void setGlobusGateKeeperEndPoint(String globusGateKeeperEndPoint) {
+ public void setGlobusGateKeeperEndPoint(List<String> globusGateKeeperEndPoint) {
this.globusGateKeeperEndPoint = globusGateKeeperEndPoint;
}
@@ -316,11 +333,11 @@ import org.slf4j.LoggerFactory;
public void setFieldValue(_Fields field, Object value) {
switch (field) {
- case GLOBUS_JOB_SUBMISSION_ID:
+ case JOB_SUBMISSION_DATA_ID:
if (value == null) {
- unsetGlobusJobSubmissionID();
+ unsetJobSubmissionDataID();
} else {
- setGlobusJobSubmissionID((String)value);
+ setJobSubmissionDataID((String)value);
}
break;
@@ -344,7 +361,7 @@ import org.slf4j.LoggerFactory;
if (value == null) {
unsetGlobusGateKeeperEndPoint();
} else {
- setGlobusGateKeeperEndPoint((String)value);
+ setGlobusGateKeeperEndPoint((List<String>)value);
}
break;
@@ -353,8 +370,8 @@ import org.slf4j.LoggerFactory;
public Object getFieldValue(_Fields field) {
switch (field) {
- case GLOBUS_JOB_SUBMISSION_ID:
- return getGlobusJobSubmissionID();
+ case JOB_SUBMISSION_DATA_ID:
+ return getJobSubmissionDataID();
case SECURITY_PROTOCOL:
return getSecurityProtocol();
@@ -376,8 +393,8 @@ import org.slf4j.LoggerFactory;
}
switch (field) {
- case GLOBUS_JOB_SUBMISSION_ID:
- return isSetGlobusJobSubmissionID();
+ case JOB_SUBMISSION_DATA_ID:
+ return isSetJobSubmissionDataID();
case SECURITY_PROTOCOL:
return isSetSecurityProtocol();
case RESOURCE_JOB_MANAGER:
@@ -401,12 +418,12 @@ import org.slf4j.LoggerFactory;
if (that == null)
return false;
- boolean this_present_globusJobSubmissionID = true && this.isSetGlobusJobSubmissionID();
- boolean that_present_globusJobSubmissionID = true && that.isSetGlobusJobSubmissionID();
- if (this_present_globusJobSubmissionID || that_present_globusJobSubmissionID) {
- if (!(this_present_globusJobSubmissionID && that_present_globusJobSubmissionID))
+ boolean this_present_jobSubmissionDataID = true && this.isSetJobSubmissionDataID();
+ boolean that_present_jobSubmissionDataID = true && that.isSetJobSubmissionDataID();
+ if (this_present_jobSubmissionDataID || that_present_jobSubmissionDataID) {
+ if (!(this_present_jobSubmissionDataID && that_present_jobSubmissionDataID))
return false;
- if (!this.globusJobSubmissionID.equals(that.globusJobSubmissionID))
+ if (!this.jobSubmissionDataID.equals(that.jobSubmissionDataID))
return false;
}
@@ -453,12 +470,12 @@ import org.slf4j.LoggerFactory;
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetGlobusJobSubmissionID()).compareTo(other.isSetGlobusJobSubmissionID());
+ lastComparison = Boolean.valueOf(isSetJobSubmissionDataID()).compareTo(other.isSetJobSubmissionDataID());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetGlobusJobSubmissionID()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.globusJobSubmissionID, other.globusJobSubmissionID);
+ if (isSetJobSubmissionDataID()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jobSubmissionDataID, other.jobSubmissionDataID);
if (lastComparison != 0) {
return lastComparison;
}
@@ -513,11 +530,11 @@ import org.slf4j.LoggerFactory;
StringBuilder sb = new StringBuilder("GlobusJobSubmission(");
boolean first = true;
- sb.append("globusJobSubmissionID:");
- if (this.globusJobSubmissionID == null) {
+ sb.append("jobSubmissionDataID:");
+ if (this.jobSubmissionDataID == null) {
sb.append("null");
} else {
- sb.append(this.globusJobSubmissionID);
+ sb.append(this.jobSubmissionDataID);
}
first = false;
if (!first) sb.append(", ");
@@ -552,8 +569,8 @@ import org.slf4j.LoggerFactory;
public void validate() throws org.apache.thrift.TException {
// check for required fields
- if (!isSetGlobusJobSubmissionID()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'globusJobSubmissionID' is unset! Struct:" + toString());
+ if (!isSetJobSubmissionDataID()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'jobSubmissionDataID' is unset! Struct:" + toString());
}
if (!isSetSecurityProtocol()) {
@@ -601,10 +618,10 @@ import org.slf4j.LoggerFactory;
break;
}
switch (schemeField.id) {
- case 1: // GLOBUS_JOB_SUBMISSION_ID
+ case 1: // JOB_SUBMISSION_DATA_ID
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.globusJobSubmissionID = iprot.readString();
- struct.setGlobusJobSubmissionIDIsSet(true);
+ struct.jobSubmissionDataID = iprot.readString();
+ struct.setJobSubmissionDataIDIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -626,8 +643,18 @@ import org.slf4j.LoggerFactory;
}
break;
case 4: // GLOBUS_GATE_KEEPER_END_POINT
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.globusGateKeeperEndPoint = iprot.readString();
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
+ struct.globusGateKeeperEndPoint = new ArrayList<String>(_list0.size);
+ for (int _i1 = 0; _i1 < _list0.size; ++_i1)
+ {
+ String _elem2;
+ _elem2 = iprot.readString();
+ struct.globusGateKeeperEndPoint.add(_elem2);
+ }
+ iprot.readListEnd();
+ }
struct.setGlobusGateKeeperEndPointIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -646,9 +673,9 @@ import org.slf4j.LoggerFactory;
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
- if (struct.globusJobSubmissionID != null) {
- oprot.writeFieldBegin(GLOBUS_JOB_SUBMISSION_ID_FIELD_DESC);
- oprot.writeString(struct.globusJobSubmissionID);
+ if (struct.jobSubmissionDataID != null) {
+ oprot.writeFieldBegin(JOB_SUBMISSION_DATA_ID_FIELD_DESC);
+ oprot.writeString(struct.jobSubmissionDataID);
oprot.writeFieldEnd();
}
if (struct.securityProtocol != null) {
@@ -664,7 +691,14 @@ import org.slf4j.LoggerFactory;
if (struct.globusGateKeeperEndPoint != null) {
if (struct.isSetGlobusGateKeeperEndPoint()) {
oprot.writeFieldBegin(GLOBUS_GATE_KEEPER_END_POINT_FIELD_DESC);
- oprot.writeString(struct.globusGateKeeperEndPoint);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.globusGateKeeperEndPoint.size()));
+ for (String _iter3 : struct.globusGateKeeperEndPoint)
+ {
+ oprot.writeString(_iter3);
+ }
+ oprot.writeListEnd();
+ }
oprot.writeFieldEnd();
}
}
@@ -685,7 +719,7 @@ import org.slf4j.LoggerFactory;
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, GlobusJobSubmission struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
- oprot.writeString(struct.globusJobSubmissionID);
+ oprot.writeString(struct.jobSubmissionDataID);
oprot.writeI32(struct.securityProtocol.getValue());
oprot.writeI32(struct.resourceJobManager.getValue());
BitSet optionals = new BitSet();
@@ -694,22 +728,37 @@ import org.slf4j.LoggerFactory;
}
oprot.writeBitSet(optionals, 1);
if (struct.isSetGlobusGateKeeperEndPoint()) {
- oprot.writeString(struct.globusGateKeeperEndPoint);
+ {
+ oprot.writeI32(struct.globusGateKeeperEndPoint.size());
+ for (String _iter4 : struct.globusGateKeeperEndPoint)
+ {
+ oprot.writeString(_iter4);
+ }
+ }
}
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, GlobusJobSubmission struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- struct.globusJobSubmissionID = iprot.readString();
- struct.setGlobusJobSubmissionIDIsSet(true);
+ struct.jobSubmissionDataID = iprot.readString();
+ struct.setJobSubmissionDataIDIsSet(true);
struct.securityProtocol = SecurityProtocol.findByValue(iprot.readI32());
struct.setSecurityProtocolIsSet(true);
struct.resourceJobManager = ResourceJobManager.findByValue(iprot.readI32());
struct.setResourceJobManagerIsSet(true);
BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
- struct.globusGateKeeperEndPoint = iprot.readString();
+ {
+ org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.globusGateKeeperEndPoint = new ArrayList<String>(_list5.size);
+ for (int _i6 = 0; _i6 < _list5.size; ++_i6)
+ {
+ String _elem7;
+ _elem7 = iprot.readString();
+ struct.globusGateKeeperEndPoint.add(_elem7);
+ }
+ }
struct.setGlobusGateKeeperEndPointIsSet(true);
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/23c11841/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/SCPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/SCPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/SCPDataMovement.java
index 2dd2c59..90aa4e2 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/SCPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/SCPDataMovement.java
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
@SuppressWarnings("all") 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 SCP_DATA_MOVEMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("scpDataMovementID", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.thrift.protocol.TField DATA_SUBMISSION_DATA_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("dataSubmissionDataID", 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 SSH_PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("sshPort", org.apache.thrift.protocol.TType.I32, (short)3);
@@ -61,13 +61,13 @@ import org.slf4j.LoggerFactory;
schemes.put(TupleScheme.class, new SCPDataMovementTupleSchemeFactory());
}
- private String scpDataMovementID; // required
+ private String dataSubmissionDataID; // required
private SecurityProtocol securityProtocol; // required
private int sshPort; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
- SCP_DATA_MOVEMENT_ID((short)1, "scpDataMovementID"),
+ DATA_SUBMISSION_DATA_ID((short)1, "dataSubmissionDataID"),
/**
*
* @see SecurityProtocol
@@ -88,8 +88,8 @@ import org.slf4j.LoggerFactory;
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
- case 1: // SCP_DATA_MOVEMENT_ID
- return SCP_DATA_MOVEMENT_ID;
+ case 1: // DATA_SUBMISSION_DATA_ID
+ return DATA_SUBMISSION_DATA_ID;
case 2: // SECURITY_PROTOCOL
return SECURITY_PROTOCOL;
case 3: // SSH_PORT
@@ -140,7 +140,7 @@ import org.slf4j.LoggerFactory;
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.SCP_DATA_MOVEMENT_ID, new org.apache.thrift.meta_data.FieldMetaData("scpDataMovementID", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.DATA_SUBMISSION_DATA_ID, new org.apache.thrift.meta_data.FieldMetaData("dataSubmissionDataID", 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)));
@@ -151,18 +151,18 @@ import org.slf4j.LoggerFactory;
}
public SCPDataMovement() {
- this.scpDataMovementID = "DO_NOT_SET_AT_CLIENTS";
+ this.dataSubmissionDataID = "DO_NOT_SET_AT_CLIENTS";
this.sshPort = 22;
}
public SCPDataMovement(
- String scpDataMovementID,
+ String dataSubmissionDataID,
SecurityProtocol securityProtocol)
{
this();
- this.scpDataMovementID = scpDataMovementID;
+ this.dataSubmissionDataID = dataSubmissionDataID;
this.securityProtocol = securityProtocol;
}
@@ -171,8 +171,8 @@ import org.slf4j.LoggerFactory;
*/
public SCPDataMovement(SCPDataMovement other) {
__isset_bitfield = other.__isset_bitfield;
- if (other.isSetScpDataMovementID()) {
- this.scpDataMovementID = other.scpDataMovementID;
+ if (other.isSetDataSubmissionDataID()) {
+ this.dataSubmissionDataID = other.dataSubmissionDataID;
}
if (other.isSetSecurityProtocol()) {
this.securityProtocol = other.securityProtocol;
@@ -186,33 +186,33 @@ import org.slf4j.LoggerFactory;
@Override
public void clear() {
- this.scpDataMovementID = "DO_NOT_SET_AT_CLIENTS";
+ this.dataSubmissionDataID = "DO_NOT_SET_AT_CLIENTS";
this.securityProtocol = null;
this.sshPort = 22;
}
- public String getScpDataMovementID() {
- return this.scpDataMovementID;
+ public String getDataSubmissionDataID() {
+ return this.dataSubmissionDataID;
}
- public void setScpDataMovementID(String scpDataMovementID) {
- this.scpDataMovementID = scpDataMovementID;
+ public void setDataSubmissionDataID(String dataSubmissionDataID) {
+ this.dataSubmissionDataID = dataSubmissionDataID;
}
- public void unsetScpDataMovementID() {
- this.scpDataMovementID = null;
+ public void unsetDataSubmissionDataID() {
+ this.dataSubmissionDataID = null;
}
- /** Returns true if field scpDataMovementID is set (has been assigned a value) and false otherwise */
- public boolean isSetScpDataMovementID() {
- return this.scpDataMovementID != null;
+ /** Returns true if field dataSubmissionDataID is set (has been assigned a value) and false otherwise */
+ public boolean isSetDataSubmissionDataID() {
+ return this.dataSubmissionDataID != null;
}
- public void setScpDataMovementIDIsSet(boolean value) {
+ public void setDataSubmissionDataIDIsSet(boolean value) {
if (!value) {
- this.scpDataMovementID = null;
+ this.dataSubmissionDataID = null;
}
}
@@ -271,11 +271,11 @@ import org.slf4j.LoggerFactory;
public void setFieldValue(_Fields field, Object value) {
switch (field) {
- case SCP_DATA_MOVEMENT_ID:
+ case DATA_SUBMISSION_DATA_ID:
if (value == null) {
- unsetScpDataMovementID();
+ unsetDataSubmissionDataID();
} else {
- setScpDataMovementID((String)value);
+ setDataSubmissionDataID((String)value);
}
break;
@@ -300,8 +300,8 @@ import org.slf4j.LoggerFactory;
public Object getFieldValue(_Fields field) {
switch (field) {
- case SCP_DATA_MOVEMENT_ID:
- return getScpDataMovementID();
+ case DATA_SUBMISSION_DATA_ID:
+ return getDataSubmissionDataID();
case SECURITY_PROTOCOL:
return getSecurityProtocol();
@@ -320,8 +320,8 @@ import org.slf4j.LoggerFactory;
}
switch (field) {
- case SCP_DATA_MOVEMENT_ID:
- return isSetScpDataMovementID();
+ case DATA_SUBMISSION_DATA_ID:
+ return isSetDataSubmissionDataID();
case SECURITY_PROTOCOL:
return isSetSecurityProtocol();
case SSH_PORT:
@@ -343,12 +343,12 @@ import org.slf4j.LoggerFactory;
if (that == null)
return false;
- boolean this_present_scpDataMovementID = true && this.isSetScpDataMovementID();
- boolean that_present_scpDataMovementID = true && that.isSetScpDataMovementID();
- if (this_present_scpDataMovementID || that_present_scpDataMovementID) {
- if (!(this_present_scpDataMovementID && that_present_scpDataMovementID))
+ boolean this_present_dataSubmissionDataID = true && this.isSetDataSubmissionDataID();
+ boolean that_present_dataSubmissionDataID = true && that.isSetDataSubmissionDataID();
+ if (this_present_dataSubmissionDataID || that_present_dataSubmissionDataID) {
+ if (!(this_present_dataSubmissionDataID && that_present_dataSubmissionDataID))
return false;
- if (!this.scpDataMovementID.equals(that.scpDataMovementID))
+ if (!this.dataSubmissionDataID.equals(that.dataSubmissionDataID))
return false;
}
@@ -386,12 +386,12 @@ import org.slf4j.LoggerFactory;
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetScpDataMovementID()).compareTo(other.isSetScpDataMovementID());
+ lastComparison = Boolean.valueOf(isSetDataSubmissionDataID()).compareTo(other.isSetDataSubmissionDataID());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetScpDataMovementID()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.scpDataMovementID, other.scpDataMovementID);
+ if (isSetDataSubmissionDataID()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataSubmissionDataID, other.dataSubmissionDataID);
if (lastComparison != 0) {
return lastComparison;
}
@@ -436,11 +436,11 @@ import org.slf4j.LoggerFactory;
StringBuilder sb = new StringBuilder("SCPDataMovement(");
boolean first = true;
- sb.append("scpDataMovementID:");
- if (this.scpDataMovementID == null) {
+ sb.append("dataSubmissionDataID:");
+ if (this.dataSubmissionDataID == null) {
sb.append("null");
} else {
- sb.append(this.scpDataMovementID);
+ sb.append(this.dataSubmissionDataID);
}
first = false;
if (!first) sb.append(", ");
@@ -463,8 +463,8 @@ import org.slf4j.LoggerFactory;
public void validate() throws org.apache.thrift.TException {
// check for required fields
- if (!isSetScpDataMovementID()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'scpDataMovementID' is unset! Struct:" + toString());
+ if (!isSetDataSubmissionDataID()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'dataSubmissionDataID' is unset! Struct:" + toString());
}
if (!isSetSecurityProtocol()) {
@@ -510,10 +510,10 @@ import org.slf4j.LoggerFactory;
break;
}
switch (schemeField.id) {
- case 1: // SCP_DATA_MOVEMENT_ID
+ case 1: // DATA_SUBMISSION_DATA_ID
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.scpDataMovementID = iprot.readString();
- struct.setScpDataMovementIDIsSet(true);
+ struct.dataSubmissionDataID = iprot.readString();
+ struct.setDataSubmissionDataIDIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -547,9 +547,9 @@ import org.slf4j.LoggerFactory;
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
- if (struct.scpDataMovementID != null) {
- oprot.writeFieldBegin(SCP_DATA_MOVEMENT_ID_FIELD_DESC);
- oprot.writeString(struct.scpDataMovementID);
+ if (struct.dataSubmissionDataID != null) {
+ oprot.writeFieldBegin(DATA_SUBMISSION_DATA_ID_FIELD_DESC);
+ oprot.writeString(struct.dataSubmissionDataID);
oprot.writeFieldEnd();
}
if (struct.securityProtocol != null) {
@@ -579,7 +579,7 @@ import org.slf4j.LoggerFactory;
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, SCPDataMovement struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
- oprot.writeString(struct.scpDataMovementID);
+ oprot.writeString(struct.dataSubmissionDataID);
oprot.writeI32(struct.securityProtocol.getValue());
BitSet optionals = new BitSet();
if (struct.isSetSshPort()) {
@@ -594,8 +594,8 @@ import org.slf4j.LoggerFactory;
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, SCPDataMovement struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- struct.scpDataMovementID = iprot.readString();
- struct.setScpDataMovementIDIsSet(true);
+ struct.dataSubmissionDataID = iprot.readString();
+ struct.setDataSubmissionDataIDIsSet(true);
struct.securityProtocol = SecurityProtocol.findByValue(iprot.readI32());
struct.setSecurityProtocolIsSet(true);
BitSet incoming = iprot.readBitSet(1);
http://git-wip-us.apache.org/repos/asf/airavata/blob/23c11841/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/SSHJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/SSHJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/SSHJobSubmission.java
index 20099e2..e66ef7d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/SSHJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/SSHJobSubmission.java
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
@SuppressWarnings("all") public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmission, SSHJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<SSHJobSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SSHJobSubmission");
- private static final org.apache.thrift.protocol.TField SSH_JOB_SUBMISSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sshJobSubmissionID", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_DATA_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("jobSubmissionDataID", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.thrift.protocol.TField RESOURCE_JOB_MANAGER_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceJobManager", org.apache.thrift.protocol.TType.I32, (short)2);
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)3);
@@ -61,13 +61,13 @@ import org.slf4j.LoggerFactory;
schemes.put(TupleScheme.class, new SSHJobSubmissionTupleSchemeFactory());
}
- private String sshJobSubmissionID; // required
+ private String jobSubmissionDataID; // required
private ResourceJobManager resourceJobManager; // required
private int sshPort; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
- SSH_JOB_SUBMISSION_ID((short)1, "sshJobSubmissionID"),
+ JOB_SUBMISSION_DATA_ID((short)1, "jobSubmissionDataID"),
/**
*
* @see ResourceJobManager
@@ -88,8 +88,8 @@ import org.slf4j.LoggerFactory;
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
- case 1: // SSH_JOB_SUBMISSION_ID
- return SSH_JOB_SUBMISSION_ID;
+ case 1: // JOB_SUBMISSION_DATA_ID
+ return JOB_SUBMISSION_DATA_ID;
case 2: // RESOURCE_JOB_MANAGER
return RESOURCE_JOB_MANAGER;
case 3: // SSH_PORT
@@ -140,7 +140,7 @@ import org.slf4j.LoggerFactory;
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.SSH_JOB_SUBMISSION_ID, new org.apache.thrift.meta_data.FieldMetaData("sshJobSubmissionID", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.JOB_SUBMISSION_DATA_ID, new org.apache.thrift.meta_data.FieldMetaData("jobSubmissionDataID", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
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.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ResourceJobManager.class)));
@@ -151,18 +151,18 @@ import org.slf4j.LoggerFactory;
}
public SSHJobSubmission() {
- this.sshJobSubmissionID = "DO_NOT_SET_AT_CLIENTS";
+ this.jobSubmissionDataID = "DO_NOT_SET_AT_CLIENTS";
this.sshPort = 22;
}
public SSHJobSubmission(
- String sshJobSubmissionID,
+ String jobSubmissionDataID,
ResourceJobManager resourceJobManager)
{
this();
- this.sshJobSubmissionID = sshJobSubmissionID;
+ this.jobSubmissionDataID = jobSubmissionDataID;
this.resourceJobManager = resourceJobManager;
}
@@ -171,8 +171,8 @@ import org.slf4j.LoggerFactory;
*/
public SSHJobSubmission(SSHJobSubmission other) {
__isset_bitfield = other.__isset_bitfield;
- if (other.isSetSshJobSubmissionID()) {
- this.sshJobSubmissionID = other.sshJobSubmissionID;
+ if (other.isSetJobSubmissionDataID()) {
+ this.jobSubmissionDataID = other.jobSubmissionDataID;
}
if (other.isSetResourceJobManager()) {
this.resourceJobManager = other.resourceJobManager;
@@ -186,33 +186,33 @@ import org.slf4j.LoggerFactory;
@Override
public void clear() {
- this.sshJobSubmissionID = "DO_NOT_SET_AT_CLIENTS";
+ this.jobSubmissionDataID = "DO_NOT_SET_AT_CLIENTS";
this.resourceJobManager = null;
this.sshPort = 22;
}
- public String getSshJobSubmissionID() {
- return this.sshJobSubmissionID;
+ public String getJobSubmissionDataID() {
+ return this.jobSubmissionDataID;
}
- public void setSshJobSubmissionID(String sshJobSubmissionID) {
- this.sshJobSubmissionID = sshJobSubmissionID;
+ public void setJobSubmissionDataID(String jobSubmissionDataID) {
+ this.jobSubmissionDataID = jobSubmissionDataID;
}
- public void unsetSshJobSubmissionID() {
- this.sshJobSubmissionID = null;
+ public void unsetJobSubmissionDataID() {
+ this.jobSubmissionDataID = null;
}
- /** Returns true if field sshJobSubmissionID is set (has been assigned a value) and false otherwise */
- public boolean isSetSshJobSubmissionID() {
- return this.sshJobSubmissionID != null;
+ /** Returns true if field jobSubmissionDataID is set (has been assigned a value) and false otherwise */
+ public boolean isSetJobSubmissionDataID() {
+ return this.jobSubmissionDataID != null;
}
- public void setSshJobSubmissionIDIsSet(boolean value) {
+ public void setJobSubmissionDataIDIsSet(boolean value) {
if (!value) {
- this.sshJobSubmissionID = null;
+ this.jobSubmissionDataID = null;
}
}
@@ -271,11 +271,11 @@ import org.slf4j.LoggerFactory;
public void setFieldValue(_Fields field, Object value) {
switch (field) {
- case SSH_JOB_SUBMISSION_ID:
+ case JOB_SUBMISSION_DATA_ID:
if (value == null) {
- unsetSshJobSubmissionID();
+ unsetJobSubmissionDataID();
} else {
- setSshJobSubmissionID((String)value);
+ setJobSubmissionDataID((String)value);
}
break;
@@ -300,8 +300,8 @@ import org.slf4j.LoggerFactory;
public Object getFieldValue(_Fields field) {
switch (field) {
- case SSH_JOB_SUBMISSION_ID:
- return getSshJobSubmissionID();
+ case JOB_SUBMISSION_DATA_ID:
+ return getJobSubmissionDataID();
case RESOURCE_JOB_MANAGER:
return getResourceJobManager();
@@ -320,8 +320,8 @@ import org.slf4j.LoggerFactory;
}
switch (field) {
- case SSH_JOB_SUBMISSION_ID:
- return isSetSshJobSubmissionID();
+ case JOB_SUBMISSION_DATA_ID:
+ return isSetJobSubmissionDataID();
case RESOURCE_JOB_MANAGER:
return isSetResourceJobManager();
case SSH_PORT:
@@ -343,12 +343,12 @@ import org.slf4j.LoggerFactory;
if (that == null)
return false;
- boolean this_present_sshJobSubmissionID = true && this.isSetSshJobSubmissionID();
- boolean that_present_sshJobSubmissionID = true && that.isSetSshJobSubmissionID();
- if (this_present_sshJobSubmissionID || that_present_sshJobSubmissionID) {
- if (!(this_present_sshJobSubmissionID && that_present_sshJobSubmissionID))
+ boolean this_present_jobSubmissionDataID = true && this.isSetJobSubmissionDataID();
+ boolean that_present_jobSubmissionDataID = true && that.isSetJobSubmissionDataID();
+ if (this_present_jobSubmissionDataID || that_present_jobSubmissionDataID) {
+ if (!(this_present_jobSubmissionDataID && that_present_jobSubmissionDataID))
return false;
- if (!this.sshJobSubmissionID.equals(that.sshJobSubmissionID))
+ if (!this.jobSubmissionDataID.equals(that.jobSubmissionDataID))
return false;
}
@@ -386,12 +386,12 @@ import org.slf4j.LoggerFactory;
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetSshJobSubmissionID()).compareTo(other.isSetSshJobSubmissionID());
+ lastComparison = Boolean.valueOf(isSetJobSubmissionDataID()).compareTo(other.isSetJobSubmissionDataID());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetSshJobSubmissionID()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sshJobSubmissionID, other.sshJobSubmissionID);
+ if (isSetJobSubmissionDataID()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jobSubmissionDataID, other.jobSubmissionDataID);
if (lastComparison != 0) {
return lastComparison;
}
@@ -436,11 +436,11 @@ import org.slf4j.LoggerFactory;
StringBuilder sb = new StringBuilder("SSHJobSubmission(");
boolean first = true;
- sb.append("sshJobSubmissionID:");
- if (this.sshJobSubmissionID == null) {
+ sb.append("jobSubmissionDataID:");
+ if (this.jobSubmissionDataID == null) {
sb.append("null");
} else {
- sb.append(this.sshJobSubmissionID);
+ sb.append(this.jobSubmissionDataID);
}
first = false;
if (!first) sb.append(", ");
@@ -463,8 +463,8 @@ import org.slf4j.LoggerFactory;
public void validate() throws org.apache.thrift.TException {
// check for required fields
- if (!isSetSshJobSubmissionID()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'sshJobSubmissionID' is unset! Struct:" + toString());
+ if (!isSetJobSubmissionDataID()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'jobSubmissionDataID' is unset! Struct:" + toString());
}
if (!isSetResourceJobManager()) {
@@ -510,10 +510,10 @@ import org.slf4j.LoggerFactory;
break;
}
switch (schemeField.id) {
- case 1: // SSH_JOB_SUBMISSION_ID
+ case 1: // JOB_SUBMISSION_DATA_ID
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.sshJobSubmissionID = iprot.readString();
- struct.setSshJobSubmissionIDIsSet(true);
+ struct.jobSubmissionDataID = iprot.readString();
+ struct.setJobSubmissionDataIDIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -547,9 +547,9 @@ import org.slf4j.LoggerFactory;
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
- if (struct.sshJobSubmissionID != null) {
- oprot.writeFieldBegin(SSH_JOB_SUBMISSION_ID_FIELD_DESC);
- oprot.writeString(struct.sshJobSubmissionID);
+ if (struct.jobSubmissionDataID != null) {
+ oprot.writeFieldBegin(JOB_SUBMISSION_DATA_ID_FIELD_DESC);
+ oprot.writeString(struct.jobSubmissionDataID);
oprot.writeFieldEnd();
}
if (struct.resourceJobManager != null) {
@@ -579,7 +579,7 @@ import org.slf4j.LoggerFactory;
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, SSHJobSubmission struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
- oprot.writeString(struct.sshJobSubmissionID);
+ oprot.writeString(struct.jobSubmissionDataID);
oprot.writeI32(struct.resourceJobManager.getValue());
BitSet optionals = new BitSet();
if (struct.isSetSshPort()) {
@@ -594,8 +594,8 @@ import org.slf4j.LoggerFactory;
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, SSHJobSubmission struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- struct.sshJobSubmissionID = iprot.readString();
- struct.setSshJobSubmissionIDIsSet(true);
+ struct.jobSubmissionDataID = iprot.readString();
+ struct.setJobSubmissionDataIDIsSet(true);
struct.resourceJobManager = ResourceJobManager.findByValue(iprot.readI32());
struct.setResourceJobManagerIsSet(true);
BitSet incoming = iprot.readBitSet(1);
[2/3] generating code
Posted by sa...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/23c11841/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationCatalogDataModel_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationCatalogDataModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationCatalogDataModel_types.h
index 4b6965b..3cd2194 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationCatalogDataModel_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationCatalogDataModel_types.h
@@ -73,19 +73,19 @@ class SCPDataMovement {
static const char* ascii_fingerprint; // = "FEB6B2CD28861B4EED855CACA1FEF2CB";
static const uint8_t binary_fingerprint[16]; // = {0xFE,0xB6,0xB2,0xCD,0x28,0x86,0x1B,0x4E,0xED,0x85,0x5C,0xAC,0xA1,0xFE,0xF2,0xCB};
- SCPDataMovement() : scpDataMovementID("DO_NOT_SET_AT_CLIENTS"), securityProtocol((SecurityProtocol::type)0), sshPort(22) {
+ SCPDataMovement() : dataSubmissionDataID("DO_NOT_SET_AT_CLIENTS"), securityProtocol((SecurityProtocol::type)0), sshPort(22) {
}
virtual ~SCPDataMovement() throw() {}
- std::string scpDataMovementID;
+ std::string dataSubmissionDataID;
SecurityProtocol::type securityProtocol;
int32_t sshPort;
_SCPDataMovement__isset __isset;
- void __set_scpDataMovementID(const std::string& val) {
- scpDataMovementID = val;
+ void __set_dataSubmissionDataID(const std::string& val) {
+ dataSubmissionDataID = val;
}
void __set_securityProtocol(const SecurityProtocol::type val) {
@@ -99,7 +99,7 @@ class SCPDataMovement {
bool operator == (const SCPDataMovement & rhs) const
{
- if (!(scpDataMovementID == rhs.scpDataMovementID))
+ if (!(dataSubmissionDataID == rhs.dataSubmissionDataID))
return false;
if (!(securityProtocol == rhs.securityProtocol))
return false;
@@ -133,19 +133,19 @@ class SSHJobSubmission {
static const char* ascii_fingerprint; // = "FEB6B2CD28861B4EED855CACA1FEF2CB";
static const uint8_t binary_fingerprint[16]; // = {0xFE,0xB6,0xB2,0xCD,0x28,0x86,0x1B,0x4E,0xED,0x85,0x5C,0xAC,0xA1,0xFE,0xF2,0xCB};
- SSHJobSubmission() : sshJobSubmissionID("DO_NOT_SET_AT_CLIENTS"), resourceJobManager((ResourceJobManager::type)0), sshPort(22) {
+ SSHJobSubmission() : jobSubmissionDataID("DO_NOT_SET_AT_CLIENTS"), resourceJobManager((ResourceJobManager::type)0), sshPort(22) {
}
virtual ~SSHJobSubmission() throw() {}
- std::string sshJobSubmissionID;
+ std::string jobSubmissionDataID;
ResourceJobManager::type resourceJobManager;
int32_t sshPort;
_SSHJobSubmission__isset __isset;
- void __set_sshJobSubmissionID(const std::string& val) {
- sshJobSubmissionID = val;
+ void __set_jobSubmissionDataID(const std::string& val) {
+ jobSubmissionDataID = val;
}
void __set_resourceJobManager(const ResourceJobManager::type val) {
@@ -159,7 +159,7 @@ class SSHJobSubmission {
bool operator == (const SSHJobSubmission & rhs) const
{
- if (!(sshJobSubmissionID == rhs.sshJobSubmissionID))
+ if (!(jobSubmissionDataID == rhs.jobSubmissionDataID))
return false;
if (!(resourceJobManager == rhs.resourceJobManager))
return false;
@@ -190,23 +190,23 @@ typedef struct _GlobusJobSubmission__isset {
class GlobusJobSubmission {
public:
- static const char* ascii_fingerprint; // = "6B87230A5315302FA994567088F60D3A";
- static const uint8_t binary_fingerprint[16]; // = {0x6B,0x87,0x23,0x0A,0x53,0x15,0x30,0x2F,0xA9,0x94,0x56,0x70,0x88,0xF6,0x0D,0x3A};
+ static const char* ascii_fingerprint; // = "DF4253F78D7B543C16FA461660D38A03";
+ static const uint8_t binary_fingerprint[16]; // = {0xDF,0x42,0x53,0xF7,0x8D,0x7B,0x54,0x3C,0x16,0xFA,0x46,0x16,0x60,0xD3,0x8A,0x03};
- GlobusJobSubmission() : globusJobSubmissionID("DO_NOT_SET_AT_CLIENTS"), securityProtocol((SecurityProtocol::type)0), resourceJobManager((ResourceJobManager::type)0), globusGateKeeperEndPoint() {
+ GlobusJobSubmission() : jobSubmissionDataID("DO_NOT_SET_AT_CLIENTS"), securityProtocol((SecurityProtocol::type)0), resourceJobManager((ResourceJobManager::type)0) {
}
virtual ~GlobusJobSubmission() throw() {}
- std::string globusJobSubmissionID;
+ std::string jobSubmissionDataID;
SecurityProtocol::type securityProtocol;
ResourceJobManager::type resourceJobManager;
- std::string globusGateKeeperEndPoint;
+ std::vector<std::string> globusGateKeeperEndPoint;
_GlobusJobSubmission__isset __isset;
- void __set_globusJobSubmissionID(const std::string& val) {
- globusJobSubmissionID = val;
+ void __set_jobSubmissionDataID(const std::string& val) {
+ jobSubmissionDataID = val;
}
void __set_securityProtocol(const SecurityProtocol::type val) {
@@ -217,14 +217,14 @@ class GlobusJobSubmission {
resourceJobManager = val;
}
- void __set_globusGateKeeperEndPoint(const std::string& val) {
+ void __set_globusGateKeeperEndPoint(const std::vector<std::string> & val) {
globusGateKeeperEndPoint = val;
__isset.globusGateKeeperEndPoint = true;
}
bool operator == (const GlobusJobSubmission & rhs) const
{
- if (!(globusJobSubmissionID == rhs.globusJobSubmissionID))
+ if (!(jobSubmissionDataID == rhs.jobSubmissionDataID))
return false;
if (!(securityProtocol == rhs.securityProtocol))
return false;
@@ -265,12 +265,12 @@ class GSISSHJobSubmission {
static const char* ascii_fingerprint; // = "6969A7F145C4403B2F9081A498E933FD";
static const uint8_t binary_fingerprint[16]; // = {0x69,0x69,0xA7,0xF1,0x45,0xC4,0x40,0x3B,0x2F,0x90,0x81,0xA4,0x98,0xE9,0x33,0xFD};
- GSISSHJobSubmission() : gssishJobSubmissionID("DO_NOT_SET_AT_CLIENTS"), resourceJobManager((ResourceJobManager::type)0), sshPort(22), installedPath(), monitorMode() {
+ GSISSHJobSubmission() : jobSubmissionDataID("DO_NOT_SET_AT_CLIENTS"), resourceJobManager((ResourceJobManager::type)0), sshPort(22), installedPath(), monitorMode() {
}
virtual ~GSISSHJobSubmission() throw() {}
- std::string gssishJobSubmissionID;
+ std::string jobSubmissionDataID;
ResourceJobManager::type resourceJobManager;
int32_t sshPort;
std::set<std::string> exports;
@@ -281,8 +281,8 @@ class GSISSHJobSubmission {
_GSISSHJobSubmission__isset __isset;
- void __set_gssishJobSubmissionID(const std::string& val) {
- gssishJobSubmissionID = val;
+ void __set_jobSubmissionDataID(const std::string& val) {
+ jobSubmissionDataID = val;
}
void __set_resourceJobManager(const ResourceJobManager::type val) {
@@ -321,7 +321,7 @@ class GSISSHJobSubmission {
bool operator == (const GSISSHJobSubmission & rhs) const
{
- if (!(gssishJobSubmissionID == rhs.gssishJobSubmissionID))
+ if (!(jobSubmissionDataID == rhs.jobSubmissionDataID))
return false;
if (!(resourceJobManager == rhs.resourceJobManager))
return false;
http://git-wip-us.apache.org/repos/asf/airavata/blob/23c11841/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/AppCatalog/ApplicationCatalogAPI.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/AppCatalog/ApplicationCatalogAPI.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/AppCatalog/ApplicationCatalogAPI.php
index de7f2b1..b7f2194 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/AppCatalog/ApplicationCatalogAPI.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/AppCatalog/ApplicationCatalogAPI.php
@@ -35,8 +35,8 @@ interface ApplicationCatalogAPIIf {
public function listApplicationInterfaceIds();
public function getApplicationInterface($applicationInterfaceId);
public function addApplicationDeployment($applicationInterfaceId, \ApplicationDeployment $applicationDeployment);
- public function listApplicationDeploymentIds();
- public function getApplicationDeployment($applicationDeploymentId);
+ public function listApplicationDeploymentIds($applicationInterfaceId);
+ public function getApplicationDeployment($applicationInterfaceId, $applicationDeploymentId);
}
class ApplicationCatalogAPIClient implements \Airavata\API\AppCatalog\ApplicationCatalogAPIIf {
@@ -1102,15 +1102,16 @@ class ApplicationCatalogAPIClient implements \Airavata\API\AppCatalog\Applicatio
return;
}
- public function listApplicationDeploymentIds()
+ public function listApplicationDeploymentIds($applicationInterfaceId)
{
- $this->send_listApplicationDeploymentIds();
+ $this->send_listApplicationDeploymentIds($applicationInterfaceId);
return $this->recv_listApplicationDeploymentIds();
}
- public function send_listApplicationDeploymentIds()
+ public function send_listApplicationDeploymentIds($applicationInterfaceId)
{
$args = new \Airavata\API\AppCatalog\ApplicationCatalogAPI_listApplicationDeploymentIds_args();
+ $args->applicationInterfaceId = $applicationInterfaceId;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
@@ -1161,15 +1162,16 @@ class ApplicationCatalogAPIClient implements \Airavata\API\AppCatalog\Applicatio
throw new \Exception("listApplicationDeploymentIds failed: unknown result");
}
- public function getApplicationDeployment($applicationDeploymentId)
+ public function getApplicationDeployment($applicationInterfaceId, $applicationDeploymentId)
{
- $this->send_getApplicationDeployment($applicationDeploymentId);
+ $this->send_getApplicationDeployment($applicationInterfaceId, $applicationDeploymentId);
return $this->recv_getApplicationDeployment();
}
- public function send_getApplicationDeployment($applicationDeploymentId)
+ public function send_getApplicationDeployment($applicationInterfaceId, $applicationDeploymentId)
{
$args = new \Airavata\API\AppCatalog\ApplicationCatalogAPI_getApplicationDeployment_args();
+ $args->applicationInterfaceId = $applicationInterfaceId;
$args->applicationDeploymentId = $applicationDeploymentId;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
@@ -4958,12 +4960,22 @@ class ApplicationCatalogAPI_addApplicationDeployment_result {
class ApplicationCatalogAPI_listApplicationDeploymentIds_args {
static $_TSPEC;
+ public $applicationInterfaceId = null;
- public function __construct() {
+ public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'applicationInterfaceId',
+ 'type' => TType::STRING,
+ ),
);
}
+ if (is_array($vals)) {
+ if (isset($vals['applicationInterfaceId'])) {
+ $this->applicationInterfaceId = $vals['applicationInterfaceId'];
+ }
+ }
}
public function getName() {
@@ -4985,6 +4997,13 @@ class ApplicationCatalogAPI_listApplicationDeploymentIds_args {
}
switch ($fid)
{
+ case 1:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->applicationInterfaceId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -4998,6 +5017,11 @@ class ApplicationCatalogAPI_listApplicationDeploymentIds_args {
public function write($output) {
$xfer = 0;
$xfer += $output->writeStructBegin('ApplicationCatalogAPI_listApplicationDeploymentIds_args');
+ if ($this->applicationInterfaceId !== null) {
+ $xfer += $output->writeFieldBegin('applicationInterfaceId', TType::STRING, 1);
+ $xfer += $output->writeString($this->applicationInterfaceId);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -5172,18 +5196,26 @@ class ApplicationCatalogAPI_listApplicationDeploymentIds_result {
class ApplicationCatalogAPI_getApplicationDeployment_args {
static $_TSPEC;
+ public $applicationInterfaceId = null;
public $applicationDeploymentId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
1 => array(
+ 'var' => 'applicationInterfaceId',
+ 'type' => TType::STRING,
+ ),
+ 2 => array(
'var' => 'applicationDeploymentId',
'type' => TType::STRING,
),
);
}
if (is_array($vals)) {
+ if (isset($vals['applicationInterfaceId'])) {
+ $this->applicationInterfaceId = $vals['applicationInterfaceId'];
+ }
if (isset($vals['applicationDeploymentId'])) {
$this->applicationDeploymentId = $vals['applicationDeploymentId'];
}
@@ -5211,6 +5243,13 @@ class ApplicationCatalogAPI_getApplicationDeployment_args {
{
case 1:
if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->applicationInterfaceId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRING) {
$xfer += $input->readString($this->applicationDeploymentId);
} else {
$xfer += $input->skip($ftype);
@@ -5229,8 +5268,13 @@ class ApplicationCatalogAPI_getApplicationDeployment_args {
public function write($output) {
$xfer = 0;
$xfer += $output->writeStructBegin('ApplicationCatalogAPI_getApplicationDeployment_args');
+ if ($this->applicationInterfaceId !== null) {
+ $xfer += $output->writeFieldBegin('applicationInterfaceId', TType::STRING, 1);
+ $xfer += $output->writeString($this->applicationInterfaceId);
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->applicationDeploymentId !== null) {
- $xfer += $output->writeFieldBegin('applicationDeploymentId', TType::STRING, 1);
+ $xfer += $output->writeFieldBegin('applicationDeploymentId', TType::STRING, 2);
$xfer += $output->writeString($this->applicationDeploymentId);
$xfer += $output->writeFieldEnd();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/23c11841/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Types.php
index d34fd54..495f1b0 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Types.php
@@ -74,7 +74,7 @@ final class SecurityProtocol {
class SCPDataMovement {
static $_TSPEC;
- public $scpDataMovementID = "DO_NOT_SET_AT_CLIENTS";
+ public $dataSubmissionDataID = "DO_NOT_SET_AT_CLIENTS";
public $securityProtocol = null;
public $sshPort = 22;
@@ -82,7 +82,7 @@ class SCPDataMovement {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
1 => array(
- 'var' => 'scpDataMovementID',
+ 'var' => 'dataSubmissionDataID',
'type' => TType::STRING,
),
2 => array(
@@ -96,8 +96,8 @@ class SCPDataMovement {
);
}
if (is_array($vals)) {
- if (isset($vals['scpDataMovementID'])) {
- $this->scpDataMovementID = $vals['scpDataMovementID'];
+ if (isset($vals['dataSubmissionDataID'])) {
+ $this->dataSubmissionDataID = $vals['dataSubmissionDataID'];
}
if (isset($vals['securityProtocol'])) {
$this->securityProtocol = $vals['securityProtocol'];
@@ -129,7 +129,7 @@ class SCPDataMovement {
{
case 1:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->scpDataMovementID);
+ $xfer += $input->readString($this->dataSubmissionDataID);
} else {
$xfer += $input->skip($ftype);
}
@@ -161,9 +161,9 @@ class SCPDataMovement {
public function write($output) {
$xfer = 0;
$xfer += $output->writeStructBegin('SCPDataMovement');
- if ($this->scpDataMovementID !== null) {
- $xfer += $output->writeFieldBegin('scpDataMovementID', TType::STRING, 1);
- $xfer += $output->writeString($this->scpDataMovementID);
+ if ($this->dataSubmissionDataID !== null) {
+ $xfer += $output->writeFieldBegin('dataSubmissionDataID', TType::STRING, 1);
+ $xfer += $output->writeString($this->dataSubmissionDataID);
$xfer += $output->writeFieldEnd();
}
if ($this->securityProtocol !== null) {
@@ -186,7 +186,7 @@ class SCPDataMovement {
class SSHJobSubmission {
static $_TSPEC;
- public $sshJobSubmissionID = "DO_NOT_SET_AT_CLIENTS";
+ public $jobSubmissionDataID = "DO_NOT_SET_AT_CLIENTS";
public $resourceJobManager = null;
public $sshPort = 22;
@@ -194,7 +194,7 @@ class SSHJobSubmission {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
1 => array(
- 'var' => 'sshJobSubmissionID',
+ 'var' => 'jobSubmissionDataID',
'type' => TType::STRING,
),
2 => array(
@@ -208,8 +208,8 @@ class SSHJobSubmission {
);
}
if (is_array($vals)) {
- if (isset($vals['sshJobSubmissionID'])) {
- $this->sshJobSubmissionID = $vals['sshJobSubmissionID'];
+ if (isset($vals['jobSubmissionDataID'])) {
+ $this->jobSubmissionDataID = $vals['jobSubmissionDataID'];
}
if (isset($vals['resourceJobManager'])) {
$this->resourceJobManager = $vals['resourceJobManager'];
@@ -241,7 +241,7 @@ class SSHJobSubmission {
{
case 1:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->sshJobSubmissionID);
+ $xfer += $input->readString($this->jobSubmissionDataID);
} else {
$xfer += $input->skip($ftype);
}
@@ -273,9 +273,9 @@ class SSHJobSubmission {
public function write($output) {
$xfer = 0;
$xfer += $output->writeStructBegin('SSHJobSubmission');
- if ($this->sshJobSubmissionID !== null) {
- $xfer += $output->writeFieldBegin('sshJobSubmissionID', TType::STRING, 1);
- $xfer += $output->writeString($this->sshJobSubmissionID);
+ if ($this->jobSubmissionDataID !== null) {
+ $xfer += $output->writeFieldBegin('jobSubmissionDataID', TType::STRING, 1);
+ $xfer += $output->writeString($this->jobSubmissionDataID);
$xfer += $output->writeFieldEnd();
}
if ($this->resourceJobManager !== null) {
@@ -298,7 +298,7 @@ class SSHJobSubmission {
class GlobusJobSubmission {
static $_TSPEC;
- public $globusJobSubmissionID = "DO_NOT_SET_AT_CLIENTS";
+ public $jobSubmissionDataID = "DO_NOT_SET_AT_CLIENTS";
public $securityProtocol = null;
public $resourceJobManager = null;
public $globusGateKeeperEndPoint = null;
@@ -307,7 +307,7 @@ class GlobusJobSubmission {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
1 => array(
- 'var' => 'globusJobSubmissionID',
+ 'var' => 'jobSubmissionDataID',
'type' => TType::STRING,
),
2 => array(
@@ -320,13 +320,17 @@ class GlobusJobSubmission {
),
4 => array(
'var' => 'globusGateKeeperEndPoint',
- 'type' => TType::STRING,
+ 'type' => TType::LST,
+ 'etype' => TType::STRING,
+ 'elem' => array(
+ 'type' => TType::STRING,
+ ),
),
);
}
if (is_array($vals)) {
- if (isset($vals['globusJobSubmissionID'])) {
- $this->globusJobSubmissionID = $vals['globusJobSubmissionID'];
+ if (isset($vals['jobSubmissionDataID'])) {
+ $this->jobSubmissionDataID = $vals['jobSubmissionDataID'];
}
if (isset($vals['securityProtocol'])) {
$this->securityProtocol = $vals['securityProtocol'];
@@ -361,7 +365,7 @@ class GlobusJobSubmission {
{
case 1:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->globusJobSubmissionID);
+ $xfer += $input->readString($this->jobSubmissionDataID);
} else {
$xfer += $input->skip($ftype);
}
@@ -381,8 +385,18 @@ class GlobusJobSubmission {
}
break;
case 4:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->globusGateKeeperEndPoint);
+ if ($ftype == TType::LST) {
+ $this->globusGateKeeperEndPoint = array();
+ $_size0 = 0;
+ $_etype3 = 0;
+ $xfer += $input->readListBegin($_etype3, $_size0);
+ for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
+ {
+ $elem5 = null;
+ $xfer += $input->readString($elem5);
+ $this->globusGateKeeperEndPoint []= $elem5;
+ }
+ $xfer += $input->readListEnd();
} else {
$xfer += $input->skip($ftype);
}
@@ -400,9 +414,9 @@ class GlobusJobSubmission {
public function write($output) {
$xfer = 0;
$xfer += $output->writeStructBegin('GlobusJobSubmission');
- if ($this->globusJobSubmissionID !== null) {
- $xfer += $output->writeFieldBegin('globusJobSubmissionID', TType::STRING, 1);
- $xfer += $output->writeString($this->globusJobSubmissionID);
+ if ($this->jobSubmissionDataID !== null) {
+ $xfer += $output->writeFieldBegin('jobSubmissionDataID', TType::STRING, 1);
+ $xfer += $output->writeString($this->jobSubmissionDataID);
$xfer += $output->writeFieldEnd();
}
if ($this->securityProtocol !== null) {
@@ -416,8 +430,20 @@ class GlobusJobSubmission {
$xfer += $output->writeFieldEnd();
}
if ($this->globusGateKeeperEndPoint !== null) {
- $xfer += $output->writeFieldBegin('globusGateKeeperEndPoint', TType::STRING, 4);
- $xfer += $output->writeString($this->globusGateKeeperEndPoint);
+ if (!is_array($this->globusGateKeeperEndPoint)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('globusGateKeeperEndPoint', TType::LST, 4);
+ {
+ $output->writeListBegin(TType::STRING, count($this->globusGateKeeperEndPoint));
+ {
+ foreach ($this->globusGateKeeperEndPoint as $iter6)
+ {
+ $xfer += $output->writeString($iter6);
+ }
+ }
+ $output->writeListEnd();
+ }
$xfer += $output->writeFieldEnd();
}
$xfer += $output->writeFieldStop();
@@ -430,7 +456,7 @@ class GlobusJobSubmission {
class GSISSHJobSubmission {
static $_TSPEC;
- public $gssishJobSubmissionID = "DO_NOT_SET_AT_CLIENTS";
+ public $jobSubmissionDataID = "DO_NOT_SET_AT_CLIENTS";
public $resourceJobManager = null;
public $sshPort = 22;
public $exports = null;
@@ -443,7 +469,7 @@ class GSISSHJobSubmission {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
1 => array(
- 'var' => 'gssishJobSubmissionID',
+ 'var' => 'jobSubmissionDataID',
'type' => TType::STRING,
),
2 => array(
@@ -489,8 +515,8 @@ class GSISSHJobSubmission {
);
}
if (is_array($vals)) {
- if (isset($vals['gssishJobSubmissionID'])) {
- $this->gssishJobSubmissionID = $vals['gssishJobSubmissionID'];
+ if (isset($vals['jobSubmissionDataID'])) {
+ $this->jobSubmissionDataID = $vals['jobSubmissionDataID'];
}
if (isset($vals['resourceJobManager'])) {
$this->resourceJobManager = $vals['resourceJobManager'];
@@ -537,7 +563,7 @@ class GSISSHJobSubmission {
{
case 1:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gssishJobSubmissionID);
+ $xfer += $input->readString($this->jobSubmissionDataID);
} else {
$xfer += $input->skip($ftype);
}
@@ -559,17 +585,17 @@ class GSISSHJobSubmission {
case 4:
if ($ftype == TType::SET) {
$this->exports = array();
- $_size0 = 0;
- $_etype3 = 0;
- $xfer += $input->readSetBegin($_etype3, $_size0);
- for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
+ $_size7 = 0;
+ $_etype10 = 0;
+ $xfer += $input->readSetBegin($_etype10, $_size7);
+ for ($_i11 = 0; $_i11 < $_size7; ++$_i11)
{
- $elem5 = null;
- $xfer += $input->readString($elem5);
- if (is_scalar($elem5)) {
- $this->exports[$elem5] = true;
+ $elem12 = null;
+ $xfer += $input->readString($elem12);
+ if (is_scalar($elem12)) {
+ $this->exports[$elem12] = true;
} else {
- $this->exports []= $elem5;
+ $this->exports []= $elem12;
}
}
$xfer += $input->readSetEnd();
@@ -580,14 +606,14 @@ class GSISSHJobSubmission {
case 5:
if ($ftype == TType::LST) {
$this->preJobCommands = array();
- $_size6 = 0;
- $_etype9 = 0;
- $xfer += $input->readListBegin($_etype9, $_size6);
- for ($_i10 = 0; $_i10 < $_size6; ++$_i10)
+ $_size13 = 0;
+ $_etype16 = 0;
+ $xfer += $input->readListBegin($_etype16, $_size13);
+ for ($_i17 = 0; $_i17 < $_size13; ++$_i17)
{
- $elem11 = null;
- $xfer += $input->readString($elem11);
- $this->preJobCommands []= $elem11;
+ $elem18 = null;
+ $xfer += $input->readString($elem18);
+ $this->preJobCommands []= $elem18;
}
$xfer += $input->readListEnd();
} else {
@@ -597,14 +623,14 @@ class GSISSHJobSubmission {
case 6:
if ($ftype == TType::LST) {
$this->postJobCommands = array();
- $_size12 = 0;
- $_etype15 = 0;
- $xfer += $input->readListBegin($_etype15, $_size12);
- for ($_i16 = 0; $_i16 < $_size12; ++$_i16)
+ $_size19 = 0;
+ $_etype22 = 0;
+ $xfer += $input->readListBegin($_etype22, $_size19);
+ for ($_i23 = 0; $_i23 < $_size19; ++$_i23)
{
- $elem17 = null;
- $xfer += $input->readString($elem17);
- $this->postJobCommands []= $elem17;
+ $elem24 = null;
+ $xfer += $input->readString($elem24);
+ $this->postJobCommands []= $elem24;
}
$xfer += $input->readListEnd();
} else {
@@ -638,9 +664,9 @@ class GSISSHJobSubmission {
public function write($output) {
$xfer = 0;
$xfer += $output->writeStructBegin('GSISSHJobSubmission');
- if ($this->gssishJobSubmissionID !== null) {
- $xfer += $output->writeFieldBegin('gssishJobSubmissionID', TType::STRING, 1);
- $xfer += $output->writeString($this->gssishJobSubmissionID);
+ if ($this->jobSubmissionDataID !== null) {
+ $xfer += $output->writeFieldBegin('jobSubmissionDataID', TType::STRING, 1);
+ $xfer += $output->writeString($this->jobSubmissionDataID);
$xfer += $output->writeFieldEnd();
}
if ($this->resourceJobManager !== null) {
@@ -661,12 +687,12 @@ class GSISSHJobSubmission {
{
$output->writeSetBegin(TType::STRING, count($this->exports));
{
- foreach ($this->exports as $iter18 => $iter19)
+ foreach ($this->exports as $iter25 => $iter26)
{
- if (is_scalar($iter19)) {
- $xfer += $output->writeString($iter18);
+ if (is_scalar($iter26)) {
+ $xfer += $output->writeString($iter25);
} else {
- $xfer += $output->writeString($iter19);
+ $xfer += $output->writeString($iter26);
}
}
}
@@ -682,9 +708,9 @@ class GSISSHJobSubmission {
{
$output->writeListBegin(TType::STRING, count($this->preJobCommands));
{
- foreach ($this->preJobCommands as $iter20)
+ foreach ($this->preJobCommands as $iter27)
{
- $xfer += $output->writeString($iter20);
+ $xfer += $output->writeString($iter27);
}
}
$output->writeListEnd();
@@ -699,9 +725,9 @@ class GSISSHJobSubmission {
{
$output->writeListBegin(TType::STRING, count($this->postJobCommands));
{
- foreach ($this->postJobCommands as $iter21)
+ foreach ($this->postJobCommands as $iter28)
{
- $xfer += $output->writeString($iter21);
+ $xfer += $output->writeString($iter28);
}
}
$output->writeListEnd();
@@ -885,17 +911,17 @@ class ComputeResourceDescription {
case 4:
if ($ftype == TType::SET) {
$this->hostAliases = array();
- $_size22 = 0;
- $_etype25 = 0;
- $xfer += $input->readSetBegin($_etype25, $_size22);
- for ($_i26 = 0; $_i26 < $_size22; ++$_i26)
+ $_size29 = 0;
+ $_etype32 = 0;
+ $xfer += $input->readSetBegin($_etype32, $_size29);
+ for ($_i33 = 0; $_i33 < $_size29; ++$_i33)
{
- $elem27 = null;
- $xfer += $input->readString($elem27);
- if (is_scalar($elem27)) {
- $this->hostAliases[$elem27] = true;
+ $elem34 = null;
+ $xfer += $input->readString($elem34);
+ if (is_scalar($elem34)) {
+ $this->hostAliases[$elem34] = true;
} else {
- $this->hostAliases []= $elem27;
+ $this->hostAliases []= $elem34;
}
}
$xfer += $input->readSetEnd();
@@ -906,17 +932,17 @@ class ComputeResourceDescription {
case 5:
if ($ftype == TType::SET) {
$this->ipAddresses = array();
- $_size28 = 0;
- $_etype31 = 0;
- $xfer += $input->readSetBegin($_etype31, $_size28);
- for ($_i32 = 0; $_i32 < $_size28; ++$_i32)
+ $_size35 = 0;
+ $_etype38 = 0;
+ $xfer += $input->readSetBegin($_etype38, $_size35);
+ for ($_i39 = 0; $_i39 < $_size35; ++$_i39)
{
- $elem33 = null;
- $xfer += $input->readString($elem33);
- if (is_scalar($elem33)) {
- $this->ipAddresses[$elem33] = true;
+ $elem40 = null;
+ $xfer += $input->readString($elem40);
+ if (is_scalar($elem40)) {
+ $this->ipAddresses[$elem40] = true;
} else {
- $this->ipAddresses []= $elem33;
+ $this->ipAddresses []= $elem40;
}
}
$xfer += $input->readSetEnd();
@@ -948,17 +974,17 @@ class ComputeResourceDescription {
case 9:
if ($ftype == TType::MAP) {
$this->jobSubmissionProtocols = array();
- $_size34 = 0;
- $_ktype35 = 0;
- $_vtype36 = 0;
- $xfer += $input->readMapBegin($_ktype35, $_vtype36, $_size34);
- for ($_i38 = 0; $_i38 < $_size34; ++$_i38)
+ $_size41 = 0;
+ $_ktype42 = 0;
+ $_vtype43 = 0;
+ $xfer += $input->readMapBegin($_ktype42, $_vtype43, $_size41);
+ for ($_i45 = 0; $_i45 < $_size41; ++$_i45)
{
- $key39 = '';
- $val40 = 0;
- $xfer += $input->readString($key39);
- $xfer += $input->readI32($val40);
- $this->jobSubmissionProtocols[$key39] = $val40;
+ $key46 = '';
+ $val47 = 0;
+ $xfer += $input->readString($key46);
+ $xfer += $input->readI32($val47);
+ $this->jobSubmissionProtocols[$key46] = $val47;
}
$xfer += $input->readMapEnd();
} else {
@@ -968,17 +994,17 @@ class ComputeResourceDescription {
case 10:
if ($ftype == TType::MAP) {
$this->dataMovementProtocols = array();
- $_size41 = 0;
- $_ktype42 = 0;
- $_vtype43 = 0;
- $xfer += $input->readMapBegin($_ktype42, $_vtype43, $_size41);
- for ($_i45 = 0; $_i45 < $_size41; ++$_i45)
+ $_size48 = 0;
+ $_ktype49 = 0;
+ $_vtype50 = 0;
+ $xfer += $input->readMapBegin($_ktype49, $_vtype50, $_size48);
+ for ($_i52 = 0; $_i52 < $_size48; ++$_i52)
{
- $key46 = '';
- $val47 = 0;
- $xfer += $input->readString($key46);
- $xfer += $input->readI32($val47);
- $this->dataMovementProtocols[$key46] = $val47;
+ $key53 = '';
+ $val54 = 0;
+ $xfer += $input->readString($key53);
+ $xfer += $input->readI32($val54);
+ $this->dataMovementProtocols[$key53] = $val54;
}
$xfer += $input->readMapEnd();
} else {
@@ -1021,12 +1047,12 @@ class ComputeResourceDescription {
{
$output->writeSetBegin(TType::STRING, count($this->hostAliases));
{
- foreach ($this->hostAliases as $iter48 => $iter49)
+ foreach ($this->hostAliases as $iter55 => $iter56)
{
- if (is_scalar($iter49)) {
- $xfer += $output->writeString($iter48);
+ if (is_scalar($iter56)) {
+ $xfer += $output->writeString($iter55);
} else {
- $xfer += $output->writeString($iter49);
+ $xfer += $output->writeString($iter56);
}
}
}
@@ -1042,12 +1068,12 @@ class ComputeResourceDescription {
{
$output->writeSetBegin(TType::STRING, count($this->ipAddresses));
{
- foreach ($this->ipAddresses as $iter50 => $iter51)
+ foreach ($this->ipAddresses as $iter57 => $iter58)
{
- if (is_scalar($iter51)) {
- $xfer += $output->writeString($iter50);
+ if (is_scalar($iter58)) {
+ $xfer += $output->writeString($iter57);
} else {
- $xfer += $output->writeString($iter51);
+ $xfer += $output->writeString($iter58);
}
}
}
@@ -1078,10 +1104,10 @@ class ComputeResourceDescription {
{
$output->writeMapBegin(TType::STRING, TType::I32, count($this->jobSubmissionProtocols));
{
- foreach ($this->jobSubmissionProtocols as $kiter52 => $viter53)
+ foreach ($this->jobSubmissionProtocols as $kiter59 => $viter60)
{
- $xfer += $output->writeString($kiter52);
- $xfer += $output->writeI32($viter53);
+ $xfer += $output->writeString($kiter59);
+ $xfer += $output->writeI32($viter60);
}
}
$output->writeMapEnd();
@@ -1096,10 +1122,10 @@ class ComputeResourceDescription {
{
$output->writeMapBegin(TType::STRING, TType::I32, count($this->dataMovementProtocols));
{
- foreach ($this->dataMovementProtocols as $kiter54 => $viter55)
+ foreach ($this->dataMovementProtocols as $kiter61 => $viter62)
{
- $xfer += $output->writeString($kiter54);
- $xfer += $output->writeI32($viter55);
+ $xfer += $output->writeString($kiter61);
+ $xfer += $output->writeI32($viter62);
}
}
$output->writeMapEnd();
@@ -1405,15 +1431,15 @@ class ApplicationInterface {
case 3:
if ($ftype == TType::LST) {
$this->applicationDeployments = array();
- $_size56 = 0;
- $_etype59 = 0;
- $xfer += $input->readListBegin($_etype59, $_size56);
- for ($_i60 = 0; $_i60 < $_size56; ++$_i60)
+ $_size63 = 0;
+ $_etype66 = 0;
+ $xfer += $input->readListBegin($_etype66, $_size63);
+ for ($_i67 = 0; $_i67 < $_size63; ++$_i67)
{
- $elem61 = null;
- $elem61 = new \ApplicationDeployment();
- $xfer += $elem61->read($input);
- $this->applicationDeployments []= $elem61;
+ $elem68 = null;
+ $elem68 = new \ApplicationDeployment();
+ $xfer += $elem68->read($input);
+ $this->applicationDeployments []= $elem68;
}
$xfer += $input->readListEnd();
} else {
@@ -1451,9 +1477,9 @@ class ApplicationInterface {
{
$output->writeListBegin(TType::STRUCT, count($this->applicationDeployments));
{
- foreach ($this->applicationDeployments as $iter62)
+ foreach ($this->applicationDeployments as $iter69)
{
- $xfer += $iter62->write($output);
+ $xfer += $iter69->write($output);
}
}
$output->writeListEnd();
http://git-wip-us.apache.org/repos/asf/airavata/blob/23c11841/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/ApplicationInterface.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/ApplicationInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/ApplicationInterface.java
index 2361310..77db61a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/ApplicationInterface.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/ApplicationInterface.java
@@ -532,14 +532,14 @@ import org.slf4j.LoggerFactory;
case 3: // APPLICATION_DEPLOYMENTS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list60 = iprot.readListBegin();
- struct.applicationDeployments = new ArrayList<ApplicationDeployment>(_list60.size);
- for (int _i61 = 0; _i61 < _list60.size; ++_i61)
+ org.apache.thrift.protocol.TList _list68 = iprot.readListBegin();
+ struct.applicationDeployments = new ArrayList<ApplicationDeployment>(_list68.size);
+ for (int _i69 = 0; _i69 < _list68.size; ++_i69)
{
- ApplicationDeployment _elem62;
- _elem62 = new ApplicationDeployment();
- _elem62.read(iprot);
- struct.applicationDeployments.add(_elem62);
+ ApplicationDeployment _elem70;
+ _elem70 = new ApplicationDeployment();
+ _elem70.read(iprot);
+ struct.applicationDeployments.add(_elem70);
}
iprot.readListEnd();
}
@@ -578,9 +578,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(APPLICATION_DEPLOYMENTS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.applicationDeployments.size()));
- for (ApplicationDeployment _iter63 : struct.applicationDeployments)
+ for (ApplicationDeployment _iter71 : struct.applicationDeployments)
{
- _iter63.write(oprot);
+ _iter71.write(oprot);
}
oprot.writeListEnd();
}
@@ -619,9 +619,9 @@ import org.slf4j.LoggerFactory;
if (struct.isSetApplicationDeployments()) {
{
oprot.writeI32(struct.applicationDeployments.size());
- for (ApplicationDeployment _iter64 : struct.applicationDeployments)
+ for (ApplicationDeployment _iter72 : struct.applicationDeployments)
{
- _iter64.write(oprot);
+ _iter72.write(oprot);
}
}
}
@@ -639,14 +639,14 @@ import org.slf4j.LoggerFactory;
}
if (incoming.get(1)) {
{
- org.apache.thrift.protocol.TList _list65 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.applicationDeployments = new ArrayList<ApplicationDeployment>(_list65.size);
- for (int _i66 = 0; _i66 < _list65.size; ++_i66)
+ org.apache.thrift.protocol.TList _list73 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.applicationDeployments = new ArrayList<ApplicationDeployment>(_list73.size);
+ for (int _i74 = 0; _i74 < _list73.size; ++_i74)
{
- ApplicationDeployment _elem67;
- _elem67 = new ApplicationDeployment();
- _elem67.read(iprot);
- struct.applicationDeployments.add(_elem67);
+ ApplicationDeployment _elem75;
+ _elem75 = new ApplicationDeployment();
+ _elem75.read(iprot);
+ struct.applicationDeployments.add(_elem75);
}
}
struct.setApplicationDeploymentsIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/23c11841/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/ComputeResourceDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/ComputeResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/ComputeResourceDescription.java
index eb608f6..c08fc85 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/ComputeResourceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/ComputeResourceDescription.java
@@ -1176,13 +1176,13 @@ import org.slf4j.LoggerFactory;
case 4: // HOST_ALIASES
if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
{
- org.apache.thrift.protocol.TSet _set24 = iprot.readSetBegin();
- struct.hostAliases = new HashSet<String>(2*_set24.size);
- for (int _i25 = 0; _i25 < _set24.size; ++_i25)
+ org.apache.thrift.protocol.TSet _set32 = iprot.readSetBegin();
+ struct.hostAliases = new HashSet<String>(2*_set32.size);
+ for (int _i33 = 0; _i33 < _set32.size; ++_i33)
{
- String _elem26;
- _elem26 = iprot.readString();
- struct.hostAliases.add(_elem26);
+ String _elem34;
+ _elem34 = iprot.readString();
+ struct.hostAliases.add(_elem34);
}
iprot.readSetEnd();
}
@@ -1194,13 +1194,13 @@ import org.slf4j.LoggerFactory;
case 5: // IP_ADDRESSES
if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
{
- org.apache.thrift.protocol.TSet _set27 = iprot.readSetBegin();
- struct.ipAddresses = new HashSet<String>(2*_set27.size);
- for (int _i28 = 0; _i28 < _set27.size; ++_i28)
+ org.apache.thrift.protocol.TSet _set35 = iprot.readSetBegin();
+ struct.ipAddresses = new HashSet<String>(2*_set35.size);
+ for (int _i36 = 0; _i36 < _set35.size; ++_i36)
{
- String _elem29;
- _elem29 = iprot.readString();
- struct.ipAddresses.add(_elem29);
+ String _elem37;
+ _elem37 = iprot.readString();
+ struct.ipAddresses.add(_elem37);
}
iprot.readSetEnd();
}
@@ -1236,15 +1236,15 @@ import org.slf4j.LoggerFactory;
case 9: // JOB_SUBMISSION_PROTOCOLS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map30 = iprot.readMapBegin();
- struct.jobSubmissionProtocols = new HashMap<String,JobSubmissionProtocol>(2*_map30.size);
- for (int _i31 = 0; _i31 < _map30.size; ++_i31)
+ org.apache.thrift.protocol.TMap _map38 = iprot.readMapBegin();
+ struct.jobSubmissionProtocols = new HashMap<String,JobSubmissionProtocol>(2*_map38.size);
+ for (int _i39 = 0; _i39 < _map38.size; ++_i39)
{
- String _key32;
- JobSubmissionProtocol _val33;
- _key32 = iprot.readString();
- _val33 = JobSubmissionProtocol.findByValue(iprot.readI32());
- struct.jobSubmissionProtocols.put(_key32, _val33);
+ String _key40;
+ JobSubmissionProtocol _val41;
+ _key40 = iprot.readString();
+ _val41 = JobSubmissionProtocol.findByValue(iprot.readI32());
+ struct.jobSubmissionProtocols.put(_key40, _val41);
}
iprot.readMapEnd();
}
@@ -1256,15 +1256,15 @@ import org.slf4j.LoggerFactory;
case 10: // DATA_MOVEMENT_PROTOCOLS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map34 = iprot.readMapBegin();
- struct.dataMovementProtocols = new HashMap<String,DataMovementProtocol>(2*_map34.size);
- for (int _i35 = 0; _i35 < _map34.size; ++_i35)
+ org.apache.thrift.protocol.TMap _map42 = iprot.readMapBegin();
+ struct.dataMovementProtocols = new HashMap<String,DataMovementProtocol>(2*_map42.size);
+ for (int _i43 = 0; _i43 < _map42.size; ++_i43)
{
- String _key36;
- DataMovementProtocol _val37;
- _key36 = iprot.readString();
- _val37 = DataMovementProtocol.findByValue(iprot.readI32());
- struct.dataMovementProtocols.put(_key36, _val37);
+ String _key44;
+ DataMovementProtocol _val45;
+ _key44 = iprot.readString();
+ _val45 = DataMovementProtocol.findByValue(iprot.readI32());
+ struct.dataMovementProtocols.put(_key44, _val45);
}
iprot.readMapEnd();
}
@@ -1304,9 +1304,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(HOST_ALIASES_FIELD_DESC);
{
oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.hostAliases.size()));
- for (String _iter38 : struct.hostAliases)
+ for (String _iter46 : struct.hostAliases)
{
- oprot.writeString(_iter38);
+ oprot.writeString(_iter46);
}
oprot.writeSetEnd();
}
@@ -1318,9 +1318,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(IP_ADDRESSES_FIELD_DESC);
{
oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.ipAddresses.size()));
- for (String _iter39 : struct.ipAddresses)
+ for (String _iter47 : struct.ipAddresses)
{
- oprot.writeString(_iter39);
+ oprot.writeString(_iter47);
}
oprot.writeSetEnd();
}
@@ -1352,10 +1352,10 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(JOB_SUBMISSION_PROTOCOLS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, struct.jobSubmissionProtocols.size()));
- for (Map.Entry<String, JobSubmissionProtocol> _iter40 : struct.jobSubmissionProtocols.entrySet())
+ for (Map.Entry<String, JobSubmissionProtocol> _iter48 : struct.jobSubmissionProtocols.entrySet())
{
- oprot.writeString(_iter40.getKey());
- oprot.writeI32(_iter40.getValue().getValue());
+ oprot.writeString(_iter48.getKey());
+ oprot.writeI32(_iter48.getValue().getValue());
}
oprot.writeMapEnd();
}
@@ -1365,10 +1365,10 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(DATA_MOVEMENT_PROTOCOLS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, struct.dataMovementProtocols.size()));
- for (Map.Entry<String, DataMovementProtocol> _iter41 : struct.dataMovementProtocols.entrySet())
+ for (Map.Entry<String, DataMovementProtocol> _iter49 : struct.dataMovementProtocols.entrySet())
{
- oprot.writeString(_iter41.getKey());
- oprot.writeI32(_iter41.getValue().getValue());
+ oprot.writeString(_iter49.getKey());
+ oprot.writeI32(_iter49.getValue().getValue());
}
oprot.writeMapEnd();
}
@@ -1396,18 +1396,18 @@ import org.slf4j.LoggerFactory;
oprot.writeString(struct.hostName);
{
oprot.writeI32(struct.jobSubmissionProtocols.size());
- for (Map.Entry<String, JobSubmissionProtocol> _iter42 : struct.jobSubmissionProtocols.entrySet())
+ for (Map.Entry<String, JobSubmissionProtocol> _iter50 : struct.jobSubmissionProtocols.entrySet())
{
- oprot.writeString(_iter42.getKey());
- oprot.writeI32(_iter42.getValue().getValue());
+ oprot.writeString(_iter50.getKey());
+ oprot.writeI32(_iter50.getValue().getValue());
}
}
{
oprot.writeI32(struct.dataMovementProtocols.size());
- for (Map.Entry<String, DataMovementProtocol> _iter43 : struct.dataMovementProtocols.entrySet())
+ for (Map.Entry<String, DataMovementProtocol> _iter51 : struct.dataMovementProtocols.entrySet())
{
- oprot.writeString(_iter43.getKey());
- oprot.writeI32(_iter43.getValue().getValue());
+ oprot.writeString(_iter51.getKey());
+ oprot.writeI32(_iter51.getValue().getValue());
}
}
BitSet optionals = new BitSet();
@@ -1430,18 +1430,18 @@ import org.slf4j.LoggerFactory;
if (struct.isSetHostAliases()) {
{
oprot.writeI32(struct.hostAliases.size());
- for (String _iter44 : struct.hostAliases)
+ for (String _iter52 : struct.hostAliases)
{
- oprot.writeString(_iter44);
+ oprot.writeString(_iter52);
}
}
}
if (struct.isSetIpAddresses()) {
{
oprot.writeI32(struct.ipAddresses.size());
- for (String _iter45 : struct.ipAddresses)
+ for (String _iter53 : struct.ipAddresses)
{
- oprot.writeString(_iter45);
+ oprot.writeString(_iter53);
}
}
}
@@ -1466,54 +1466,54 @@ import org.slf4j.LoggerFactory;
struct.hostName = iprot.readString();
struct.setHostNameIsSet(true);
{
- org.apache.thrift.protocol.TMap _map46 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
- struct.jobSubmissionProtocols = new HashMap<String,JobSubmissionProtocol>(2*_map46.size);
- for (int _i47 = 0; _i47 < _map46.size; ++_i47)
+ org.apache.thrift.protocol.TMap _map54 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
+ struct.jobSubmissionProtocols = new HashMap<String,JobSubmissionProtocol>(2*_map54.size);
+ for (int _i55 = 0; _i55 < _map54.size; ++_i55)
{
- String _key48;
- JobSubmissionProtocol _val49;
- _key48 = iprot.readString();
- _val49 = JobSubmissionProtocol.findByValue(iprot.readI32());
- struct.jobSubmissionProtocols.put(_key48, _val49);
+ String _key56;
+ JobSubmissionProtocol _val57;
+ _key56 = iprot.readString();
+ _val57 = JobSubmissionProtocol.findByValue(iprot.readI32());
+ struct.jobSubmissionProtocols.put(_key56, _val57);
}
}
struct.setJobSubmissionProtocolsIsSet(true);
{
- org.apache.thrift.protocol.TMap _map50 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
- struct.dataMovementProtocols = new HashMap<String,DataMovementProtocol>(2*_map50.size);
- for (int _i51 = 0; _i51 < _map50.size; ++_i51)
+ org.apache.thrift.protocol.TMap _map58 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
+ struct.dataMovementProtocols = new HashMap<String,DataMovementProtocol>(2*_map58.size);
+ for (int _i59 = 0; _i59 < _map58.size; ++_i59)
{
- String _key52;
- DataMovementProtocol _val53;
- _key52 = iprot.readString();
- _val53 = DataMovementProtocol.findByValue(iprot.readI32());
- struct.dataMovementProtocols.put(_key52, _val53);
+ String _key60;
+ DataMovementProtocol _val61;
+ _key60 = iprot.readString();
+ _val61 = DataMovementProtocol.findByValue(iprot.readI32());
+ struct.dataMovementProtocols.put(_key60, _val61);
}
}
struct.setDataMovementProtocolsIsSet(true);
BitSet incoming = iprot.readBitSet(5);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TSet _set54 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.hostAliases = new HashSet<String>(2*_set54.size);
- for (int _i55 = 0; _i55 < _set54.size; ++_i55)
+ org.apache.thrift.protocol.TSet _set62 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.hostAliases = new HashSet<String>(2*_set62.size);
+ for (int _i63 = 0; _i63 < _set62.size; ++_i63)
{
- String _elem56;
- _elem56 = iprot.readString();
- struct.hostAliases.add(_elem56);
+ String _elem64;
+ _elem64 = iprot.readString();
+ struct.hostAliases.add(_elem64);
}
}
struct.setHostAliasesIsSet(true);
}
if (incoming.get(1)) {
{
- org.apache.thrift.protocol.TSet _set57 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.ipAddresses = new HashSet<String>(2*_set57.size);
- for (int _i58 = 0; _i58 < _set57.size; ++_i58)
+ org.apache.thrift.protocol.TSet _set65 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.ipAddresses = new HashSet<String>(2*_set65.size);
+ for (int _i66 = 0; _i66 < _set65.size; ++_i66)
{
- String _elem59;
- _elem59 = iprot.readString();
- struct.ipAddresses.add(_elem59);
+ String _elem67;
+ _elem67 = iprot.readString();
+ struct.ipAddresses.add(_elem67);
}
}
struct.setIpAddressesIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/23c11841/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/GSISSHJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/GSISSHJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/GSISSHJobSubmission.java
index a0e7107..f634f70 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/GSISSHJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/GSISSHJobSubmission.java
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
@SuppressWarnings("all") public class GSISSHJobSubmission implements org.apache.thrift.TBase<GSISSHJobSubmission, GSISSHJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<GSISSHJobSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GSISSHJobSubmission");
- private static final org.apache.thrift.protocol.TField GSSISH_JOB_SUBMISSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gssishJobSubmissionID", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_DATA_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("jobSubmissionDataID", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.thrift.protocol.TField RESOURCE_JOB_MANAGER_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceJobManager", org.apache.thrift.protocol.TType.I32, (short)2);
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)3);
private static final org.apache.thrift.protocol.TField EXPORTS_FIELD_DESC = new org.apache.thrift.protocol.TField("exports", org.apache.thrift.protocol.TType.SET, (short)4);
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
schemes.put(TupleScheme.class, new GSISSHJobSubmissionTupleSchemeFactory());
}
- private String gssishJobSubmissionID; // required
+ private String jobSubmissionDataID; // required
private ResourceJobManager resourceJobManager; // required
private int sshPort; // optional
private Set<String> exports; // optional
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
- GSSISH_JOB_SUBMISSION_ID((short)1, "gssishJobSubmissionID"),
+ JOB_SUBMISSION_DATA_ID((short)1, "jobSubmissionDataID"),
/**
*
* @see ResourceJobManager
@@ -103,8 +103,8 @@ import org.slf4j.LoggerFactory;
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
- case 1: // GSSISH_JOB_SUBMISSION_ID
- return GSSISH_JOB_SUBMISSION_ID;
+ case 1: // JOB_SUBMISSION_DATA_ID
+ return JOB_SUBMISSION_DATA_ID;
case 2: // RESOURCE_JOB_MANAGER
return RESOURCE_JOB_MANAGER;
case 3: // SSH_PORT
@@ -165,7 +165,7 @@ import org.slf4j.LoggerFactory;
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.GSSISH_JOB_SUBMISSION_ID, new org.apache.thrift.meta_data.FieldMetaData("gssishJobSubmissionID", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.JOB_SUBMISSION_DATA_ID, new org.apache.thrift.meta_data.FieldMetaData("jobSubmissionDataID", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
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.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ResourceJobManager.class)));
@@ -189,18 +189,18 @@ import org.slf4j.LoggerFactory;
}
public GSISSHJobSubmission() {
- this.gssishJobSubmissionID = "DO_NOT_SET_AT_CLIENTS";
+ this.jobSubmissionDataID = "DO_NOT_SET_AT_CLIENTS";
this.sshPort = 22;
}
public GSISSHJobSubmission(
- String gssishJobSubmissionID,
+ String jobSubmissionDataID,
ResourceJobManager resourceJobManager)
{
this();
- this.gssishJobSubmissionID = gssishJobSubmissionID;
+ this.jobSubmissionDataID = jobSubmissionDataID;
this.resourceJobManager = resourceJobManager;
}
@@ -209,8 +209,8 @@ import org.slf4j.LoggerFactory;
*/
public GSISSHJobSubmission(GSISSHJobSubmission other) {
__isset_bitfield = other.__isset_bitfield;
- if (other.isSetGssishJobSubmissionID()) {
- this.gssishJobSubmissionID = other.gssishJobSubmissionID;
+ if (other.isSetJobSubmissionDataID()) {
+ this.jobSubmissionDataID = other.jobSubmissionDataID;
}
if (other.isSetResourceJobManager()) {
this.resourceJobManager = other.resourceJobManager;
@@ -242,7 +242,7 @@ import org.slf4j.LoggerFactory;
@Override
public void clear() {
- this.gssishJobSubmissionID = "DO_NOT_SET_AT_CLIENTS";
+ this.jobSubmissionDataID = "DO_NOT_SET_AT_CLIENTS";
this.resourceJobManager = null;
this.sshPort = 22;
@@ -254,26 +254,26 @@ import org.slf4j.LoggerFactory;
this.monitorMode = null;
}
- public String getGssishJobSubmissionID() {
- return this.gssishJobSubmissionID;
+ public String getJobSubmissionDataID() {
+ return this.jobSubmissionDataID;
}
- public void setGssishJobSubmissionID(String gssishJobSubmissionID) {
- this.gssishJobSubmissionID = gssishJobSubmissionID;
+ public void setJobSubmissionDataID(String jobSubmissionDataID) {
+ this.jobSubmissionDataID = jobSubmissionDataID;
}
- public void unsetGssishJobSubmissionID() {
- this.gssishJobSubmissionID = null;
+ public void unsetJobSubmissionDataID() {
+ this.jobSubmissionDataID = null;
}
- /** Returns true if field gssishJobSubmissionID is set (has been assigned a value) and false otherwise */
- public boolean isSetGssishJobSubmissionID() {
- return this.gssishJobSubmissionID != null;
+ /** Returns true if field jobSubmissionDataID is set (has been assigned a value) and false otherwise */
+ public boolean isSetJobSubmissionDataID() {
+ return this.jobSubmissionDataID != null;
}
- public void setGssishJobSubmissionIDIsSet(boolean value) {
+ public void setJobSubmissionDataIDIsSet(boolean value) {
if (!value) {
- this.gssishJobSubmissionID = null;
+ this.jobSubmissionDataID = null;
}
}
@@ -492,11 +492,11 @@ import org.slf4j.LoggerFactory;
public void setFieldValue(_Fields field, Object value) {
switch (field) {
- case GSSISH_JOB_SUBMISSION_ID:
+ case JOB_SUBMISSION_DATA_ID:
if (value == null) {
- unsetGssishJobSubmissionID();
+ unsetJobSubmissionDataID();
} else {
- setGssishJobSubmissionID((String)value);
+ setJobSubmissionDataID((String)value);
}
break;
@@ -561,8 +561,8 @@ import org.slf4j.LoggerFactory;
public Object getFieldValue(_Fields field) {
switch (field) {
- case GSSISH_JOB_SUBMISSION_ID:
- return getGssishJobSubmissionID();
+ case JOB_SUBMISSION_DATA_ID:
+ return getJobSubmissionDataID();
case RESOURCE_JOB_MANAGER:
return getResourceJobManager();
@@ -596,8 +596,8 @@ import org.slf4j.LoggerFactory;
}
switch (field) {
- case GSSISH_JOB_SUBMISSION_ID:
- return isSetGssishJobSubmissionID();
+ case JOB_SUBMISSION_DATA_ID:
+ return isSetJobSubmissionDataID();
case RESOURCE_JOB_MANAGER:
return isSetResourceJobManager();
case SSH_PORT:
@@ -629,12 +629,12 @@ import org.slf4j.LoggerFactory;
if (that == null)
return false;
- boolean this_present_gssishJobSubmissionID = true && this.isSetGssishJobSubmissionID();
- boolean that_present_gssishJobSubmissionID = true && that.isSetGssishJobSubmissionID();
- if (this_present_gssishJobSubmissionID || that_present_gssishJobSubmissionID) {
- if (!(this_present_gssishJobSubmissionID && that_present_gssishJobSubmissionID))
+ boolean this_present_jobSubmissionDataID = true && this.isSetJobSubmissionDataID();
+ boolean that_present_jobSubmissionDataID = true && that.isSetJobSubmissionDataID();
+ if (this_present_jobSubmissionDataID || that_present_jobSubmissionDataID) {
+ if (!(this_present_jobSubmissionDataID && that_present_jobSubmissionDataID))
return false;
- if (!this.gssishJobSubmissionID.equals(that.gssishJobSubmissionID))
+ if (!this.jobSubmissionDataID.equals(that.jobSubmissionDataID))
return false;
}
@@ -717,12 +717,12 @@ import org.slf4j.LoggerFactory;
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetGssishJobSubmissionID()).compareTo(other.isSetGssishJobSubmissionID());
+ lastComparison = Boolean.valueOf(isSetJobSubmissionDataID()).compareTo(other.isSetJobSubmissionDataID());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetGssishJobSubmissionID()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gssishJobSubmissionID, other.gssishJobSubmissionID);
+ if (isSetJobSubmissionDataID()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jobSubmissionDataID, other.jobSubmissionDataID);
if (lastComparison != 0) {
return lastComparison;
}
@@ -817,11 +817,11 @@ import org.slf4j.LoggerFactory;
StringBuilder sb = new StringBuilder("GSISSHJobSubmission(");
boolean first = true;
- sb.append("gssishJobSubmissionID:");
- if (this.gssishJobSubmissionID == null) {
+ sb.append("jobSubmissionDataID:");
+ if (this.jobSubmissionDataID == null) {
sb.append("null");
} else {
- sb.append(this.gssishJobSubmissionID);
+ sb.append(this.jobSubmissionDataID);
}
first = false;
if (!first) sb.append(", ");
@@ -894,8 +894,8 @@ import org.slf4j.LoggerFactory;
public void validate() throws org.apache.thrift.TException {
// check for required fields
- if (!isSetGssishJobSubmissionID()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'gssishJobSubmissionID' is unset! Struct:" + toString());
+ if (!isSetJobSubmissionDataID()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'jobSubmissionDataID' is unset! Struct:" + toString());
}
if (!isSetResourceJobManager()) {
@@ -941,10 +941,10 @@ import org.slf4j.LoggerFactory;
break;
}
switch (schemeField.id) {
- case 1: // GSSISH_JOB_SUBMISSION_ID
+ case 1: // JOB_SUBMISSION_DATA_ID
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.gssishJobSubmissionID = iprot.readString();
- struct.setGssishJobSubmissionIDIsSet(true);
+ struct.jobSubmissionDataID = iprot.readString();
+ struct.setJobSubmissionDataIDIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -968,13 +968,13 @@ import org.slf4j.LoggerFactory;
case 4: // EXPORTS
if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
{
- org.apache.thrift.protocol.TSet _set0 = iprot.readSetBegin();
- struct.exports = new HashSet<String>(2*_set0.size);
- for (int _i1 = 0; _i1 < _set0.size; ++_i1)
+ org.apache.thrift.protocol.TSet _set8 = iprot.readSetBegin();
+ struct.exports = new HashSet<String>(2*_set8.size);
+ for (int _i9 = 0; _i9 < _set8.size; ++_i9)
{
- String _elem2;
- _elem2 = iprot.readString();
- struct.exports.add(_elem2);
+ String _elem10;
+ _elem10 = iprot.readString();
+ struct.exports.add(_elem10);
}
iprot.readSetEnd();
}
@@ -986,13 +986,13 @@ import org.slf4j.LoggerFactory;
case 5: // PRE_JOB_COMMANDS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list3 = iprot.readListBegin();
- struct.preJobCommands = new ArrayList<String>(_list3.size);
- for (int _i4 = 0; _i4 < _list3.size; ++_i4)
+ org.apache.thrift.protocol.TList _list11 = iprot.readListBegin();
+ struct.preJobCommands = new ArrayList<String>(_list11.size);
+ for (int _i12 = 0; _i12 < _list11.size; ++_i12)
{
- String _elem5;
- _elem5 = iprot.readString();
- struct.preJobCommands.add(_elem5);
+ String _elem13;
+ _elem13 = iprot.readString();
+ struct.preJobCommands.add(_elem13);
}
iprot.readListEnd();
}
@@ -1004,13 +1004,13 @@ import org.slf4j.LoggerFactory;
case 6: // POST_JOB_COMMANDS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list6 = iprot.readListBegin();
- struct.postJobCommands = new ArrayList<String>(_list6.size);
- for (int _i7 = 0; _i7 < _list6.size; ++_i7)
+ org.apache.thrift.protocol.TList _list14 = iprot.readListBegin();
+ struct.postJobCommands = new ArrayList<String>(_list14.size);
+ for (int _i15 = 0; _i15 < _list14.size; ++_i15)
{
- String _elem8;
- _elem8 = iprot.readString();
- struct.postJobCommands.add(_elem8);
+ String _elem16;
+ _elem16 = iprot.readString();
+ struct.postJobCommands.add(_elem16);
}
iprot.readListEnd();
}
@@ -1048,9 +1048,9 @@ import org.slf4j.LoggerFactory;
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
- if (struct.gssishJobSubmissionID != null) {
- oprot.writeFieldBegin(GSSISH_JOB_SUBMISSION_ID_FIELD_DESC);
- oprot.writeString(struct.gssishJobSubmissionID);
+ if (struct.jobSubmissionDataID != null) {
+ oprot.writeFieldBegin(JOB_SUBMISSION_DATA_ID_FIELD_DESC);
+ oprot.writeString(struct.jobSubmissionDataID);
oprot.writeFieldEnd();
}
if (struct.resourceJobManager != null) {
@@ -1068,9 +1068,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(EXPORTS_FIELD_DESC);
{
oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.exports.size()));
- for (String _iter9 : struct.exports)
+ for (String _iter17 : struct.exports)
{
- oprot.writeString(_iter9);
+ oprot.writeString(_iter17);
}
oprot.writeSetEnd();
}
@@ -1082,9 +1082,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(PRE_JOB_COMMANDS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.preJobCommands.size()));
- for (String _iter10 : struct.preJobCommands)
+ for (String _iter18 : struct.preJobCommands)
{
- oprot.writeString(_iter10);
+ oprot.writeString(_iter18);
}
oprot.writeListEnd();
}
@@ -1096,9 +1096,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(POST_JOB_COMMANDS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.postJobCommands.size()));
- for (String _iter11 : struct.postJobCommands)
+ for (String _iter19 : struct.postJobCommands)
{
- oprot.writeString(_iter11);
+ oprot.writeString(_iter19);
}
oprot.writeListEnd();
}
@@ -1136,7 +1136,7 @@ import org.slf4j.LoggerFactory;
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, GSISSHJobSubmission struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
- oprot.writeString(struct.gssishJobSubmissionID);
+ oprot.writeString(struct.jobSubmissionDataID);
oprot.writeI32(struct.resourceJobManager.getValue());
BitSet optionals = new BitSet();
if (struct.isSetSshPort()) {
@@ -1164,27 +1164,27 @@ import org.slf4j.LoggerFactory;
if (struct.isSetExports()) {
{
oprot.writeI32(struct.exports.size());
- for (String _iter12 : struct.exports)
+ for (String _iter20 : struct.exports)
{
- oprot.writeString(_iter12);
+ oprot.writeString(_iter20);
}
}
}
if (struct.isSetPreJobCommands()) {
{
oprot.writeI32(struct.preJobCommands.size());
- for (String _iter13 : struct.preJobCommands)
+ for (String _iter21 : struct.preJobCommands)
{
- oprot.writeString(_iter13);
+ oprot.writeString(_iter21);
}
}
}
if (struct.isSetPostJobCommands()) {
{
oprot.writeI32(struct.postJobCommands.size());
- for (String _iter14 : struct.postJobCommands)
+ for (String _iter22 : struct.postJobCommands)
{
- oprot.writeString(_iter14);
+ oprot.writeString(_iter22);
}
}
}
@@ -1199,8 +1199,8 @@ import org.slf4j.LoggerFactory;
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, GSISSHJobSubmission struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- struct.gssishJobSubmissionID = iprot.readString();
- struct.setGssishJobSubmissionIDIsSet(true);
+ struct.jobSubmissionDataID = iprot.readString();
+ struct.setJobSubmissionDataIDIsSet(true);
struct.resourceJobManager = ResourceJobManager.findByValue(iprot.readI32());
struct.setResourceJobManagerIsSet(true);
BitSet incoming = iprot.readBitSet(6);
@@ -1210,39 +1210,39 @@ import org.slf4j.LoggerFactory;
}
if (incoming.get(1)) {
{
- org.apache.thrift.protocol.TSet _set15 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.exports = new HashSet<String>(2*_set15.size);
- for (int _i16 = 0; _i16 < _set15.size; ++_i16)
+ org.apache.thrift.protocol.TSet _set23 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.exports = new HashSet<String>(2*_set23.size);
+ for (int _i24 = 0; _i24 < _set23.size; ++_i24)
{
- String _elem17;
- _elem17 = iprot.readString();
- struct.exports.add(_elem17);
+ String _elem25;
+ _elem25 = iprot.readString();
+ struct.exports.add(_elem25);
}
}
struct.setExportsIsSet(true);
}
if (incoming.get(2)) {
{
- org.apache.thrift.protocol.TList _list18 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.preJobCommands = new ArrayList<String>(_list18.size);
- for (int _i19 = 0; _i19 < _list18.size; ++_i19)
+ org.apache.thrift.protocol.TList _list26 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.preJobCommands = new ArrayList<String>(_list26.size);
+ for (int _i27 = 0; _i27 < _list26.size; ++_i27)
{
- String _elem20;
- _elem20 = iprot.readString();
- struct.preJobCommands.add(_elem20);
+ String _elem28;
+ _elem28 = iprot.readString();
+ struct.preJobCommands.add(_elem28);
}
}
struct.setPreJobCommandsIsSet(true);
}
if (incoming.get(3)) {
{
- org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.postJobCommands = new ArrayList<String>(_list21.size);
- for (int _i22 = 0; _i22 < _list21.size; ++_i22)
+ org.apache.thrift.protocol.TList _list29 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.postJobCommands = new ArrayList<String>(_list29.size);
+ for (int _i30 = 0; _i30 < _list29.size; ++_i30)
{
- String _elem23;
- _elem23 = iprot.readString();
- struct.postJobCommands.add(_elem23);
+ String _elem31;
+ _elem31 = iprot.readString();
+ struct.postJobCommands.add(_elem31);
}
}
struct.setPostJobCommandsIsSet(true);
[3/3] git commit: generating code
Posted by sa...@apache.org.
generating code
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/23c11841
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/23c11841
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/23c11841
Branch: refs/heads/master
Commit: 23c118418520c64a24606c3978b20e57465c35c0
Parents: 3049a0b
Author: samindaw <sa...@gmail.com>
Authored: Tue May 20 06:22:49 2014 -0700
Committer: samindaw <sa...@gmail.com>
Committed: Tue May 20 06:22:49 2014 -0700
----------------------------------------------------------------------
.../java/org/apache/airavata/api/Airavata.java | 6 +-
.../api/appcatalog/ApplicationCatalogAPI.java | 261 +++++++++++++++--
.../resources/lib/ApplicationCatalogAPI.cpp | 67 ++++-
.../main/resources/lib/ApplicationCatalogAPI.h | 50 ++--
.../ApplicationCatalogAPI_server.skeleton.cpp | 4 +-
.../lib/applicationCatalogDataModel_types.cpp | 284 +++++++++---------
.../lib/applicationCatalogDataModel_types.h | 48 ++--
.../API/AppCatalog/ApplicationCatalogAPI.php | 64 ++++-
.../src/main/resources/lib/Types.php | 286 ++++++++++---------
.../model/appcatalog/ApplicationInterface.java | 36 +--
.../appcatalog/ComputeResourceDescription.java | 152 +++++-----
.../model/appcatalog/GSISSHJobSubmission.java | 200 ++++++-------
.../model/appcatalog/GlobusJobSubmission.java | 177 +++++++-----
.../model/appcatalog/SCPDataMovement.java | 104 +++----
.../model/appcatalog/SSHJobSubmission.java | 104 +++----
15 files changed, 1128 insertions(+), 715 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/23c11841/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
index 131d477..1d61f68 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
@@ -28,6 +28,7 @@ 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;
@@ -37,10 +38,13 @@ import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap;
import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
import java.util.EnumSet;
import java.util.Collections;
import java.util.BitSet;
-
+import java.nio.ByteBuffer;
+import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/airavata/blob/23c11841/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/appcatalog/ApplicationCatalogAPI.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/appcatalog/ApplicationCatalogAPI.java b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/appcatalog/ApplicationCatalogAPI.java
index d184f0f..385897d 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/appcatalog/ApplicationCatalogAPI.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/appcatalog/ApplicationCatalogAPI.java
@@ -28,6 +28,7 @@ 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;
@@ -37,10 +38,13 @@ import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap;
import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
import java.util.EnumSet;
import java.util.Collections;
import java.util.BitSet;
-
+import java.nio.ByteBuffer;
+import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -103,9 +107,9 @@ import org.slf4j.LoggerFactory;
*/
public void addApplicationDeployment(String applicationInterfaceId, org.apache.airavata.model.appcatalog.ApplicationDeployment applicationDeployment) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
- public List<String> listApplicationDeploymentIds() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
+ public List<String> listApplicationDeploymentIds(String applicationInterfaceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
- public org.apache.airavata.model.appcatalog.ApplicationDeployment getApplicationDeployment(String applicationDeploymentId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
+ public org.apache.airavata.model.appcatalog.ApplicationDeployment getApplicationDeployment(String applicationInterfaceId, String applicationDeploymentId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
}
@@ -147,9 +151,9 @@ import org.slf4j.LoggerFactory;
public void addApplicationDeployment(String applicationInterfaceId, org.apache.airavata.model.appcatalog.ApplicationDeployment applicationDeployment, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void listApplicationDeploymentIds(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void listApplicationDeploymentIds(String applicationInterfaceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getApplicationDeployment(String applicationDeploymentId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void getApplicationDeployment(String applicationInterfaceId, String applicationDeploymentId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
}
@@ -721,15 +725,16 @@ import org.slf4j.LoggerFactory;
return;
}
- public List<String> listApplicationDeploymentIds() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ public List<String> listApplicationDeploymentIds(String applicationInterfaceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
{
- send_listApplicationDeploymentIds();
+ send_listApplicationDeploymentIds(applicationInterfaceId);
return recv_listApplicationDeploymentIds();
}
- public void send_listApplicationDeploymentIds() throws org.apache.thrift.TException
+ public void send_listApplicationDeploymentIds(String applicationInterfaceId) throws org.apache.thrift.TException
{
listApplicationDeploymentIds_args args = new listApplicationDeploymentIds_args();
+ args.setApplicationInterfaceId(applicationInterfaceId);
sendBase("listApplicationDeploymentIds", args);
}
@@ -752,15 +757,16 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "listApplicationDeploymentIds failed: unknown result");
}
- public org.apache.airavata.model.appcatalog.ApplicationDeployment getApplicationDeployment(String applicationDeploymentId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ public org.apache.airavata.model.appcatalog.ApplicationDeployment getApplicationDeployment(String applicationInterfaceId, String applicationDeploymentId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
{
- send_getApplicationDeployment(applicationDeploymentId);
+ send_getApplicationDeployment(applicationInterfaceId, applicationDeploymentId);
return recv_getApplicationDeployment();
}
- public void send_getApplicationDeployment(String applicationDeploymentId) throws org.apache.thrift.TException
+ public void send_getApplicationDeployment(String applicationInterfaceId, String applicationDeploymentId) throws org.apache.thrift.TException
{
getApplicationDeployment_args args = new getApplicationDeployment_args();
+ args.setApplicationInterfaceId(applicationInterfaceId);
args.setApplicationDeploymentId(applicationDeploymentId);
sendBase("getApplicationDeployment", args);
}
@@ -1384,21 +1390,24 @@ import org.slf4j.LoggerFactory;
}
}
- public void listApplicationDeploymentIds(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void listApplicationDeploymentIds(String applicationInterfaceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- listApplicationDeploymentIds_call method_call = new listApplicationDeploymentIds_call(resultHandler, this, ___protocolFactory, ___transport);
+ listApplicationDeploymentIds_call method_call = new listApplicationDeploymentIds_call(applicationInterfaceId, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
public static class listApplicationDeploymentIds_call extends org.apache.thrift.async.TAsyncMethodCall {
- public listApplicationDeploymentIds_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ private String applicationInterfaceId;
+ public listApplicationDeploymentIds_call(String applicationInterfaceId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
+ this.applicationInterfaceId = applicationInterfaceId;
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("listApplicationDeploymentIds", org.apache.thrift.protocol.TMessageType.CALL, 0));
listApplicationDeploymentIds_args args = new listApplicationDeploymentIds_args();
+ args.setApplicationInterfaceId(applicationInterfaceId);
args.write(prot);
prot.writeMessageEnd();
}
@@ -1413,23 +1422,26 @@ import org.slf4j.LoggerFactory;
}
}
- public void getApplicationDeployment(String applicationDeploymentId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void getApplicationDeployment(String applicationInterfaceId, String applicationDeploymentId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- getApplicationDeployment_call method_call = new getApplicationDeployment_call(applicationDeploymentId, resultHandler, this, ___protocolFactory, ___transport);
+ getApplicationDeployment_call method_call = new getApplicationDeployment_call(applicationInterfaceId, applicationDeploymentId, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
public static class getApplicationDeployment_call extends org.apache.thrift.async.TAsyncMethodCall {
+ private String applicationInterfaceId;
private String applicationDeploymentId;
- public getApplicationDeployment_call(String applicationDeploymentId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public getApplicationDeployment_call(String applicationInterfaceId, String applicationDeploymentId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
+ this.applicationInterfaceId = applicationInterfaceId;
this.applicationDeploymentId = applicationDeploymentId;
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getApplicationDeployment", org.apache.thrift.protocol.TMessageType.CALL, 0));
getApplicationDeployment_args args = new getApplicationDeployment_args();
+ args.setApplicationInterfaceId(applicationInterfaceId);
args.setApplicationDeploymentId(applicationDeploymentId);
args.write(prot);
prot.writeMessageEnd();
@@ -1994,7 +2006,7 @@ import org.slf4j.LoggerFactory;
public listApplicationDeploymentIds_result getResult(I iface, listApplicationDeploymentIds_args args) throws org.apache.thrift.TException {
listApplicationDeploymentIds_result result = new listApplicationDeploymentIds_result();
try {
- result.success = iface.listApplicationDeploymentIds();
+ result.success = iface.listApplicationDeploymentIds(args.applicationInterfaceId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
} catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -2022,7 +2034,7 @@ import org.slf4j.LoggerFactory;
public getApplicationDeployment_result getResult(I iface, getApplicationDeployment_args args) throws org.apache.thrift.TException {
getApplicationDeployment_result result = new getApplicationDeployment_result();
try {
- result.success = iface.getApplicationDeployment(args.applicationDeploymentId);
+ result.success = iface.getApplicationDeployment(args.applicationInterfaceId, args.applicationDeploymentId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
} catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -3317,7 +3329,7 @@ import org.slf4j.LoggerFactory;
}
public void start(I iface, listApplicationDeploymentIds_args args, org.apache.thrift.async.AsyncMethodCallback<List<String>> resultHandler) throws TException {
- iface.listApplicationDeploymentIds(resultHandler);
+ iface.listApplicationDeploymentIds(args.applicationInterfaceId,resultHandler);
}
}
@@ -3384,7 +3396,7 @@ import org.slf4j.LoggerFactory;
}
public void start(I iface, getApplicationDeployment_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.ApplicationDeployment> resultHandler) throws TException {
- iface.getApplicationDeployment(args.applicationDeploymentId,resultHandler);
+ iface.getApplicationDeployment(args.applicationInterfaceId, args.applicationDeploymentId,resultHandler);
}
}
@@ -20858,6 +20870,7 @@ import org.slf4j.LoggerFactory;
public static class listApplicationDeploymentIds_args implements org.apache.thrift.TBase<listApplicationDeploymentIds_args, listApplicationDeploymentIds_args._Fields>, java.io.Serializable, Cloneable, Comparable<listApplicationDeploymentIds_args> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("listApplicationDeploymentIds_args");
+ private static final org.apache.thrift.protocol.TField APPLICATION_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -20865,10 +20878,11 @@ import org.slf4j.LoggerFactory;
schemes.put(TupleScheme.class, new listApplicationDeploymentIds_argsTupleSchemeFactory());
}
+ public String applicationInterfaceId; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-;
+ APPLICATION_INTERFACE_ID((short)1, "applicationInterfaceId");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -20883,6 +20897,8 @@ import org.slf4j.LoggerFactory;
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
+ case 1: // APPLICATION_INTERFACE_ID
+ return APPLICATION_INTERFACE_ID;
default:
return null;
}
@@ -20921,9 +20937,13 @@ import org.slf4j.LoggerFactory;
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.APPLICATION_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("applicationInterfaceId", 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(listApplicationDeploymentIds_args.class, metaDataMap);
}
@@ -20931,10 +20951,20 @@ import org.slf4j.LoggerFactory;
public listApplicationDeploymentIds_args() {
}
+ public listApplicationDeploymentIds_args(
+ String applicationInterfaceId)
+ {
+ this();
+ this.applicationInterfaceId = applicationInterfaceId;
+ }
+
/**
* Performs a deep copy on <i>other</i>.
*/
public listApplicationDeploymentIds_args(listApplicationDeploymentIds_args other) {
+ if (other.isSetApplicationInterfaceId()) {
+ this.applicationInterfaceId = other.applicationInterfaceId;
+ }
}
public listApplicationDeploymentIds_args deepCopy() {
@@ -20943,15 +20973,51 @@ import org.slf4j.LoggerFactory;
@Override
public void clear() {
+ this.applicationInterfaceId = null;
+ }
+
+ public String getApplicationInterfaceId() {
+ return this.applicationInterfaceId;
+ }
+
+ public listApplicationDeploymentIds_args setApplicationInterfaceId(String applicationInterfaceId) {
+ this.applicationInterfaceId = applicationInterfaceId;
+ return this;
+ }
+
+ public void unsetApplicationInterfaceId() {
+ this.applicationInterfaceId = null;
+ }
+
+ /** Returns true if field applicationInterfaceId is set (has been assigned a value) and false otherwise */
+ public boolean isSetApplicationInterfaceId() {
+ return this.applicationInterfaceId != null;
+ }
+
+ public void setApplicationInterfaceIdIsSet(boolean value) {
+ if (!value) {
+ this.applicationInterfaceId = null;
+ }
}
public void setFieldValue(_Fields field, Object value) {
switch (field) {
+ case APPLICATION_INTERFACE_ID:
+ if (value == null) {
+ unsetApplicationInterfaceId();
+ } else {
+ setApplicationInterfaceId((String)value);
+ }
+ break;
+
}
}
public Object getFieldValue(_Fields field) {
switch (field) {
+ case APPLICATION_INTERFACE_ID:
+ return getApplicationInterfaceId();
+
}
throw new IllegalStateException();
}
@@ -20963,6 +21029,8 @@ import org.slf4j.LoggerFactory;
}
switch (field) {
+ case APPLICATION_INTERFACE_ID:
+ return isSetApplicationInterfaceId();
}
throw new IllegalStateException();
}
@@ -20980,6 +21048,15 @@ import org.slf4j.LoggerFactory;
if (that == null)
return false;
+ boolean this_present_applicationInterfaceId = true && this.isSetApplicationInterfaceId();
+ boolean that_present_applicationInterfaceId = true && that.isSetApplicationInterfaceId();
+ if (this_present_applicationInterfaceId || that_present_applicationInterfaceId) {
+ if (!(this_present_applicationInterfaceId && that_present_applicationInterfaceId))
+ return false;
+ if (!this.applicationInterfaceId.equals(that.applicationInterfaceId))
+ return false;
+ }
+
return true;
}
@@ -20996,6 +21073,16 @@ import org.slf4j.LoggerFactory;
int lastComparison = 0;
+ lastComparison = Boolean.valueOf(isSetApplicationInterfaceId()).compareTo(other.isSetApplicationInterfaceId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetApplicationInterfaceId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.applicationInterfaceId, other.applicationInterfaceId);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -21016,12 +21103,22 @@ import org.slf4j.LoggerFactory;
StringBuilder sb = new StringBuilder("listApplicationDeploymentIds_args(");
boolean first = true;
+ sb.append("applicationInterfaceId:");
+ if (this.applicationInterfaceId == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.applicationInterfaceId);
+ }
+ first = false;
sb.append(")");
return sb.toString();
}
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ if (applicationInterfaceId == null) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'applicationInterfaceId' was not present! Struct: " + toString());
+ }
// check for sub-struct validity
}
@@ -21059,6 +21156,14 @@ import org.slf4j.LoggerFactory;
break;
}
switch (schemeField.id) {
+ case 1: // APPLICATION_INTERFACE_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.applicationInterfaceId = iprot.readString();
+ struct.setApplicationInterfaceIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -21074,6 +21179,11 @@ import org.slf4j.LoggerFactory;
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.applicationInterfaceId != null) {
+ oprot.writeFieldBegin(APPLICATION_INTERFACE_ID_FIELD_DESC);
+ oprot.writeString(struct.applicationInterfaceId);
+ oprot.writeFieldEnd();
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -21091,11 +21201,14 @@ import org.slf4j.LoggerFactory;
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, listApplicationDeploymentIds_args struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeString(struct.applicationInterfaceId);
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, listApplicationDeploymentIds_args struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.applicationInterfaceId = iprot.readString();
+ struct.setApplicationInterfaceIdIsSet(true);
}
}
@@ -21813,7 +21926,8 @@ import org.slf4j.LoggerFactory;
public static class getApplicationDeployment_args implements org.apache.thrift.TBase<getApplicationDeployment_args, getApplicationDeployment_args._Fields>, java.io.Serializable, Cloneable, Comparable<getApplicationDeployment_args> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getApplicationDeployment_args");
- private static final org.apache.thrift.protocol.TField APPLICATION_DEPLOYMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationDeploymentId", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.thrift.protocol.TField APPLICATION_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.thrift.protocol.TField APPLICATION_DEPLOYMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationDeploymentId", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -21821,11 +21935,13 @@ import org.slf4j.LoggerFactory;
schemes.put(TupleScheme.class, new getApplicationDeployment_argsTupleSchemeFactory());
}
+ public String applicationInterfaceId; // required
public String applicationDeploymentId; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
- APPLICATION_DEPLOYMENT_ID((short)1, "applicationDeploymentId");
+ APPLICATION_INTERFACE_ID((short)1, "applicationInterfaceId"),
+ APPLICATION_DEPLOYMENT_ID((short)2, "applicationDeploymentId");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -21840,7 +21956,9 @@ import org.slf4j.LoggerFactory;
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
- case 1: // APPLICATION_DEPLOYMENT_ID
+ case 1: // APPLICATION_INTERFACE_ID
+ return APPLICATION_INTERFACE_ID;
+ case 2: // APPLICATION_DEPLOYMENT_ID
return APPLICATION_DEPLOYMENT_ID;
default:
return null;
@@ -21885,6 +22003,8 @@ import org.slf4j.LoggerFactory;
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.APPLICATION_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("applicationInterfaceId", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.APPLICATION_DEPLOYMENT_ID, new org.apache.thrift.meta_data.FieldMetaData("applicationDeploymentId", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -21895,9 +22015,11 @@ import org.slf4j.LoggerFactory;
}
public getApplicationDeployment_args(
+ String applicationInterfaceId,
String applicationDeploymentId)
{
this();
+ this.applicationInterfaceId = applicationInterfaceId;
this.applicationDeploymentId = applicationDeploymentId;
}
@@ -21905,6 +22027,9 @@ import org.slf4j.LoggerFactory;
* Performs a deep copy on <i>other</i>.
*/
public getApplicationDeployment_args(getApplicationDeployment_args other) {
+ if (other.isSetApplicationInterfaceId()) {
+ this.applicationInterfaceId = other.applicationInterfaceId;
+ }
if (other.isSetApplicationDeploymentId()) {
this.applicationDeploymentId = other.applicationDeploymentId;
}
@@ -21916,9 +22041,34 @@ import org.slf4j.LoggerFactory;
@Override
public void clear() {
+ this.applicationInterfaceId = null;
this.applicationDeploymentId = null;
}
+ public String getApplicationInterfaceId() {
+ return this.applicationInterfaceId;
+ }
+
+ public getApplicationDeployment_args setApplicationInterfaceId(String applicationInterfaceId) {
+ this.applicationInterfaceId = applicationInterfaceId;
+ return this;
+ }
+
+ public void unsetApplicationInterfaceId() {
+ this.applicationInterfaceId = null;
+ }
+
+ /** Returns true if field applicationInterfaceId is set (has been assigned a value) and false otherwise */
+ public boolean isSetApplicationInterfaceId() {
+ return this.applicationInterfaceId != null;
+ }
+
+ public void setApplicationInterfaceIdIsSet(boolean value) {
+ if (!value) {
+ this.applicationInterfaceId = null;
+ }
+ }
+
public String getApplicationDeploymentId() {
return this.applicationDeploymentId;
}
@@ -21945,6 +22095,14 @@ import org.slf4j.LoggerFactory;
public void setFieldValue(_Fields field, Object value) {
switch (field) {
+ case APPLICATION_INTERFACE_ID:
+ if (value == null) {
+ unsetApplicationInterfaceId();
+ } else {
+ setApplicationInterfaceId((String)value);
+ }
+ break;
+
case APPLICATION_DEPLOYMENT_ID:
if (value == null) {
unsetApplicationDeploymentId();
@@ -21958,6 +22116,9 @@ import org.slf4j.LoggerFactory;
public Object getFieldValue(_Fields field) {
switch (field) {
+ case APPLICATION_INTERFACE_ID:
+ return getApplicationInterfaceId();
+
case APPLICATION_DEPLOYMENT_ID:
return getApplicationDeploymentId();
@@ -21972,6 +22133,8 @@ import org.slf4j.LoggerFactory;
}
switch (field) {
+ case APPLICATION_INTERFACE_ID:
+ return isSetApplicationInterfaceId();
case APPLICATION_DEPLOYMENT_ID:
return isSetApplicationDeploymentId();
}
@@ -21991,6 +22154,15 @@ import org.slf4j.LoggerFactory;
if (that == null)
return false;
+ boolean this_present_applicationInterfaceId = true && this.isSetApplicationInterfaceId();
+ boolean that_present_applicationInterfaceId = true && that.isSetApplicationInterfaceId();
+ if (this_present_applicationInterfaceId || that_present_applicationInterfaceId) {
+ if (!(this_present_applicationInterfaceId && that_present_applicationInterfaceId))
+ return false;
+ if (!this.applicationInterfaceId.equals(that.applicationInterfaceId))
+ return false;
+ }
+
boolean this_present_applicationDeploymentId = true && this.isSetApplicationDeploymentId();
boolean that_present_applicationDeploymentId = true && that.isSetApplicationDeploymentId();
if (this_present_applicationDeploymentId || that_present_applicationDeploymentId) {
@@ -22016,6 +22188,16 @@ import org.slf4j.LoggerFactory;
int lastComparison = 0;
+ lastComparison = Boolean.valueOf(isSetApplicationInterfaceId()).compareTo(other.isSetApplicationInterfaceId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetApplicationInterfaceId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.applicationInterfaceId, other.applicationInterfaceId);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
lastComparison = Boolean.valueOf(isSetApplicationDeploymentId()).compareTo(other.isSetApplicationDeploymentId());
if (lastComparison != 0) {
return lastComparison;
@@ -22046,6 +22228,14 @@ import org.slf4j.LoggerFactory;
StringBuilder sb = new StringBuilder("getApplicationDeployment_args(");
boolean first = true;
+ sb.append("applicationInterfaceId:");
+ if (this.applicationInterfaceId == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.applicationInterfaceId);
+ }
+ first = false;
+ if (!first) sb.append(", ");
sb.append("applicationDeploymentId:");
if (this.applicationDeploymentId == null) {
sb.append("null");
@@ -22059,6 +22249,9 @@ import org.slf4j.LoggerFactory;
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ if (applicationInterfaceId == null) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'applicationInterfaceId' was not present! Struct: " + toString());
+ }
if (applicationDeploymentId == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'applicationDeploymentId' was not present! Struct: " + toString());
}
@@ -22099,7 +22292,15 @@ import org.slf4j.LoggerFactory;
break;
}
switch (schemeField.id) {
- case 1: // APPLICATION_DEPLOYMENT_ID
+ case 1: // APPLICATION_INTERFACE_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.applicationInterfaceId = iprot.readString();
+ struct.setApplicationInterfaceIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // APPLICATION_DEPLOYMENT_ID
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.applicationDeploymentId = iprot.readString();
struct.setApplicationDeploymentIdIsSet(true);
@@ -22122,6 +22323,11 @@ import org.slf4j.LoggerFactory;
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.applicationInterfaceId != null) {
+ oprot.writeFieldBegin(APPLICATION_INTERFACE_ID_FIELD_DESC);
+ oprot.writeString(struct.applicationInterfaceId);
+ oprot.writeFieldEnd();
+ }
if (struct.applicationDeploymentId != null) {
oprot.writeFieldBegin(APPLICATION_DEPLOYMENT_ID_FIELD_DESC);
oprot.writeString(struct.applicationDeploymentId);
@@ -22144,12 +22350,15 @@ import org.slf4j.LoggerFactory;
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, getApplicationDeployment_args struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeString(struct.applicationInterfaceId);
oprot.writeString(struct.applicationDeploymentId);
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, getApplicationDeployment_args struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.applicationInterfaceId = iprot.readString();
+ struct.setApplicationInterfaceIdIsSet(true);
struct.applicationDeploymentId = iprot.readString();
struct.setApplicationDeploymentIdIsSet(true);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/23c11841/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.cpp
index 69b3087..429b558 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.cpp
@@ -3956,6 +3956,7 @@ uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_args::read(::apache:
using ::apache::thrift::protocol::TProtocolException;
+ bool isset_applicationInterfaceId = false;
while (true)
{
@@ -3963,12 +3964,27 @@ uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_args::read(::apache:
if (ftype == ::apache::thrift::protocol::T_STOP) {
break;
}
- xfer += iprot->skip(ftype);
+ switch (fid)
+ {
+ case 1:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->applicationInterfaceId);
+ isset_applicationInterfaceId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
xfer += iprot->readFieldEnd();
}
xfer += iprot->readStructEnd();
+ if (!isset_applicationInterfaceId)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
@@ -3976,6 +3992,10 @@ uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_args::write(::apache
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("ApplicationCatalogAPI_listApplicationDeploymentIds_args");
+ xfer += oprot->writeFieldBegin("applicationInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->applicationInterfaceId);
+ xfer += oprot->writeFieldEnd();
+
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -3985,6 +4005,10 @@ uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_pargs::write(::apach
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("ApplicationCatalogAPI_listApplicationDeploymentIds_pargs");
+ xfer += oprot->writeFieldBegin("applicationInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString((*(this->applicationInterfaceId)));
+ xfer += oprot->writeFieldEnd();
+
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -4189,6 +4213,7 @@ uint32_t ApplicationCatalogAPI_getApplicationDeployment_args::read(::apache::thr
using ::apache::thrift::protocol::TProtocolException;
+ bool isset_applicationInterfaceId = false;
bool isset_applicationDeploymentId = false;
while (true)
@@ -4201,6 +4226,14 @@ uint32_t ApplicationCatalogAPI_getApplicationDeployment_args::read(::apache::thr
{
case 1:
if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->applicationInterfaceId);
+ isset_applicationInterfaceId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->applicationDeploymentId);
isset_applicationDeploymentId = true;
} else {
@@ -4216,6 +4249,8 @@ uint32_t ApplicationCatalogAPI_getApplicationDeployment_args::read(::apache::thr
xfer += iprot->readStructEnd();
+ if (!isset_applicationInterfaceId)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_applicationDeploymentId)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
@@ -4225,7 +4260,11 @@ uint32_t ApplicationCatalogAPI_getApplicationDeployment_args::write(::apache::th
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("ApplicationCatalogAPI_getApplicationDeployment_args");
- xfer += oprot->writeFieldBegin("applicationDeploymentId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeFieldBegin("applicationInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->applicationInterfaceId);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("applicationDeploymentId", ::apache::thrift::protocol::T_STRING, 2);
xfer += oprot->writeString(this->applicationDeploymentId);
xfer += oprot->writeFieldEnd();
@@ -4238,7 +4277,11 @@ uint32_t ApplicationCatalogAPI_getApplicationDeployment_pargs::write(::apache::t
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("ApplicationCatalogAPI_getApplicationDeployment_pargs");
- xfer += oprot->writeFieldBegin("applicationDeploymentId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeFieldBegin("applicationInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString((*(this->applicationInterfaceId)));
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("applicationDeploymentId", ::apache::thrift::protocol::T_STRING, 2);
xfer += oprot->writeString((*(this->applicationDeploymentId)));
xfer += oprot->writeFieldEnd();
@@ -5567,18 +5610,19 @@ void ApplicationCatalogAPIClient::recv_addApplicationDeployment()
return;
}
-void ApplicationCatalogAPIClient::listApplicationDeploymentIds(std::vector<std::string> & _return)
+void ApplicationCatalogAPIClient::listApplicationDeploymentIds(std::vector<std::string> & _return, const std::string& applicationInterfaceId)
{
- send_listApplicationDeploymentIds();
+ send_listApplicationDeploymentIds(applicationInterfaceId);
recv_listApplicationDeploymentIds(_return);
}
-void ApplicationCatalogAPIClient::send_listApplicationDeploymentIds()
+void ApplicationCatalogAPIClient::send_listApplicationDeploymentIds(const std::string& applicationInterfaceId)
{
int32_t cseqid = 0;
oprot_->writeMessageBegin("listApplicationDeploymentIds", ::apache::thrift::protocol::T_CALL, cseqid);
ApplicationCatalogAPI_listApplicationDeploymentIds_pargs args;
+ args.applicationInterfaceId = &applicationInterfaceId;
args.write(oprot_);
oprot_->writeMessageEnd();
@@ -5633,18 +5677,19 @@ void ApplicationCatalogAPIClient::recv_listApplicationDeploymentIds(std::vector<
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "listApplicationDeploymentIds failed: unknown result");
}
-void ApplicationCatalogAPIClient::getApplicationDeployment( ::ApplicationDeployment& _return, const std::string& applicationDeploymentId)
+void ApplicationCatalogAPIClient::getApplicationDeployment( ::ApplicationDeployment& _return, const std::string& applicationInterfaceId, const std::string& applicationDeploymentId)
{
- send_getApplicationDeployment(applicationDeploymentId);
+ send_getApplicationDeployment(applicationInterfaceId, applicationDeploymentId);
recv_getApplicationDeployment(_return);
}
-void ApplicationCatalogAPIClient::send_getApplicationDeployment(const std::string& applicationDeploymentId)
+void ApplicationCatalogAPIClient::send_getApplicationDeployment(const std::string& applicationInterfaceId, const std::string& applicationDeploymentId)
{
int32_t cseqid = 0;
oprot_->writeMessageBegin("getApplicationDeployment", ::apache::thrift::protocol::T_CALL, cseqid);
ApplicationCatalogAPI_getApplicationDeployment_pargs args;
+ args.applicationInterfaceId = &applicationInterfaceId;
args.applicationDeploymentId = &applicationDeploymentId;
args.write(oprot_);
@@ -6860,7 +6905,7 @@ void ApplicationCatalogAPIProcessor::process_listApplicationDeploymentIds(int32_
ApplicationCatalogAPI_listApplicationDeploymentIds_result result;
try {
- iface_->listApplicationDeploymentIds(result.success);
+ iface_->listApplicationDeploymentIds(result.success, args.applicationInterfaceId);
result.__isset.success = true;
} catch ( ::airavata::api::error::InvalidRequestException &ire) {
result.ire = ire;
@@ -6923,7 +6968,7 @@ void ApplicationCatalogAPIProcessor::process_getApplicationDeployment(int32_t se
ApplicationCatalogAPI_getApplicationDeployment_result result;
try {
- iface_->getApplicationDeployment(result.success, args.applicationDeploymentId);
+ iface_->getApplicationDeployment(result.success, args.applicationInterfaceId, args.applicationDeploymentId);
result.__isset.success = true;
} catch ( ::airavata::api::error::InvalidRequestException &ire) {
result.ire = ire;
http://git-wip-us.apache.org/repos/asf/airavata/blob/23c11841/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.h
index ea72ac0..e56ef4a 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.h
@@ -33,8 +33,8 @@ class ApplicationCatalogAPIIf {
virtual void listApplicationInterfaceIds(std::vector<std::string> & _return) = 0;
virtual void getApplicationInterface( ::ApplicationInterface& _return, const std::string& applicationInterfaceId) = 0;
virtual void addApplicationDeployment(const std::string& applicationInterfaceId, const ::ApplicationDeployment& applicationDeployment) = 0;
- virtual void listApplicationDeploymentIds(std::vector<std::string> & _return) = 0;
- virtual void getApplicationDeployment( ::ApplicationDeployment& _return, const std::string& applicationDeploymentId) = 0;
+ virtual void listApplicationDeploymentIds(std::vector<std::string> & _return, const std::string& applicationInterfaceId) = 0;
+ virtual void getApplicationDeployment( ::ApplicationDeployment& _return, const std::string& applicationInterfaceId, const std::string& applicationDeploymentId) = 0;
};
class ApplicationCatalogAPIIfFactory {
@@ -119,10 +119,10 @@ class ApplicationCatalogAPINull : virtual public ApplicationCatalogAPIIf {
void addApplicationDeployment(const std::string& /* applicationInterfaceId */, const ::ApplicationDeployment& /* applicationDeployment */) {
return;
}
- void listApplicationDeploymentIds(std::vector<std::string> & /* _return */) {
+ void listApplicationDeploymentIds(std::vector<std::string> & /* _return */, const std::string& /* applicationInterfaceId */) {
return;
}
- void getApplicationDeployment( ::ApplicationDeployment& /* _return */, const std::string& /* applicationDeploymentId */) {
+ void getApplicationDeployment( ::ApplicationDeployment& /* _return */, const std::string& /* applicationInterfaceId */, const std::string& /* applicationDeploymentId */) {
return;
}
};
@@ -2423,14 +2423,21 @@ class ApplicationCatalogAPI_addApplicationDeployment_presult {
class ApplicationCatalogAPI_listApplicationDeploymentIds_args {
public:
- ApplicationCatalogAPI_listApplicationDeploymentIds_args() {
+ ApplicationCatalogAPI_listApplicationDeploymentIds_args() : applicationInterfaceId() {
}
virtual ~ApplicationCatalogAPI_listApplicationDeploymentIds_args() throw() {}
+ std::string applicationInterfaceId;
+
+ void __set_applicationInterfaceId(const std::string& val) {
+ applicationInterfaceId = val;
+ }
- bool operator == (const ApplicationCatalogAPI_listApplicationDeploymentIds_args & /* rhs */) const
+ bool operator == (const ApplicationCatalogAPI_listApplicationDeploymentIds_args & rhs) const
{
+ if (!(applicationInterfaceId == rhs.applicationInterfaceId))
+ return false;
return true;
}
bool operator != (const ApplicationCatalogAPI_listApplicationDeploymentIds_args &rhs) const {
@@ -2451,6 +2458,7 @@ class ApplicationCatalogAPI_listApplicationDeploymentIds_pargs {
virtual ~ApplicationCatalogAPI_listApplicationDeploymentIds_pargs() throw() {}
+ const std::string* applicationInterfaceId;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -2547,19 +2555,26 @@ class ApplicationCatalogAPI_listApplicationDeploymentIds_presult {
class ApplicationCatalogAPI_getApplicationDeployment_args {
public:
- ApplicationCatalogAPI_getApplicationDeployment_args() : applicationDeploymentId() {
+ ApplicationCatalogAPI_getApplicationDeployment_args() : applicationInterfaceId(), applicationDeploymentId() {
}
virtual ~ApplicationCatalogAPI_getApplicationDeployment_args() throw() {}
+ std::string applicationInterfaceId;
std::string applicationDeploymentId;
+ void __set_applicationInterfaceId(const std::string& val) {
+ applicationInterfaceId = val;
+ }
+
void __set_applicationDeploymentId(const std::string& val) {
applicationDeploymentId = val;
}
bool operator == (const ApplicationCatalogAPI_getApplicationDeployment_args & rhs) const
{
+ if (!(applicationInterfaceId == rhs.applicationInterfaceId))
+ return false;
if (!(applicationDeploymentId == rhs.applicationDeploymentId))
return false;
return true;
@@ -2582,6 +2597,7 @@ class ApplicationCatalogAPI_getApplicationDeployment_pargs {
virtual ~ApplicationCatalogAPI_getApplicationDeployment_pargs() throw() {}
+ const std::string* applicationInterfaceId;
const std::string* applicationDeploymentId;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -2749,11 +2765,11 @@ class ApplicationCatalogAPIClient : virtual public ApplicationCatalogAPIIf {
void addApplicationDeployment(const std::string& applicationInterfaceId, const ::ApplicationDeployment& applicationDeployment);
void send_addApplicationDeployment(const std::string& applicationInterfaceId, const ::ApplicationDeployment& applicationDeployment);
void recv_addApplicationDeployment();
- void listApplicationDeploymentIds(std::vector<std::string> & _return);
- void send_listApplicationDeploymentIds();
+ void listApplicationDeploymentIds(std::vector<std::string> & _return, const std::string& applicationInterfaceId);
+ void send_listApplicationDeploymentIds(const std::string& applicationInterfaceId);
void recv_listApplicationDeploymentIds(std::vector<std::string> & _return);
- void getApplicationDeployment( ::ApplicationDeployment& _return, const std::string& applicationDeploymentId);
- void send_getApplicationDeployment(const std::string& applicationDeploymentId);
+ void getApplicationDeployment( ::ApplicationDeployment& _return, const std::string& applicationInterfaceId, const std::string& applicationDeploymentId);
+ void send_getApplicationDeployment(const std::string& applicationInterfaceId, const std::string& applicationDeploymentId);
void recv_getApplicationDeployment( ::ApplicationDeployment& _return);
protected:
boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
@@ -3013,23 +3029,23 @@ class ApplicationCatalogAPIMultiface : virtual public ApplicationCatalogAPIIf {
ifaces_[i]->addApplicationDeployment(applicationInterfaceId, applicationDeployment);
}
- void listApplicationDeploymentIds(std::vector<std::string> & _return) {
+ void listApplicationDeploymentIds(std::vector<std::string> & _return, const std::string& applicationInterfaceId) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
- ifaces_[i]->listApplicationDeploymentIds(_return);
+ ifaces_[i]->listApplicationDeploymentIds(_return, applicationInterfaceId);
}
- ifaces_[i]->listApplicationDeploymentIds(_return);
+ ifaces_[i]->listApplicationDeploymentIds(_return, applicationInterfaceId);
return;
}
- void getApplicationDeployment( ::ApplicationDeployment& _return, const std::string& applicationDeploymentId) {
+ void getApplicationDeployment( ::ApplicationDeployment& _return, const std::string& applicationInterfaceId, const std::string& applicationDeploymentId) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
- ifaces_[i]->getApplicationDeployment(_return, applicationDeploymentId);
+ ifaces_[i]->getApplicationDeployment(_return, applicationInterfaceId, applicationDeploymentId);
}
- ifaces_[i]->getApplicationDeployment(_return, applicationDeploymentId);
+ ifaces_[i]->getApplicationDeployment(_return, applicationInterfaceId, applicationDeploymentId);
return;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/23c11841/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI_server.skeleton.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI_server.skeleton.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI_server.skeleton.cpp
index 2d11705..957e511 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI_server.skeleton.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI_server.skeleton.cpp
@@ -112,12 +112,12 @@ class ApplicationCatalogAPIHandler : virtual public ApplicationCatalogAPIIf {
printf("addApplicationDeployment\n");
}
- void listApplicationDeploymentIds(std::vector<std::string> & _return) {
+ void listApplicationDeploymentIds(std::vector<std::string> & _return, const std::string& applicationInterfaceId) {
// Your implementation goes here
printf("listApplicationDeploymentIds\n");
}
- void getApplicationDeployment( ::ApplicationDeployment& _return, const std::string& applicationDeploymentId) {
+ void getApplicationDeployment( ::ApplicationDeployment& _return, const std::string& applicationInterfaceId, const std::string& applicationDeploymentId) {
// Your implementation goes here
printf("getApplicationDeployment\n");
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/23c11841/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationCatalogDataModel_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationCatalogDataModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationCatalogDataModel_types.cpp
index a0b5933..6fa5f9a 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationCatalogDataModel_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationCatalogDataModel_types.cpp
@@ -82,7 +82,7 @@ uint32_t SCPDataMovement::read(::apache::thrift::protocol::TProtocol* iprot) {
using ::apache::thrift::protocol::TProtocolException;
- bool isset_scpDataMovementID = false;
+ bool isset_dataSubmissionDataID = false;
bool isset_securityProtocol = false;
while (true)
@@ -95,8 +95,8 @@ uint32_t SCPDataMovement::read(::apache::thrift::protocol::TProtocol* iprot) {
{
case 1:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->scpDataMovementID);
- isset_scpDataMovementID = true;
+ xfer += iprot->readString(this->dataSubmissionDataID);
+ isset_dataSubmissionDataID = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -128,7 +128,7 @@ uint32_t SCPDataMovement::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->readStructEnd();
- if (!isset_scpDataMovementID)
+ if (!isset_dataSubmissionDataID)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_securityProtocol)
throw TProtocolException(TProtocolException::INVALID_DATA);
@@ -139,8 +139,8 @@ uint32_t SCPDataMovement::write(::apache::thrift::protocol::TProtocol* oprot) co
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("SCPDataMovement");
- xfer += oprot->writeFieldBegin("scpDataMovementID", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString(this->scpDataMovementID);
+ xfer += oprot->writeFieldBegin("dataSubmissionDataID", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->dataSubmissionDataID);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("securityProtocol", ::apache::thrift::protocol::T_I32, 2);
@@ -159,7 +159,7 @@ uint32_t SCPDataMovement::write(::apache::thrift::protocol::TProtocol* oprot) co
void swap(SCPDataMovement &a, SCPDataMovement &b) {
using ::std::swap;
- swap(a.scpDataMovementID, b.scpDataMovementID);
+ swap(a.dataSubmissionDataID, b.dataSubmissionDataID);
swap(a.securityProtocol, b.securityProtocol);
swap(a.sshPort, b.sshPort);
swap(a.__isset, b.__isset);
@@ -179,7 +179,7 @@ uint32_t SSHJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot) {
using ::apache::thrift::protocol::TProtocolException;
- bool isset_sshJobSubmissionID = false;
+ bool isset_jobSubmissionDataID = false;
bool isset_resourceJobManager = false;
while (true)
@@ -192,8 +192,8 @@ uint32_t SSHJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot) {
{
case 1:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->sshJobSubmissionID);
- isset_sshJobSubmissionID = true;
+ xfer += iprot->readString(this->jobSubmissionDataID);
+ isset_jobSubmissionDataID = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -225,7 +225,7 @@ uint32_t SSHJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->readStructEnd();
- if (!isset_sshJobSubmissionID)
+ if (!isset_jobSubmissionDataID)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_resourceJobManager)
throw TProtocolException(TProtocolException::INVALID_DATA);
@@ -236,8 +236,8 @@ uint32_t SSHJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot) c
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("SSHJobSubmission");
- xfer += oprot->writeFieldBegin("sshJobSubmissionID", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString(this->sshJobSubmissionID);
+ xfer += oprot->writeFieldBegin("jobSubmissionDataID", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->jobSubmissionDataID);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("resourceJobManager", ::apache::thrift::protocol::T_I32, 2);
@@ -256,14 +256,14 @@ uint32_t SSHJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot) c
void swap(SSHJobSubmission &a, SSHJobSubmission &b) {
using ::std::swap;
- swap(a.sshJobSubmissionID, b.sshJobSubmissionID);
+ swap(a.jobSubmissionDataID, b.jobSubmissionDataID);
swap(a.resourceJobManager, b.resourceJobManager);
swap(a.sshPort, b.sshPort);
swap(a.__isset, b.__isset);
}
-const char* GlobusJobSubmission::ascii_fingerprint = "6B87230A5315302FA994567088F60D3A";
-const uint8_t GlobusJobSubmission::binary_fingerprint[16] = {0x6B,0x87,0x23,0x0A,0x53,0x15,0x30,0x2F,0xA9,0x94,0x56,0x70,0x88,0xF6,0x0D,0x3A};
+const char* GlobusJobSubmission::ascii_fingerprint = "DF4253F78D7B543C16FA461660D38A03";
+const uint8_t GlobusJobSubmission::binary_fingerprint[16] = {0xDF,0x42,0x53,0xF7,0x8D,0x7B,0x54,0x3C,0x16,0xFA,0x46,0x16,0x60,0xD3,0x8A,0x03};
uint32_t GlobusJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -276,7 +276,7 @@ uint32_t GlobusJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
using ::apache::thrift::protocol::TProtocolException;
- bool isset_globusJobSubmissionID = false;
+ bool isset_jobSubmissionDataID = false;
bool isset_securityProtocol = false;
bool isset_resourceJobManager = false;
@@ -290,8 +290,8 @@ uint32_t GlobusJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
{
case 1:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->globusJobSubmissionID);
- isset_globusJobSubmissionID = true;
+ xfer += iprot->readString(this->jobSubmissionDataID);
+ isset_jobSubmissionDataID = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -317,8 +317,20 @@ uint32_t GlobusJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
}
break;
case 4:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->globusGateKeeperEndPoint);
+ if (ftype == ::apache::thrift::protocol::T_LIST) {
+ {
+ this->globusGateKeeperEndPoint.clear();
+ uint32_t _size4;
+ ::apache::thrift::protocol::TType _etype7;
+ xfer += iprot->readListBegin(_etype7, _size4);
+ this->globusGateKeeperEndPoint.resize(_size4);
+ uint32_t _i8;
+ for (_i8 = 0; _i8 < _size4; ++_i8)
+ {
+ xfer += iprot->readString(this->globusGateKeeperEndPoint[_i8]);
+ }
+ xfer += iprot->readListEnd();
+ }
this->__isset.globusGateKeeperEndPoint = true;
} else {
xfer += iprot->skip(ftype);
@@ -333,7 +345,7 @@ uint32_t GlobusJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
xfer += iprot->readStructEnd();
- if (!isset_globusJobSubmissionID)
+ if (!isset_jobSubmissionDataID)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_securityProtocol)
throw TProtocolException(TProtocolException::INVALID_DATA);
@@ -346,8 +358,8 @@ uint32_t GlobusJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("GlobusJobSubmission");
- xfer += oprot->writeFieldBegin("globusJobSubmissionID", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString(this->globusJobSubmissionID);
+ xfer += oprot->writeFieldBegin("jobSubmissionDataID", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->jobSubmissionDataID);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("securityProtocol", ::apache::thrift::protocol::T_I32, 2);
@@ -359,8 +371,16 @@ uint32_t GlobusJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot
xfer += oprot->writeFieldEnd();
if (this->__isset.globusGateKeeperEndPoint) {
- xfer += oprot->writeFieldBegin("globusGateKeeperEndPoint", ::apache::thrift::protocol::T_STRING, 4);
- xfer += oprot->writeString(this->globusGateKeeperEndPoint);
+ xfer += oprot->writeFieldBegin("globusGateKeeperEndPoint", ::apache::thrift::protocol::T_LIST, 4);
+ {
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->globusGateKeeperEndPoint.size()));
+ std::vector<std::string> ::const_iterator _iter9;
+ for (_iter9 = this->globusGateKeeperEndPoint.begin(); _iter9 != this->globusGateKeeperEndPoint.end(); ++_iter9)
+ {
+ xfer += oprot->writeString((*_iter9));
+ }
+ xfer += oprot->writeListEnd();
+ }
xfer += oprot->writeFieldEnd();
}
xfer += oprot->writeFieldStop();
@@ -370,7 +390,7 @@ uint32_t GlobusJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot
void swap(GlobusJobSubmission &a, GlobusJobSubmission &b) {
using ::std::swap;
- swap(a.globusJobSubmissionID, b.globusJobSubmissionID);
+ swap(a.jobSubmissionDataID, b.jobSubmissionDataID);
swap(a.securityProtocol, b.securityProtocol);
swap(a.resourceJobManager, b.resourceJobManager);
swap(a.globusGateKeeperEndPoint, b.globusGateKeeperEndPoint);
@@ -391,7 +411,7 @@ uint32_t GSISSHJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
using ::apache::thrift::protocol::TProtocolException;
- bool isset_gssishJobSubmissionID = false;
+ bool isset_jobSubmissionDataID = false;
bool isset_resourceJobManager = false;
while (true)
@@ -404,17 +424,17 @@ uint32_t GSISSHJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
{
case 1:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->gssishJobSubmissionID);
- isset_gssishJobSubmissionID = true;
+ xfer += iprot->readString(this->jobSubmissionDataID);
+ isset_jobSubmissionDataID = true;
} else {
xfer += iprot->skip(ftype);
}
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast4;
- xfer += iprot->readI32(ecast4);
- this->resourceJobManager = (ResourceJobManager::type)ecast4;
+ int32_t ecast10;
+ xfer += iprot->readI32(ecast10);
+ this->resourceJobManager = (ResourceJobManager::type)ecast10;
isset_resourceJobManager = true;
} else {
xfer += iprot->skip(ftype);
@@ -432,15 +452,15 @@ uint32_t GSISSHJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
if (ftype == ::apache::thrift::protocol::T_SET) {
{
this->exports.clear();
- uint32_t _size5;
- ::apache::thrift::protocol::TType _etype8;
- xfer += iprot->readSetBegin(_etype8, _size5);
- uint32_t _i9;
- for (_i9 = 0; _i9 < _size5; ++_i9)
+ uint32_t _size11;
+ ::apache::thrift::protocol::TType _etype14;
+ xfer += iprot->readSetBegin(_etype14, _size11);
+ uint32_t _i15;
+ for (_i15 = 0; _i15 < _size11; ++_i15)
{
- std::string _elem10;
- xfer += iprot->readString(_elem10);
- this->exports.insert(_elem10);
+ std::string _elem16;
+ xfer += iprot->readString(_elem16);
+ this->exports.insert(_elem16);
}
xfer += iprot->readSetEnd();
}
@@ -453,14 +473,14 @@ uint32_t GSISSHJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->preJobCommands.clear();
- uint32_t _size11;
- ::apache::thrift::protocol::TType _etype14;
- xfer += iprot->readListBegin(_etype14, _size11);
- this->preJobCommands.resize(_size11);
- uint32_t _i15;
- for (_i15 = 0; _i15 < _size11; ++_i15)
+ uint32_t _size17;
+ ::apache::thrift::protocol::TType _etype20;
+ xfer += iprot->readListBegin(_etype20, _size17);
+ this->preJobCommands.resize(_size17);
+ uint32_t _i21;
+ for (_i21 = 0; _i21 < _size17; ++_i21)
{
- xfer += iprot->readString(this->preJobCommands[_i15]);
+ xfer += iprot->readString(this->preJobCommands[_i21]);
}
xfer += iprot->readListEnd();
}
@@ -473,14 +493,14 @@ uint32_t GSISSHJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->postJobCommands.clear();
- uint32_t _size16;
- ::apache::thrift::protocol::TType _etype19;
- xfer += iprot->readListBegin(_etype19, _size16);
- this->postJobCommands.resize(_size16);
- uint32_t _i20;
- for (_i20 = 0; _i20 < _size16; ++_i20)
+ uint32_t _size22;
+ ::apache::thrift::protocol::TType _etype25;
+ xfer += iprot->readListBegin(_etype25, _size22);
+ this->postJobCommands.resize(_size22);
+ uint32_t _i26;
+ for (_i26 = 0; _i26 < _size22; ++_i26)
{
- xfer += iprot->readString(this->postJobCommands[_i20]);
+ xfer += iprot->readString(this->postJobCommands[_i26]);
}
xfer += iprot->readListEnd();
}
@@ -514,7 +534,7 @@ uint32_t GSISSHJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
xfer += iprot->readStructEnd();
- if (!isset_gssishJobSubmissionID)
+ if (!isset_jobSubmissionDataID)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_resourceJobManager)
throw TProtocolException(TProtocolException::INVALID_DATA);
@@ -525,8 +545,8 @@ uint32_t GSISSHJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("GSISSHJobSubmission");
- xfer += oprot->writeFieldBegin("gssishJobSubmissionID", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString(this->gssishJobSubmissionID);
+ xfer += oprot->writeFieldBegin("jobSubmissionDataID", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->jobSubmissionDataID);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("resourceJobManager", ::apache::thrift::protocol::T_I32, 2);
@@ -542,10 +562,10 @@ uint32_t GSISSHJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot
xfer += oprot->writeFieldBegin("exports", ::apache::thrift::protocol::T_SET, 4);
{
xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->exports.size()));
- std::set<std::string> ::const_iterator _iter21;
- for (_iter21 = this->exports.begin(); _iter21 != this->exports.end(); ++_iter21)
+ std::set<std::string> ::const_iterator _iter27;
+ for (_iter27 = this->exports.begin(); _iter27 != this->exports.end(); ++_iter27)
{
- xfer += oprot->writeString((*_iter21));
+ xfer += oprot->writeString((*_iter27));
}
xfer += oprot->writeSetEnd();
}
@@ -555,10 +575,10 @@ uint32_t GSISSHJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot
xfer += oprot->writeFieldBegin("preJobCommands", ::apache::thrift::protocol::T_LIST, 5);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->preJobCommands.size()));
- std::vector<std::string> ::const_iterator _iter22;
- for (_iter22 = this->preJobCommands.begin(); _iter22 != this->preJobCommands.end(); ++_iter22)
+ std::vector<std::string> ::const_iterator _iter28;
+ for (_iter28 = this->preJobCommands.begin(); _iter28 != this->preJobCommands.end(); ++_iter28)
{
- xfer += oprot->writeString((*_iter22));
+ xfer += oprot->writeString((*_iter28));
}
xfer += oprot->writeListEnd();
}
@@ -568,10 +588,10 @@ uint32_t GSISSHJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot
xfer += oprot->writeFieldBegin("postJobCommands", ::apache::thrift::protocol::T_LIST, 6);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->postJobCommands.size()));
- std::vector<std::string> ::const_iterator _iter23;
- for (_iter23 = this->postJobCommands.begin(); _iter23 != this->postJobCommands.end(); ++_iter23)
+ std::vector<std::string> ::const_iterator _iter29;
+ for (_iter29 = this->postJobCommands.begin(); _iter29 != this->postJobCommands.end(); ++_iter29)
{
- xfer += oprot->writeString((*_iter23));
+ xfer += oprot->writeString((*_iter29));
}
xfer += oprot->writeListEnd();
}
@@ -594,7 +614,7 @@ uint32_t GSISSHJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot
void swap(GSISSHJobSubmission &a, GSISSHJobSubmission &b) {
using ::std::swap;
- swap(a.gssishJobSubmissionID, b.gssishJobSubmissionID);
+ swap(a.jobSubmissionDataID, b.jobSubmissionDataID);
swap(a.resourceJobManager, b.resourceJobManager);
swap(a.sshPort, b.sshPort);
swap(a.exports, b.exports);
@@ -661,15 +681,15 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
if (ftype == ::apache::thrift::protocol::T_SET) {
{
this->hostAliases.clear();
- uint32_t _size24;
- ::apache::thrift::protocol::TType _etype27;
- xfer += iprot->readSetBegin(_etype27, _size24);
- uint32_t _i28;
- for (_i28 = 0; _i28 < _size24; ++_i28)
+ uint32_t _size30;
+ ::apache::thrift::protocol::TType _etype33;
+ xfer += iprot->readSetBegin(_etype33, _size30);
+ uint32_t _i34;
+ for (_i34 = 0; _i34 < _size30; ++_i34)
{
- std::string _elem29;
- xfer += iprot->readString(_elem29);
- this->hostAliases.insert(_elem29);
+ std::string _elem35;
+ xfer += iprot->readString(_elem35);
+ this->hostAliases.insert(_elem35);
}
xfer += iprot->readSetEnd();
}
@@ -682,15 +702,15 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
if (ftype == ::apache::thrift::protocol::T_SET) {
{
this->ipAddresses.clear();
- uint32_t _size30;
- ::apache::thrift::protocol::TType _etype33;
- xfer += iprot->readSetBegin(_etype33, _size30);
- uint32_t _i34;
- for (_i34 = 0; _i34 < _size30; ++_i34)
+ uint32_t _size36;
+ ::apache::thrift::protocol::TType _etype39;
+ xfer += iprot->readSetBegin(_etype39, _size36);
+ uint32_t _i40;
+ for (_i40 = 0; _i40 < _size36; ++_i40)
{
- std::string _elem35;
- xfer += iprot->readString(_elem35);
- this->ipAddresses.insert(_elem35);
+ std::string _elem41;
+ xfer += iprot->readString(_elem41);
+ this->ipAddresses.insert(_elem41);
}
xfer += iprot->readSetEnd();
}
@@ -727,19 +747,19 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->jobSubmissionProtocols.clear();
- uint32_t _size36;
- ::apache::thrift::protocol::TType _ktype37;
- ::apache::thrift::protocol::TType _vtype38;
- xfer += iprot->readMapBegin(_ktype37, _vtype38, _size36);
- uint32_t _i40;
- for (_i40 = 0; _i40 < _size36; ++_i40)
+ uint32_t _size42;
+ ::apache::thrift::protocol::TType _ktype43;
+ ::apache::thrift::protocol::TType _vtype44;
+ xfer += iprot->readMapBegin(_ktype43, _vtype44, _size42);
+ uint32_t _i46;
+ for (_i46 = 0; _i46 < _size42; ++_i46)
{
- std::string _key41;
- xfer += iprot->readString(_key41);
- JobSubmissionProtocol::type& _val42 = this->jobSubmissionProtocols[_key41];
- int32_t ecast43;
- xfer += iprot->readI32(ecast43);
- _val42 = (JobSubmissionProtocol::type)ecast43;
+ std::string _key47;
+ xfer += iprot->readString(_key47);
+ JobSubmissionProtocol::type& _val48 = this->jobSubmissionProtocols[_key47];
+ int32_t ecast49;
+ xfer += iprot->readI32(ecast49);
+ _val48 = (JobSubmissionProtocol::type)ecast49;
}
xfer += iprot->readMapEnd();
}
@@ -752,19 +772,19 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->dataMovementProtocols.clear();
- uint32_t _size44;
- ::apache::thrift::protocol::TType _ktype45;
- ::apache::thrift::protocol::TType _vtype46;
- xfer += iprot->readMapBegin(_ktype45, _vtype46, _size44);
- uint32_t _i48;
- for (_i48 = 0; _i48 < _size44; ++_i48)
+ uint32_t _size50;
+ ::apache::thrift::protocol::TType _ktype51;
+ ::apache::thrift::protocol::TType _vtype52;
+ xfer += iprot->readMapBegin(_ktype51, _vtype52, _size50);
+ uint32_t _i54;
+ for (_i54 = 0; _i54 < _size50; ++_i54)
{
- std::string _key49;
- xfer += iprot->readString(_key49);
- DataMovementProtocol::type& _val50 = this->dataMovementProtocols[_key49];
- int32_t ecast51;
- xfer += iprot->readI32(ecast51);
- _val50 = (DataMovementProtocol::type)ecast51;
+ std::string _key55;
+ xfer += iprot->readString(_key55);
+ DataMovementProtocol::type& _val56 = this->dataMovementProtocols[_key55];
+ int32_t ecast57;
+ xfer += iprot->readI32(ecast57);
+ _val56 = (DataMovementProtocol::type)ecast57;
}
xfer += iprot->readMapEnd();
}
@@ -815,10 +835,10 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeFieldBegin("hostAliases", ::apache::thrift::protocol::T_SET, 4);
{
xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->hostAliases.size()));
- std::set<std::string> ::const_iterator _iter52;
- for (_iter52 = this->hostAliases.begin(); _iter52 != this->hostAliases.end(); ++_iter52)
+ std::set<std::string> ::const_iterator _iter58;
+ for (_iter58 = this->hostAliases.begin(); _iter58 != this->hostAliases.end(); ++_iter58)
{
- xfer += oprot->writeString((*_iter52));
+ xfer += oprot->writeString((*_iter58));
}
xfer += oprot->writeSetEnd();
}
@@ -828,10 +848,10 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeFieldBegin("ipAddresses", ::apache::thrift::protocol::T_SET, 5);
{
xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->ipAddresses.size()));
- std::set<std::string> ::const_iterator _iter53;
- for (_iter53 = this->ipAddresses.begin(); _iter53 != this->ipAddresses.end(); ++_iter53)
+ std::set<std::string> ::const_iterator _iter59;
+ for (_iter59 = this->ipAddresses.begin(); _iter59 != this->ipAddresses.end(); ++_iter59)
{
- xfer += oprot->writeString((*_iter53));
+ xfer += oprot->writeString((*_iter59));
}
xfer += oprot->writeSetEnd();
}
@@ -855,11 +875,11 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeFieldBegin("jobSubmissionProtocols", ::apache::thrift::protocol::T_MAP, 9);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I32, static_cast<uint32_t>(this->jobSubmissionProtocols.size()));
- std::map<std::string, JobSubmissionProtocol::type> ::const_iterator _iter54;
- for (_iter54 = this->jobSubmissionProtocols.begin(); _iter54 != this->jobSubmissionProtocols.end(); ++_iter54)
+ std::map<std::string, JobSubmissionProtocol::type> ::const_iterator _iter60;
+ for (_iter60 = this->jobSubmissionProtocols.begin(); _iter60 != this->jobSubmissionProtocols.end(); ++_iter60)
{
- xfer += oprot->writeString(_iter54->first);
- xfer += oprot->writeI32((int32_t)_iter54->second);
+ xfer += oprot->writeString(_iter60->first);
+ xfer += oprot->writeI32((int32_t)_iter60->second);
}
xfer += oprot->writeMapEnd();
}
@@ -868,11 +888,11 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeFieldBegin("dataMovementProtocols", ::apache::thrift::protocol::T_MAP, 10);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I32, static_cast<uint32_t>(this->dataMovementProtocols.size()));
- std::map<std::string, DataMovementProtocol::type> ::const_iterator _iter55;
- for (_iter55 = this->dataMovementProtocols.begin(); _iter55 != this->dataMovementProtocols.end(); ++_iter55)
+ std::map<std::string, DataMovementProtocol::type> ::const_iterator _iter61;
+ for (_iter61 = this->dataMovementProtocols.begin(); _iter61 != this->dataMovementProtocols.end(); ++_iter61)
{
- xfer += oprot->writeString(_iter55->first);
- xfer += oprot->writeI32((int32_t)_iter55->second);
+ xfer += oprot->writeString(_iter61->first);
+ xfer += oprot->writeI32((int32_t)_iter61->second);
}
xfer += oprot->writeMapEnd();
}
@@ -1117,14 +1137,14 @@ uint32_t ApplicationInterface::read(::apache::thrift::protocol::TProtocol* iprot
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->applicationDeployments.clear();
- uint32_t _size56;
- ::apache::thrift::protocol::TType _etype59;
- xfer += iprot->readListBegin(_etype59, _size56);
- this->applicationDeployments.resize(_size56);
- uint32_t _i60;
- for (_i60 = 0; _i60 < _size56; ++_i60)
+ uint32_t _size62;
+ ::apache::thrift::protocol::TType _etype65;
+ xfer += iprot->readListBegin(_etype65, _size62);
+ this->applicationDeployments.resize(_size62);
+ uint32_t _i66;
+ for (_i66 = 0; _i66 < _size62; ++_i66)
{
- xfer += this->applicationDeployments[_i60].read(iprot);
+ xfer += this->applicationDeployments[_i66].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -1164,10 +1184,10 @@ uint32_t ApplicationInterface::write(::apache::thrift::protocol::TProtocol* opro
xfer += oprot->writeFieldBegin("applicationDeployments", ::apache::thrift::protocol::T_LIST, 3);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->applicationDeployments.size()));
- std::vector<ApplicationDeployment> ::const_iterator _iter61;
- for (_iter61 = this->applicationDeployments.begin(); _iter61 != this->applicationDeployments.end(); ++_iter61)
+ std::vector<ApplicationDeployment> ::const_iterator _iter67;
+ for (_iter67 = this->applicationDeployments.begin(); _iter67 != this->applicationDeployments.end(); ++_iter67)
{
- xfer += (*_iter61).write(oprot);
+ xfer += (*_iter67).write(oprot);
}
xfer += oprot->writeListEnd();
}