Repository: airavata Updated Branches: refs/heads/master b26219fe3 -> 8dc80579f
removing isEmpty field from modules Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8dc80579 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8dc80579 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8dc80579 Branch: refs/heads/master Commit: 8dc80579f695c0e8852d8182af422320b7f5254b Parents: b26219f Author: Chathuri Wimalasena <[email protected]> Authored: Tue Jul 8 17:22:01 2014 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Tue Jul 8 17:22:01 2014 -0400 ---------------------------------------------------------------------- .../lib/applicationDeploymentModel_types.cpp | 34 ++--- .../lib/applicationDeploymentModel_types.h | 13 +- .../Model/AppCatalog/AppDeployment/Types.php | 40 ++---- .../samples/TestCreateLaunchExperiment.java | 23 +++- .../appdeployment/ApplicationModule.java | 128 +++---------------- .../applicationDeploymentModel.thrift | 9 +- 6 files changed, 64 insertions(+), 183 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/8dc80579/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 9ba96cf..af206c5 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 @@ -104,8 +104,8 @@ void swap(SetEnvPaths &a, SetEnvPaths &b) { swap(a.value, b.value); } -const char* ApplicationModule::ascii_fingerprint = "EAD3BFBDF5BD64DF63F11230D11B43DE"; -const uint8_t ApplicationModule::binary_fingerprint[16] = {0xEA,0xD3,0xBF,0xBD,0xF5,0xBD,0x64,0xDF,0x63,0xF1,0x12,0x30,0xD1,0x1B,0x43,0xDE}; +const char* ApplicationModule::ascii_fingerprint = "FED0FBEAA0C90D1589E8B650561B7675"; +const uint8_t ApplicationModule::binary_fingerprint[16] = {0xFE,0xD0,0xFB,0xEA,0xA0,0xC9,0x0D,0x15,0x89,0xE8,0xB6,0x50,0x56,0x1B,0x76,0x75}; uint32_t ApplicationModule::read(::apache::thrift::protocol::TProtocol* iprot) { @@ -118,7 +118,6 @@ uint32_t ApplicationModule::read(::apache::thrift::protocol::TProtocol* iprot) { using ::apache::thrift::protocol::TProtocolException; - bool isset_isEmpty = false; bool isset_appModuleId = false; bool isset_appModuleName = false; @@ -131,14 +130,6 @@ uint32_t ApplicationModule::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->appModuleId); isset_appModuleId = true; @@ -146,7 +137,7 @@ uint32_t ApplicationModule::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->appModuleName); isset_appModuleName = true; @@ -154,7 +145,7 @@ uint32_t ApplicationModule::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 4: + case 3: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->appModuleVersion); this->__isset.appModuleVersion = true; @@ -162,7 +153,7 @@ uint32_t ApplicationModule::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->appModuleDescription); this->__isset.appModuleDescription = true; @@ -179,8 +170,6 @@ uint32_t ApplicationModule::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->readStructEnd(); - if (!isset_isEmpty) - throw TProtocolException(TProtocolException::INVALID_DATA); if (!isset_appModuleId) throw TProtocolException(TProtocolException::INVALID_DATA); if (!isset_appModuleName) @@ -192,25 +181,21 @@ uint32_t ApplicationModule::write(::apache::thrift::protocol::TProtocol* oprot) uint32_t xfer = 0; xfer += oprot->writeStructBegin("ApplicationModule"); - xfer += oprot->writeFieldBegin("isEmpty", ::apache::thrift::protocol::T_BOOL, 1); - xfer += oprot->writeBool(this->isEmpty); - xfer += oprot->writeFieldEnd(); - - xfer += oprot->writeFieldBegin("appModuleId", ::apache::thrift::protocol::T_STRING, 2); + xfer += oprot->writeFieldBegin("appModuleId", ::apache::thrift::protocol::T_STRING, 1); xfer += oprot->writeString(this->appModuleId); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("appModuleName", ::apache::thrift::protocol::T_STRING, 3); + xfer += oprot->writeFieldBegin("appModuleName", ::apache::thrift::protocol::T_STRING, 2); xfer += oprot->writeString(this->appModuleName); xfer += oprot->writeFieldEnd(); if (this->__isset.appModuleVersion) { - xfer += oprot->writeFieldBegin("appModuleVersion", ::apache::thrift::protocol::T_STRING, 4); + xfer += oprot->writeFieldBegin("appModuleVersion", ::apache::thrift::protocol::T_STRING, 3); xfer += oprot->writeString(this->appModuleVersion); xfer += oprot->writeFieldEnd(); } if (this->__isset.appModuleDescription) { - xfer += oprot->writeFieldBegin("appModuleDescription", ::apache::thrift::protocol::T_STRING, 5); + xfer += oprot->writeFieldBegin("appModuleDescription", ::apache::thrift::protocol::T_STRING, 4); xfer += oprot->writeString(this->appModuleDescription); xfer += oprot->writeFieldEnd(); } @@ -221,7 +206,6 @@ uint32_t ApplicationModule::write(::apache::thrift::protocol::TProtocol* oprot) void swap(ApplicationModule &a, ApplicationModule &b) { using ::std::swap; - swap(a.isEmpty, b.isEmpty); swap(a.appModuleId, b.appModuleId); swap(a.appModuleName, b.appModuleName); swap(a.appModuleVersion, b.appModuleVersion); http://git-wip-us.apache.org/repos/asf/airavata/blob/8dc80579/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 7c7ee39..9cb5655 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 @@ -81,15 +81,14 @@ typedef struct _ApplicationModule__isset { class ApplicationModule { public: - static const char* ascii_fingerprint; // = "EAD3BFBDF5BD64DF63F11230D11B43DE"; - static const uint8_t binary_fingerprint[16]; // = {0xEA,0xD3,0xBF,0xBD,0xF5,0xBD,0x64,0xDF,0x63,0xF1,0x12,0x30,0xD1,0x1B,0x43,0xDE}; + static const char* ascii_fingerprint; // = "FED0FBEAA0C90D1589E8B650561B7675"; + static const uint8_t binary_fingerprint[16]; // = {0xFE,0xD0,0xFB,0xEA,0xA0,0xC9,0x0D,0x15,0x89,0xE8,0xB6,0x50,0x56,0x1B,0x76,0x75}; - ApplicationModule() : isEmpty(false), appModuleId("DO_NOT_SET_AT_CLIENTS"), appModuleName(), appModuleVersion(), appModuleDescription() { + ApplicationModule() : appModuleId("DO_NOT_SET_AT_CLIENTS"), appModuleName(), appModuleVersion(), appModuleDescription() { } virtual ~ApplicationModule() throw() {} - bool isEmpty; std::string appModuleId; std::string appModuleName; std::string appModuleVersion; @@ -97,10 +96,6 @@ class ApplicationModule { _ApplicationModule__isset __isset; - void __set_isEmpty(const bool val) { - isEmpty = val; - } - void __set_appModuleId(const std::string& val) { appModuleId = val; } @@ -121,8 +116,6 @@ class ApplicationModule { bool operator == (const ApplicationModule & rhs) const { - if (!(isEmpty == rhs.isEmpty)) - return false; if (!(appModuleId == rhs.appModuleId)) return false; if (!(appModuleName == rhs.appModuleName)) http://git-wip-us.apache.org/repos/asf/airavata/blob/8dc80579/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 cc0f006..9d7e452 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 @@ -125,7 +125,6 @@ class SetEnvPaths { class ApplicationModule { static $_TSPEC; - public $isEmpty = false; public $appModuleId = "DO_NOT_SET_AT_CLIENTS"; public $appModuleName = null; public $appModuleVersion = null; @@ -135,31 +134,24 @@ class ApplicationModule { if (!isset(self::$_TSPEC)) { self::$_TSPEC = array( 1 => array( - 'var' => 'isEmpty', - 'type' => TType::BOOL, - ), - 2 => array( 'var' => 'appModuleId', 'type' => TType::STRING, ), - 3 => array( + 2 => array( 'var' => 'appModuleName', 'type' => TType::STRING, ), - 4 => array( + 3 => array( 'var' => 'appModuleVersion', 'type' => TType::STRING, ), - 5 => array( + 4 => array( 'var' => 'appModuleDescription', 'type' => TType::STRING, ), ); } if (is_array($vals)) { - if (isset($vals['isEmpty'])) { - $this->isEmpty = $vals['isEmpty']; - } if (isset($vals['appModuleId'])) { $this->appModuleId = $vals['appModuleId']; } @@ -195,34 +187,27 @@ class ApplicationModule { 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->appModuleId); } else { $xfer += $input->skip($ftype); } break; - case 3: + case 2: if ($ftype == TType::STRING) { $xfer += $input->readString($this->appModuleName); } else { $xfer += $input->skip($ftype); } break; - case 4: + case 3: if ($ftype == TType::STRING) { $xfer += $input->readString($this->appModuleVersion); } else { $xfer += $input->skip($ftype); } break; - case 5: + case 4: if ($ftype == TType::STRING) { $xfer += $input->readString($this->appModuleDescription); } else { @@ -242,28 +227,23 @@ class ApplicationModule { public function write($output) { $xfer = 0; $xfer += $output->writeStructBegin('ApplicationModule'); - if ($this->isEmpty !== null) { - $xfer += $output->writeFieldBegin('isEmpty', TType::BOOL, 1); - $xfer += $output->writeBool($this->isEmpty); - $xfer += $output->writeFieldEnd(); - } if ($this->appModuleId !== null) { - $xfer += $output->writeFieldBegin('appModuleId', TType::STRING, 2); + $xfer += $output->writeFieldBegin('appModuleId', TType::STRING, 1); $xfer += $output->writeString($this->appModuleId); $xfer += $output->writeFieldEnd(); } if ($this->appModuleName !== null) { - $xfer += $output->writeFieldBegin('appModuleName', TType::STRING, 3); + $xfer += $output->writeFieldBegin('appModuleName', TType::STRING, 2); $xfer += $output->writeString($this->appModuleName); $xfer += $output->writeFieldEnd(); } if ($this->appModuleVersion !== null) { - $xfer += $output->writeFieldBegin('appModuleVersion', TType::STRING, 4); + $xfer += $output->writeFieldBegin('appModuleVersion', TType::STRING, 3); $xfer += $output->writeString($this->appModuleVersion); $xfer += $output->writeFieldEnd(); } if ($this->appModuleDescription !== null) { - $xfer += $output->writeFieldBegin('appModuleDescription', TType::STRING, 5); + $xfer += $output->writeFieldBegin('appModuleDescription', TType::STRING, 4); $xfer += $output->writeString($this->appModuleDescription); $xfer += $output->writeFieldEnd(); } http://git-wip-us.apache.org/repos/asf/airavata/blob/8dc80579/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java index aed60eb..b74f683 100644 --- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java +++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java @@ -30,6 +30,7 @@ import org.apache.airavata.client.tools.DocumentCreator; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.utils.AiravataUtils; import org.apache.airavata.common.utils.ClientSettings; +import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule; import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription; import org.apache.airavata.model.error.*; import org.apache.airavata.model.util.ExperimentModelUtil; @@ -62,7 +63,8 @@ public class TestCreateLaunchExperiment { final Airavata.Client airavata = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT); System.out.println("API version is " + airavata.getAPIVersion()); getAllComputeResources(airavata); - getAVailableComputeResourcesForApp(airavata, "Amber_0cecdf39-1ce2-4d98-bc76-87447e10fd4d"); + getAppModule(airavata, "amber_c476de64-ca5c-415a-94e9-b77fbe67b806"); +// getAVailableComputeResourcesForApp(airavata, "Amber_0cecdf39-1ce2-4d98-bc76-87447e10fd4d"); // for (int i = 0; i < 10 ; i++){ // long time = System.currentTimeMillis(); // List<ExperimentSummary> experiments = getExperimentsForApplication(airavata, "ultrascan", "US3Application"); @@ -147,6 +149,25 @@ public class TestCreateLaunchExperiment { } } + public static void getAppModule (Airavata.Client client, String moduleId){ + try { + ApplicationModule applicationModule = client.getApplicationModule(moduleId); + if (applicationModule != null){ + System.out.println("module name :" + applicationModule.getAppModuleName()); + System.out.println("module version :" + applicationModule.getAppModuleVersion()); + } + } catch (AiravataSystemException e) { + e.printStackTrace(); + } catch (InvalidRequestException e) { + e.printStackTrace(); + } catch (AiravataClientException e) { + e.printStackTrace(); + }catch (TException e) { + e.printStackTrace(); + } + } + + public static void getAVailableComputeResourcesForApp (Airavata.Client client, String applicationName){ try { List<String> resources = client.getAvailableAppInterfaceComputeResources(applicationName); http://git-wip-us.apache.org/repos/asf/airavata/blob/8dc80579/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java index d5c4b35..dcb4067 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java @@ -66,11 +66,10 @@ import org.slf4j.LoggerFactory; @SuppressWarnings("all") public class ApplicationModule implements org.apache.thrift.TBase<ApplicationModule, ApplicationModule._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationModule> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationModule"); - 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_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 APP_MODULE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("appModuleName", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField APP_MODULE_VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("appModuleVersion", org.apache.thrift.protocol.TType.STRING, (short)4); - private static final org.apache.thrift.protocol.TField APP_MODULE_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("appModuleDescription", org.apache.thrift.protocol.TType.STRING, (short)5); + 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)1); + private static final org.apache.thrift.protocol.TField APP_MODULE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("appModuleName", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField APP_MODULE_VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("appModuleVersion", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField APP_MODULE_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("appModuleDescription", org.apache.thrift.protocol.TType.STRING, (short)4); 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 ApplicationModuleTupleSchemeFactory()); } - private boolean isEmpty; // required private String appModuleId; // required private String appModuleName; // required private String appModuleVersion; // optional @@ -86,11 +84,10 @@ 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_MODULE_ID((short)2, "appModuleId"), - APP_MODULE_NAME((short)3, "appModuleName"), - APP_MODULE_VERSION((short)4, "appModuleVersion"), - APP_MODULE_DESCRIPTION((short)5, "appModuleDescription"); + APP_MODULE_ID((short)1, "appModuleId"), + APP_MODULE_NAME((short)2, "appModuleName"), + APP_MODULE_VERSION((short)3, "appModuleVersion"), + APP_MODULE_DESCRIPTION((short)4, "appModuleDescription"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -105,15 +102,13 @@ import org.slf4j.LoggerFactory; */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // IS_EMPTY - return IS_EMPTY; - case 2: // APP_MODULE_ID + case 1: // APP_MODULE_ID return APP_MODULE_ID; - case 3: // APP_MODULE_NAME + case 2: // APP_MODULE_NAME return APP_MODULE_NAME; - case 4: // APP_MODULE_VERSION + case 3: // APP_MODULE_VERSION return APP_MODULE_VERSION; - case 5: // APP_MODULE_DESCRIPTION + case 4: // APP_MODULE_DESCRIPTION return APP_MODULE_DESCRIPTION; default: return null; @@ -155,14 +150,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_MODULE_VERSION,_Fields.APP_MODULE_DESCRIPTION}; 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_MODULE_ID, new org.apache.thrift.meta_data.FieldMetaData("appModuleId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.APP_MODULE_NAME, new org.apache.thrift.meta_data.FieldMetaData("appModuleName", org.apache.thrift.TFieldRequirementType.REQUIRED, @@ -176,20 +167,15 @@ import org.slf4j.LoggerFactory; } public ApplicationModule() { - this.isEmpty = false; - this.appModuleId = "DO_NOT_SET_AT_CLIENTS"; } public ApplicationModule( - boolean isEmpty, String appModuleId, String appModuleName) { this(); - this.isEmpty = isEmpty; - setIsEmptyIsSet(true); this.appModuleId = appModuleId; this.appModuleName = appModuleName; } @@ -198,8 +184,6 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on <i>other</i>. */ public ApplicationModule(ApplicationModule other) { - __isset_bitfield = other.__isset_bitfield; - this.isEmpty = other.isEmpty; if (other.isSetAppModuleId()) { this.appModuleId = other.appModuleId; } @@ -220,8 +204,6 @@ import org.slf4j.LoggerFactory; @Override public void clear() { - this.isEmpty = false; - this.appModuleId = "DO_NOT_SET_AT_CLIENTS"; this.appModuleName = null; @@ -229,28 +211,6 @@ import org.slf4j.LoggerFactory; this.appModuleDescription = 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 getAppModuleId() { return this.appModuleId; } @@ -345,14 +305,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_MODULE_ID: if (value == null) { unsetAppModuleId(); @@ -390,9 +342,6 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { - case IS_EMPTY: - return Boolean.valueOf(isIsEmpty()); - case APP_MODULE_ID: return getAppModuleId(); @@ -416,8 +365,6 @@ import org.slf4j.LoggerFactory; } switch (field) { - case IS_EMPTY: - return isSetIsEmpty(); case APP_MODULE_ID: return isSetAppModuleId(); case APP_MODULE_NAME: @@ -443,15 +390,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_appModuleId = true && this.isSetAppModuleId(); boolean that_present_appModuleId = true && that.isSetAppModuleId(); if (this_present_appModuleId || that_present_appModuleId) { @@ -504,16 +442,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(isSetAppModuleId()).compareTo(other.isSetAppModuleId()); if (lastComparison != 0) { return lastComparison; @@ -574,10 +502,6 @@ import org.slf4j.LoggerFactory; StringBuilder sb = new StringBuilder("ApplicationModule("); boolean first = true; - sb.append("isEmpty:"); - sb.append(this.isEmpty); - first = false; - if (!first) sb.append(", "); sb.append("appModuleId:"); if (this.appModuleId == null) { sb.append("null"); @@ -619,10 +543,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 (!isSetAppModuleId()) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'appModuleId' is unset! Struct:" + toString()); } @@ -644,8 +564,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); @@ -670,15 +588,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_MODULE_ID + case 1: // APP_MODULE_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.appModuleId = iprot.readString(); struct.setAppModuleIdIsSet(true); @@ -686,7 +596,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // APP_MODULE_NAME + case 2: // APP_MODULE_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.appModuleName = iprot.readString(); struct.setAppModuleNameIsSet(true); @@ -694,7 +604,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // APP_MODULE_VERSION + case 3: // APP_MODULE_VERSION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.appModuleVersion = iprot.readString(); struct.setAppModuleVersionIsSet(true); @@ -702,7 +612,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // APP_MODULE_DESCRIPTION + case 4: // APP_MODULE_DESCRIPTION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.appModuleDescription = iprot.readString(); struct.setAppModuleDescriptionIsSet(true); @@ -723,9 +633,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.appModuleId != null) { oprot.writeFieldBegin(APP_MODULE_ID_FIELD_DESC); oprot.writeString(struct.appModuleId); @@ -767,7 +674,6 @@ import org.slf4j.LoggerFactory; @Override public void write(org.apache.thrift.protocol.TProtocol prot, ApplicationModule struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; - oprot.writeBool(struct.isEmpty); oprot.writeString(struct.appModuleId); oprot.writeString(struct.appModuleName); BitSet optionals = new BitSet(); @@ -789,8 +695,6 @@ import org.slf4j.LoggerFactory; @Override public void read(org.apache.thrift.protocol.TProtocol prot, ApplicationModule struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - struct.isEmpty = iprot.readBool(); - struct.setIsEmptyIsSet(true); struct.appModuleId = iprot.readString(); struct.setAppModuleIdIsSet(true); struct.appModuleName = iprot.readString(); http://git-wip-us.apache.org/repos/asf/airavata/blob/8dc80579/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 799f672..199a88e 100644 --- a/airavata-api/thrift-interface-descriptions/applicationDeploymentModel.thrift +++ b/airavata-api/thrift-interface-descriptions/applicationDeploymentModel.thrift @@ -59,11 +59,10 @@ struct SetEnvPaths { * */ struct ApplicationModule { - 1: required bool isEmpty = 0, - 2: required string appModuleId = DEFAULT_ID, - 3: required string appModuleName, - 4: optional string appModuleVersion, - 5: optional string appModuleDescription + 1: required string appModuleId = DEFAULT_ID, + 2: required string appModuleName, + 3: optional string appModuleVersion, + 4: optional string appModuleDescription } /**
