You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/07/08 17:48:46 UTC
[1/3] fixing issues in document creator
Repository: airavata
Updated Branches:
refs/heads/master 3630458b2 -> 9c5d4bf24
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
index bc2af43..04ca862 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
@@ -80,16 +80,15 @@ import org.slf4j.LoggerFactory;
@SuppressWarnings("all") public class ComputeResourceDescription implements org.apache.thrift.TBase<ComputeResourceDescription, ComputeResourceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ComputeResourceDescription> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputeResourceDescription");
- private static final org.apache.thrift.protocol.TField IS_EMPTY_FIELD_DESC = new org.apache.thrift.protocol.TField("isEmpty", org.apache.thrift.protocol.TType.BOOL, (short)1);
- private static final org.apache.thrift.protocol.TField COMPUTE_RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("computeResourceId", org.apache.thrift.protocol.TType.STRING, (short)2);
- private static final org.apache.thrift.protocol.TField HOST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("hostName", org.apache.thrift.protocol.TType.STRING, (short)3);
- private static final org.apache.thrift.protocol.TField HOST_ALIASES_FIELD_DESC = new org.apache.thrift.protocol.TField("hostAliases", org.apache.thrift.protocol.TType.SET, (short)4);
- private static final org.apache.thrift.protocol.TField IP_ADDRESSES_FIELD_DESC = new org.apache.thrift.protocol.TField("ipAddresses", org.apache.thrift.protocol.TType.SET, (short)5);
- private static final org.apache.thrift.protocol.TField RESOURCE_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceDescription", org.apache.thrift.protocol.TType.STRING, (short)6);
- private static final org.apache.thrift.protocol.TField BATCH_QUEUES_FIELD_DESC = new org.apache.thrift.protocol.TField("batchQueues", org.apache.thrift.protocol.TType.LIST, (short)7);
- private static final org.apache.thrift.protocol.TField FILE_SYSTEMS_FIELD_DESC = new org.apache.thrift.protocol.TField("fileSystems", org.apache.thrift.protocol.TType.MAP, (short)8);
- private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_INTERFACES_FIELD_DESC = new org.apache.thrift.protocol.TField("jobSubmissionInterfaces", org.apache.thrift.protocol.TType.LIST, (short)9);
- private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_INTERFACES_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovementInterfaces", org.apache.thrift.protocol.TType.LIST, (short)10);
+ private static final org.apache.thrift.protocol.TField COMPUTE_RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("computeResourceId", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.thrift.protocol.TField HOST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("hostName", org.apache.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.thrift.protocol.TField HOST_ALIASES_FIELD_DESC = new org.apache.thrift.protocol.TField("hostAliases", org.apache.thrift.protocol.TType.SET, (short)3);
+ private static final org.apache.thrift.protocol.TField IP_ADDRESSES_FIELD_DESC = new org.apache.thrift.protocol.TField("ipAddresses", org.apache.thrift.protocol.TType.SET, (short)4);
+ private static final org.apache.thrift.protocol.TField RESOURCE_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceDescription", org.apache.thrift.protocol.TType.STRING, (short)5);
+ private static final org.apache.thrift.protocol.TField BATCH_QUEUES_FIELD_DESC = new org.apache.thrift.protocol.TField("batchQueues", org.apache.thrift.protocol.TType.LIST, (short)6);
+ private static final org.apache.thrift.protocol.TField FILE_SYSTEMS_FIELD_DESC = new org.apache.thrift.protocol.TField("fileSystems", org.apache.thrift.protocol.TType.MAP, (short)7);
+ private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_INTERFACES_FIELD_DESC = new org.apache.thrift.protocol.TField("jobSubmissionInterfaces", org.apache.thrift.protocol.TType.LIST, (short)8);
+ private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_INTERFACES_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovementInterfaces", org.apache.thrift.protocol.TType.LIST, (short)9);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -97,7 +96,6 @@ import org.slf4j.LoggerFactory;
schemes.put(TupleScheme.class, new ComputeResourceDescriptionTupleSchemeFactory());
}
- private boolean isEmpty; // required
private String computeResourceId; // required
private String hostName; // required
private Set<String> hostAliases; // optional
@@ -110,16 +108,15 @@ 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 {
- IS_EMPTY((short)1, "isEmpty"),
- COMPUTE_RESOURCE_ID((short)2, "computeResourceId"),
- HOST_NAME((short)3, "hostName"),
- HOST_ALIASES((short)4, "hostAliases"),
- IP_ADDRESSES((short)5, "ipAddresses"),
- RESOURCE_DESCRIPTION((short)6, "resourceDescription"),
- BATCH_QUEUES((short)7, "batchQueues"),
- FILE_SYSTEMS((short)8, "fileSystems"),
- JOB_SUBMISSION_INTERFACES((short)9, "jobSubmissionInterfaces"),
- DATA_MOVEMENT_INTERFACES((short)10, "dataMovementInterfaces");
+ COMPUTE_RESOURCE_ID((short)1, "computeResourceId"),
+ HOST_NAME((short)2, "hostName"),
+ HOST_ALIASES((short)3, "hostAliases"),
+ IP_ADDRESSES((short)4, "ipAddresses"),
+ RESOURCE_DESCRIPTION((short)5, "resourceDescription"),
+ BATCH_QUEUES((short)6, "batchQueues"),
+ FILE_SYSTEMS((short)7, "fileSystems"),
+ JOB_SUBMISSION_INTERFACES((short)8, "jobSubmissionInterfaces"),
+ DATA_MOVEMENT_INTERFACES((short)9, "dataMovementInterfaces");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -134,25 +131,23 @@ import org.slf4j.LoggerFactory;
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
- case 1: // IS_EMPTY
- return IS_EMPTY;
- case 2: // COMPUTE_RESOURCE_ID
+ case 1: // COMPUTE_RESOURCE_ID
return COMPUTE_RESOURCE_ID;
- case 3: // HOST_NAME
+ case 2: // HOST_NAME
return HOST_NAME;
- case 4: // HOST_ALIASES
+ case 3: // HOST_ALIASES
return HOST_ALIASES;
- case 5: // IP_ADDRESSES
+ case 4: // IP_ADDRESSES
return IP_ADDRESSES;
- case 6: // RESOURCE_DESCRIPTION
+ case 5: // RESOURCE_DESCRIPTION
return RESOURCE_DESCRIPTION;
- case 7: // BATCH_QUEUES
+ case 6: // BATCH_QUEUES
return BATCH_QUEUES;
- case 8: // FILE_SYSTEMS
+ case 7: // FILE_SYSTEMS
return FILE_SYSTEMS;
- case 9: // JOB_SUBMISSION_INTERFACES
+ case 8: // JOB_SUBMISSION_INTERFACES
return JOB_SUBMISSION_INTERFACES;
- case 10: // DATA_MOVEMENT_INTERFACES
+ case 9: // DATA_MOVEMENT_INTERFACES
return DATA_MOVEMENT_INTERFACES;
default:
return null;
@@ -194,14 +189,10 @@ import org.slf4j.LoggerFactory;
}
// isset id assignments
- private static final int __ISEMPTY_ISSET_ID = 0;
- private byte __isset_bitfield = 0;
private _Fields optionals[] = {_Fields.HOST_ALIASES,_Fields.IP_ADDRESSES,_Fields.RESOURCE_DESCRIPTION,_Fields.BATCH_QUEUES,_Fields.FILE_SYSTEMS,_Fields.JOB_SUBMISSION_INTERFACES,_Fields.DATA_MOVEMENT_INTERFACES};
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.IS_EMPTY, new org.apache.thrift.meta_data.FieldMetaData("isEmpty", org.apache.thrift.TFieldRequirementType.REQUIRED,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
tmpMap.put(_Fields.COMPUTE_RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("computeResourceId", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.HOST_NAME, new org.apache.thrift.meta_data.FieldMetaData("hostName", org.apache.thrift.TFieldRequirementType.REQUIRED,
@@ -232,20 +223,15 @@ import org.slf4j.LoggerFactory;
}
public ComputeResourceDescription() {
- this.isEmpty = false;
-
this.computeResourceId = "DO_NOT_SET_AT_CLIENTS";
}
public ComputeResourceDescription(
- boolean isEmpty,
String computeResourceId,
String hostName)
{
this();
- this.isEmpty = isEmpty;
- setIsEmptyIsSet(true);
this.computeResourceId = computeResourceId;
this.hostName = hostName;
}
@@ -254,8 +240,6 @@ import org.slf4j.LoggerFactory;
* Performs a deep copy on <i>other</i>.
*/
public ComputeResourceDescription(ComputeResourceDescription other) {
- __isset_bitfield = other.__isset_bitfield;
- this.isEmpty = other.isEmpty;
if (other.isSetComputeResourceId()) {
this.computeResourceId = other.computeResourceId;
}
@@ -317,8 +301,6 @@ import org.slf4j.LoggerFactory;
@Override
public void clear() {
- this.isEmpty = false;
-
this.computeResourceId = "DO_NOT_SET_AT_CLIENTS";
this.hostName = null;
@@ -331,28 +313,6 @@ import org.slf4j.LoggerFactory;
this.dataMovementInterfaces = null;
}
- public boolean isIsEmpty() {
- return this.isEmpty;
- }
-
- public void setIsEmpty(boolean isEmpty) {
- this.isEmpty = isEmpty;
- setIsEmptyIsSet(true);
- }
-
- public void unsetIsEmpty() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISEMPTY_ISSET_ID);
- }
-
- /** Returns true if field isEmpty is set (has been assigned a value) and false otherwise */
- public boolean isSetIsEmpty() {
- return EncodingUtils.testBit(__isset_bitfield, __ISEMPTY_ISSET_ID);
- }
-
- public void setIsEmptyIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISEMPTY_ISSET_ID, value);
- }
-
public String getComputeResourceId() {
return this.computeResourceId;
}
@@ -648,14 +608,6 @@ import org.slf4j.LoggerFactory;
public void setFieldValue(_Fields field, Object value) {
switch (field) {
- case IS_EMPTY:
- if (value == null) {
- unsetIsEmpty();
- } else {
- setIsEmpty((Boolean)value);
- }
- break;
-
case COMPUTE_RESOURCE_ID:
if (value == null) {
unsetComputeResourceId();
@@ -733,9 +685,6 @@ import org.slf4j.LoggerFactory;
public Object getFieldValue(_Fields field) {
switch (field) {
- case IS_EMPTY:
- return Boolean.valueOf(isIsEmpty());
-
case COMPUTE_RESOURCE_ID:
return getComputeResourceId();
@@ -774,8 +723,6 @@ import org.slf4j.LoggerFactory;
}
switch (field) {
- case IS_EMPTY:
- return isSetIsEmpty();
case COMPUTE_RESOURCE_ID:
return isSetComputeResourceId();
case HOST_NAME:
@@ -811,15 +758,6 @@ import org.slf4j.LoggerFactory;
if (that == null)
return false;
- boolean this_present_isEmpty = true;
- boolean that_present_isEmpty = true;
- if (this_present_isEmpty || that_present_isEmpty) {
- if (!(this_present_isEmpty && that_present_isEmpty))
- return false;
- if (this.isEmpty != that.isEmpty)
- return false;
- }
-
boolean this_present_computeResourceId = true && this.isSetComputeResourceId();
boolean that_present_computeResourceId = true && that.isSetComputeResourceId();
if (this_present_computeResourceId || that_present_computeResourceId) {
@@ -917,16 +855,6 @@ import org.slf4j.LoggerFactory;
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetIsEmpty()).compareTo(other.isSetIsEmpty());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetIsEmpty()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isEmpty, other.isEmpty);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
lastComparison = Boolean.valueOf(isSetComputeResourceId()).compareTo(other.isSetComputeResourceId());
if (lastComparison != 0) {
return lastComparison;
@@ -1037,10 +965,6 @@ import org.slf4j.LoggerFactory;
StringBuilder sb = new StringBuilder("ComputeResourceDescription(");
boolean first = true;
- sb.append("isEmpty:");
- sb.append(this.isEmpty);
- first = false;
- if (!first) sb.append(", ");
sb.append("computeResourceId:");
if (this.computeResourceId == null) {
sb.append("null");
@@ -1132,10 +1056,6 @@ import org.slf4j.LoggerFactory;
public void validate() throws org.apache.thrift.TException {
// check for required fields
- if (!isSetIsEmpty()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'isEmpty' is unset! Struct:" + toString());
- }
-
if (!isSetComputeResourceId()) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'computeResourceId' is unset! Struct:" + toString());
}
@@ -1157,8 +1077,6 @@ import org.slf4j.LoggerFactory;
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bitfield = 0;
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
@@ -1183,15 +1101,7 @@ import org.slf4j.LoggerFactory;
break;
}
switch (schemeField.id) {
- case 1: // IS_EMPTY
- if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
- struct.isEmpty = iprot.readBool();
- struct.setIsEmptyIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 2: // COMPUTE_RESOURCE_ID
+ case 1: // COMPUTE_RESOURCE_ID
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.computeResourceId = iprot.readString();
struct.setComputeResourceIdIsSet(true);
@@ -1199,7 +1109,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 3: // HOST_NAME
+ case 2: // HOST_NAME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.hostName = iprot.readString();
struct.setHostNameIsSet(true);
@@ -1207,7 +1117,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 4: // HOST_ALIASES
+ case 3: // HOST_ALIASES
if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
{
org.apache.thrift.protocol.TSet _set26 = iprot.readSetBegin();
@@ -1225,7 +1135,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 5: // IP_ADDRESSES
+ case 4: // IP_ADDRESSES
if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
{
org.apache.thrift.protocol.TSet _set29 = iprot.readSetBegin();
@@ -1243,7 +1153,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 6: // RESOURCE_DESCRIPTION
+ case 5: // RESOURCE_DESCRIPTION
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.resourceDescription = iprot.readString();
struct.setResourceDescriptionIsSet(true);
@@ -1251,7 +1161,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 7: // BATCH_QUEUES
+ case 6: // BATCH_QUEUES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list32 = iprot.readListBegin();
@@ -1270,7 +1180,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 8: // FILE_SYSTEMS
+ case 7: // FILE_SYSTEMS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
org.apache.thrift.protocol.TMap _map35 = iprot.readMapBegin();
@@ -1290,7 +1200,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 9: // JOB_SUBMISSION_INTERFACES
+ case 8: // JOB_SUBMISSION_INTERFACES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list39 = iprot.readListBegin();
@@ -1309,7 +1219,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 10: // DATA_MOVEMENT_INTERFACES
+ case 9: // DATA_MOVEMENT_INTERFACES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list42 = iprot.readListBegin();
@@ -1341,9 +1251,6 @@ import org.slf4j.LoggerFactory;
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
- oprot.writeFieldBegin(IS_EMPTY_FIELD_DESC);
- oprot.writeBool(struct.isEmpty);
- oprot.writeFieldEnd();
if (struct.computeResourceId != null) {
oprot.writeFieldBegin(COMPUTE_RESOURCE_ID_FIELD_DESC);
oprot.writeString(struct.computeResourceId);
@@ -1463,7 +1370,6 @@ import org.slf4j.LoggerFactory;
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, ComputeResourceDescription struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
- oprot.writeBool(struct.isEmpty);
oprot.writeString(struct.computeResourceId);
oprot.writeString(struct.hostName);
BitSet optionals = new BitSet();
@@ -1552,8 +1458,6 @@ import org.slf4j.LoggerFactory;
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, ComputeResourceDescription struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- struct.isEmpty = iprot.readBool();
- struct.setIsEmptyIsSet(true);
struct.computeResourceId = iprot.readString();
struct.setComputeResourceIdIsSet(true);
struct.hostName = iprot.readString();
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/airavataAPI.thrift b/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
index f4b5478..971ebd7 100644
--- a/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
+++ b/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
@@ -1188,7 +1188,7 @@ service Airavata {
* Returns a success/failure of the update.
*
*/
- bool registerGatewayResourceProfile(
+ string registerGatewayResourceProfile(
1: required gatewayResourceProfileModel.GatewayResourceProfile gatewayResourceProfile)
throws (1: airavataErrors.InvalidRequestException ire,
2: airavataErrors.AiravataClientException ace,
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/thrift-interface-descriptions/applicationDeploymentModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/applicationDeploymentModel.thrift b/airavata-api/thrift-interface-descriptions/applicationDeploymentModel.thrift
index fa7ed01..799f672 100644
--- a/airavata-api/thrift-interface-descriptions/applicationDeploymentModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/applicationDeploymentModel.thrift
@@ -115,15 +115,15 @@ enum ApplicationParallelismType {
*
*/
struct ApplicationDeploymentDescription {
- 1: required bool isEmpty = 0,
- 2: required string appDeploymentId = DEFAULT_ID,
- 3: required string appModuleId,
- 4: required string computeHostId,
- 5: required string executablePath,
- 6: required ApplicationParallelismType parallelism = ApplicationParallelismType.SERIAL ,
- 7: optional string appDeploymentDescription,
- 8: optional list<string> moduleLoadCmds,
- 9: optional list<SetEnvPaths> libPrependPaths,
- 10: optional list<SetEnvPaths> libAppendPaths,
- 11: optional list<SetEnvPaths> setEnvironment,
+// 1: required bool isEmpty = 0,
+ 1: required string appDeploymentId = DEFAULT_ID,
+ 2: required string appModuleId,
+ 3: required string computeHostId,
+ 4: required string executablePath,
+ 5: required ApplicationParallelismType parallelism = ApplicationParallelismType.SERIAL ,
+ 6: optional string appDeploymentDescription,
+ 7: optional list<string> moduleLoadCmds,
+ 8: optional list<SetEnvPaths> libPrependPaths,
+ 9: optional list<SetEnvPaths> libAppendPaths,
+ 10: optional list<SetEnvPaths> setEnvironment,
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift b/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift
index d5ead5b..df29cc1 100644
--- a/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift
@@ -67,14 +67,14 @@ enum DataType{
*
*/
struct InputDataObjectType {
- 1: required bool isEmpty = 0,
- 2: required string name,
- 3: optional string value,
- 4: optional DataType type,
- 5: optional string applicationArgument,
- 6: optional bool standardInput = 0,
- 7: optional string userFriendlyDescription,
- 8: optional string metaData
+// 1: required bool isEmpty = 0,
+ 1: required string name,
+ 2: optional string value,
+ 3: optional DataType type,
+ 4: optional string applicationArgument,
+ 5: optional bool standardInput = 0,
+ 6: optional string userFriendlyDescription,
+ 7: optional string metaData
}
/**
@@ -124,11 +124,11 @@ struct OutputDataObjectType {
*
*/
struct ApplicationInterfaceDescription {
- 1: required bool isEmpty = 0,
- 2: required string applicationInterfaceId = DEFAULT_ID,
- 3: required string applicationName,
- 4: optional string applicationDesription,
- 5: optional list<string> applicationModules,
- 6: optional list<InputDataObjectType> applicationInputs,
- 7: optional list<OutputDataObjectType> applicationOutputs
+// 1: required bool isEmpty = 0,
+ 1: required string applicationInterfaceId = DEFAULT_ID,
+ 2: required string applicationName,
+ 3: optional string applicationDesription,
+ 4: optional list<string> applicationModules,
+ 5: optional list<InputDataObjectType> applicationInputs,
+ 6: optional list<OutputDataObjectType> applicationOutputs
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift b/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift
index 9e43cdb..10b813c 100644
--- a/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift
@@ -352,14 +352,14 @@ struct DataMovementInterface {
*
*/
struct ComputeResourceDescription {
- 1: required bool isEmpty = 0,
- 2: required string computeResourceId = DEFAULT_ID,
- 3: required string hostName,
- 4: optional set<string> hostAliases,
- 5: optional set<string> ipAddresses,
- 6: optional string resourceDescription,
- 7: optional list<BatchQueue> batchQueues,
- 8: optional map<FileSystems, string> fileSystems,
- 9: optional list<JobSubmissionInterface> jobSubmissionInterfaces,
- 10: optional list<DataMovementInterface> dataMovementInterfaces
+// 1: required bool isEmpty = 0,
+ 1: required string computeResourceId = DEFAULT_ID,
+ 2: required string hostName,
+ 3: optional set<string> hostAliases,
+ 4: optional set<string> ipAddresses,
+ 5: optional string resourceDescription,
+ 6: optional list<BatchQueue> batchQueues,
+ 7: optional map<FileSystems, string> fileSystems,
+ 8: optional list<JobSubmissionInterface> jobSubmissionInterfaces,
+ 9: optional list<DataMovementInterface> dataMovementInterfaces
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java
index 4f7f37d..eceac93 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java
@@ -65,7 +65,7 @@ public class DocumentCreatorNew {
//Define compute resource host
ComputeResourceDescription host = DocumentCreatorUtils.createComputeResourceDescription(
"localhost", new HashSet<String>(Arrays.asList(new String[]{"127.0.0.1"})), new HashSet<String>(Arrays.asList(new String[]{"127.0.0.1"})));
- host.setIsEmpty(false);
+// host.setIsEmpty(true);
host.setComputeResourceId(client.registerComputeResource(host));
LOCALSubmission localSubmission = new LOCALSubmission();
@@ -82,7 +82,7 @@ public class DocumentCreatorNew {
//Define application interfaces
ApplicationInterfaceDescription application = new ApplicationInterfaceDescription();
- application.setIsEmpty(false);
+// application.setIsEmpty(false);
application.setApplicationName("SimpleEcho0");
application.addToApplicationModules(module.getAppModuleId());
application.addToApplicationInputs(DocumentCreatorUtils.createAppInput("echo_input","echo_input","Echo Input Data",null,DataType.STRING));
@@ -98,29 +98,30 @@ public class DocumentCreatorNew {
host.getComputeResourceId(), "/tmp", null,
false, null,
null, null);
-// gatewayResourceProfile = new GatewayResourceProfile();
+ gatewayResourceProfile = new GatewayResourceProfile();
// gatewayResourceProfile.setGatewayID("default");
-// gatewayResourceProfile.setGatewayName("default");
-// gatewayResourceProfile.addToComputeResourcePreferences(computeResourcePreference);
-// client.registerGatewayResourceProfile(gatewayResourceProfile);
- client.addGatewayComputeResourcePreference(getGatewayResourceProfile().getGatewayID(), host.getComputeResourceId(), computeResourcePreference);
+ gatewayResourceProfile.setGatewayName("default");
+ gatewayResourceProfile.addToComputeResourcePreferences(computeResourcePreference);
+ String gatewayId = client.registerGatewayResourceProfile(gatewayResourceProfile);
+ gatewayResourceProfile.setGatewayID(gatewayId);
+ client.addGatewayComputeResourcePreference(gatewayResourceProfile.getGatewayID(), host.getComputeResourceId(), computeResourcePreference);
}
- private GatewayResourceProfile getGatewayResourceProfile() throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException{
- if (gatewayResourceProfile==null){
- try {
- gatewayResourceProfile = client.getGatewayResourceProfile("default");
- } catch (Exception e) {
-
- }
- if (gatewayResourceProfile==null) {
- gatewayResourceProfile = new GatewayResourceProfile();
- gatewayResourceProfile.setGatewayID("default");
- gatewayResourceProfile.setGatewayName("default");
- client.registerGatewayResourceProfile(gatewayResourceProfile);
- }
- }
- return gatewayResourceProfile;
+ private GatewayResourceProfile getGatewayResourceProfile() throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
+// if (gatewayResourceProfile==null){
+// try {
+// gatewayResourceProfile = client.getGatewayResourceProfile(ga);
+// } catch (Exception e) {
+//
+// }
+ if (gatewayResourceProfile == null) {
+ gatewayResourceProfile = new GatewayResourceProfile();
+// gatewayResourceProfile.setGatewayID("default");
+ gatewayResourceProfile.setGatewayName("default");
+ gatewayResourceProfile.setGatewayID(client.registerGatewayResourceProfile(gatewayResourceProfile));
+ }
+// }
+ return gatewayResourceProfile;
}
public void createSSHHostDocs() throws AppCatalogException, InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
@@ -132,6 +133,7 @@ public class DocumentCreatorNew {
SSHJobSubmission jobSubmission = new SSHJobSubmission();
jobSubmission.setSshPort(22);
+ jobSubmission.setSecurityProtocol(SecurityProtocol.SSH_KEYS);
ResourceJobManager resourceJobManager = DocumentCreatorUtils.createResourceJobManager(ResourceJobManagerType.FORK, null, null, null);
jobSubmission.setResourceJobManager(resourceJobManager);
client.addSSHJobSubmissionDetails(host.getComputeResourceId(), 1, jobSubmission);
@@ -148,7 +150,7 @@ public class DocumentCreatorNew {
client.registerApplicationDeployment(deployment);
ApplicationInterfaceDescription application = new ApplicationInterfaceDescription();
- application.setIsEmpty(false);
+// application.setIsEmpty(false);
application.setApplicationName("SSHEcho1");
application.addToApplicationModules(module.getAppModuleId());
application.addToApplicationInputs(DocumentCreatorUtils.createAppInput("echo_input","echo_input", null, null, DataType.STRING));
@@ -273,7 +275,7 @@ public class DocumentCreatorNew {
module1.setAppModuleId(client.registerApplicationModule(module1));
ApplicationInterfaceDescription application = new ApplicationInterfaceDescription();
- application.setIsEmpty(false);
+// application.setIsEmpty(false);
application.setApplicationName("SimpleEcho2");
application.addToApplicationModules(module1.getAppModuleId());
application.addToApplicationInputs(DocumentCreatorUtils.createAppInput("echo_input", "echo_input", "echo_input", null, DataType.STRING));
@@ -290,7 +292,7 @@ public class DocumentCreatorNew {
ApplicationModule module2 = DocumentCreatorUtils.createApplicationModule("wrf", "1.0.0", null);
module2.setAppModuleId(client.registerApplicationModule(module2));
ApplicationInterfaceDescription application2 = new ApplicationInterfaceDescription();
- application2.setIsEmpty(false);
+// application2.setIsEmpty(false);
application2.setApplicationName("WRF");
application2.addToApplicationModules(module2.getAppModuleId());
application2.addToApplicationInputs(DocumentCreatorUtils.createAppInput("WRF_Namelist", "WRF_Namelist", null, null, DataType.URI));
@@ -327,7 +329,7 @@ public class DocumentCreatorNew {
module.setAppModuleId(client.registerApplicationModule(module));
ApplicationInterfaceDescription application = new ApplicationInterfaceDescription();
- application.setIsEmpty(false);
+// application.setIsEmpty(false);
application.setApplicationName("SimpleEcho3");
application.addToApplicationModules(module.getAppModuleId());
application.addToApplicationInputs(DocumentCreatorUtils.createAppInput("echo_input", "echo_input", null, null, DataType.STRING));
@@ -363,7 +365,7 @@ public class DocumentCreatorNew {
module.setAppModuleId(client.registerApplicationModule(module));
ApplicationInterfaceDescription application = new ApplicationInterfaceDescription();
- application.setIsEmpty(false);
+// application.setIsEmpty(false);
application.setApplicationName("SimpleEcho4");
application.addToApplicationModules(module.getAppModuleId());
application.addToApplicationInputs(DocumentCreatorUtils.createAppInput("echo_input", "echo_input", null, null, DataType.STRING));
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorUtils.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorUtils.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorUtils.java
index 1ee3160..6f7d3ab 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorUtils.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorUtils.java
@@ -61,7 +61,7 @@ public class DocumentCreatorUtils {
String computeResourceId, String appModuleId,
String executablePath, ApplicationParallelismType parallelism, String appDeploymentDescription) {
ApplicationDeploymentDescription deployment = new ApplicationDeploymentDescription();
- deployment.setIsEmpty(false);
+// deployment.setIsEmpty(false);
deployment.setAppDeploymentDescription(appDeploymentDescription);
deployment.setAppModuleId(appModuleId);
deployment.setComputeHostId(computeResourceId);
@@ -124,7 +124,7 @@ public class DocumentCreatorUtils {
public static InputDataObjectType createAppInput (String inputName, String argumentName, String description, String value, org.apache.airavata.model.appcatalog.appinterface.DataType type ){
InputDataObjectType input = new InputDataObjectType();
- input.setIsEmpty(false);
+// input.setIsEmpty(false);
if (inputName!=null) {
input.setName(inputName);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/GwyResourceProfileImpl.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/GwyResourceProfileImpl.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/GwyResourceProfileImpl.java
index c4eb791..4ce597a 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/GwyResourceProfileImpl.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/GwyResourceProfileImpl.java
@@ -31,6 +31,7 @@ import org.apache.aiaravata.application.catalog.data.resources.ComputeResourceRe
import org.apache.aiaravata.application.catalog.data.resources.GatewayProfileResource;
import org.apache.aiaravata.application.catalog.data.resources.Resource;
import org.apache.aiaravata.application.catalog.data.util.AppCatalogThriftConversion;
+import org.apache.aiaravata.application.catalog.data.util.AppCatalogUtils;
import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile;
import org.slf4j.Logger;
@@ -44,7 +45,7 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
try {
GatewayProfileResource profileResource = new GatewayProfileResource();
profileResource.setGatewayName(gatewayProfile.getGatewayName());
- profileResource.setGatewayID(gatewayProfile.getGatewayName());
+ profileResource.setGatewayID(AppCatalogUtils.getID(gatewayProfile.getGatewayName()));
profileResource.setGatewayDesc(gatewayProfile.getGatewayDescription());
profileResource.save();
gatewayProfile.setGatewayID(profileResource.getGatewayID());
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties
index 23a7af9..de42f19 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -327,14 +327,14 @@ gateway_id=php_reference_gateway
apiserver.server.host=localhost
apiserver.server.port=8930
-apiserver.server.min.threads=30
+apiserver.server.min.threads=50
#app.catalog.server.host=localhost
#app.catalog.server.port=8931
orchestrator.server.host=localhost
orchestrator.server.port=8940
gfac.server.host=localhost
gfac.server.port=8950
-orchestrator.server.min.threads=30
+orchestrator.server.min.threads=50
##----------------------------- Zookeeper Server Configurations ----------------------###
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationInput.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationInput.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationInput.java
index 07c80b5..2e4d2b2 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationInput.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationInput.java
@@ -43,7 +43,7 @@ public class ApplicationInput implements Serializable {
private String metadata;
@Lob
@Column(name = "VALUE")
- private String value;
+ private char[] value;
@ManyToOne(cascade= CascadeType.MERGE)
@JoinColumn(name = "TASK_ID")
@@ -81,11 +81,11 @@ public class ApplicationInput implements Serializable {
this.metadata = metadata;
}
- public String getValue() {
+ public char[] getValue() {
return value;
}
- public void setValue(String value) {
+ public void setValue(char[] value) {
this.value = value;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationOutput.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationOutput.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationOutput.java
index cb983e3..e6f9efa 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationOutput.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationOutput.java
@@ -43,7 +43,7 @@ public class ApplicationOutput implements Serializable {
private String metadata;
@Lob
@Column(name = "VALUE")
- private String value;
+ private char[] value;
@ManyToOne(cascade= CascadeType.MERGE)
@JoinColumn(name = "TASK_ID")
@@ -65,11 +65,11 @@ public class ApplicationOutput implements Serializable {
this.metadata = metadata;
}
- public String getValue() {
+ public char[] getValue() {
return value;
}
- public void setValue(String value) {
+ public void setValue(char[] value) {
this.value = value;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationInputResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationInputResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationInputResource.java
index 4f9aea1..aa2271e 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationInputResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationInputResource.java
@@ -123,7 +123,10 @@ public class ApplicationInputResource extends AbstractResource {
applicationInput.setTaskId(taskDetail.getTaskId());
applicationInput.setInputKey(inputKey);
applicationInput.setInputKeyType(inputType);
- applicationInput.setValue(value);
+ if (value != null){
+ applicationInput.setValue(value.toCharArray());
+ }
+
applicationInput.setMetadata(metadata);
if (existingInput != null) {
@@ -131,7 +134,9 @@ public class ApplicationInputResource extends AbstractResource {
existingInput.setTaskId(taskDetail.getTaskId());
existingInput.setInputKey(inputKey);
existingInput.setInputKeyType(inputType);
- existingInput.setValue(value);
+ if (value != null){
+ existingInput.setValue(value.toCharArray());
+ }
existingInput.setMetadata(metadata);
applicationInput = em.merge(existingInput);
} else {
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationOutputResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationOutputResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationOutputResource.java
index 3d53c40..544d6ab 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationOutputResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationOutputResource.java
@@ -123,7 +123,9 @@ public class ApplicationOutputResource extends AbstractResource {
applicationOutput.setTaskId(taskDetail.getTaskId());
applicationOutput.setOutputKey(outputKey);
applicationOutput.setOutputKeyType(outputType);
- applicationOutput.setValue(value);
+ if (value != null){
+ applicationOutput.setValue(value.toCharArray());
+ }
applicationOutput.setMetadata(metadata);
if (existingOutput != null) {
@@ -131,7 +133,9 @@ public class ApplicationOutputResource extends AbstractResource {
existingOutput.setTaskId(taskDetail.getTaskId());
existingOutput.setOutputKey(outputKey);
existingOutput.setOutputKeyType(outputType);
- existingOutput.setValue(value);
+ if (value != null){
+ existingOutput.setValue(value.toCharArray());
+ }
existingOutput.setMetadata(metadata);
applicationOutput = em.merge(existingOutput);
} else {
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
index 352cfa4..4be0e64 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
@@ -678,7 +678,7 @@ public class Utils {
inputResource.setTaskDetailResource(taskDetailResource);
inputResource.setInputKey(o.getInputKey());
inputResource.setInputType(o.getInputKeyType());
- inputResource.setValue(o.getValue());
+ inputResource.setValue(new String(o.getValue()));
inputResource.setMetadata(o.getMetadata());
}
return inputResource;
@@ -691,7 +691,7 @@ public class Utils {
outputResource.setTaskDetailResource(taskDetailResource);
outputResource.setOutputType(o.getOutputKeyType());
outputResource.setOutputKey(o.getOutputKey());
- outputResource.setValue(o.getValue());
+ outputResource.setValue(new String(o.getValue()));
outputResource.setMetadata(o.getMetadata());
}
return outputResource;
[2/3] fixing issues in document creator
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php
index ce8cf4f..47029f1 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php
@@ -33,7 +33,6 @@ final class DataType {
class InputDataObjectType {
static $_TSPEC;
- public $isEmpty = false;
public $name = null;
public $value = null;
public $type = null;
@@ -46,43 +45,36 @@ class InputDataObjectType {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
1 => array(
- 'var' => 'isEmpty',
- 'type' => TType::BOOL,
- ),
- 2 => array(
'var' => 'name',
'type' => TType::STRING,
),
- 3 => array(
+ 2 => array(
'var' => 'value',
'type' => TType::STRING,
),
- 4 => array(
+ 3 => array(
'var' => 'type',
'type' => TType::I32,
),
- 5 => array(
+ 4 => array(
'var' => 'applicationArgument',
'type' => TType::STRING,
),
- 6 => array(
+ 5 => array(
'var' => 'standardInput',
'type' => TType::BOOL,
),
- 7 => array(
+ 6 => array(
'var' => 'userFriendlyDescription',
'type' => TType::STRING,
),
- 8 => array(
+ 7 => array(
'var' => 'metaData',
'type' => TType::STRING,
),
);
}
if (is_array($vals)) {
- if (isset($vals['isEmpty'])) {
- $this->isEmpty = $vals['isEmpty'];
- }
if (isset($vals['name'])) {
$this->name = $vals['name'];
}
@@ -127,55 +119,48 @@ class InputDataObjectType {
switch ($fid)
{
case 1:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->isEmpty);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->name);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 3:
+ case 2:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->value);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 4:
+ case 3:
if ($ftype == TType::I32) {
$xfer += $input->readI32($this->type);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 5:
+ case 4:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->applicationArgument);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 6:
+ case 5:
if ($ftype == TType::BOOL) {
$xfer += $input->readBool($this->standardInput);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 7:
+ case 6:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->userFriendlyDescription);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 8:
+ case 7:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->metaData);
} else {
@@ -195,43 +180,38 @@ class InputDataObjectType {
public function write($output) {
$xfer = 0;
$xfer += $output->writeStructBegin('InputDataObjectType');
- if ($this->isEmpty !== null) {
- $xfer += $output->writeFieldBegin('isEmpty', TType::BOOL, 1);
- $xfer += $output->writeBool($this->isEmpty);
- $xfer += $output->writeFieldEnd();
- }
if ($this->name !== null) {
- $xfer += $output->writeFieldBegin('name', TType::STRING, 2);
+ $xfer += $output->writeFieldBegin('name', TType::STRING, 1);
$xfer += $output->writeString($this->name);
$xfer += $output->writeFieldEnd();
}
if ($this->value !== null) {
- $xfer += $output->writeFieldBegin('value', TType::STRING, 3);
+ $xfer += $output->writeFieldBegin('value', TType::STRING, 2);
$xfer += $output->writeString($this->value);
$xfer += $output->writeFieldEnd();
}
if ($this->type !== null) {
- $xfer += $output->writeFieldBegin('type', TType::I32, 4);
+ $xfer += $output->writeFieldBegin('type', TType::I32, 3);
$xfer += $output->writeI32($this->type);
$xfer += $output->writeFieldEnd();
}
if ($this->applicationArgument !== null) {
- $xfer += $output->writeFieldBegin('applicationArgument', TType::STRING, 5);
+ $xfer += $output->writeFieldBegin('applicationArgument', TType::STRING, 4);
$xfer += $output->writeString($this->applicationArgument);
$xfer += $output->writeFieldEnd();
}
if ($this->standardInput !== null) {
- $xfer += $output->writeFieldBegin('standardInput', TType::BOOL, 6);
+ $xfer += $output->writeFieldBegin('standardInput', TType::BOOL, 5);
$xfer += $output->writeBool($this->standardInput);
$xfer += $output->writeFieldEnd();
}
if ($this->userFriendlyDescription !== null) {
- $xfer += $output->writeFieldBegin('userFriendlyDescription', TType::STRING, 7);
+ $xfer += $output->writeFieldBegin('userFriendlyDescription', TType::STRING, 6);
$xfer += $output->writeString($this->userFriendlyDescription);
$xfer += $output->writeFieldEnd();
}
if ($this->metaData !== null) {
- $xfer += $output->writeFieldBegin('metaData', TType::STRING, 8);
+ $xfer += $output->writeFieldBegin('metaData', TType::STRING, 7);
$xfer += $output->writeString($this->metaData);
$xfer += $output->writeFieldEnd();
}
@@ -377,7 +357,6 @@ class OutputDataObjectType {
class ApplicationInterfaceDescription {
static $_TSPEC;
- public $isEmpty = false;
public $applicationInterfaceId = "DO_NOT_SET_AT_CLIENTS";
public $applicationName = null;
public $applicationDesription = null;
@@ -389,22 +368,18 @@ class ApplicationInterfaceDescription {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
1 => array(
- 'var' => 'isEmpty',
- 'type' => TType::BOOL,
- ),
- 2 => array(
'var' => 'applicationInterfaceId',
'type' => TType::STRING,
),
- 3 => array(
+ 2 => array(
'var' => 'applicationName',
'type' => TType::STRING,
),
- 4 => array(
+ 3 => array(
'var' => 'applicationDesription',
'type' => TType::STRING,
),
- 5 => array(
+ 4 => array(
'var' => 'applicationModules',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -412,7 +387,7 @@ class ApplicationInterfaceDescription {
'type' => TType::STRING,
),
),
- 6 => array(
+ 5 => array(
'var' => 'applicationInputs',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -421,7 +396,7 @@ class ApplicationInterfaceDescription {
'class' => '\Airavata\Model\AppCatalog\AppInterface\InputDataObjectType',
),
),
- 7 => array(
+ 6 => array(
'var' => 'applicationOutputs',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -433,9 +408,6 @@ class ApplicationInterfaceDescription {
);
}
if (is_array($vals)) {
- if (isset($vals['isEmpty'])) {
- $this->isEmpty = $vals['isEmpty'];
- }
if (isset($vals['applicationInterfaceId'])) {
$this->applicationInterfaceId = $vals['applicationInterfaceId'];
}
@@ -477,34 +449,27 @@ class ApplicationInterfaceDescription {
switch ($fid)
{
case 1:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->isEmpty);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->applicationInterfaceId);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 3:
+ case 2:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->applicationName);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 4:
+ case 3:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->applicationDesription);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 5:
+ case 4:
if ($ftype == TType::LST) {
$this->applicationModules = array();
$_size0 = 0;
@@ -521,7 +486,7 @@ class ApplicationInterfaceDescription {
$xfer += $input->skip($ftype);
}
break;
- case 6:
+ case 5:
if ($ftype == TType::LST) {
$this->applicationInputs = array();
$_size6 = 0;
@@ -539,7 +504,7 @@ class ApplicationInterfaceDescription {
$xfer += $input->skip($ftype);
}
break;
- case 7:
+ case 6:
if ($ftype == TType::LST) {
$this->applicationOutputs = array();
$_size12 = 0;
@@ -570,23 +535,18 @@ class ApplicationInterfaceDescription {
public function write($output) {
$xfer = 0;
$xfer += $output->writeStructBegin('ApplicationInterfaceDescription');
- if ($this->isEmpty !== null) {
- $xfer += $output->writeFieldBegin('isEmpty', TType::BOOL, 1);
- $xfer += $output->writeBool($this->isEmpty);
- $xfer += $output->writeFieldEnd();
- }
if ($this->applicationInterfaceId !== null) {
- $xfer += $output->writeFieldBegin('applicationInterfaceId', TType::STRING, 2);
+ $xfer += $output->writeFieldBegin('applicationInterfaceId', TType::STRING, 1);
$xfer += $output->writeString($this->applicationInterfaceId);
$xfer += $output->writeFieldEnd();
}
if ($this->applicationName !== null) {
- $xfer += $output->writeFieldBegin('applicationName', TType::STRING, 3);
+ $xfer += $output->writeFieldBegin('applicationName', TType::STRING, 2);
$xfer += $output->writeString($this->applicationName);
$xfer += $output->writeFieldEnd();
}
if ($this->applicationDesription !== null) {
- $xfer += $output->writeFieldBegin('applicationDesription', TType::STRING, 4);
+ $xfer += $output->writeFieldBegin('applicationDesription', TType::STRING, 3);
$xfer += $output->writeString($this->applicationDesription);
$xfer += $output->writeFieldEnd();
}
@@ -594,7 +554,7 @@ class ApplicationInterfaceDescription {
if (!is_array($this->applicationModules)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('applicationModules', TType::LST, 5);
+ $xfer += $output->writeFieldBegin('applicationModules', TType::LST, 4);
{
$output->writeListBegin(TType::STRING, count($this->applicationModules));
{
@@ -611,7 +571,7 @@ class ApplicationInterfaceDescription {
if (!is_array($this->applicationInputs)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('applicationInputs', TType::LST, 6);
+ $xfer += $output->writeFieldBegin('applicationInputs', TType::LST, 5);
{
$output->writeListBegin(TType::STRUCT, count($this->applicationInputs));
{
@@ -628,7 +588,7 @@ class ApplicationInterfaceDescription {
if (!is_array($this->applicationOutputs)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('applicationOutputs', TType::LST, 7);
+ $xfer += $output->writeFieldBegin('applicationOutputs', TType::LST, 6);
{
$output->writeListBegin(TType::STRUCT, count($this->applicationOutputs));
{
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
index 338688c..c88aeaf 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
@@ -1426,7 +1426,6 @@ class DataMovementInterface {
class ComputeResourceDescription {
static $_TSPEC;
- public $isEmpty = false;
public $computeResourceId = "DO_NOT_SET_AT_CLIENTS";
public $hostName = null;
public $hostAliases = null;
@@ -1441,18 +1440,14 @@ class ComputeResourceDescription {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
1 => array(
- 'var' => 'isEmpty',
- 'type' => TType::BOOL,
- ),
- 2 => array(
'var' => 'computeResourceId',
'type' => TType::STRING,
),
- 3 => array(
+ 2 => array(
'var' => 'hostName',
'type' => TType::STRING,
),
- 4 => array(
+ 3 => array(
'var' => 'hostAliases',
'type' => TType::SET,
'etype' => TType::STRING,
@@ -1460,7 +1455,7 @@ class ComputeResourceDescription {
'type' => TType::STRING,
),
),
- 5 => array(
+ 4 => array(
'var' => 'ipAddresses',
'type' => TType::SET,
'etype' => TType::STRING,
@@ -1468,11 +1463,11 @@ class ComputeResourceDescription {
'type' => TType::STRING,
),
),
- 6 => array(
+ 5 => array(
'var' => 'resourceDescription',
'type' => TType::STRING,
),
- 7 => array(
+ 6 => array(
'var' => 'batchQueues',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -1481,7 +1476,7 @@ class ComputeResourceDescription {
'class' => '\Airavata\Model\AppCatalog\ComputeResource\BatchQueue',
),
),
- 8 => array(
+ 7 => array(
'var' => 'fileSystems',
'type' => TType::MAP,
'ktype' => TType::I32,
@@ -1493,7 +1488,7 @@ class ComputeResourceDescription {
'type' => TType::STRING,
),
),
- 9 => array(
+ 8 => array(
'var' => 'jobSubmissionInterfaces',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -1502,7 +1497,7 @@ class ComputeResourceDescription {
'class' => '\Airavata\Model\AppCatalog\ComputeResource\JobSubmissionInterface',
),
),
- 10 => array(
+ 9 => array(
'var' => 'dataMovementInterfaces',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -1514,9 +1509,6 @@ class ComputeResourceDescription {
);
}
if (is_array($vals)) {
- if (isset($vals['isEmpty'])) {
- $this->isEmpty = $vals['isEmpty'];
- }
if (isset($vals['computeResourceId'])) {
$this->computeResourceId = $vals['computeResourceId'];
}
@@ -1567,27 +1559,20 @@ class ComputeResourceDescription {
switch ($fid)
{
case 1:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->isEmpty);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->computeResourceId);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 3:
+ case 2:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->hostName);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 4:
+ case 3:
if ($ftype == TType::SET) {
$this->hostAliases = array();
$_size23 = 0;
@@ -1608,7 +1593,7 @@ class ComputeResourceDescription {
$xfer += $input->skip($ftype);
}
break;
- case 5:
+ case 4:
if ($ftype == TType::SET) {
$this->ipAddresses = array();
$_size29 = 0;
@@ -1629,14 +1614,14 @@ class ComputeResourceDescription {
$xfer += $input->skip($ftype);
}
break;
- case 6:
+ case 5:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->resourceDescription);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 7:
+ case 6:
if ($ftype == TType::LST) {
$this->batchQueues = array();
$_size35 = 0;
@@ -1654,7 +1639,7 @@ class ComputeResourceDescription {
$xfer += $input->skip($ftype);
}
break;
- case 8:
+ case 7:
if ($ftype == TType::MAP) {
$this->fileSystems = array();
$_size41 = 0;
@@ -1674,7 +1659,7 @@ class ComputeResourceDescription {
$xfer += $input->skip($ftype);
}
break;
- case 9:
+ case 8:
if ($ftype == TType::LST) {
$this->jobSubmissionInterfaces = array();
$_size48 = 0;
@@ -1692,7 +1677,7 @@ class ComputeResourceDescription {
$xfer += $input->skip($ftype);
}
break;
- case 10:
+ case 9:
if ($ftype == TType::LST) {
$this->dataMovementInterfaces = array();
$_size54 = 0;
@@ -1723,18 +1708,13 @@ class ComputeResourceDescription {
public function write($output) {
$xfer = 0;
$xfer += $output->writeStructBegin('ComputeResourceDescription');
- if ($this->isEmpty !== null) {
- $xfer += $output->writeFieldBegin('isEmpty', TType::BOOL, 1);
- $xfer += $output->writeBool($this->isEmpty);
- $xfer += $output->writeFieldEnd();
- }
if ($this->computeResourceId !== null) {
- $xfer += $output->writeFieldBegin('computeResourceId', TType::STRING, 2);
+ $xfer += $output->writeFieldBegin('computeResourceId', TType::STRING, 1);
$xfer += $output->writeString($this->computeResourceId);
$xfer += $output->writeFieldEnd();
}
if ($this->hostName !== null) {
- $xfer += $output->writeFieldBegin('hostName', TType::STRING, 3);
+ $xfer += $output->writeFieldBegin('hostName', TType::STRING, 2);
$xfer += $output->writeString($this->hostName);
$xfer += $output->writeFieldEnd();
}
@@ -1742,7 +1722,7 @@ class ComputeResourceDescription {
if (!is_array($this->hostAliases)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('hostAliases', TType::SET, 4);
+ $xfer += $output->writeFieldBegin('hostAliases', TType::SET, 3);
{
$output->writeSetBegin(TType::STRING, count($this->hostAliases));
{
@@ -1763,7 +1743,7 @@ class ComputeResourceDescription {
if (!is_array($this->ipAddresses)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('ipAddresses', TType::SET, 5);
+ $xfer += $output->writeFieldBegin('ipAddresses', TType::SET, 4);
{
$output->writeSetBegin(TType::STRING, count($this->ipAddresses));
{
@@ -1781,7 +1761,7 @@ class ComputeResourceDescription {
$xfer += $output->writeFieldEnd();
}
if ($this->resourceDescription !== null) {
- $xfer += $output->writeFieldBegin('resourceDescription', TType::STRING, 6);
+ $xfer += $output->writeFieldBegin('resourceDescription', TType::STRING, 5);
$xfer += $output->writeString($this->resourceDescription);
$xfer += $output->writeFieldEnd();
}
@@ -1789,7 +1769,7 @@ class ComputeResourceDescription {
if (!is_array($this->batchQueues)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('batchQueues', TType::LST, 7);
+ $xfer += $output->writeFieldBegin('batchQueues', TType::LST, 6);
{
$output->writeListBegin(TType::STRUCT, count($this->batchQueues));
{
@@ -1806,7 +1786,7 @@ class ComputeResourceDescription {
if (!is_array($this->fileSystems)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('fileSystems', TType::MAP, 8);
+ $xfer += $output->writeFieldBegin('fileSystems', TType::MAP, 7);
{
$output->writeMapBegin(TType::I32, TType::STRING, count($this->fileSystems));
{
@@ -1824,7 +1804,7 @@ class ComputeResourceDescription {
if (!is_array($this->jobSubmissionInterfaces)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('jobSubmissionInterfaces', TType::LST, 9);
+ $xfer += $output->writeFieldBegin('jobSubmissionInterfaces', TType::LST, 8);
{
$output->writeListBegin(TType::STRUCT, count($this->jobSubmissionInterfaces));
{
@@ -1841,7 +1821,7 @@ class ComputeResourceDescription {
if (!is_array($this->dataMovementInterfaces)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('dataMovementInterfaces', TType::LST, 10);
+ $xfer += $output->writeFieldBegin('dataMovementInterfaces', TType::LST, 9);
{
$output->writeListBegin(TType::STRUCT, count($this->dataMovementInterfaces));
{
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
index b6882ef..6bfc794 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
@@ -77,17 +77,16 @@ import org.slf4j.LoggerFactory;
@SuppressWarnings("all") public class ApplicationDeploymentDescription implements org.apache.thrift.TBase<ApplicationDeploymentDescription, ApplicationDeploymentDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationDeploymentDescription> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationDeploymentDescription");
- private static final org.apache.thrift.protocol.TField IS_EMPTY_FIELD_DESC = new org.apache.thrift.protocol.TField("isEmpty", org.apache.thrift.protocol.TType.BOOL, (short)1);
- private static final org.apache.thrift.protocol.TField APP_DEPLOYMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("appDeploymentId", org.apache.thrift.protocol.TType.STRING, (short)2);
- private static final org.apache.thrift.protocol.TField APP_MODULE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("appModuleId", org.apache.thrift.protocol.TType.STRING, (short)3);
- private static final org.apache.thrift.protocol.TField COMPUTE_HOST_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("computeHostId", org.apache.thrift.protocol.TType.STRING, (short)4);
- private static final org.apache.thrift.protocol.TField EXECUTABLE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("executablePath", org.apache.thrift.protocol.TType.STRING, (short)5);
- private static final org.apache.thrift.protocol.TField PARALLELISM_FIELD_DESC = new org.apache.thrift.protocol.TField("parallelism", org.apache.thrift.protocol.TType.I32, (short)6);
- private static final org.apache.thrift.protocol.TField APP_DEPLOYMENT_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("appDeploymentDescription", org.apache.thrift.protocol.TType.STRING, (short)7);
- private static final org.apache.thrift.protocol.TField MODULE_LOAD_CMDS_FIELD_DESC = new org.apache.thrift.protocol.TField("moduleLoadCmds", org.apache.thrift.protocol.TType.LIST, (short)8);
- private static final org.apache.thrift.protocol.TField LIB_PREPEND_PATHS_FIELD_DESC = new org.apache.thrift.protocol.TField("libPrependPaths", org.apache.thrift.protocol.TType.LIST, (short)9);
- private static final org.apache.thrift.protocol.TField LIB_APPEND_PATHS_FIELD_DESC = new org.apache.thrift.protocol.TField("libAppendPaths", org.apache.thrift.protocol.TType.LIST, (short)10);
- private static final org.apache.thrift.protocol.TField SET_ENVIRONMENT_FIELD_DESC = new org.apache.thrift.protocol.TField("setEnvironment", org.apache.thrift.protocol.TType.LIST, (short)11);
+ private static final org.apache.thrift.protocol.TField APP_DEPLOYMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("appDeploymentId", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.thrift.protocol.TField APP_MODULE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("appModuleId", org.apache.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.thrift.protocol.TField COMPUTE_HOST_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("computeHostId", org.apache.thrift.protocol.TType.STRING, (short)3);
+ private static final org.apache.thrift.protocol.TField EXECUTABLE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("executablePath", org.apache.thrift.protocol.TType.STRING, (short)4);
+ private static final org.apache.thrift.protocol.TField PARALLELISM_FIELD_DESC = new org.apache.thrift.protocol.TField("parallelism", org.apache.thrift.protocol.TType.I32, (short)5);
+ private static final org.apache.thrift.protocol.TField APP_DEPLOYMENT_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("appDeploymentDescription", org.apache.thrift.protocol.TType.STRING, (short)6);
+ private static final org.apache.thrift.protocol.TField MODULE_LOAD_CMDS_FIELD_DESC = new org.apache.thrift.protocol.TField("moduleLoadCmds", org.apache.thrift.protocol.TType.LIST, (short)7);
+ private static final org.apache.thrift.protocol.TField LIB_PREPEND_PATHS_FIELD_DESC = new org.apache.thrift.protocol.TField("libPrependPaths", org.apache.thrift.protocol.TType.LIST, (short)8);
+ private static final org.apache.thrift.protocol.TField LIB_APPEND_PATHS_FIELD_DESC = new org.apache.thrift.protocol.TField("libAppendPaths", org.apache.thrift.protocol.TType.LIST, (short)9);
+ private static final org.apache.thrift.protocol.TField SET_ENVIRONMENT_FIELD_DESC = new org.apache.thrift.protocol.TField("setEnvironment", org.apache.thrift.protocol.TType.LIST, (short)10);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -95,7 +94,6 @@ import org.slf4j.LoggerFactory;
schemes.put(TupleScheme.class, new ApplicationDeploymentDescriptionTupleSchemeFactory());
}
- private boolean isEmpty; // required
private String appDeploymentId; // required
private String appModuleId; // required
private String computeHostId; // required
@@ -109,21 +107,20 @@ 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 {
- IS_EMPTY((short)1, "isEmpty"),
- APP_DEPLOYMENT_ID((short)2, "appDeploymentId"),
- APP_MODULE_ID((short)3, "appModuleId"),
- COMPUTE_HOST_ID((short)4, "computeHostId"),
- EXECUTABLE_PATH((short)5, "executablePath"),
+ APP_DEPLOYMENT_ID((short)1, "appDeploymentId"),
+ APP_MODULE_ID((short)2, "appModuleId"),
+ COMPUTE_HOST_ID((short)3, "computeHostId"),
+ EXECUTABLE_PATH((short)4, "executablePath"),
/**
*
* @see ApplicationParallelismType
*/
- PARALLELISM((short)6, "parallelism"),
- APP_DEPLOYMENT_DESCRIPTION((short)7, "appDeploymentDescription"),
- MODULE_LOAD_CMDS((short)8, "moduleLoadCmds"),
- LIB_PREPEND_PATHS((short)9, "libPrependPaths"),
- LIB_APPEND_PATHS((short)10, "libAppendPaths"),
- SET_ENVIRONMENT((short)11, "setEnvironment");
+ PARALLELISM((short)5, "parallelism"),
+ APP_DEPLOYMENT_DESCRIPTION((short)6, "appDeploymentDescription"),
+ MODULE_LOAD_CMDS((short)7, "moduleLoadCmds"),
+ LIB_PREPEND_PATHS((short)8, "libPrependPaths"),
+ LIB_APPEND_PATHS((short)9, "libAppendPaths"),
+ SET_ENVIRONMENT((short)10, "setEnvironment");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -138,27 +135,25 @@ import org.slf4j.LoggerFactory;
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
- case 1: // IS_EMPTY
- return IS_EMPTY;
- case 2: // APP_DEPLOYMENT_ID
+ case 1: // APP_DEPLOYMENT_ID
return APP_DEPLOYMENT_ID;
- case 3: // APP_MODULE_ID
+ case 2: // APP_MODULE_ID
return APP_MODULE_ID;
- case 4: // COMPUTE_HOST_ID
+ case 3: // COMPUTE_HOST_ID
return COMPUTE_HOST_ID;
- case 5: // EXECUTABLE_PATH
+ case 4: // EXECUTABLE_PATH
return EXECUTABLE_PATH;
- case 6: // PARALLELISM
+ case 5: // PARALLELISM
return PARALLELISM;
- case 7: // APP_DEPLOYMENT_DESCRIPTION
+ case 6: // APP_DEPLOYMENT_DESCRIPTION
return APP_DEPLOYMENT_DESCRIPTION;
- case 8: // MODULE_LOAD_CMDS
+ case 7: // MODULE_LOAD_CMDS
return MODULE_LOAD_CMDS;
- case 9: // LIB_PREPEND_PATHS
+ case 8: // LIB_PREPEND_PATHS
return LIB_PREPEND_PATHS;
- case 10: // LIB_APPEND_PATHS
+ case 9: // LIB_APPEND_PATHS
return LIB_APPEND_PATHS;
- case 11: // SET_ENVIRONMENT
+ case 10: // SET_ENVIRONMENT
return SET_ENVIRONMENT;
default:
return null;
@@ -200,14 +195,10 @@ import org.slf4j.LoggerFactory;
}
// isset id assignments
- private static final int __ISEMPTY_ISSET_ID = 0;
- private byte __isset_bitfield = 0;
private _Fields optionals[] = {_Fields.APP_DEPLOYMENT_DESCRIPTION,_Fields.MODULE_LOAD_CMDS,_Fields.LIB_PREPEND_PATHS,_Fields.LIB_APPEND_PATHS,_Fields.SET_ENVIRONMENT};
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.IS_EMPTY, new org.apache.thrift.meta_data.FieldMetaData("isEmpty", org.apache.thrift.TFieldRequirementType.REQUIRED,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
tmpMap.put(_Fields.APP_DEPLOYMENT_ID, new org.apache.thrift.meta_data.FieldMetaData("appDeploymentId", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.APP_MODULE_ID, new org.apache.thrift.meta_data.FieldMetaData("appModuleId", org.apache.thrift.TFieldRequirementType.REQUIRED,
@@ -237,8 +228,6 @@ import org.slf4j.LoggerFactory;
}
public ApplicationDeploymentDescription() {
- this.isEmpty = false;
-
this.appDeploymentId = "DO_NOT_SET_AT_CLIENTS";
this.parallelism = org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType.SERIAL;
@@ -246,7 +235,6 @@ import org.slf4j.LoggerFactory;
}
public ApplicationDeploymentDescription(
- boolean isEmpty,
String appDeploymentId,
String appModuleId,
String computeHostId,
@@ -254,8 +242,6 @@ import org.slf4j.LoggerFactory;
ApplicationParallelismType parallelism)
{
this();
- this.isEmpty = isEmpty;
- setIsEmptyIsSet(true);
this.appDeploymentId = appDeploymentId;
this.appModuleId = appModuleId;
this.computeHostId = computeHostId;
@@ -267,8 +253,6 @@ import org.slf4j.LoggerFactory;
* Performs a deep copy on <i>other</i>.
*/
public ApplicationDeploymentDescription(ApplicationDeploymentDescription other) {
- __isset_bitfield = other.__isset_bitfield;
- this.isEmpty = other.isEmpty;
if (other.isSetAppDeploymentId()) {
this.appDeploymentId = other.appDeploymentId;
}
@@ -320,8 +304,6 @@ import org.slf4j.LoggerFactory;
@Override
public void clear() {
- this.isEmpty = false;
-
this.appDeploymentId = "DO_NOT_SET_AT_CLIENTS";
this.appModuleId = null;
@@ -336,28 +318,6 @@ import org.slf4j.LoggerFactory;
this.setEnvironment = null;
}
- public boolean isIsEmpty() {
- return this.isEmpty;
- }
-
- public void setIsEmpty(boolean isEmpty) {
- this.isEmpty = isEmpty;
- setIsEmptyIsSet(true);
- }
-
- public void unsetIsEmpty() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISEMPTY_ISSET_ID);
- }
-
- /** Returns true if field isEmpty is set (has been assigned a value) and false otherwise */
- public boolean isSetIsEmpty() {
- return EncodingUtils.testBit(__isset_bitfield, __ISEMPTY_ISSET_ID);
- }
-
- public void setIsEmptyIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISEMPTY_ISSET_ID, value);
- }
-
public String getAppDeploymentId() {
return this.appDeploymentId;
}
@@ -658,14 +618,6 @@ import org.slf4j.LoggerFactory;
public void setFieldValue(_Fields field, Object value) {
switch (field) {
- case IS_EMPTY:
- if (value == null) {
- unsetIsEmpty();
- } else {
- setIsEmpty((Boolean)value);
- }
- break;
-
case APP_DEPLOYMENT_ID:
if (value == null) {
unsetAppDeploymentId();
@@ -751,9 +703,6 @@ import org.slf4j.LoggerFactory;
public Object getFieldValue(_Fields field) {
switch (field) {
- case IS_EMPTY:
- return Boolean.valueOf(isIsEmpty());
-
case APP_DEPLOYMENT_ID:
return getAppDeploymentId();
@@ -795,8 +744,6 @@ import org.slf4j.LoggerFactory;
}
switch (field) {
- case IS_EMPTY:
- return isSetIsEmpty();
case APP_DEPLOYMENT_ID:
return isSetAppDeploymentId();
case APP_MODULE_ID:
@@ -834,15 +781,6 @@ import org.slf4j.LoggerFactory;
if (that == null)
return false;
- boolean this_present_isEmpty = true;
- boolean that_present_isEmpty = true;
- if (this_present_isEmpty || that_present_isEmpty) {
- if (!(this_present_isEmpty && that_present_isEmpty))
- return false;
- if (this.isEmpty != that.isEmpty)
- return false;
- }
-
boolean this_present_appDeploymentId = true && this.isSetAppDeploymentId();
boolean that_present_appDeploymentId = true && that.isSetAppDeploymentId();
if (this_present_appDeploymentId || that_present_appDeploymentId) {
@@ -949,16 +887,6 @@ import org.slf4j.LoggerFactory;
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetIsEmpty()).compareTo(other.isSetIsEmpty());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetIsEmpty()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isEmpty, other.isEmpty);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
lastComparison = Boolean.valueOf(isSetAppDeploymentId()).compareTo(other.isSetAppDeploymentId());
if (lastComparison != 0) {
return lastComparison;
@@ -1079,10 +1007,6 @@ import org.slf4j.LoggerFactory;
StringBuilder sb = new StringBuilder("ApplicationDeploymentDescription(");
boolean first = true;
- sb.append("isEmpty:");
- sb.append(this.isEmpty);
- first = false;
- if (!first) sb.append(", ");
sb.append("appDeploymentId:");
if (this.appDeploymentId == null) {
sb.append("null");
@@ -1178,10 +1102,6 @@ import org.slf4j.LoggerFactory;
public void validate() throws org.apache.thrift.TException {
// check for required fields
- if (!isSetIsEmpty()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'isEmpty' is unset! Struct:" + toString());
- }
-
if (!isSetAppDeploymentId()) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'appDeploymentId' is unset! Struct:" + toString());
}
@@ -1215,8 +1135,6 @@ import org.slf4j.LoggerFactory;
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bitfield = 0;
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
@@ -1241,15 +1159,7 @@ import org.slf4j.LoggerFactory;
break;
}
switch (schemeField.id) {
- case 1: // IS_EMPTY
- if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
- struct.isEmpty = iprot.readBool();
- struct.setIsEmptyIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 2: // APP_DEPLOYMENT_ID
+ case 1: // APP_DEPLOYMENT_ID
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.appDeploymentId = iprot.readString();
struct.setAppDeploymentIdIsSet(true);
@@ -1257,7 +1167,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 3: // APP_MODULE_ID
+ case 2: // APP_MODULE_ID
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.appModuleId = iprot.readString();
struct.setAppModuleIdIsSet(true);
@@ -1265,7 +1175,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 4: // COMPUTE_HOST_ID
+ case 3: // COMPUTE_HOST_ID
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.computeHostId = iprot.readString();
struct.setComputeHostIdIsSet(true);
@@ -1273,7 +1183,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 5: // EXECUTABLE_PATH
+ case 4: // EXECUTABLE_PATH
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.executablePath = iprot.readString();
struct.setExecutablePathIsSet(true);
@@ -1281,7 +1191,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 6: // PARALLELISM
+ case 5: // PARALLELISM
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.parallelism = ApplicationParallelismType.findByValue(iprot.readI32());
struct.setParallelismIsSet(true);
@@ -1289,7 +1199,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 7: // APP_DEPLOYMENT_DESCRIPTION
+ case 6: // APP_DEPLOYMENT_DESCRIPTION
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.appDeploymentDescription = iprot.readString();
struct.setAppDeploymentDescriptionIsSet(true);
@@ -1297,7 +1207,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 8: // MODULE_LOAD_CMDS
+ case 7: // MODULE_LOAD_CMDS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
@@ -1315,7 +1225,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 9: // LIB_PREPEND_PATHS
+ case 8: // LIB_PREPEND_PATHS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list3 = iprot.readListBegin();
@@ -1334,7 +1244,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 10: // LIB_APPEND_PATHS
+ case 9: // LIB_APPEND_PATHS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list6 = iprot.readListBegin();
@@ -1353,7 +1263,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 11: // SET_ENVIRONMENT
+ case 10: // SET_ENVIRONMENT
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list9 = iprot.readListBegin();
@@ -1385,9 +1295,6 @@ import org.slf4j.LoggerFactory;
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
- oprot.writeFieldBegin(IS_EMPTY_FIELD_DESC);
- oprot.writeBool(struct.isEmpty);
- oprot.writeFieldEnd();
if (struct.appDeploymentId != null) {
oprot.writeFieldBegin(APP_DEPLOYMENT_ID_FIELD_DESC);
oprot.writeString(struct.appDeploymentId);
@@ -1493,7 +1400,6 @@ import org.slf4j.LoggerFactory;
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, ApplicationDeploymentDescription struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
- oprot.writeBool(struct.isEmpty);
oprot.writeString(struct.appDeploymentId);
oprot.writeString(struct.appModuleId);
oprot.writeString(struct.computeHostId);
@@ -1560,8 +1466,6 @@ import org.slf4j.LoggerFactory;
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, ApplicationDeploymentDescription struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- struct.isEmpty = iprot.readBool();
- struct.setIsEmptyIsSet(true);
struct.appDeploymentId = iprot.readString();
struct.setAppDeploymentIdIsSet(true);
struct.appModuleId = iprot.readString();
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
index 53ed366..379e5dc 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
@@ -64,13 +64,12 @@ import org.slf4j.LoggerFactory;
@SuppressWarnings("all") public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<ApplicationInterfaceDescription, ApplicationInterfaceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationInterfaceDescription> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationInterfaceDescription");
- private static final org.apache.thrift.protocol.TField IS_EMPTY_FIELD_DESC = new org.apache.thrift.protocol.TField("isEmpty", org.apache.thrift.protocol.TType.BOOL, (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)2);
- private static final org.apache.thrift.protocol.TField APPLICATION_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationName", org.apache.thrift.protocol.TType.STRING, (short)3);
- private static final org.apache.thrift.protocol.TField APPLICATION_DESRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationDesription", org.apache.thrift.protocol.TType.STRING, (short)4);
- private static final org.apache.thrift.protocol.TField APPLICATION_MODULES_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationModules", org.apache.thrift.protocol.TType.LIST, (short)5);
- private static final org.apache.thrift.protocol.TField APPLICATION_INPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationInputs", org.apache.thrift.protocol.TType.LIST, (short)6);
- private static final org.apache.thrift.protocol.TField APPLICATION_OUTPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationOutputs", org.apache.thrift.protocol.TType.LIST, (short)7);
+ 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_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationName", org.apache.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.thrift.protocol.TField APPLICATION_DESRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationDesription", org.apache.thrift.protocol.TType.STRING, (short)3);
+ private static final org.apache.thrift.protocol.TField APPLICATION_MODULES_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationModules", org.apache.thrift.protocol.TType.LIST, (short)4);
+ private static final org.apache.thrift.protocol.TField APPLICATION_INPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationInputs", org.apache.thrift.protocol.TType.LIST, (short)5);
+ private static final org.apache.thrift.protocol.TField APPLICATION_OUTPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationOutputs", org.apache.thrift.protocol.TType.LIST, (short)6);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -78,7 +77,6 @@ import org.slf4j.LoggerFactory;
schemes.put(TupleScheme.class, new ApplicationInterfaceDescriptionTupleSchemeFactory());
}
- private boolean isEmpty; // required
private String applicationInterfaceId; // required
private String applicationName; // required
private String applicationDesription; // optional
@@ -88,13 +86,12 @@ 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 {
- IS_EMPTY((short)1, "isEmpty"),
- APPLICATION_INTERFACE_ID((short)2, "applicationInterfaceId"),
- APPLICATION_NAME((short)3, "applicationName"),
- APPLICATION_DESRIPTION((short)4, "applicationDesription"),
- APPLICATION_MODULES((short)5, "applicationModules"),
- APPLICATION_INPUTS((short)6, "applicationInputs"),
- APPLICATION_OUTPUTS((short)7, "applicationOutputs");
+ APPLICATION_INTERFACE_ID((short)1, "applicationInterfaceId"),
+ APPLICATION_NAME((short)2, "applicationName"),
+ APPLICATION_DESRIPTION((short)3, "applicationDesription"),
+ APPLICATION_MODULES((short)4, "applicationModules"),
+ APPLICATION_INPUTS((short)5, "applicationInputs"),
+ APPLICATION_OUTPUTS((short)6, "applicationOutputs");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -109,19 +106,17 @@ import org.slf4j.LoggerFactory;
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
- case 1: // IS_EMPTY
- return IS_EMPTY;
- case 2: // APPLICATION_INTERFACE_ID
+ case 1: // APPLICATION_INTERFACE_ID
return APPLICATION_INTERFACE_ID;
- case 3: // APPLICATION_NAME
+ case 2: // APPLICATION_NAME
return APPLICATION_NAME;
- case 4: // APPLICATION_DESRIPTION
+ case 3: // APPLICATION_DESRIPTION
return APPLICATION_DESRIPTION;
- case 5: // APPLICATION_MODULES
+ case 4: // APPLICATION_MODULES
return APPLICATION_MODULES;
- case 6: // APPLICATION_INPUTS
+ case 5: // APPLICATION_INPUTS
return APPLICATION_INPUTS;
- case 7: // APPLICATION_OUTPUTS
+ case 6: // APPLICATION_OUTPUTS
return APPLICATION_OUTPUTS;
default:
return null;
@@ -163,14 +158,10 @@ import org.slf4j.LoggerFactory;
}
// isset id assignments
- private static final int __ISEMPTY_ISSET_ID = 0;
- private byte __isset_bitfield = 0;
private _Fields optionals[] = {_Fields.APPLICATION_DESRIPTION,_Fields.APPLICATION_MODULES,_Fields.APPLICATION_INPUTS,_Fields.APPLICATION_OUTPUTS};
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.IS_EMPTY, new org.apache.thrift.meta_data.FieldMetaData("isEmpty", org.apache.thrift.TFieldRequirementType.REQUIRED,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
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_NAME, new org.apache.thrift.meta_data.FieldMetaData("applicationName", org.apache.thrift.TFieldRequirementType.REQUIRED,
@@ -191,20 +182,15 @@ import org.slf4j.LoggerFactory;
}
public ApplicationInterfaceDescription() {
- this.isEmpty = false;
-
this.applicationInterfaceId = "DO_NOT_SET_AT_CLIENTS";
}
public ApplicationInterfaceDescription(
- boolean isEmpty,
String applicationInterfaceId,
String applicationName)
{
this();
- this.isEmpty = isEmpty;
- setIsEmptyIsSet(true);
this.applicationInterfaceId = applicationInterfaceId;
this.applicationName = applicationName;
}
@@ -213,8 +199,6 @@ import org.slf4j.LoggerFactory;
* Performs a deep copy on <i>other</i>.
*/
public ApplicationInterfaceDescription(ApplicationInterfaceDescription other) {
- __isset_bitfield = other.__isset_bitfield;
- this.isEmpty = other.isEmpty;
if (other.isSetApplicationInterfaceId()) {
this.applicationInterfaceId = other.applicationInterfaceId;
}
@@ -250,8 +234,6 @@ import org.slf4j.LoggerFactory;
@Override
public void clear() {
- this.isEmpty = false;
-
this.applicationInterfaceId = "DO_NOT_SET_AT_CLIENTS";
this.applicationName = null;
@@ -261,28 +243,6 @@ import org.slf4j.LoggerFactory;
this.applicationOutputs = null;
}
- public boolean isIsEmpty() {
- return this.isEmpty;
- }
-
- public void setIsEmpty(boolean isEmpty) {
- this.isEmpty = isEmpty;
- setIsEmptyIsSet(true);
- }
-
- public void unsetIsEmpty() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISEMPTY_ISSET_ID);
- }
-
- /** Returns true if field isEmpty is set (has been assigned a value) and false otherwise */
- public boolean isSetIsEmpty() {
- return EncodingUtils.testBit(__isset_bitfield, __ISEMPTY_ISSET_ID);
- }
-
- public void setIsEmptyIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISEMPTY_ISSET_ID, value);
- }
-
public String getApplicationInterfaceId() {
return this.applicationInterfaceId;
}
@@ -468,14 +428,6 @@ import org.slf4j.LoggerFactory;
public void setFieldValue(_Fields field, Object value) {
switch (field) {
- case IS_EMPTY:
- if (value == null) {
- unsetIsEmpty();
- } else {
- setIsEmpty((Boolean)value);
- }
- break;
-
case APPLICATION_INTERFACE_ID:
if (value == null) {
unsetApplicationInterfaceId();
@@ -529,9 +481,6 @@ import org.slf4j.LoggerFactory;
public Object getFieldValue(_Fields field) {
switch (field) {
- case IS_EMPTY:
- return Boolean.valueOf(isIsEmpty());
-
case APPLICATION_INTERFACE_ID:
return getApplicationInterfaceId();
@@ -561,8 +510,6 @@ import org.slf4j.LoggerFactory;
}
switch (field) {
- case IS_EMPTY:
- return isSetIsEmpty();
case APPLICATION_INTERFACE_ID:
return isSetApplicationInterfaceId();
case APPLICATION_NAME:
@@ -592,15 +539,6 @@ import org.slf4j.LoggerFactory;
if (that == null)
return false;
- boolean this_present_isEmpty = true;
- boolean that_present_isEmpty = true;
- if (this_present_isEmpty || that_present_isEmpty) {
- if (!(this_present_isEmpty && that_present_isEmpty))
- return false;
- if (this.isEmpty != that.isEmpty)
- return false;
- }
-
boolean this_present_applicationInterfaceId = true && this.isSetApplicationInterfaceId();
boolean that_present_applicationInterfaceId = true && that.isSetApplicationInterfaceId();
if (this_present_applicationInterfaceId || that_present_applicationInterfaceId) {
@@ -671,16 +609,6 @@ import org.slf4j.LoggerFactory;
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetIsEmpty()).compareTo(other.isSetIsEmpty());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetIsEmpty()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isEmpty, other.isEmpty);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
lastComparison = Boolean.valueOf(isSetApplicationInterfaceId()).compareTo(other.isSetApplicationInterfaceId());
if (lastComparison != 0) {
return lastComparison;
@@ -761,10 +689,6 @@ import org.slf4j.LoggerFactory;
StringBuilder sb = new StringBuilder("ApplicationInterfaceDescription(");
boolean first = true;
- sb.append("isEmpty:");
- sb.append(this.isEmpty);
- first = false;
- if (!first) sb.append(", ");
sb.append("applicationInterfaceId:");
if (this.applicationInterfaceId == null) {
sb.append("null");
@@ -826,10 +750,6 @@ import org.slf4j.LoggerFactory;
public void validate() throws org.apache.thrift.TException {
// check for required fields
- if (!isSetIsEmpty()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'isEmpty' is unset! Struct:" + toString());
- }
-
if (!isSetApplicationInterfaceId()) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'applicationInterfaceId' is unset! Struct:" + toString());
}
@@ -851,8 +771,6 @@ import org.slf4j.LoggerFactory;
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bitfield = 0;
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
@@ -877,15 +795,7 @@ import org.slf4j.LoggerFactory;
break;
}
switch (schemeField.id) {
- case 1: // IS_EMPTY
- if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
- struct.isEmpty = iprot.readBool();
- struct.setIsEmptyIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 2: // APPLICATION_INTERFACE_ID
+ case 1: // APPLICATION_INTERFACE_ID
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.applicationInterfaceId = iprot.readString();
struct.setApplicationInterfaceIdIsSet(true);
@@ -893,7 +803,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 3: // APPLICATION_NAME
+ case 2: // APPLICATION_NAME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.applicationName = iprot.readString();
struct.setApplicationNameIsSet(true);
@@ -901,7 +811,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 4: // APPLICATION_DESRIPTION
+ case 3: // APPLICATION_DESRIPTION
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.applicationDesription = iprot.readString();
struct.setApplicationDesriptionIsSet(true);
@@ -909,7 +819,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 5: // APPLICATION_MODULES
+ case 4: // APPLICATION_MODULES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
@@ -927,7 +837,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 6: // APPLICATION_INPUTS
+ case 5: // APPLICATION_INPUTS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list3 = iprot.readListBegin();
@@ -946,7 +856,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 7: // APPLICATION_OUTPUTS
+ case 6: // APPLICATION_OUTPUTS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list6 = iprot.readListBegin();
@@ -978,9 +888,6 @@ import org.slf4j.LoggerFactory;
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
- oprot.writeFieldBegin(IS_EMPTY_FIELD_DESC);
- oprot.writeBool(struct.isEmpty);
- oprot.writeFieldEnd();
if (struct.applicationInterfaceId != null) {
oprot.writeFieldBegin(APPLICATION_INTERFACE_ID_FIELD_DESC);
oprot.writeString(struct.applicationInterfaceId);
@@ -1057,7 +964,6 @@ import org.slf4j.LoggerFactory;
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, ApplicationInterfaceDescription struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
- oprot.writeBool(struct.isEmpty);
oprot.writeString(struct.applicationInterfaceId);
oprot.writeString(struct.applicationName);
BitSet optionals = new BitSet();
@@ -1109,8 +1015,6 @@ import org.slf4j.LoggerFactory;
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, ApplicationInterfaceDescription struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- struct.isEmpty = iprot.readBool();
- struct.setIsEmptyIsSet(true);
struct.applicationInterfaceId = iprot.readString();
struct.setApplicationInterfaceIdIsSet(true);
struct.applicationName = iprot.readString();
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/InputDataObjectType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/InputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/InputDataObjectType.java
index 50f76b8..973af8a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/InputDataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/InputDataObjectType.java
@@ -77,14 +77,13 @@ import org.slf4j.LoggerFactory;
@SuppressWarnings("all") public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObjectType, InputDataObjectType._Fields>, java.io.Serializable, Cloneable, Comparable<InputDataObjectType> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InputDataObjectType");
- private static final org.apache.thrift.protocol.TField IS_EMPTY_FIELD_DESC = new org.apache.thrift.protocol.TField("isEmpty", org.apache.thrift.protocol.TType.BOOL, (short)1);
- private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)2);
- private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)3);
- private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)4);
- private static final org.apache.thrift.protocol.TField APPLICATION_ARGUMENT_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationArgument", org.apache.thrift.protocol.TType.STRING, (short)5);
- private static final org.apache.thrift.protocol.TField STANDARD_INPUT_FIELD_DESC = new org.apache.thrift.protocol.TField("standardInput", org.apache.thrift.protocol.TType.BOOL, (short)6);
- private static final org.apache.thrift.protocol.TField USER_FRIENDLY_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("userFriendlyDescription", org.apache.thrift.protocol.TType.STRING, (short)7);
- private static final org.apache.thrift.protocol.TField META_DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("metaData", org.apache.thrift.protocol.TType.STRING, (short)8);
+ private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)3);
+ private static final org.apache.thrift.protocol.TField APPLICATION_ARGUMENT_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationArgument", org.apache.thrift.protocol.TType.STRING, (short)4);
+ private static final org.apache.thrift.protocol.TField STANDARD_INPUT_FIELD_DESC = new org.apache.thrift.protocol.TField("standardInput", org.apache.thrift.protocol.TType.BOOL, (short)5);
+ private static final org.apache.thrift.protocol.TField USER_FRIENDLY_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("userFriendlyDescription", org.apache.thrift.protocol.TType.STRING, (short)6);
+ private static final org.apache.thrift.protocol.TField META_DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("metaData", org.apache.thrift.protocol.TType.STRING, (short)7);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -92,7 +91,6 @@ import org.slf4j.LoggerFactory;
schemes.put(TupleScheme.class, new InputDataObjectTypeTupleSchemeFactory());
}
- private boolean isEmpty; // required
private String name; // required
private String value; // optional
private DataType type; // optional
@@ -103,18 +101,17 @@ 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 {
- IS_EMPTY((short)1, "isEmpty"),
- NAME((short)2, "name"),
- VALUE((short)3, "value"),
+ NAME((short)1, "name"),
+ VALUE((short)2, "value"),
/**
*
* @see DataType
*/
- TYPE((short)4, "type"),
- APPLICATION_ARGUMENT((short)5, "applicationArgument"),
- STANDARD_INPUT((short)6, "standardInput"),
- USER_FRIENDLY_DESCRIPTION((short)7, "userFriendlyDescription"),
- META_DATA((short)8, "metaData");
+ TYPE((short)3, "type"),
+ APPLICATION_ARGUMENT((short)4, "applicationArgument"),
+ STANDARD_INPUT((short)5, "standardInput"),
+ USER_FRIENDLY_DESCRIPTION((short)6, "userFriendlyDescription"),
+ META_DATA((short)7, "metaData");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -129,21 +126,19 @@ import org.slf4j.LoggerFactory;
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
- case 1: // IS_EMPTY
- return IS_EMPTY;
- case 2: // NAME
+ case 1: // NAME
return NAME;
- case 3: // VALUE
+ case 2: // VALUE
return VALUE;
- case 4: // TYPE
+ case 3: // TYPE
return TYPE;
- case 5: // APPLICATION_ARGUMENT
+ case 4: // APPLICATION_ARGUMENT
return APPLICATION_ARGUMENT;
- case 6: // STANDARD_INPUT
+ case 5: // STANDARD_INPUT
return STANDARD_INPUT;
- case 7: // USER_FRIENDLY_DESCRIPTION
+ case 6: // USER_FRIENDLY_DESCRIPTION
return USER_FRIENDLY_DESCRIPTION;
- case 8: // META_DATA
+ case 7: // META_DATA
return META_DATA;
default:
return null;
@@ -185,15 +180,12 @@ import org.slf4j.LoggerFactory;
}
// isset id assignments
- private static final int __ISEMPTY_ISSET_ID = 0;
- private static final int __STANDARDINPUT_ISSET_ID = 1;
+ private static final int __STANDARDINPUT_ISSET_ID = 0;
private byte __isset_bitfield = 0;
private _Fields optionals[] = {_Fields.VALUE,_Fields.TYPE,_Fields.APPLICATION_ARGUMENT,_Fields.STANDARD_INPUT,_Fields.USER_FRIENDLY_DESCRIPTION,_Fields.META_DATA};
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.IS_EMPTY, new org.apache.thrift.meta_data.FieldMetaData("isEmpty", org.apache.thrift.TFieldRequirementType.REQUIRED,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -213,19 +205,14 @@ import org.slf4j.LoggerFactory;
}
public InputDataObjectType() {
- this.isEmpty = false;
-
this.standardInput = false;
}
public InputDataObjectType(
- boolean isEmpty,
String name)
{
this();
- this.isEmpty = isEmpty;
- setIsEmptyIsSet(true);
this.name = name;
}
@@ -234,7 +221,6 @@ import org.slf4j.LoggerFactory;
*/
public InputDataObjectType(InputDataObjectType other) {
__isset_bitfield = other.__isset_bitfield;
- this.isEmpty = other.isEmpty;
if (other.isSetName()) {
this.name = other.name;
}
@@ -262,8 +248,6 @@ import org.slf4j.LoggerFactory;
@Override
public void clear() {
- this.isEmpty = false;
-
this.name = null;
this.value = null;
this.type = null;
@@ -274,28 +258,6 @@ import org.slf4j.LoggerFactory;
this.metaData = null;
}
- public boolean isIsEmpty() {
- return this.isEmpty;
- }
-
- public void setIsEmpty(boolean isEmpty) {
- this.isEmpty = isEmpty;
- setIsEmptyIsSet(true);
- }
-
- public void unsetIsEmpty() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISEMPTY_ISSET_ID);
- }
-
- /** Returns true if field isEmpty is set (has been assigned a value) and false otherwise */
- public boolean isSetIsEmpty() {
- return EncodingUtils.testBit(__isset_bitfield, __ISEMPTY_ISSET_ID);
- }
-
- public void setIsEmptyIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISEMPTY_ISSET_ID, value);
- }
-
public String getName() {
return this.name;
}
@@ -466,14 +428,6 @@ import org.slf4j.LoggerFactory;
public void setFieldValue(_Fields field, Object value) {
switch (field) {
- case IS_EMPTY:
- if (value == null) {
- unsetIsEmpty();
- } else {
- setIsEmpty((Boolean)value);
- }
- break;
-
case NAME:
if (value == null) {
unsetName();
@@ -535,9 +489,6 @@ import org.slf4j.LoggerFactory;
public Object getFieldValue(_Fields field) {
switch (field) {
- case IS_EMPTY:
- return Boolean.valueOf(isIsEmpty());
-
case NAME:
return getName();
@@ -570,8 +521,6 @@ import org.slf4j.LoggerFactory;
}
switch (field) {
- case IS_EMPTY:
- return isSetIsEmpty();
case NAME:
return isSetName();
case VALUE:
@@ -603,15 +552,6 @@ import org.slf4j.LoggerFactory;
if (that == null)
return false;
- boolean this_present_isEmpty = true;
- boolean that_present_isEmpty = true;
- if (this_present_isEmpty || that_present_isEmpty) {
- if (!(this_present_isEmpty && that_present_isEmpty))
- return false;
- if (this.isEmpty != that.isEmpty)
- return false;
- }
-
boolean this_present_name = true && this.isSetName();
boolean that_present_name = true && that.isSetName();
if (this_present_name || that_present_name) {
@@ -691,16 +631,6 @@ import org.slf4j.LoggerFactory;
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetIsEmpty()).compareTo(other.isSetIsEmpty());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetIsEmpty()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isEmpty, other.isEmpty);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
if (lastComparison != 0) {
return lastComparison;
@@ -791,10 +721,6 @@ import org.slf4j.LoggerFactory;
StringBuilder sb = new StringBuilder("InputDataObjectType(");
boolean first = true;
- sb.append("isEmpty:");
- sb.append(this.isEmpty);
- first = false;
- if (!first) sb.append(", ");
sb.append("name:");
if (this.name == null) {
sb.append("null");
@@ -864,10 +790,6 @@ import org.slf4j.LoggerFactory;
public void validate() throws org.apache.thrift.TException {
// check for required fields
- if (!isSetIsEmpty()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'isEmpty' is unset! Struct:" + toString());
- }
-
if (!isSetName()) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString());
}
@@ -911,15 +833,7 @@ import org.slf4j.LoggerFactory;
break;
}
switch (schemeField.id) {
- case 1: // IS_EMPTY
- if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
- struct.isEmpty = iprot.readBool();
- struct.setIsEmptyIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 2: // NAME
+ case 1: // NAME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.name = iprot.readString();
struct.setNameIsSet(true);
@@ -927,7 +841,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 3: // VALUE
+ case 2: // VALUE
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.value = iprot.readString();
struct.setValueIsSet(true);
@@ -935,7 +849,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 4: // TYPE
+ case 3: // TYPE
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.type = DataType.findByValue(iprot.readI32());
struct.setTypeIsSet(true);
@@ -943,7 +857,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 5: // APPLICATION_ARGUMENT
+ case 4: // APPLICATION_ARGUMENT
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.applicationArgument = iprot.readString();
struct.setApplicationArgumentIsSet(true);
@@ -951,7 +865,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 6: // STANDARD_INPUT
+ case 5: // STANDARD_INPUT
if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
struct.standardInput = iprot.readBool();
struct.setStandardInputIsSet(true);
@@ -959,7 +873,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 7: // USER_FRIENDLY_DESCRIPTION
+ case 6: // USER_FRIENDLY_DESCRIPTION
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.userFriendlyDescription = iprot.readString();
struct.setUserFriendlyDescriptionIsSet(true);
@@ -967,7 +881,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 8: // META_DATA
+ case 7: // META_DATA
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.metaData = iprot.readString();
struct.setMetaDataIsSet(true);
@@ -988,9 +902,6 @@ import org.slf4j.LoggerFactory;
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
- oprot.writeFieldBegin(IS_EMPTY_FIELD_DESC);
- oprot.writeBool(struct.isEmpty);
- oprot.writeFieldEnd();
if (struct.name != null) {
oprot.writeFieldBegin(NAME_FIELD_DESC);
oprot.writeString(struct.name);
@@ -1053,7 +964,6 @@ import org.slf4j.LoggerFactory;
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, InputDataObjectType struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
- oprot.writeBool(struct.isEmpty);
oprot.writeString(struct.name);
BitSet optionals = new BitSet();
if (struct.isSetValue()) {
@@ -1098,8 +1008,6 @@ import org.slf4j.LoggerFactory;
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, InputDataObjectType struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- struct.isEmpty = iprot.readBool();
- struct.setIsEmptyIsSet(true);
struct.name = iprot.readString();
struct.setNameIsSet(true);
BitSet incoming = iprot.readBitSet(6);
[3/3] git commit: fixing issues in document creator
Posted by ch...@apache.org.
fixing issues in document creator
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9c5d4bf2
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9c5d4bf2
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9c5d4bf2
Branch: refs/heads/master
Commit: 9c5d4bf24df8d2e3f0d2551ff58b791d86ea5fdc
Parents: 3630458
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Tue Jul 8 11:48:41 2014 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Tue Jul 8 11:48:41 2014 -0400
----------------------------------------------------------------------
.../airavata/api/server/AiravataAPIServer.java | 6 +-
.../server/handler/AiravataServerHandler.java | 7 +-
.../java/org/apache/airavata/api/Airavata.java | 82 +++++----
.../src/main/resources/lib/Airavata.cpp | 24 +--
.../src/main/resources/lib/Airavata.h | 26 +--
.../resources/lib/Airavata_server.skeleton.cpp | 2 +-
.../lib/applicationDeploymentModel_types.cpp | 58 +++---
.../lib/applicationDeploymentModel_types.h | 13 +-
.../lib/applicationInterfaceModel_types.cpp | 88 +++-------
.../lib/applicationInterfaceModel_types.h | 26 +--
.../lib/computeResourceModel_types.cpp | 54 ++----
.../resources/lib/computeResourceModel_types.h | 13 +-
.../resources/lib/Airavata/API/Airavata.php | 10 +-
.../Model/AppCatalog/AppDeployment/Types.php | 76 +++-----
.../Model/AppCatalog/AppInterface/Types.php | 110 ++++--------
.../Model/AppCatalog/ComputeResource/Types.php | 70 +++-----
.../ApplicationDeploymentDescription.java | 176 +++++--------------
.../ApplicationInterfaceDescription.java | 144 +++------------
.../appinterface/InputDataObjectType.java | 150 +++-------------
.../ComputeResourceDescription.java | 168 ++++--------------
.../airavataAPI.thrift | 2 +-
.../applicationDeploymentModel.thrift | 22 +--
.../applicationInterfaceModel.thrift | 30 ++--
.../computeResourceModel.thrift | 20 +--
.../client/tools/DocumentCreatorNew.java | 56 +++---
.../client/tools/DocumentCreatorUtils.java | 4 +-
.../data/impl/GwyResourceProfileImpl.java | 3 +-
.../main/resources/airavata-server.properties | 4 +-
.../registry/jpa/model/ApplicationInput.java | 6 +-
.../registry/jpa/model/ApplicationOutput.java | 6 +-
.../jpa/resources/ApplicationInputResource.java | 9 +-
.../resources/ApplicationOutputResource.java | 8 +-
.../registry/jpa/resources/Utils.java | 4 +-
33 files changed, 467 insertions(+), 1010 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java
index 4786e52..f0d303f 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java
@@ -67,14 +67,14 @@ public class AiravataAPIServer implements IServer{
TServerTransport serverTransport;
if(serverHost == null){
- serverTransport = new TServerSocket(serverPort, 10000);
+ serverTransport = new TServerSocket(serverPort);
}else{
InetSocketAddress inetSocketAddress = new InetSocketAddress(serverHost, serverPort);
- serverTransport = new TServerSocket(inetSocketAddress, 10000);
+ serverTransport = new TServerSocket(inetSocketAddress);
}
TThreadPoolServer.Args options = new TThreadPoolServer.Args(serverTransport);
- options.minWorkerThreads = Integer.parseInt(ServerSettings.getSetting(Constants.API_SERVER_MIN_THREADS, "30"));
+ options.minWorkerThreads = Integer.parseInt(ServerSettings.getSetting(Constants.API_SERVER_MIN_THREADS, "50"));
server = new TThreadPoolServer(options.processor(airavataAPIServer));
new Thread() {
public void run() {
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index 18de25d..e00c1b9 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -2077,12 +2077,11 @@ public class AiravataServerHandler implements Airavata.Iface, Watcher {
* Returns a success/failure of the registration.
*/
@Override
- public boolean registerGatewayResourceProfile(GatewayResourceProfile gatewayResourceProfile) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
+ public String registerGatewayResourceProfile(GatewayResourceProfile gatewayResourceProfile) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
try {
appCatalog = AppCatalogFactory.getAppCatalog();
GwyResourceProfile gatewayProfile = appCatalog.getGatewayProfile();
- gatewayProfile.addGatewayResourceProfile(gatewayResourceProfile);
- return true;
+ return gatewayProfile.addGatewayResourceProfile(gatewayResourceProfile);
} catch (AppCatalogException e) {
logger.error("Error while registering gateway resource profile...", e);
AiravataSystemException exception = new AiravataSystemException();
@@ -2180,7 +2179,7 @@ public class AiravataServerHandler implements Airavata.Iface, Watcher {
throw new AppCatalogException("Gateway resource profile '"+gatewayID+"' does not exist!!!");
}
GatewayResourceProfile profile = gatewayProfile.getGatewayProfile(gatewayID);
- gatewayProfile.removeGatewayResourceProfile(gatewayID);
+// gatewayProfile.removeGatewayResourceProfile(gatewayID);
profile.addToComputeResourcePreferences(computeResourcePreference);
gatewayProfile.updateGatewayResourceProfile(gatewayID, profile);
return true;
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/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 3a37321..96ab5d3 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
@@ -1064,7 +1064,7 @@ import org.slf4j.LoggerFactory;
*
* @param gatewayResourceProfile
*/
- public boolean registerGatewayResourceProfile(org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile gatewayResourceProfile) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
+ public String registerGatewayResourceProfile(org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile gatewayResourceProfile) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
/**
* Fetch the given Gateway Resource Profile.
@@ -3400,7 +3400,7 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteDataMovementInterface failed: unknown result");
}
- public boolean registerGatewayResourceProfile(org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile gatewayResourceProfile) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ public String registerGatewayResourceProfile(org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile gatewayResourceProfile) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
{
send_registerGatewayResourceProfile(gatewayResourceProfile);
return recv_registerGatewayResourceProfile();
@@ -3413,7 +3413,7 @@ import org.slf4j.LoggerFactory;
sendBase("registerGatewayResourceProfile", args);
}
- public boolean recv_registerGatewayResourceProfile() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ public String recv_registerGatewayResourceProfile() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
{
registerGatewayResourceProfile_result result = new registerGatewayResourceProfile_result();
receiveBase(result, "registerGatewayResourceProfile");
@@ -5835,7 +5835,7 @@ import org.slf4j.LoggerFactory;
prot.writeMessageEnd();
}
- public boolean getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException {
+ public String getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException {
if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
throw new IllegalStateException("Method call not finished!");
}
@@ -8006,7 +8006,6 @@ import org.slf4j.LoggerFactory;
registerGatewayResourceProfile_result result = new registerGatewayResourceProfile_result();
try {
result.success = iface.registerGatewayResourceProfile(args.gatewayResourceProfile);
- result.setSuccessIsSet(true);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
} catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -12566,7 +12565,7 @@ import org.slf4j.LoggerFactory;
}
}
- public static class registerGatewayResourceProfile<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerGatewayResourceProfile_args, Boolean> {
+ public static class registerGatewayResourceProfile<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerGatewayResourceProfile_args, String> {
public registerGatewayResourceProfile() {
super("registerGatewayResourceProfile");
}
@@ -12575,13 +12574,12 @@ import org.slf4j.LoggerFactory;
return new registerGatewayResourceProfile_args();
}
- public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<Boolean>() {
- public void onComplete(Boolean o) {
+ return new AsyncMethodCallback<String>() {
+ public void onComplete(String o) {
registerGatewayResourceProfile_result result = new registerGatewayResourceProfile_result();
result.success = o;
- result.setSuccessIsSet(true);
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
return;
@@ -12629,7 +12627,7 @@ import org.slf4j.LoggerFactory;
return false;
}
- public void start(I iface, registerGatewayResourceProfile_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+ public void start(I iface, registerGatewayResourceProfile_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
iface.registerGatewayResourceProfile(args.gatewayResourceProfile,resultHandler);
}
}
@@ -80108,7 +80106,7 @@ import org.slf4j.LoggerFactory;
public static class registerGatewayResourceProfile_result implements org.apache.thrift.TBase<registerGatewayResourceProfile_result, registerGatewayResourceProfile_result._Fields>, java.io.Serializable, Cloneable, Comparable<registerGatewayResourceProfile_result> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("registerGatewayResourceProfile_result");
- private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
+ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0);
private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1);
private static final org.apache.thrift.protocol.TField ACE_FIELD_DESC = new org.apache.thrift.protocol.TField("ace", org.apache.thrift.protocol.TType.STRUCT, (short)2);
private static final org.apache.thrift.protocol.TField ASE_FIELD_DESC = new org.apache.thrift.protocol.TField("ase", org.apache.thrift.protocol.TType.STRUCT, (short)3);
@@ -80119,7 +80117,7 @@ import org.slf4j.LoggerFactory;
schemes.put(TupleScheme.class, new registerGatewayResourceProfile_resultTupleSchemeFactory());
}
- public boolean success; // required
+ public String success; // required
public org.apache.airavata.model.error.InvalidRequestException ire; // required
public org.apache.airavata.model.error.AiravataClientException ace; // required
public org.apache.airavata.model.error.AiravataSystemException ase; // required
@@ -80192,13 +80190,11 @@ import org.slf4j.LoggerFactory;
}
// isset id assignments
- private static final int __SUCCESS_ISSET_ID = 0;
- private byte __isset_bitfield = 0;
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.IRE, new org.apache.thrift.meta_data.FieldMetaData("ire", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
tmpMap.put(_Fields.ACE, new org.apache.thrift.meta_data.FieldMetaData("ace", org.apache.thrift.TFieldRequirementType.DEFAULT,
@@ -80213,14 +80209,13 @@ import org.slf4j.LoggerFactory;
}
public registerGatewayResourceProfile_result(
- boolean success,
+ String success,
org.apache.airavata.model.error.InvalidRequestException ire,
org.apache.airavata.model.error.AiravataClientException ace,
org.apache.airavata.model.error.AiravataSystemException ase)
{
this();
this.success = success;
- setSuccessIsSet(true);
this.ire = ire;
this.ace = ace;
this.ase = ase;
@@ -80230,8 +80225,9 @@ import org.slf4j.LoggerFactory;
* Performs a deep copy on <i>other</i>.
*/
public registerGatewayResourceProfile_result(registerGatewayResourceProfile_result other) {
- __isset_bitfield = other.__isset_bitfield;
- this.success = other.success;
+ if (other.isSetSuccess()) {
+ this.success = other.success;
+ }
if (other.isSetIre()) {
this.ire = new org.apache.airavata.model.error.InvalidRequestException(other.ire);
}
@@ -80249,34 +80245,34 @@ import org.slf4j.LoggerFactory;
@Override
public void clear() {
- setSuccessIsSet(false);
- this.success = false;
+ this.success = null;
this.ire = null;
this.ace = null;
this.ase = null;
}
- public boolean isSuccess() {
+ public String getSuccess() {
return this.success;
}
- public registerGatewayResourceProfile_result setSuccess(boolean success) {
+ public registerGatewayResourceProfile_result setSuccess(String success) {
this.success = success;
- setSuccessIsSet(true);
return this;
}
public void unsetSuccess() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+ this.success = null;
}
/** Returns true if field success is set (has been assigned a value) and false otherwise */
public boolean isSetSuccess() {
- return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+ return this.success != null;
}
public void setSuccessIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
+ if (!value) {
+ this.success = null;
+ }
}
public org.apache.airavata.model.error.InvalidRequestException getIre() {
@@ -80357,7 +80353,7 @@ import org.slf4j.LoggerFactory;
if (value == null) {
unsetSuccess();
} else {
- setSuccess((Boolean)value);
+ setSuccess((String)value);
}
break;
@@ -80391,7 +80387,7 @@ import org.slf4j.LoggerFactory;
public Object getFieldValue(_Fields field) {
switch (field) {
case SUCCESS:
- return Boolean.valueOf(isSuccess());
+ return getSuccess();
case IRE:
return getIre();
@@ -80438,12 +80434,12 @@ import org.slf4j.LoggerFactory;
if (that == null)
return false;
- boolean this_present_success = true;
- boolean that_present_success = true;
+ boolean this_present_success = true && this.isSetSuccess();
+ boolean that_present_success = true && that.isSetSuccess();
if (this_present_success || that_present_success) {
if (!(this_present_success && that_present_success))
return false;
- if (this.success != that.success)
+ if (!this.success.equals(that.success))
return false;
}
@@ -80551,7 +80547,11 @@ import org.slf4j.LoggerFactory;
boolean first = true;
sb.append("success:");
- sb.append(this.success);
+ if (this.success == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.success);
+ }
first = false;
if (!first) sb.append(", ");
sb.append("ire:");
@@ -80596,8 +80596,6 @@ import org.slf4j.LoggerFactory;
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bitfield = 0;
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
@@ -80623,8 +80621,8 @@ import org.slf4j.LoggerFactory;
}
switch (schemeField.id) {
case 0: // SUCCESS
- if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
- struct.success = iprot.readBool();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.success = iprot.readString();
struct.setSuccessIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -80672,9 +80670,9 @@ import org.slf4j.LoggerFactory;
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
- if (struct.isSetSuccess()) {
+ if (struct.success != null) {
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
- oprot.writeBool(struct.success);
+ oprot.writeString(struct.success);
oprot.writeFieldEnd();
}
if (struct.ire != null) {
@@ -80724,7 +80722,7 @@ import org.slf4j.LoggerFactory;
}
oprot.writeBitSet(optionals, 4);
if (struct.isSetSuccess()) {
- oprot.writeBool(struct.success);
+ oprot.writeString(struct.success);
}
if (struct.isSetIre()) {
struct.ire.write(oprot);
@@ -80742,7 +80740,7 @@ import org.slf4j.LoggerFactory;
TTupleProtocol iprot = (TTupleProtocol) prot;
BitSet incoming = iprot.readBitSet(4);
if (incoming.get(0)) {
- struct.success = iprot.readBool();
+ struct.success = iprot.readString();
struct.setSuccessIsSet(true);
}
if (incoming.get(1)) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.cpp
index 188bdce..d9ce563 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.cpp
@@ -15245,8 +15245,8 @@ uint32_t Airavata_registerGatewayResourceProfile_result::read(::apache::thrift::
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool(this->success);
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->success);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -15295,8 +15295,8 @@ uint32_t Airavata_registerGatewayResourceProfile_result::write(::apache::thrift:
xfer += oprot->writeStructBegin("Airavata_registerGatewayResourceProfile_result");
if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
- xfer += oprot->writeBool(this->success);
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRING, 0);
+ xfer += oprot->writeString(this->success);
xfer += oprot->writeFieldEnd();
} else if (this->__isset.ire) {
xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -15337,8 +15337,8 @@ uint32_t Airavata_registerGatewayResourceProfile_presult::read(::apache::thrift:
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool((*(this->success)));
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString((*(this->success)));
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -21561,10 +21561,10 @@ bool AiravataClient::recv_deleteDataMovementInterface()
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "deleteDataMovementInterface failed: unknown result");
}
-bool AiravataClient::registerGatewayResourceProfile(const ::GatewayResourceProfile& gatewayResourceProfile)
+void AiravataClient::registerGatewayResourceProfile(std::string& _return, const ::GatewayResourceProfile& gatewayResourceProfile)
{
send_registerGatewayResourceProfile(gatewayResourceProfile);
- return recv_registerGatewayResourceProfile();
+ recv_registerGatewayResourceProfile(_return);
}
void AiravataClient::send_registerGatewayResourceProfile(const ::GatewayResourceProfile& gatewayResourceProfile)
@@ -21581,7 +21581,7 @@ void AiravataClient::send_registerGatewayResourceProfile(const ::GatewayResourc
oprot_->getTransport()->flush();
}
-bool AiravataClient::recv_registerGatewayResourceProfile()
+void AiravataClient::recv_registerGatewayResourceProfile(std::string& _return)
{
int32_t rseqid = 0;
@@ -21606,7 +21606,6 @@ bool AiravataClient::recv_registerGatewayResourceProfile()
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- bool _return;
Airavata_registerGatewayResourceProfile_presult result;
result.success = &_return;
result.read(iprot_);
@@ -21614,7 +21613,8 @@ bool AiravataClient::recv_registerGatewayResourceProfile()
iprot_->getTransport()->readEnd();
if (result.__isset.success) {
- return _return;
+ // _return pointer has now been filled
+ return;
}
if (result.__isset.ire) {
throw result.ire;
@@ -26173,7 +26173,7 @@ void AiravataProcessor::process_registerGatewayResourceProfile(int32_t seqid, ::
Airavata_registerGatewayResourceProfile_result result;
try {
- result.success = iface_->registerGatewayResourceProfile(args.gatewayResourceProfile);
+ iface_->registerGatewayResourceProfile(result.success, args.gatewayResourceProfile);
result.__isset.success = true;
} catch ( ::airavata::api::error::InvalidRequestException &ire) {
result.ire = ire;
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.h
index 4f8c10a..55c1d74 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.h
@@ -78,7 +78,7 @@ class AiravataIf {
virtual bool changeDataMovementPriorities(const std::map<std::string, int32_t> & dataMovementPriorityMap) = 0;
virtual bool deleteJobSubmissionInterface(const std::string& jobSubmissionInterfaceId) = 0;
virtual bool deleteDataMovementInterface(const std::string& dataMovementInterfaceId) = 0;
- virtual bool registerGatewayResourceProfile(const ::GatewayResourceProfile& gatewayResourceProfile) = 0;
+ virtual void registerGatewayResourceProfile(std::string& _return, const ::GatewayResourceProfile& gatewayResourceProfile) = 0;
virtual void getGatewayResourceProfile( ::GatewayResourceProfile& _return, const std::string& gatewayID) = 0;
virtual bool updateGatewayResourceProfile(const std::string& gatewayID, const ::GatewayResourceProfile& gatewayResourceProfile) = 0;
virtual bool deleteGatewayResourceProfile(const std::string& gatewayID) = 0;
@@ -330,9 +330,8 @@ class AiravataNull : virtual public AiravataIf {
bool _return = false;
return _return;
}
- bool registerGatewayResourceProfile(const ::GatewayResourceProfile& /* gatewayResourceProfile */) {
- bool _return = false;
- return _return;
+ void registerGatewayResourceProfile(std::string& /* _return */, const ::GatewayResourceProfile& /* gatewayResourceProfile */) {
+ return;
}
void getGatewayResourceProfile( ::GatewayResourceProfile& /* _return */, const std::string& /* gatewayID */) {
return;
@@ -8884,19 +8883,19 @@ typedef struct _Airavata_registerGatewayResourceProfile_result__isset {
class Airavata_registerGatewayResourceProfile_result {
public:
- Airavata_registerGatewayResourceProfile_result() : success(0) {
+ Airavata_registerGatewayResourceProfile_result() : success() {
}
virtual ~Airavata_registerGatewayResourceProfile_result() throw() {}
- bool success;
+ std::string success;
::airavata::api::error::InvalidRequestException ire;
::airavata::api::error::AiravataClientException ace;
::airavata::api::error::AiravataSystemException ase;
_Airavata_registerGatewayResourceProfile_result__isset __isset;
- void __set_success(const bool val) {
+ void __set_success(const std::string& val) {
success = val;
}
@@ -8949,7 +8948,7 @@ class Airavata_registerGatewayResourceProfile_presult {
virtual ~Airavata_registerGatewayResourceProfile_presult() throw() {}
- bool* success;
+ std::string* success;
::airavata::api::error::InvalidRequestException ire;
::airavata::api::error::AiravataClientException ace;
::airavata::api::error::AiravataSystemException ase;
@@ -10281,9 +10280,9 @@ class AiravataClient : virtual public AiravataIf {
bool deleteDataMovementInterface(const std::string& dataMovementInterfaceId);
void send_deleteDataMovementInterface(const std::string& dataMovementInterfaceId);
bool recv_deleteDataMovementInterface();
- bool registerGatewayResourceProfile(const ::GatewayResourceProfile& gatewayResourceProfile);
+ void registerGatewayResourceProfile(std::string& _return, const ::GatewayResourceProfile& gatewayResourceProfile);
void send_registerGatewayResourceProfile(const ::GatewayResourceProfile& gatewayResourceProfile);
- bool recv_registerGatewayResourceProfile();
+ void recv_registerGatewayResourceProfile(std::string& _return);
void getGatewayResourceProfile( ::GatewayResourceProfile& _return, const std::string& gatewayID);
void send_getGatewayResourceProfile(const std::string& gatewayID);
void recv_getGatewayResourceProfile( ::GatewayResourceProfile& _return);
@@ -11097,13 +11096,14 @@ class AiravataMultiface : virtual public AiravataIf {
return ifaces_[i]->deleteDataMovementInterface(dataMovementInterfaceId);
}
- bool registerGatewayResourceProfile(const ::GatewayResourceProfile& gatewayResourceProfile) {
+ void registerGatewayResourceProfile(std::string& _return, const ::GatewayResourceProfile& gatewayResourceProfile) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
- ifaces_[i]->registerGatewayResourceProfile(gatewayResourceProfile);
+ ifaces_[i]->registerGatewayResourceProfile(_return, gatewayResourceProfile);
}
- return ifaces_[i]->registerGatewayResourceProfile(gatewayResourceProfile);
+ ifaces_[i]->registerGatewayResourceProfile(_return, gatewayResourceProfile);
+ return;
}
void getGatewayResourceProfile( ::GatewayResourceProfile& _return, const std::string& gatewayID) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata_server.skeleton.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata_server.skeleton.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata_server.skeleton.cpp
index af77b8d..157945c 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata_server.skeleton.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata_server.skeleton.cpp
@@ -337,7 +337,7 @@ class AiravataHandler : virtual public AiravataIf {
printf("deleteDataMovementInterface\n");
}
- bool registerGatewayResourceProfile(const ::GatewayResourceProfile& gatewayResourceProfile) {
+ void registerGatewayResourceProfile(std::string& _return, const ::GatewayResourceProfile& gatewayResourceProfile) {
// Your implementation goes here
printf("registerGatewayResourceProfile\n");
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.cpp
index 323d352..9ba96cf 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.cpp
@@ -229,8 +229,8 @@ void swap(ApplicationModule &a, ApplicationModule &b) {
swap(a.__isset, b.__isset);
}
-const char* ApplicationDeploymentDescription::ascii_fingerprint = "19A9841A9F4627A2C10F4A28E2CF0E17";
-const uint8_t ApplicationDeploymentDescription::binary_fingerprint[16] = {0x19,0xA9,0x84,0x1A,0x9F,0x46,0x27,0xA2,0xC1,0x0F,0x4A,0x28,0xE2,0xCF,0x0E,0x17};
+const char* ApplicationDeploymentDescription::ascii_fingerprint = "179A145BD54BBE10649DEF31C71143C9";
+const uint8_t ApplicationDeploymentDescription::binary_fingerprint[16] = {0x17,0x9A,0x14,0x5B,0xD5,0x4B,0xBE,0x10,0x64,0x9D,0xEF,0x31,0xC7,0x11,0x43,0xC9};
uint32_t ApplicationDeploymentDescription::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -243,7 +243,6 @@ uint32_t ApplicationDeploymentDescription::read(::apache::thrift::protocol::TPro
using ::apache::thrift::protocol::TProtocolException;
- bool isset_isEmpty = false;
bool isset_appDeploymentId = false;
bool isset_appModuleId = false;
bool isset_computeHostId = false;
@@ -259,14 +258,6 @@ uint32_t ApplicationDeploymentDescription::read(::apache::thrift::protocol::TPro
switch (fid)
{
case 1:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool(this->isEmpty);
- isset_isEmpty = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->appDeploymentId);
isset_appDeploymentId = true;
@@ -274,7 +265,7 @@ uint32_t ApplicationDeploymentDescription::read(::apache::thrift::protocol::TPro
xfer += iprot->skip(ftype);
}
break;
- case 3:
+ case 2:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->appModuleId);
isset_appModuleId = true;
@@ -282,7 +273,7 @@ uint32_t ApplicationDeploymentDescription::read(::apache::thrift::protocol::TPro
xfer += iprot->skip(ftype);
}
break;
- case 4:
+ case 3:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->computeHostId);
isset_computeHostId = true;
@@ -290,7 +281,7 @@ uint32_t ApplicationDeploymentDescription::read(::apache::thrift::protocol::TPro
xfer += iprot->skip(ftype);
}
break;
- case 5:
+ case 4:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->executablePath);
isset_executablePath = true;
@@ -298,7 +289,7 @@ uint32_t ApplicationDeploymentDescription::read(::apache::thrift::protocol::TPro
xfer += iprot->skip(ftype);
}
break;
- case 6:
+ case 5:
if (ftype == ::apache::thrift::protocol::T_I32) {
int32_t ecast0;
xfer += iprot->readI32(ecast0);
@@ -308,7 +299,7 @@ uint32_t ApplicationDeploymentDescription::read(::apache::thrift::protocol::TPro
xfer += iprot->skip(ftype);
}
break;
- case 7:
+ case 6:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->appDeploymentDescription);
this->__isset.appDeploymentDescription = true;
@@ -316,7 +307,7 @@ uint32_t ApplicationDeploymentDescription::read(::apache::thrift::protocol::TPro
xfer += iprot->skip(ftype);
}
break;
- case 8:
+ case 7:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->moduleLoadCmds.clear();
@@ -336,7 +327,7 @@ uint32_t ApplicationDeploymentDescription::read(::apache::thrift::protocol::TPro
xfer += iprot->skip(ftype);
}
break;
- case 9:
+ case 8:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->libPrependPaths.clear();
@@ -356,7 +347,7 @@ uint32_t ApplicationDeploymentDescription::read(::apache::thrift::protocol::TPro
xfer += iprot->skip(ftype);
}
break;
- case 10:
+ case 9:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->libAppendPaths.clear();
@@ -376,7 +367,7 @@ uint32_t ApplicationDeploymentDescription::read(::apache::thrift::protocol::TPro
xfer += iprot->skip(ftype);
}
break;
- case 11:
+ case 10:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->setEnvironment.clear();
@@ -405,8 +396,6 @@ uint32_t ApplicationDeploymentDescription::read(::apache::thrift::protocol::TPro
xfer += iprot->readStructEnd();
- if (!isset_isEmpty)
- throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_appDeploymentId)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_appModuleId)
@@ -424,37 +413,33 @@ uint32_t ApplicationDeploymentDescription::write(::apache::thrift::protocol::TPr
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("ApplicationDeploymentDescription");
- xfer += oprot->writeFieldBegin("isEmpty", ::apache::thrift::protocol::T_BOOL, 1);
- xfer += oprot->writeBool(this->isEmpty);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("appDeploymentId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeFieldBegin("appDeploymentId", ::apache::thrift::protocol::T_STRING, 1);
xfer += oprot->writeString(this->appDeploymentId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("appModuleId", ::apache::thrift::protocol::T_STRING, 3);
+ xfer += oprot->writeFieldBegin("appModuleId", ::apache::thrift::protocol::T_STRING, 2);
xfer += oprot->writeString(this->appModuleId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("computeHostId", ::apache::thrift::protocol::T_STRING, 4);
+ xfer += oprot->writeFieldBegin("computeHostId", ::apache::thrift::protocol::T_STRING, 3);
xfer += oprot->writeString(this->computeHostId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("executablePath", ::apache::thrift::protocol::T_STRING, 5);
+ xfer += oprot->writeFieldBegin("executablePath", ::apache::thrift::protocol::T_STRING, 4);
xfer += oprot->writeString(this->executablePath);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("parallelism", ::apache::thrift::protocol::T_I32, 6);
+ xfer += oprot->writeFieldBegin("parallelism", ::apache::thrift::protocol::T_I32, 5);
xfer += oprot->writeI32((int32_t)this->parallelism);
xfer += oprot->writeFieldEnd();
if (this->__isset.appDeploymentDescription) {
- xfer += oprot->writeFieldBegin("appDeploymentDescription", ::apache::thrift::protocol::T_STRING, 7);
+ xfer += oprot->writeFieldBegin("appDeploymentDescription", ::apache::thrift::protocol::T_STRING, 6);
xfer += oprot->writeString(this->appDeploymentDescription);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.moduleLoadCmds) {
- xfer += oprot->writeFieldBegin("moduleLoadCmds", ::apache::thrift::protocol::T_LIST, 8);
+ xfer += oprot->writeFieldBegin("moduleLoadCmds", ::apache::thrift::protocol::T_LIST, 7);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->moduleLoadCmds.size()));
std::vector<std::string> ::const_iterator _iter21;
@@ -467,7 +452,7 @@ uint32_t ApplicationDeploymentDescription::write(::apache::thrift::protocol::TPr
xfer += oprot->writeFieldEnd();
}
if (this->__isset.libPrependPaths) {
- xfer += oprot->writeFieldBegin("libPrependPaths", ::apache::thrift::protocol::T_LIST, 9);
+ xfer += oprot->writeFieldBegin("libPrependPaths", ::apache::thrift::protocol::T_LIST, 8);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->libPrependPaths.size()));
std::vector<SetEnvPaths> ::const_iterator _iter22;
@@ -480,7 +465,7 @@ uint32_t ApplicationDeploymentDescription::write(::apache::thrift::protocol::TPr
xfer += oprot->writeFieldEnd();
}
if (this->__isset.libAppendPaths) {
- xfer += oprot->writeFieldBegin("libAppendPaths", ::apache::thrift::protocol::T_LIST, 10);
+ xfer += oprot->writeFieldBegin("libAppendPaths", ::apache::thrift::protocol::T_LIST, 9);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->libAppendPaths.size()));
std::vector<SetEnvPaths> ::const_iterator _iter23;
@@ -493,7 +478,7 @@ uint32_t ApplicationDeploymentDescription::write(::apache::thrift::protocol::TPr
xfer += oprot->writeFieldEnd();
}
if (this->__isset.setEnvironment) {
- xfer += oprot->writeFieldBegin("setEnvironment", ::apache::thrift::protocol::T_LIST, 11);
+ xfer += oprot->writeFieldBegin("setEnvironment", ::apache::thrift::protocol::T_LIST, 10);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->setEnvironment.size()));
std::vector<SetEnvPaths> ::const_iterator _iter24;
@@ -512,7 +497,6 @@ uint32_t ApplicationDeploymentDescription::write(::apache::thrift::protocol::TPr
void swap(ApplicationDeploymentDescription &a, ApplicationDeploymentDescription &b) {
using ::std::swap;
- swap(a.isEmpty, b.isEmpty);
swap(a.appDeploymentId, b.appDeploymentId);
swap(a.appModuleId, b.appModuleId);
swap(a.computeHostId, b.computeHostId);
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.h
index dec8238..7c7ee39 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.h
@@ -162,17 +162,16 @@ typedef struct _ApplicationDeploymentDescription__isset {
class ApplicationDeploymentDescription {
public:
- static const char* ascii_fingerprint; // = "19A9841A9F4627A2C10F4A28E2CF0E17";
- static const uint8_t binary_fingerprint[16]; // = {0x19,0xA9,0x84,0x1A,0x9F,0x46,0x27,0xA2,0xC1,0x0F,0x4A,0x28,0xE2,0xCF,0x0E,0x17};
+ static const char* ascii_fingerprint; // = "179A145BD54BBE10649DEF31C71143C9";
+ static const uint8_t binary_fingerprint[16]; // = {0x17,0x9A,0x14,0x5B,0xD5,0x4B,0xBE,0x10,0x64,0x9D,0xEF,0x31,0xC7,0x11,0x43,0xC9};
- ApplicationDeploymentDescription() : isEmpty(false), appDeploymentId("DO_NOT_SET_AT_CLIENTS"), appModuleId(), computeHostId(), executablePath(), parallelism((ApplicationParallelismType::type)0), appDeploymentDescription() {
+ ApplicationDeploymentDescription() : appDeploymentId("DO_NOT_SET_AT_CLIENTS"), appModuleId(), computeHostId(), executablePath(), parallelism((ApplicationParallelismType::type)0), appDeploymentDescription() {
parallelism = (ApplicationParallelismType::type)0;
}
virtual ~ApplicationDeploymentDescription() throw() {}
- bool isEmpty;
std::string appDeploymentId;
std::string appModuleId;
std::string computeHostId;
@@ -186,10 +185,6 @@ class ApplicationDeploymentDescription {
_ApplicationDeploymentDescription__isset __isset;
- void __set_isEmpty(const bool val) {
- isEmpty = val;
- }
-
void __set_appDeploymentId(const std::string& val) {
appDeploymentId = val;
}
@@ -237,8 +232,6 @@ class ApplicationDeploymentDescription {
bool operator == (const ApplicationDeploymentDescription & rhs) const
{
- if (!(isEmpty == rhs.isEmpty))
- return false;
if (!(appDeploymentId == rhs.appDeploymentId))
return false;
if (!(appModuleId == rhs.appModuleId))
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_types.cpp
index e481a59..37193af 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_types.cpp
@@ -24,8 +24,8 @@ const char* _kDataTypeNames[] = {
};
const std::map<int, const char*> _DataType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(4, _kDataTypeValues, _kDataTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
-const char* InputDataObjectType::ascii_fingerprint = "0C147F4C4DFD0B9FF70275BF29D07281";
-const uint8_t InputDataObjectType::binary_fingerprint[16] = {0x0C,0x14,0x7F,0x4C,0x4D,0xFD,0x0B,0x9F,0xF7,0x02,0x75,0xBF,0x29,0xD0,0x72,0x81};
+const char* InputDataObjectType::ascii_fingerprint = "24F962C1CE4BE9FBD0F5D5EE9D1D5C00";
+const uint8_t InputDataObjectType::binary_fingerprint[16] = {0x24,0xF9,0x62,0xC1,0xCE,0x4B,0xE9,0xFB,0xD0,0xF5,0xD5,0xEE,0x9D,0x1D,0x5C,0x00};
uint32_t InputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -38,7 +38,6 @@ uint32_t InputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot)
using ::apache::thrift::protocol::TProtocolException;
- bool isset_isEmpty = false;
bool isset_name = false;
while (true)
@@ -50,14 +49,6 @@ uint32_t InputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot)
switch (fid)
{
case 1:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool(this->isEmpty);
- isset_isEmpty = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->name);
isset_name = true;
@@ -65,7 +56,7 @@ uint32_t InputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot)
xfer += iprot->skip(ftype);
}
break;
- case 3:
+ case 2:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->value);
this->__isset.value = true;
@@ -73,7 +64,7 @@ uint32_t InputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot)
xfer += iprot->skip(ftype);
}
break;
- case 4:
+ case 3:
if (ftype == ::apache::thrift::protocol::T_I32) {
int32_t ecast0;
xfer += iprot->readI32(ecast0);
@@ -83,7 +74,7 @@ uint32_t InputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot)
xfer += iprot->skip(ftype);
}
break;
- case 5:
+ case 4:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->applicationArgument);
this->__isset.applicationArgument = true;
@@ -91,7 +82,7 @@ uint32_t InputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot)
xfer += iprot->skip(ftype);
}
break;
- case 6:
+ case 5:
if (ftype == ::apache::thrift::protocol::T_BOOL) {
xfer += iprot->readBool(this->standardInput);
this->__isset.standardInput = true;
@@ -99,7 +90,7 @@ uint32_t InputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot)
xfer += iprot->skip(ftype);
}
break;
- case 7:
+ case 6:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->userFriendlyDescription);
this->__isset.userFriendlyDescription = true;
@@ -107,7 +98,7 @@ uint32_t InputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot)
xfer += iprot->skip(ftype);
}
break;
- case 8:
+ case 7:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->metaData);
this->__isset.metaData = true;
@@ -124,8 +115,6 @@ uint32_t InputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot)
xfer += iprot->readStructEnd();
- if (!isset_isEmpty)
- throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_name)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
@@ -135,41 +124,37 @@ uint32_t InputDataObjectType::write(::apache::thrift::protocol::TProtocol* oprot
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("InputDataObjectType");
- xfer += oprot->writeFieldBegin("isEmpty", ::apache::thrift::protocol::T_BOOL, 1);
- xfer += oprot->writeBool(this->isEmpty);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("name", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeFieldBegin("name", ::apache::thrift::protocol::T_STRING, 1);
xfer += oprot->writeString(this->name);
xfer += oprot->writeFieldEnd();
if (this->__isset.value) {
- xfer += oprot->writeFieldBegin("value", ::apache::thrift::protocol::T_STRING, 3);
+ xfer += oprot->writeFieldBegin("value", ::apache::thrift::protocol::T_STRING, 2);
xfer += oprot->writeString(this->value);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.type) {
- xfer += oprot->writeFieldBegin("type", ::apache::thrift::protocol::T_I32, 4);
+ xfer += oprot->writeFieldBegin("type", ::apache::thrift::protocol::T_I32, 3);
xfer += oprot->writeI32((int32_t)this->type);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.applicationArgument) {
- xfer += oprot->writeFieldBegin("applicationArgument", ::apache::thrift::protocol::T_STRING, 5);
+ xfer += oprot->writeFieldBegin("applicationArgument", ::apache::thrift::protocol::T_STRING, 4);
xfer += oprot->writeString(this->applicationArgument);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.standardInput) {
- xfer += oprot->writeFieldBegin("standardInput", ::apache::thrift::protocol::T_BOOL, 6);
+ xfer += oprot->writeFieldBegin("standardInput", ::apache::thrift::protocol::T_BOOL, 5);
xfer += oprot->writeBool(this->standardInput);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.userFriendlyDescription) {
- xfer += oprot->writeFieldBegin("userFriendlyDescription", ::apache::thrift::protocol::T_STRING, 7);
+ xfer += oprot->writeFieldBegin("userFriendlyDescription", ::apache::thrift::protocol::T_STRING, 6);
xfer += oprot->writeString(this->userFriendlyDescription);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.metaData) {
- xfer += oprot->writeFieldBegin("metaData", ::apache::thrift::protocol::T_STRING, 8);
+ xfer += oprot->writeFieldBegin("metaData", ::apache::thrift::protocol::T_STRING, 7);
xfer += oprot->writeString(this->metaData);
xfer += oprot->writeFieldEnd();
}
@@ -180,7 +165,6 @@ uint32_t InputDataObjectType::write(::apache::thrift::protocol::TProtocol* oprot
void swap(InputDataObjectType &a, InputDataObjectType &b) {
using ::std::swap;
- swap(a.isEmpty, b.isEmpty);
swap(a.name, b.name);
swap(a.value, b.value);
swap(a.type, b.type);
@@ -302,8 +286,8 @@ void swap(OutputDataObjectType &a, OutputDataObjectType &b) {
swap(a.__isset, b.__isset);
}
-const char* ApplicationInterfaceDescription::ascii_fingerprint = "B4A4B770076264D5948E96332AE8D291";
-const uint8_t ApplicationInterfaceDescription::binary_fingerprint[16] = {0xB4,0xA4,0xB7,0x70,0x07,0x62,0x64,0xD5,0x94,0x8E,0x96,0x33,0x2A,0xE8,0xD2,0x91};
+const char* ApplicationInterfaceDescription::ascii_fingerprint = "3C4F9F747CEDFDF7A46B0786A7C09268";
+const uint8_t ApplicationInterfaceDescription::binary_fingerprint[16] = {0x3C,0x4F,0x9F,0x74,0x7C,0xED,0xFD,0xF7,0xA4,0x6B,0x07,0x86,0xA7,0xC0,0x92,0x68};
uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -316,7 +300,6 @@ uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProt
using ::apache::thrift::protocol::TProtocolException;
- bool isset_isEmpty = false;
bool isset_applicationInterfaceId = false;
bool isset_applicationName = false;
@@ -329,14 +312,6 @@ uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProt
switch (fid)
{
case 1:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool(this->isEmpty);
- isset_isEmpty = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->applicationInterfaceId);
isset_applicationInterfaceId = true;
@@ -344,7 +319,7 @@ uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProt
xfer += iprot->skip(ftype);
}
break;
- case 3:
+ case 2:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->applicationName);
isset_applicationName = true;
@@ -352,7 +327,7 @@ uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProt
xfer += iprot->skip(ftype);
}
break;
- case 4:
+ case 3:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->applicationDesription);
this->__isset.applicationDesription = true;
@@ -360,7 +335,7 @@ uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProt
xfer += iprot->skip(ftype);
}
break;
- case 5:
+ case 4:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->applicationModules.clear();
@@ -380,7 +355,7 @@ uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProt
xfer += iprot->skip(ftype);
}
break;
- case 6:
+ case 5:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->applicationInputs.clear();
@@ -400,7 +375,7 @@ uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProt
xfer += iprot->skip(ftype);
}
break;
- case 7:
+ case 6:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->applicationOutputs.clear();
@@ -429,8 +404,6 @@ uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProt
xfer += iprot->readStructEnd();
- if (!isset_isEmpty)
- throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_applicationInterfaceId)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_applicationName)
@@ -442,25 +415,21 @@ uint32_t ApplicationInterfaceDescription::write(::apache::thrift::protocol::TPro
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("ApplicationInterfaceDescription");
- xfer += oprot->writeFieldBegin("isEmpty", ::apache::thrift::protocol::T_BOOL, 1);
- xfer += oprot->writeBool(this->isEmpty);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("applicationInterfaceId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeFieldBegin("applicationInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
xfer += oprot->writeString(this->applicationInterfaceId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("applicationName", ::apache::thrift::protocol::T_STRING, 3);
+ xfer += oprot->writeFieldBegin("applicationName", ::apache::thrift::protocol::T_STRING, 2);
xfer += oprot->writeString(this->applicationName);
xfer += oprot->writeFieldEnd();
if (this->__isset.applicationDesription) {
- xfer += oprot->writeFieldBegin("applicationDesription", ::apache::thrift::protocol::T_STRING, 4);
+ xfer += oprot->writeFieldBegin("applicationDesription", ::apache::thrift::protocol::T_STRING, 3);
xfer += oprot->writeString(this->applicationDesription);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.applicationModules) {
- xfer += oprot->writeFieldBegin("applicationModules", ::apache::thrift::protocol::T_LIST, 5);
+ xfer += oprot->writeFieldBegin("applicationModules", ::apache::thrift::protocol::T_LIST, 4);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->applicationModules.size()));
std::vector<std::string> ::const_iterator _iter17;
@@ -473,7 +442,7 @@ uint32_t ApplicationInterfaceDescription::write(::apache::thrift::protocol::TPro
xfer += oprot->writeFieldEnd();
}
if (this->__isset.applicationInputs) {
- xfer += oprot->writeFieldBegin("applicationInputs", ::apache::thrift::protocol::T_LIST, 6);
+ xfer += oprot->writeFieldBegin("applicationInputs", ::apache::thrift::protocol::T_LIST, 5);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->applicationInputs.size()));
std::vector<InputDataObjectType> ::const_iterator _iter18;
@@ -486,7 +455,7 @@ uint32_t ApplicationInterfaceDescription::write(::apache::thrift::protocol::TPro
xfer += oprot->writeFieldEnd();
}
if (this->__isset.applicationOutputs) {
- xfer += oprot->writeFieldBegin("applicationOutputs", ::apache::thrift::protocol::T_LIST, 7);
+ xfer += oprot->writeFieldBegin("applicationOutputs", ::apache::thrift::protocol::T_LIST, 6);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->applicationOutputs.size()));
std::vector<OutputDataObjectType> ::const_iterator _iter19;
@@ -505,7 +474,6 @@ uint32_t ApplicationInterfaceDescription::write(::apache::thrift::protocol::TPro
void swap(ApplicationInterfaceDescription &a, ApplicationInterfaceDescription &b) {
using ::std::swap;
- swap(a.isEmpty, b.isEmpty);
swap(a.applicationInterfaceId, b.applicationInterfaceId);
swap(a.applicationName, b.applicationName);
swap(a.applicationDesription, b.applicationDesription);
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_types.h
index d053e09..5b27863 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_types.h
@@ -41,15 +41,14 @@ typedef struct _InputDataObjectType__isset {
class InputDataObjectType {
public:
- static const char* ascii_fingerprint; // = "0C147F4C4DFD0B9FF70275BF29D07281";
- static const uint8_t binary_fingerprint[16]; // = {0x0C,0x14,0x7F,0x4C,0x4D,0xFD,0x0B,0x9F,0xF7,0x02,0x75,0xBF,0x29,0xD0,0x72,0x81};
+ static const char* ascii_fingerprint; // = "24F962C1CE4BE9FBD0F5D5EE9D1D5C00";
+ static const uint8_t binary_fingerprint[16]; // = {0x24,0xF9,0x62,0xC1,0xCE,0x4B,0xE9,0xFB,0xD0,0xF5,0xD5,0xEE,0x9D,0x1D,0x5C,0x00};
- InputDataObjectType() : isEmpty(false), name(), value(), type((DataType::type)0), applicationArgument(), standardInput(false), userFriendlyDescription(), metaData() {
+ InputDataObjectType() : name(), value(), type((DataType::type)0), applicationArgument(), standardInput(false), userFriendlyDescription(), metaData() {
}
virtual ~InputDataObjectType() throw() {}
- bool isEmpty;
std::string name;
std::string value;
DataType::type type;
@@ -60,10 +59,6 @@ class InputDataObjectType {
_InputDataObjectType__isset __isset;
- void __set_isEmpty(const bool val) {
- isEmpty = val;
- }
-
void __set_name(const std::string& val) {
name = val;
}
@@ -100,8 +95,6 @@ class InputDataObjectType {
bool operator == (const InputDataObjectType & rhs) const
{
- if (!(isEmpty == rhs.isEmpty))
- return false;
if (!(name == rhs.name))
return false;
if (__isset.value != rhs.__isset.value)
@@ -225,15 +218,14 @@ typedef struct _ApplicationInterfaceDescription__isset {
class ApplicationInterfaceDescription {
public:
- static const char* ascii_fingerprint; // = "B4A4B770076264D5948E96332AE8D291";
- static const uint8_t binary_fingerprint[16]; // = {0xB4,0xA4,0xB7,0x70,0x07,0x62,0x64,0xD5,0x94,0x8E,0x96,0x33,0x2A,0xE8,0xD2,0x91};
+ static const char* ascii_fingerprint; // = "3C4F9F747CEDFDF7A46B0786A7C09268";
+ static const uint8_t binary_fingerprint[16]; // = {0x3C,0x4F,0x9F,0x74,0x7C,0xED,0xFD,0xF7,0xA4,0x6B,0x07,0x86,0xA7,0xC0,0x92,0x68};
- ApplicationInterfaceDescription() : isEmpty(false), applicationInterfaceId("DO_NOT_SET_AT_CLIENTS"), applicationName(), applicationDesription() {
+ ApplicationInterfaceDescription() : applicationInterfaceId("DO_NOT_SET_AT_CLIENTS"), applicationName(), applicationDesription() {
}
virtual ~ApplicationInterfaceDescription() throw() {}
- bool isEmpty;
std::string applicationInterfaceId;
std::string applicationName;
std::string applicationDesription;
@@ -243,10 +235,6 @@ class ApplicationInterfaceDescription {
_ApplicationInterfaceDescription__isset __isset;
- void __set_isEmpty(const bool val) {
- isEmpty = val;
- }
-
void __set_applicationInterfaceId(const std::string& val) {
applicationInterfaceId = val;
}
@@ -277,8 +265,6 @@ class ApplicationInterfaceDescription {
bool operator == (const ApplicationInterfaceDescription & rhs) const
{
- if (!(isEmpty == rhs.isEmpty))
- return false;
if (!(applicationInterfaceId == rhs.applicationInterfaceId))
return false;
if (!(applicationName == rhs.applicationName))
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.cpp
index 1d4f065..b6966b8 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.cpp
@@ -1205,8 +1205,8 @@ void swap(DataMovementInterface &a, DataMovementInterface &b) {
swap(a.priorityOrder, b.priorityOrder);
}
-const char* ComputeResourceDescription::ascii_fingerprint = "95B7C2C0992AC1BEC9B06845F0CB3D24";
-const uint8_t ComputeResourceDescription::binary_fingerprint[16] = {0x95,0xB7,0xC2,0xC0,0x99,0x2A,0xC1,0xBE,0xC9,0xB0,0x68,0x45,0xF0,0xCB,0x3D,0x24};
+const char* ComputeResourceDescription::ascii_fingerprint = "2CAAC3134218EFF83D46106C39BECE65";
+const uint8_t ComputeResourceDescription::binary_fingerprint[16] = {0x2C,0xAA,0xC3,0x13,0x42,0x18,0xEF,0xF8,0x3D,0x46,0x10,0x6C,0x39,0xBE,0xCE,0x65};
uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -1219,7 +1219,6 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
using ::apache::thrift::protocol::TProtocolException;
- bool isset_isEmpty = false;
bool isset_computeResourceId = false;
bool isset_hostName = false;
@@ -1232,14 +1231,6 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
switch (fid)
{
case 1:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool(this->isEmpty);
- isset_isEmpty = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->computeResourceId);
isset_computeResourceId = true;
@@ -1247,7 +1238,7 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
xfer += iprot->skip(ftype);
}
break;
- case 3:
+ case 2:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->hostName);
isset_hostName = true;
@@ -1255,7 +1246,7 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
xfer += iprot->skip(ftype);
}
break;
- case 4:
+ case 3:
if (ftype == ::apache::thrift::protocol::T_SET) {
{
this->hostAliases.clear();
@@ -1276,7 +1267,7 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
xfer += iprot->skip(ftype);
}
break;
- case 5:
+ case 4:
if (ftype == ::apache::thrift::protocol::T_SET) {
{
this->ipAddresses.clear();
@@ -1297,7 +1288,7 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
xfer += iprot->skip(ftype);
}
break;
- case 6:
+ case 5:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->resourceDescription);
this->__isset.resourceDescription = true;
@@ -1305,7 +1296,7 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
xfer += iprot->skip(ftype);
}
break;
- case 7:
+ case 6:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->batchQueues.clear();
@@ -1325,7 +1316,7 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
xfer += iprot->skip(ftype);
}
break;
- case 8:
+ case 7:
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->fileSystems.clear();
@@ -1350,7 +1341,7 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
xfer += iprot->skip(ftype);
}
break;
- case 9:
+ case 8:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->jobSubmissionInterfaces.clear();
@@ -1370,7 +1361,7 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
xfer += iprot->skip(ftype);
}
break;
- case 10:
+ case 9:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->dataMovementInterfaces.clear();
@@ -1399,8 +1390,6 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
xfer += iprot->readStructEnd();
- if (!isset_isEmpty)
- throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_computeResourceId)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_hostName)
@@ -1412,20 +1401,16 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("ComputeResourceDescription");
- xfer += oprot->writeFieldBegin("isEmpty", ::apache::thrift::protocol::T_BOOL, 1);
- xfer += oprot->writeBool(this->isEmpty);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("computeResourceId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeFieldBegin("computeResourceId", ::apache::thrift::protocol::T_STRING, 1);
xfer += oprot->writeString(this->computeResourceId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("hostName", ::apache::thrift::protocol::T_STRING, 3);
+ xfer += oprot->writeFieldBegin("hostName", ::apache::thrift::protocol::T_STRING, 2);
xfer += oprot->writeString(this->hostName);
xfer += oprot->writeFieldEnd();
if (this->__isset.hostAliases) {
- xfer += oprot->writeFieldBegin("hostAliases", ::apache::thrift::protocol::T_SET, 4);
+ xfer += oprot->writeFieldBegin("hostAliases", ::apache::thrift::protocol::T_SET, 3);
{
xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->hostAliases.size()));
std::set<std::string> ::const_iterator _iter63;
@@ -1438,7 +1423,7 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeFieldEnd();
}
if (this->__isset.ipAddresses) {
- xfer += oprot->writeFieldBegin("ipAddresses", ::apache::thrift::protocol::T_SET, 5);
+ xfer += oprot->writeFieldBegin("ipAddresses", ::apache::thrift::protocol::T_SET, 4);
{
xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->ipAddresses.size()));
std::set<std::string> ::const_iterator _iter64;
@@ -1451,12 +1436,12 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeFieldEnd();
}
if (this->__isset.resourceDescription) {
- xfer += oprot->writeFieldBegin("resourceDescription", ::apache::thrift::protocol::T_STRING, 6);
+ xfer += oprot->writeFieldBegin("resourceDescription", ::apache::thrift::protocol::T_STRING, 5);
xfer += oprot->writeString(this->resourceDescription);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.batchQueues) {
- xfer += oprot->writeFieldBegin("batchQueues", ::apache::thrift::protocol::T_LIST, 7);
+ xfer += oprot->writeFieldBegin("batchQueues", ::apache::thrift::protocol::T_LIST, 6);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->batchQueues.size()));
std::vector<BatchQueue> ::const_iterator _iter65;
@@ -1469,7 +1454,7 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeFieldEnd();
}
if (this->__isset.fileSystems) {
- xfer += oprot->writeFieldBegin("fileSystems", ::apache::thrift::protocol::T_MAP, 8);
+ xfer += oprot->writeFieldBegin("fileSystems", ::apache::thrift::protocol::T_MAP, 7);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->fileSystems.size()));
std::map<FileSystems::type, std::string> ::const_iterator _iter66;
@@ -1483,7 +1468,7 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeFieldEnd();
}
if (this->__isset.jobSubmissionInterfaces) {
- xfer += oprot->writeFieldBegin("jobSubmissionInterfaces", ::apache::thrift::protocol::T_LIST, 9);
+ xfer += oprot->writeFieldBegin("jobSubmissionInterfaces", ::apache::thrift::protocol::T_LIST, 8);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->jobSubmissionInterfaces.size()));
std::vector<JobSubmissionInterface> ::const_iterator _iter67;
@@ -1496,7 +1481,7 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeFieldEnd();
}
if (this->__isset.dataMovementInterfaces) {
- xfer += oprot->writeFieldBegin("dataMovementInterfaces", ::apache::thrift::protocol::T_LIST, 10);
+ xfer += oprot->writeFieldBegin("dataMovementInterfaces", ::apache::thrift::protocol::T_LIST, 9);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->dataMovementInterfaces.size()));
std::vector<DataMovementInterface> ::const_iterator _iter68;
@@ -1515,7 +1500,6 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
void swap(ComputeResourceDescription &a, ComputeResourceDescription &b) {
using ::std::swap;
- swap(a.isEmpty, b.isEmpty);
swap(a.computeResourceId, b.computeResourceId);
swap(a.hostName, b.hostName);
swap(a.hostAliases, b.hostAliases);
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.h
index c57bb1d..ffa2bf3 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.h
@@ -725,15 +725,14 @@ typedef struct _ComputeResourceDescription__isset {
class ComputeResourceDescription {
public:
- static const char* ascii_fingerprint; // = "95B7C2C0992AC1BEC9B06845F0CB3D24";
- static const uint8_t binary_fingerprint[16]; // = {0x95,0xB7,0xC2,0xC0,0x99,0x2A,0xC1,0xBE,0xC9,0xB0,0x68,0x45,0xF0,0xCB,0x3D,0x24};
+ static const char* ascii_fingerprint; // = "2CAAC3134218EFF83D46106C39BECE65";
+ static const uint8_t binary_fingerprint[16]; // = {0x2C,0xAA,0xC3,0x13,0x42,0x18,0xEF,0xF8,0x3D,0x46,0x10,0x6C,0x39,0xBE,0xCE,0x65};
- ComputeResourceDescription() : isEmpty(false), computeResourceId("DO_NOT_SET_AT_CLIENTS"), hostName(), resourceDescription() {
+ ComputeResourceDescription() : computeResourceId("DO_NOT_SET_AT_CLIENTS"), hostName(), resourceDescription() {
}
virtual ~ComputeResourceDescription() throw() {}
- bool isEmpty;
std::string computeResourceId;
std::string hostName;
std::set<std::string> hostAliases;
@@ -746,10 +745,6 @@ class ComputeResourceDescription {
_ComputeResourceDescription__isset __isset;
- void __set_isEmpty(const bool val) {
- isEmpty = val;
- }
-
void __set_computeResourceId(const std::string& val) {
computeResourceId = val;
}
@@ -795,8 +790,6 @@ class ComputeResourceDescription {
bool operator == (const ComputeResourceDescription & rhs) const
{
- if (!(isEmpty == rhs.isEmpty))
- return false;
if (!(computeResourceId == rhs.computeResourceId))
return false;
if (!(hostName == rhs.hostName))
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
index d880646..40ca7d8 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
@@ -18881,7 +18881,7 @@ class Airavata_registerGatewayResourceProfile_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::BOOL,
+ 'type' => TType::STRING,
),
1 => array(
'var' => 'ire',
@@ -18936,8 +18936,8 @@ class Airavata_registerGatewayResourceProfile_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->success);
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->success);
} else {
$xfer += $input->skip($ftype);
}
@@ -18980,8 +18980,8 @@ class Airavata_registerGatewayResourceProfile_result {
$xfer = 0;
$xfer += $output->writeStructBegin('Airavata_registerGatewayResourceProfile_result');
if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
- $xfer += $output->writeBool($this->success);
+ $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
+ $xfer += $output->writeString($this->success);
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php
index 9137266..cc0f006 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php
@@ -277,7 +277,6 @@ class ApplicationModule {
class ApplicationDeploymentDescription {
static $_TSPEC;
- public $isEmpty = false;
public $appDeploymentId = "DO_NOT_SET_AT_CLIENTS";
public $appModuleId = null;
public $computeHostId = null;
@@ -293,34 +292,30 @@ class ApplicationDeploymentDescription {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
1 => array(
- 'var' => 'isEmpty',
- 'type' => TType::BOOL,
- ),
- 2 => array(
'var' => 'appDeploymentId',
'type' => TType::STRING,
),
- 3 => array(
+ 2 => array(
'var' => 'appModuleId',
'type' => TType::STRING,
),
- 4 => array(
+ 3 => array(
'var' => 'computeHostId',
'type' => TType::STRING,
),
- 5 => array(
+ 4 => array(
'var' => 'executablePath',
'type' => TType::STRING,
),
- 6 => array(
+ 5 => array(
'var' => 'parallelism',
'type' => TType::I32,
),
- 7 => array(
+ 6 => array(
'var' => 'appDeploymentDescription',
'type' => TType::STRING,
),
- 8 => array(
+ 7 => array(
'var' => 'moduleLoadCmds',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -328,7 +323,7 @@ class ApplicationDeploymentDescription {
'type' => TType::STRING,
),
),
- 9 => array(
+ 8 => array(
'var' => 'libPrependPaths',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -337,7 +332,7 @@ class ApplicationDeploymentDescription {
'class' => '\Airavata\Model\AppCatalog\AppDeployment\SetEnvPaths',
),
),
- 10 => array(
+ 9 => array(
'var' => 'libAppendPaths',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -346,7 +341,7 @@ class ApplicationDeploymentDescription {
'class' => '\Airavata\Model\AppCatalog\AppDeployment\SetEnvPaths',
),
),
- 11 => array(
+ 10 => array(
'var' => 'setEnvironment',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -358,9 +353,6 @@ class ApplicationDeploymentDescription {
);
}
if (is_array($vals)) {
- if (isset($vals['isEmpty'])) {
- $this->isEmpty = $vals['isEmpty'];
- }
if (isset($vals['appDeploymentId'])) {
$this->appDeploymentId = $vals['appDeploymentId'];
}
@@ -414,55 +406,48 @@ class ApplicationDeploymentDescription {
switch ($fid)
{
case 1:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->isEmpty);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->appDeploymentId);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 3:
+ case 2:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->appModuleId);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 4:
+ case 3:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->computeHostId);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 5:
+ case 4:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->executablePath);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 6:
+ case 5:
if ($ftype == TType::I32) {
$xfer += $input->readI32($this->parallelism);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 7:
+ case 6:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->appDeploymentDescription);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 8:
+ case 7:
if ($ftype == TType::LST) {
$this->moduleLoadCmds = array();
$_size0 = 0;
@@ -479,7 +464,7 @@ class ApplicationDeploymentDescription {
$xfer += $input->skip($ftype);
}
break;
- case 9:
+ case 8:
if ($ftype == TType::LST) {
$this->libPrependPaths = array();
$_size6 = 0;
@@ -497,7 +482,7 @@ class ApplicationDeploymentDescription {
$xfer += $input->skip($ftype);
}
break;
- case 10:
+ case 9:
if ($ftype == TType::LST) {
$this->libAppendPaths = array();
$_size12 = 0;
@@ -515,7 +500,7 @@ class ApplicationDeploymentDescription {
$xfer += $input->skip($ftype);
}
break;
- case 11:
+ case 10:
if ($ftype == TType::LST) {
$this->setEnvironment = array();
$_size18 = 0;
@@ -546,38 +531,33 @@ class ApplicationDeploymentDescription {
public function write($output) {
$xfer = 0;
$xfer += $output->writeStructBegin('ApplicationDeploymentDescription');
- if ($this->isEmpty !== null) {
- $xfer += $output->writeFieldBegin('isEmpty', TType::BOOL, 1);
- $xfer += $output->writeBool($this->isEmpty);
- $xfer += $output->writeFieldEnd();
- }
if ($this->appDeploymentId !== null) {
- $xfer += $output->writeFieldBegin('appDeploymentId', TType::STRING, 2);
+ $xfer += $output->writeFieldBegin('appDeploymentId', TType::STRING, 1);
$xfer += $output->writeString($this->appDeploymentId);
$xfer += $output->writeFieldEnd();
}
if ($this->appModuleId !== null) {
- $xfer += $output->writeFieldBegin('appModuleId', TType::STRING, 3);
+ $xfer += $output->writeFieldBegin('appModuleId', TType::STRING, 2);
$xfer += $output->writeString($this->appModuleId);
$xfer += $output->writeFieldEnd();
}
if ($this->computeHostId !== null) {
- $xfer += $output->writeFieldBegin('computeHostId', TType::STRING, 4);
+ $xfer += $output->writeFieldBegin('computeHostId', TType::STRING, 3);
$xfer += $output->writeString($this->computeHostId);
$xfer += $output->writeFieldEnd();
}
if ($this->executablePath !== null) {
- $xfer += $output->writeFieldBegin('executablePath', TType::STRING, 5);
+ $xfer += $output->writeFieldBegin('executablePath', TType::STRING, 4);
$xfer += $output->writeString($this->executablePath);
$xfer += $output->writeFieldEnd();
}
if ($this->parallelism !== null) {
- $xfer += $output->writeFieldBegin('parallelism', TType::I32, 6);
+ $xfer += $output->writeFieldBegin('parallelism', TType::I32, 5);
$xfer += $output->writeI32($this->parallelism);
$xfer += $output->writeFieldEnd();
}
if ($this->appDeploymentDescription !== null) {
- $xfer += $output->writeFieldBegin('appDeploymentDescription', TType::STRING, 7);
+ $xfer += $output->writeFieldBegin('appDeploymentDescription', TType::STRING, 6);
$xfer += $output->writeString($this->appDeploymentDescription);
$xfer += $output->writeFieldEnd();
}
@@ -585,7 +565,7 @@ class ApplicationDeploymentDescription {
if (!is_array($this->moduleLoadCmds)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('moduleLoadCmds', TType::LST, 8);
+ $xfer += $output->writeFieldBegin('moduleLoadCmds', TType::LST, 7);
{
$output->writeListBegin(TType::STRING, count($this->moduleLoadCmds));
{
@@ -602,7 +582,7 @@ class ApplicationDeploymentDescription {
if (!is_array($this->libPrependPaths)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('libPrependPaths', TType::LST, 9);
+ $xfer += $output->writeFieldBegin('libPrependPaths', TType::LST, 8);
{
$output->writeListBegin(TType::STRUCT, count($this->libPrependPaths));
{
@@ -619,7 +599,7 @@ class ApplicationDeploymentDescription {
if (!is_array($this->libAppendPaths)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('libAppendPaths', TType::LST, 10);
+ $xfer += $output->writeFieldBegin('libAppendPaths', TType::LST, 9);
{
$output->writeListBegin(TType::STRUCT, count($this->libAppendPaths));
{
@@ -636,7 +616,7 @@ class ApplicationDeploymentDescription {
if (!is_array($this->setEnvironment)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('setEnvironment', TType::LST, 11);
+ $xfer += $output->writeFieldBegin('setEnvironment', TType::LST, 10);
{
$output->writeListBegin(TType::STRUCT, count($this->setEnvironment));
{