Repository: airavata Updated Branches: refs/heads/master bd9c12d0d -> 07c3f788d
fixing typo in appInterface thrift file Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/07c3f788 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/07c3f788 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/07c3f788 Branch: refs/heads/master Commit: 07c3f788dc8b0a4d81d2faa14ac0cd6112e0231f Parents: bd9c12d Author: Chathuri Wimalasena <[email protected]> Authored: Wed Jul 2 16:18:35 2014 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Wed Jul 2 16:18:35 2014 -0400 ---------------------------------------------------------------------- .../lib/applicationInterfaceModel_types.cpp | 12 +-- .../lib/applicationInterfaceModel_types.h | 18 ++-- .../Model/AppCatalog/AppInterface/Types.php | 16 +-- .../appinterface/InputDataObjectType.java | 104 +++++++++---------- .../airavata/model/util/AppInterfaceUtil.java | 2 +- .../applicationInterfaceModel.thrift | 2 +- .../data/impl/ApplicationInterfaceImpl.java | 4 +- .../data/util/AppCatalogThriftConversion.java | 2 +- .../app/catalog/test/AppInterfaceTest.java | 2 +- 9 files changed, 81 insertions(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/07c3f788/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 c393fab..65acecf 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 @@ -85,8 +85,8 @@ uint32_t InputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot) break; case 5: if (ftype == ::apache::thrift::protocol::T_STRING) { - xfer += iprot->readString(this->applicationArguement); - this->__isset.applicationArguement = true; + xfer += iprot->readString(this->applicationArgument); + this->__isset.applicationArgument = true; } else { xfer += iprot->skip(ftype); } @@ -153,9 +153,9 @@ uint32_t InputDataObjectType::write(::apache::thrift::protocol::TProtocol* oprot xfer += oprot->writeI32((int32_t)this->type); xfer += oprot->writeFieldEnd(); } - if (this->__isset.applicationArguement) { - xfer += oprot->writeFieldBegin("applicationArguement", ::apache::thrift::protocol::T_STRING, 5); - xfer += oprot->writeString(this->applicationArguement); + if (this->__isset.applicationArgument) { + xfer += oprot->writeFieldBegin("applicationArgument", ::apache::thrift::protocol::T_STRING, 5); + xfer += oprot->writeString(this->applicationArgument); xfer += oprot->writeFieldEnd(); } if (this->__isset.standardInput) { @@ -184,7 +184,7 @@ void swap(InputDataObjectType &a, InputDataObjectType &b) { swap(a.name, b.name); swap(a.value, b.value); swap(a.type, b.type); - swap(a.applicationArguement, b.applicationArguement); + swap(a.applicationArgument, b.applicationArgument); swap(a.standardInput, b.standardInput); swap(a.userFriendlyDescription, b.userFriendlyDescription); swap(a.metaData, b.metaData); http://git-wip-us.apache.org/repos/asf/airavata/blob/07c3f788/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 1c89d08..bb5a8e1 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 @@ -29,10 +29,10 @@ struct DataType { extern const std::map<int, const char*> _DataType_VALUES_TO_NAMES; typedef struct _InputDataObjectType__isset { - _InputDataObjectType__isset() : value(false), type(false), applicationArguement(false), standardInput(true), userFriendlyDescription(false), metaData(false) {} + _InputDataObjectType__isset() : value(false), type(false), applicationArgument(false), standardInput(true), userFriendlyDescription(false), metaData(false) {} bool value; bool type; - bool applicationArguement; + bool applicationArgument; bool standardInput; bool userFriendlyDescription; bool metaData; @@ -44,7 +44,7 @@ class InputDataObjectType { 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}; - InputDataObjectType() : isEmpty(false), name(), value(), type((DataType::type)0), applicationArguement(), standardInput(false), userFriendlyDescription(), metaData() { + InputDataObjectType() : isEmpty(false), name(), value(), type((DataType::type)0), applicationArgument(), standardInput(false), userFriendlyDescription(), metaData() { } virtual ~InputDataObjectType() throw() {} @@ -53,7 +53,7 @@ class InputDataObjectType { std::string name; std::string value; DataType::type type; - std::string applicationArguement; + std::string applicationArgument; bool standardInput; std::string userFriendlyDescription; std::string metaData; @@ -78,9 +78,9 @@ class InputDataObjectType { __isset.type = true; } - void __set_applicationArguement(const std::string& val) { - applicationArguement = val; - __isset.applicationArguement = true; + void __set_applicationArgument(const std::string& val) { + applicationArgument = val; + __isset.applicationArgument = true; } void __set_standardInput(const bool val) { @@ -112,9 +112,9 @@ class InputDataObjectType { return false; else if (__isset.type && !(type == rhs.type)) return false; - if (__isset.applicationArguement != rhs.__isset.applicationArguement) + if (__isset.applicationArgument != rhs.__isset.applicationArgument) return false; - else if (__isset.applicationArguement && !(applicationArguement == rhs.applicationArguement)) + else if (__isset.applicationArgument && !(applicationArgument == rhs.applicationArgument)) return false; if (__isset.standardInput != rhs.__isset.standardInput) return false; http://git-wip-us.apache.org/repos/asf/airavata/blob/07c3f788/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 2097cdf..3f9ed59 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 @@ -37,7 +37,7 @@ class InputDataObjectType { public $name = null; public $value = null; public $type = null; - public $applicationArguement = null; + public $applicationArgument = null; public $standardInput = false; public $userFriendlyDescription = null; public $metaData = null; @@ -62,7 +62,7 @@ class InputDataObjectType { 'type' => TType::I32, ), 5 => array( - 'var' => 'applicationArguement', + 'var' => 'applicationArgument', 'type' => TType::STRING, ), 6 => array( @@ -92,8 +92,8 @@ class InputDataObjectType { if (isset($vals['type'])) { $this->type = $vals['type']; } - if (isset($vals['applicationArguement'])) { - $this->applicationArguement = $vals['applicationArguement']; + if (isset($vals['applicationArgument'])) { + $this->applicationArgument = $vals['applicationArgument']; } if (isset($vals['standardInput'])) { $this->standardInput = $vals['standardInput']; @@ -156,7 +156,7 @@ class InputDataObjectType { break; case 5: if ($ftype == TType::STRING) { - $xfer += $input->readString($this->applicationArguement); + $xfer += $input->readString($this->applicationArgument); } else { $xfer += $input->skip($ftype); } @@ -215,9 +215,9 @@ class InputDataObjectType { $xfer += $output->writeI32($this->type); $xfer += $output->writeFieldEnd(); } - if ($this->applicationArguement !== null) { - $xfer += $output->writeFieldBegin('applicationArguement', TType::STRING, 5); - $xfer += $output->writeString($this->applicationArguement); + if ($this->applicationArgument !== null) { + $xfer += $output->writeFieldBegin('applicationArgument', TType::STRING, 5); + $xfer += $output->writeString($this->applicationArgument); $xfer += $output->writeFieldEnd(); } if ($this->standardInput !== null) { http://git-wip-us.apache.org/repos/asf/airavata/blob/07c3f788/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 308848b..50f76b8 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 @@ -81,7 +81,7 @@ import org.slf4j.LoggerFactory; 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_ARGUEMENT_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationArguement", org.apache.thrift.protocol.TType.STRING, (short)5); + 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); @@ -96,7 +96,7 @@ import org.slf4j.LoggerFactory; private String name; // required private String value; // optional private DataType type; // optional - private String applicationArguement; // optional + private String applicationArgument; // optional private boolean standardInput; // optional private String userFriendlyDescription; // optional private String metaData; // optional @@ -111,7 +111,7 @@ import org.slf4j.LoggerFactory; * @see DataType */ TYPE((short)4, "type"), - APPLICATION_ARGUEMENT((short)5, "applicationArguement"), + APPLICATION_ARGUMENT((short)5, "applicationArgument"), STANDARD_INPUT((short)6, "standardInput"), USER_FRIENDLY_DESCRIPTION((short)7, "userFriendlyDescription"), META_DATA((short)8, "metaData"); @@ -137,8 +137,8 @@ import org.slf4j.LoggerFactory; return VALUE; case 4: // TYPE return TYPE; - case 5: // APPLICATION_ARGUEMENT - return APPLICATION_ARGUEMENT; + case 5: // APPLICATION_ARGUMENT + return APPLICATION_ARGUMENT; case 6: // STANDARD_INPUT return STANDARD_INPUT; case 7: // USER_FRIENDLY_DESCRIPTION @@ -188,7 +188,7 @@ import org.slf4j.LoggerFactory; private static final int __ISEMPTY_ISSET_ID = 0; private static final int __STANDARDINPUT_ISSET_ID = 1; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.VALUE,_Fields.TYPE,_Fields.APPLICATION_ARGUEMENT,_Fields.STANDARD_INPUT,_Fields.USER_FRIENDLY_DESCRIPTION,_Fields.META_DATA}; + 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); @@ -200,7 +200,7 @@ import org.slf4j.LoggerFactory; new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, DataType.class))); - tmpMap.put(_Fields.APPLICATION_ARGUEMENT, new org.apache.thrift.meta_data.FieldMetaData("applicationArguement", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.APPLICATION_ARGUMENT, new org.apache.thrift.meta_data.FieldMetaData("applicationArgument", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.STANDARD_INPUT, new org.apache.thrift.meta_data.FieldMetaData("standardInput", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); @@ -244,8 +244,8 @@ import org.slf4j.LoggerFactory; if (other.isSetType()) { this.type = other.type; } - if (other.isSetApplicationArguement()) { - this.applicationArguement = other.applicationArguement; + if (other.isSetApplicationArgument()) { + this.applicationArgument = other.applicationArgument; } this.standardInput = other.standardInput; if (other.isSetUserFriendlyDescription()) { @@ -267,7 +267,7 @@ import org.slf4j.LoggerFactory; this.name = null; this.value = null; this.type = null; - this.applicationArguement = null; + this.applicationArgument = null; this.standardInput = false; this.userFriendlyDescription = null; @@ -373,26 +373,26 @@ import org.slf4j.LoggerFactory; } } - public String getApplicationArguement() { - return this.applicationArguement; + public String getApplicationArgument() { + return this.applicationArgument; } - public void setApplicationArguement(String applicationArguement) { - this.applicationArguement = applicationArguement; + public void setApplicationArgument(String applicationArgument) { + this.applicationArgument = applicationArgument; } - public void unsetApplicationArguement() { - this.applicationArguement = null; + public void unsetApplicationArgument() { + this.applicationArgument = null; } - /** Returns true if field applicationArguement is set (has been assigned a value) and false otherwise */ - public boolean isSetApplicationArguement() { - return this.applicationArguement != null; + /** Returns true if field applicationArgument is set (has been assigned a value) and false otherwise */ + public boolean isSetApplicationArgument() { + return this.applicationArgument != null; } - public void setApplicationArguementIsSet(boolean value) { + public void setApplicationArgumentIsSet(boolean value) { if (!value) { - this.applicationArguement = null; + this.applicationArgument = null; } } @@ -498,11 +498,11 @@ import org.slf4j.LoggerFactory; } break; - case APPLICATION_ARGUEMENT: + case APPLICATION_ARGUMENT: if (value == null) { - unsetApplicationArguement(); + unsetApplicationArgument(); } else { - setApplicationArguement((String)value); + setApplicationArgument((String)value); } break; @@ -547,8 +547,8 @@ import org.slf4j.LoggerFactory; case TYPE: return getType(); - case APPLICATION_ARGUEMENT: - return getApplicationArguement(); + case APPLICATION_ARGUMENT: + return getApplicationArgument(); case STANDARD_INPUT: return Boolean.valueOf(isStandardInput()); @@ -578,8 +578,8 @@ import org.slf4j.LoggerFactory; return isSetValue(); case TYPE: return isSetType(); - case APPLICATION_ARGUEMENT: - return isSetApplicationArguement(); + case APPLICATION_ARGUMENT: + return isSetApplicationArgument(); case STANDARD_INPUT: return isSetStandardInput(); case USER_FRIENDLY_DESCRIPTION: @@ -639,12 +639,12 @@ import org.slf4j.LoggerFactory; return false; } - boolean this_present_applicationArguement = true && this.isSetApplicationArguement(); - boolean that_present_applicationArguement = true && that.isSetApplicationArguement(); - if (this_present_applicationArguement || that_present_applicationArguement) { - if (!(this_present_applicationArguement && that_present_applicationArguement)) + boolean this_present_applicationArgument = true && this.isSetApplicationArgument(); + boolean that_present_applicationArgument = true && that.isSetApplicationArgument(); + if (this_present_applicationArgument || that_present_applicationArgument) { + if (!(this_present_applicationArgument && that_present_applicationArgument)) return false; - if (!this.applicationArguement.equals(that.applicationArguement)) + if (!this.applicationArgument.equals(that.applicationArgument)) return false; } @@ -731,12 +731,12 @@ import org.slf4j.LoggerFactory; return lastComparison; } } - lastComparison = Boolean.valueOf(isSetApplicationArguement()).compareTo(other.isSetApplicationArguement()); + lastComparison = Boolean.valueOf(isSetApplicationArgument()).compareTo(other.isSetApplicationArgument()); if (lastComparison != 0) { return lastComparison; } - if (isSetApplicationArguement()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.applicationArguement, other.applicationArguement); + if (isSetApplicationArgument()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.applicationArgument, other.applicationArgument); if (lastComparison != 0) { return lastComparison; } @@ -822,13 +822,13 @@ import org.slf4j.LoggerFactory; } first = false; } - if (isSetApplicationArguement()) { + if (isSetApplicationArgument()) { if (!first) sb.append(", "); - sb.append("applicationArguement:"); - if (this.applicationArguement == null) { + sb.append("applicationArgument:"); + if (this.applicationArgument == null) { sb.append("null"); } else { - sb.append(this.applicationArguement); + sb.append(this.applicationArgument); } first = false; } @@ -943,10 +943,10 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // APPLICATION_ARGUEMENT + case 5: // APPLICATION_ARGUMENT if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.applicationArguement = iprot.readString(); - struct.setApplicationArguementIsSet(true); + struct.applicationArgument = iprot.readString(); + struct.setApplicationArgumentIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1010,10 +1010,10 @@ import org.slf4j.LoggerFactory; oprot.writeFieldEnd(); } } - if (struct.applicationArguement != null) { - if (struct.isSetApplicationArguement()) { - oprot.writeFieldBegin(APPLICATION_ARGUEMENT_FIELD_DESC); - oprot.writeString(struct.applicationArguement); + if (struct.applicationArgument != null) { + if (struct.isSetApplicationArgument()) { + oprot.writeFieldBegin(APPLICATION_ARGUMENT_FIELD_DESC); + oprot.writeString(struct.applicationArgument); oprot.writeFieldEnd(); } } @@ -1062,7 +1062,7 @@ import org.slf4j.LoggerFactory; if (struct.isSetType()) { optionals.set(1); } - if (struct.isSetApplicationArguement()) { + if (struct.isSetApplicationArgument()) { optionals.set(2); } if (struct.isSetStandardInput()) { @@ -1081,8 +1081,8 @@ import org.slf4j.LoggerFactory; if (struct.isSetType()) { oprot.writeI32(struct.type.getValue()); } - if (struct.isSetApplicationArguement()) { - oprot.writeString(struct.applicationArguement); + if (struct.isSetApplicationArgument()) { + oprot.writeString(struct.applicationArgument); } if (struct.isSetStandardInput()) { oprot.writeBool(struct.standardInput); @@ -1112,8 +1112,8 @@ import org.slf4j.LoggerFactory; struct.setTypeIsSet(true); } if (incoming.get(2)) { - struct.applicationArguement = iprot.readString(); - struct.setApplicationArguementIsSet(true); + struct.applicationArgument = iprot.readString(); + struct.setApplicationArgumentIsSet(true); } if (incoming.get(3)) { struct.standardInput = iprot.readBool(); http://git-wip-us.apache.org/repos/asf/airavata/blob/07c3f788/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/AppInterfaceUtil.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/AppInterfaceUtil.java b/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/AppInterfaceUtil.java index 2de82b3..4030857 100644 --- a/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/AppInterfaceUtil.java +++ b/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/AppInterfaceUtil.java @@ -53,7 +53,7 @@ public class AppInterfaceUtil { appInput.setValue(value); appInput.setType(type); appInput.setMetaData(metadata); - appInput.setApplicationArguement(applicationArgument); + appInput.setApplicationArgument(applicationArgument); appInput.setUserFriendlyDescription(userFriendlyDesc); appInput.setStandardInput(standardInput); return appInput; http://git-wip-us.apache.org/repos/asf/airavata/blob/07c3f788/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 7af5cfa..0419827 100644 --- a/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift +++ b/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift @@ -71,7 +71,7 @@ struct InputDataObjectType { 2: required string name, 3: optional string value, 4: optional DataType type, - 5: optional string applicationArguement, + 5: optional string applicationArgument, 6: optional bool standardInput = 0, 7: optional string userFriendlyDescription, 8: optional string metaData http://git-wip-us.apache.org/repos/asf/airavata/blob/07c3f788/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java index 7d75c6a..65434b8 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java @@ -91,7 +91,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface { inputResource.setDataType(input.getType().toString()); inputResource.setMetadata(input.getMetaData()); inputResource.setStandareInput(input.isStandardInput()); - inputResource.setAppArgument(input.getApplicationArguement()); + inputResource.setAppArgument(input.getApplicationArgument()); inputResource.save(); } } @@ -188,7 +188,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface { existingResource.setDataType(input.getType().toString()); existingResource.setMetadata(input.getMetaData()); existingResource.setStandareInput(input.isStandardInput()); - existingResource.setAppArgument(input.getApplicationArguement()); + existingResource.setAppArgument(input.getApplicationArgument()); existingResource.save(); } } http://git-wip-us.apache.org/repos/asf/airavata/blob/07c3f788/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java index 5c1e30a..4d0d3c4 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java @@ -367,7 +367,7 @@ public class AppCatalogThriftConversion { InputDataObjectType inputDataObjectType = new InputDataObjectType(); inputDataObjectType.setName(input.getInputKey()); inputDataObjectType.setValue(input.getInputVal()); - inputDataObjectType.setApplicationArguement(input.getAppArgument()); + inputDataObjectType.setApplicationArgument(input.getAppArgument()); inputDataObjectType.setMetaData(input.getMetadata()); inputDataObjectType.setType(DataType.valueOf(input.getDataType())); inputDataObjectType.setStandardInput(input.isStandareInput()); http://git-wip-us.apache.org/repos/asf/airavata/blob/07c3f788/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java index 4f9a52d..afd4581 100644 --- a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java +++ b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java @@ -151,7 +151,7 @@ public class AppInterfaceTest { input.setName(inputName); input.setValue(value); input.setType(type); - input.setApplicationArguement("test arg"); + input.setApplicationArgument("test arg"); return input; }
