making replica locations a separate entity
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6242acac Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6242acac Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6242acac Branch: refs/heads/develop Commit: 6242acac3a489c3ddfd03b2dd265c9b71f0f893c Parents: 9bfdc52 Author: scnakandala <[email protected]> Authored: Thu Dec 3 12:48:58 2015 -0500 Committer: scnakandala <[email protected]> Committed: Thu Dec 3 12:48:58 2015 -0500 ---------------------------------------------------------------------- .../java/org/apache/airavata/api/Airavata.java | 2 +- .../lib/airavata/data_resource_models_types.cpp | 132 +++++--------- .../lib/airavata/data_resource_models_types.h | 12 +- .../lib/Airavata/Model/Data/Resource/Types.php | 69 +------- .../airavata/model/data/resource/ttypes.py | 36 +--- .../org/apache/airavata/model/Workflow.java | 2 +- .../ApplicationDeploymentDescription.java | 2 +- .../appdeployment/ApplicationModule.java | 2 +- .../appcatalog/appdeployment/CommandObject.java | 2 +- .../appcatalog/appdeployment/SetEnvPaths.java | 2 +- .../ApplicationInterfaceDescription.java | 2 +- .../appcatalog/computeresource/BatchQueue.java | 2 +- .../computeresource/CloudJobSubmission.java | 2 +- .../ComputeResourceDescription.java | 2 +- .../computeresource/GlobusJobSubmission.java | 2 +- .../computeresource/JobSubmissionInterface.java | 2 +- .../computeresource/LOCALSubmission.java | 2 +- .../computeresource/ResourceJobManager.java | 2 +- .../computeresource/SSHJobSubmission.java | 2 +- .../computeresource/UnicoreJobSubmission.java | 2 +- .../ComputeResourcePreference.java | 2 +- .../gatewayprofile/GatewayResourceProfile.java | 2 +- .../gatewayprofile/StoragePreference.java | 2 +- .../StorageResourceDescription.java | 2 +- .../application/io/InputDataObjectType.java | 2 +- .../application/io/OutputDataObjectType.java | 2 +- .../airavata/model/commons/ErrorModel.java | 2 +- .../model/commons/ValidationResults.java | 2 +- .../airavata/model/commons/ValidatorResult.java | 2 +- .../data/movement/DataMovementInterface.java | 2 +- .../data/movement/GridFTPDataMovement.java | 2 +- .../model/data/movement/LOCALDataMovement.java | 2 +- .../model/data/movement/SCPDataMovement.java | 2 +- .../data/movement/UnicoreDataMovement.java | 2 +- .../data/resource/DataReplicaLocationModel.java | 34 ++-- .../model/data/resource/DataResourceModel.java | 171 +------------------ .../model/error/AiravataClientException.java | 2 +- .../model/error/AiravataSystemException.java | 2 +- .../model/error/AuthenticationException.java | 2 +- .../model/error/AuthorizationException.java | 2 +- .../error/ExperimentNotFoundException.java | 2 +- .../model/error/InvalidRequestException.java | 2 +- .../model/error/LaunchValidationException.java | 2 +- .../model/error/ProjectNotFoundException.java | 2 +- .../airavata/model/error/TimedOutException.java | 2 +- .../airavata/model/error/ValidationResults.java | 2 +- .../airavata/model/error/ValidatorResult.java | 2 +- .../model/experiment/ExperimentModel.java | 2 +- .../model/experiment/ExperimentStatistics.java | 2 +- .../experiment/ExperimentSummaryModel.java | 2 +- .../experiment/UserConfigurationDataModel.java | 2 +- .../org/apache/airavata/model/job/JobModel.java | 2 +- .../event/ExperimentStatusChangeEvent.java | 2 +- .../model/messaging/event/JobIdentifier.java | 2 +- .../messaging/event/JobStatusChangeEvent.java | 2 +- .../event/JobStatusChangeRequestEvent.java | 2 +- .../airavata/model/messaging/event/Message.java | 2 +- .../messaging/event/ProcessIdentifier.java | 2 +- .../event/ProcessStatusChangeEvent.java | 2 +- .../event/ProcessStatusChangeRequestEvent.java | 2 +- .../messaging/event/ProcessSubmitEvent.java | 2 +- .../messaging/event/ProcessTerminateEvent.java | 2 +- .../model/messaging/event/TaskIdentifier.java | 2 +- .../messaging/event/TaskOutputChangeEvent.java | 2 +- .../messaging/event/TaskStatusChangeEvent.java | 2 +- .../event/TaskStatusChangeRequestEvent.java | 2 +- .../airavata/model/process/ProcessModel.java | 2 +- .../ComputationalResourceSchedulingModel.java | 2 +- .../airavata/model/security/AuthzToken.java | 2 +- .../airavata/model/status/ExperimentStatus.java | 2 +- .../apache/airavata/model/status/JobStatus.java | 2 +- .../airavata/model/status/ProcessStatus.java | 2 +- .../airavata/model/status/TaskStatus.java | 2 +- .../model/task/DataStagingTaskModel.java | 2 +- .../model/task/EnvironmentSetupTaskModel.java | 2 +- .../model/task/JobSubmissionTaskModel.java | 2 +- .../airavata/model/task/MonitorTaskModel.java | 2 +- .../apache/airavata/model/task/TaskModel.java | 2 +- .../airavata/model/workspace/Gateway.java | 2 +- .../apache/airavata/model/workspace/Group.java | 2 +- .../airavata/model/workspace/Project.java | 2 +- .../apache/airavata/model/workspace/User.java | 2 +- .../airavata/data/manager/DataManager.java | 70 +++++++- .../data/manager/DataManagerConstants.java | 30 ++++ .../airavata/data/manager/DataManagerImpl.java | 169 +++++++++++++++++- .../data/manager/DataManagerImplTest.java | 116 ++++++++++--- .../core/data/catalog/impl/DataCatalogImpl.java | 140 +++++++++++++-- .../data/catalog/model/DataReplicaLocation.java | 11 ++ .../utils/ThriftDataModelConversion.java | 46 ++--- .../src/main/resources/datacatalog-derby.sql | 9 +- .../airavata/data/catalog/DataCatalogTest.java | 103 +++++++++-- .../src/test/resources/datacatalog-derby.sql | 9 +- .../airavata/registry/cpi/DataCatalog.java | 12 ++ .../airavata-api/data_resource_models.thrift | 3 +- 94 files changed, 779 insertions(+), 545 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/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 fcdd115..11790f4 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 @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class Airavata { public interface Iface { http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/data_resource_models_types.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/data_resource_models_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/data_resource_models_types.cpp index cf9df89..7074618 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/data_resource_models_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/data_resource_models_types.cpp @@ -65,12 +65,8 @@ void DataResourceModel::__set_lastModifiedTime(const int64_t val) { __isset.lastModifiedTime = true; } -void DataResourceModel::__set_replicaLocations(const std::vector<DataReplicaLocationModel> & val) { - this->replicaLocations = val; -} - -const char* DataResourceModel::ascii_fingerprint = "4F1DEF239FC3026BC5C89C567F1A9955"; -const uint8_t DataResourceModel::binary_fingerprint[16] = {0x4F,0x1D,0xEF,0x23,0x9F,0xC3,0x02,0x6B,0xC5,0xC8,0x9C,0x56,0x7F,0x1A,0x99,0x55}; +const char* DataResourceModel::ascii_fingerprint = "8F398C67A12C2B477911D779C3172BD6"; +const uint8_t DataResourceModel::binary_fingerprint[16] = {0x8F,0x39,0x8C,0x67,0xA1,0x2C,0x2B,0x47,0x79,0x11,0xD7,0x79,0xC3,0x17,0x2B,0xD6}; uint32_t DataResourceModel::read(::apache::thrift::protocol::TProtocol* iprot) { @@ -140,26 +136,6 @@ uint32_t DataResourceModel::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 7: - if (ftype == ::apache::thrift::protocol::T_LIST) { - { - this->replicaLocations.clear(); - uint32_t _size0; - ::apache::thrift::protocol::TType _etype3; - xfer += iprot->readListBegin(_etype3, _size0); - this->replicaLocations.resize(_size0); - uint32_t _i4; - for (_i4 = 0; _i4 < _size0; ++_i4) - { - xfer += this->replicaLocations[_i4].read(iprot); - } - xfer += iprot->readListEnd(); - } - this->__isset.replicaLocations = true; - } else { - xfer += iprot->skip(ftype); - } - break; default: xfer += iprot->skip(ftype); break; @@ -207,18 +183,6 @@ uint32_t DataResourceModel::write(::apache::thrift::protocol::TProtocol* oprot) xfer += oprot->writeI64(this->lastModifiedTime); xfer += oprot->writeFieldEnd(); } - xfer += oprot->writeFieldBegin("replicaLocations", ::apache::thrift::protocol::T_LIST, 7); - { - xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->replicaLocations.size())); - std::vector<DataReplicaLocationModel> ::const_iterator _iter5; - for (_iter5 = this->replicaLocations.begin(); _iter5 != this->replicaLocations.end(); ++_iter5) - { - xfer += (*_iter5).write(oprot); - } - xfer += oprot->writeListEnd(); - } - xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); oprot->decrementRecursionDepth(); @@ -233,29 +197,26 @@ void swap(DataResourceModel &a, DataResourceModel &b) { swap(a.resourceSize, b.resourceSize); swap(a.creationTime, b.creationTime); swap(a.lastModifiedTime, b.lastModifiedTime); - swap(a.replicaLocations, b.replicaLocations); swap(a.__isset, b.__isset); } -DataResourceModel::DataResourceModel(const DataResourceModel& other6) { - resourceId = other6.resourceId; - resourceName = other6.resourceName; - resourceDescription = other6.resourceDescription; - resourceSize = other6.resourceSize; - creationTime = other6.creationTime; - lastModifiedTime = other6.lastModifiedTime; - replicaLocations = other6.replicaLocations; - __isset = other6.__isset; +DataResourceModel::DataResourceModel(const DataResourceModel& other0) { + resourceId = other0.resourceId; + resourceName = other0.resourceName; + resourceDescription = other0.resourceDescription; + resourceSize = other0.resourceSize; + creationTime = other0.creationTime; + lastModifiedTime = other0.lastModifiedTime; + __isset = other0.__isset; } -DataResourceModel& DataResourceModel::operator=(const DataResourceModel& other7) { - resourceId = other7.resourceId; - resourceName = other7.resourceName; - resourceDescription = other7.resourceDescription; - resourceSize = other7.resourceSize; - creationTime = other7.creationTime; - lastModifiedTime = other7.lastModifiedTime; - replicaLocations = other7.replicaLocations; - __isset = other7.__isset; +DataResourceModel& DataResourceModel::operator=(const DataResourceModel& other1) { + resourceId = other1.resourceId; + resourceName = other1.resourceName; + resourceDescription = other1.resourceDescription; + resourceSize = other1.resourceSize; + creationTime = other1.creationTime; + lastModifiedTime = other1.lastModifiedTime; + __isset = other1.__isset; return *this; } std::ostream& operator<<(std::ostream& out, const DataResourceModel& obj) { @@ -267,7 +228,6 @@ std::ostream& operator<<(std::ostream& out, const DataResourceModel& obj) { out << ", " << "resourceSize="; (obj.__isset.resourceSize ? (out << to_string(obj.resourceSize)) : (out << "<null>")); out << ", " << "creationTime="; (obj.__isset.creationTime ? (out << to_string(obj.creationTime)) : (out << "<null>")); out << ", " << "lastModifiedTime="; (obj.__isset.lastModifiedTime ? (out << to_string(obj.lastModifiedTime)) : (out << "<null>")); - out << ", " << "replicaLocations=" << to_string(obj.replicaLocations); out << ")"; return out; } @@ -387,14 +347,14 @@ uint32_t DataReplicaLocationModel::read(::apache::thrift::protocol::TProtocol* i if (ftype == ::apache::thrift::protocol::T_LIST) { { this->dataLocations.clear(); - uint32_t _size8; - ::apache::thrift::protocol::TType _etype11; - xfer += iprot->readListBegin(_etype11, _size8); - this->dataLocations.resize(_size8); - uint32_t _i12; - for (_i12 = 0; _i12 < _size8; ++_i12) + uint32_t _size2; + ::apache::thrift::protocol::TType _etype5; + xfer += iprot->readListBegin(_etype5, _size2); + this->dataLocations.resize(_size2); + uint32_t _i6; + for (_i6 = 0; _i6 < _size2; ++_i6) { - xfer += iprot->readString(this->dataLocations[_i12]); + xfer += iprot->readString(this->dataLocations[_i6]); } xfer += iprot->readListEnd(); } @@ -454,10 +414,10 @@ uint32_t DataReplicaLocationModel::write(::apache::thrift::protocol::TProtocol* xfer += oprot->writeFieldBegin("dataLocations", ::apache::thrift::protocol::T_LIST, 7); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->dataLocations.size())); - std::vector<std::string> ::const_iterator _iter13; - for (_iter13 = this->dataLocations.begin(); _iter13 != this->dataLocations.end(); ++_iter13) + std::vector<std::string> ::const_iterator _iter7; + for (_iter7 = this->dataLocations.begin(); _iter7 != this->dataLocations.end(); ++_iter7) { - xfer += oprot->writeString((*_iter13)); + xfer += oprot->writeString((*_iter7)); } xfer += oprot->writeListEnd(); } @@ -481,25 +441,25 @@ void swap(DataReplicaLocationModel &a, DataReplicaLocationModel &b) { swap(a.__isset, b.__isset); } -DataReplicaLocationModel::DataReplicaLocationModel(const DataReplicaLocationModel& other14) { - replicaId = other14.replicaId; - resourceId = other14.resourceId; - replicaName = other14.replicaName; - replicaDescription = other14.replicaDescription; - creationTime = other14.creationTime; - lastModifiedTime = other14.lastModifiedTime; - dataLocations = other14.dataLocations; - __isset = other14.__isset; +DataReplicaLocationModel::DataReplicaLocationModel(const DataReplicaLocationModel& other8) { + replicaId = other8.replicaId; + resourceId = other8.resourceId; + replicaName = other8.replicaName; + replicaDescription = other8.replicaDescription; + creationTime = other8.creationTime; + lastModifiedTime = other8.lastModifiedTime; + dataLocations = other8.dataLocations; + __isset = other8.__isset; } -DataReplicaLocationModel& DataReplicaLocationModel::operator=(const DataReplicaLocationModel& other15) { - replicaId = other15.replicaId; - resourceId = other15.resourceId; - replicaName = other15.replicaName; - replicaDescription = other15.replicaDescription; - creationTime = other15.creationTime; - lastModifiedTime = other15.lastModifiedTime; - dataLocations = other15.dataLocations; - __isset = other15.__isset; +DataReplicaLocationModel& DataReplicaLocationModel::operator=(const DataReplicaLocationModel& other9) { + replicaId = other9.replicaId; + resourceId = other9.resourceId; + replicaName = other9.replicaName; + replicaDescription = other9.replicaDescription; + creationTime = other9.creationTime; + lastModifiedTime = other9.lastModifiedTime; + dataLocations = other9.dataLocations; + __isset = other9.__isset; return *this; } std::ostream& operator<<(std::ostream& out, const DataReplicaLocationModel& obj) { http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/data_resource_models_types.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/data_resource_models_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/data_resource_models_types.h index 0832438..c9a523a 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/data_resource_models_types.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/data_resource_models_types.h @@ -41,21 +41,20 @@ class DataResourceModel; class DataReplicaLocationModel; typedef struct _DataResourceModel__isset { - _DataResourceModel__isset() : resourceId(false), resourceName(false), resourceDescription(false), resourceSize(false), creationTime(false), lastModifiedTime(false), replicaLocations(false) {} + _DataResourceModel__isset() : resourceId(false), resourceName(false), resourceDescription(false), resourceSize(false), creationTime(false), lastModifiedTime(false) {} bool resourceId :1; bool resourceName :1; bool resourceDescription :1; bool resourceSize :1; bool creationTime :1; bool lastModifiedTime :1; - bool replicaLocations :1; } _DataResourceModel__isset; class DataResourceModel { public: - static const char* ascii_fingerprint; // = "4F1DEF239FC3026BC5C89C567F1A9955"; - static const uint8_t binary_fingerprint[16]; // = {0x4F,0x1D,0xEF,0x23,0x9F,0xC3,0x02,0x6B,0xC5,0xC8,0x9C,0x56,0x7F,0x1A,0x99,0x55}; + static const char* ascii_fingerprint; // = "8F398C67A12C2B477911D779C3172BD6"; + static const uint8_t binary_fingerprint[16]; // = {0x8F,0x39,0x8C,0x67,0xA1,0x2C,0x2B,0x47,0x79,0x11,0xD7,0x79,0xC3,0x17,0x2B,0xD6}; DataResourceModel(const DataResourceModel&); DataResourceModel& operator=(const DataResourceModel&); @@ -69,7 +68,6 @@ class DataResourceModel { int32_t resourceSize; int64_t creationTime; int64_t lastModifiedTime; - std::vector<DataReplicaLocationModel> replicaLocations; _DataResourceModel__isset __isset; @@ -85,8 +83,6 @@ class DataResourceModel { void __set_lastModifiedTime(const int64_t val); - void __set_replicaLocations(const std::vector<DataReplicaLocationModel> & val); - bool operator == (const DataResourceModel & rhs) const { if (__isset.resourceId != rhs.__isset.resourceId) @@ -113,8 +109,6 @@ class DataResourceModel { return false; else if (__isset.lastModifiedTime && !(lastModifiedTime == rhs.lastModifiedTime)) return false; - if (!(replicaLocations == rhs.replicaLocations)) - return false; return true; } bool operator != (const DataResourceModel &rhs) const { http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Resource/Types.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Resource/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Resource/Types.php index a5dffaa..d40b2ad 100644 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Resource/Types.php +++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Resource/Types.php @@ -44,10 +44,6 @@ class DataResourceModel { * @var int */ public $lastModifiedTime = null; - /** - * @var \Airavata\Model\Data\Resource\DataReplicaLocationModel[] - */ - public $replicaLocations = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -76,15 +72,6 @@ class DataResourceModel { 'var' => 'lastModifiedTime', 'type' => TType::I64, ), - 7 => array( - 'var' => 'replicaLocations', - 'type' => TType::LST, - 'etype' => TType::STRUCT, - 'elem' => array( - 'type' => TType::STRUCT, - 'class' => '\Airavata\Model\Data\Resource\DataReplicaLocationModel', - ), - ), ); } if (is_array($vals)) { @@ -106,9 +93,6 @@ class DataResourceModel { if (isset($vals['lastModifiedTime'])) { $this->lastModifiedTime = $vals['lastModifiedTime']; } - if (isset($vals['replicaLocations'])) { - $this->replicaLocations = $vals['replicaLocations']; - } } } @@ -173,24 +157,6 @@ class DataResourceModel { $xfer += $input->skip($ftype); } break; - case 7: - if ($ftype == TType::LST) { - $this->replicaLocations = array(); - $_size0 = 0; - $_etype3 = 0; - $xfer += $input->readListBegin($_etype3, $_size0); - for ($_i4 = 0; $_i4 < $_size0; ++$_i4) - { - $elem5 = null; - $elem5 = new \Airavata\Model\Data\Resource\DataReplicaLocationModel(); - $xfer += $elem5->read($input); - $this->replicaLocations []= $elem5; - } - $xfer += $input->readListEnd(); - } else { - $xfer += $input->skip($ftype); - } - break; default: $xfer += $input->skip($ftype); break; @@ -234,23 +200,6 @@ class DataResourceModel { $xfer += $output->writeI64($this->lastModifiedTime); $xfer += $output->writeFieldEnd(); } - if ($this->replicaLocations !== null) { - if (!is_array($this->replicaLocations)) { - throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); - } - $xfer += $output->writeFieldBegin('replicaLocations', TType::LST, 7); - { - $output->writeListBegin(TType::STRUCT, count($this->replicaLocations)); - { - foreach ($this->replicaLocations as $iter6) - { - $xfer += $iter6->write($output); - } - } - $output->writeListEnd(); - } - $xfer += $output->writeFieldEnd(); - } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; @@ -416,14 +365,14 @@ class DataReplicaLocationModel { case 7: if ($ftype == TType::LST) { $this->dataLocations = array(); - $_size7 = 0; - $_etype10 = 0; - $xfer += $input->readListBegin($_etype10, $_size7); - for ($_i11 = 0; $_i11 < $_size7; ++$_i11) + $_size0 = 0; + $_etype3 = 0; + $xfer += $input->readListBegin($_etype3, $_size0); + for ($_i4 = 0; $_i4 < $_size0; ++$_i4) { - $elem12 = null; - $xfer += $input->readString($elem12); - $this->dataLocations []= $elem12; + $elem5 = null; + $xfer += $input->readString($elem5); + $this->dataLocations []= $elem5; } $xfer += $input->readListEnd(); } else { @@ -481,9 +430,9 @@ class DataReplicaLocationModel { { $output->writeListBegin(TType::STRING, count($this->dataLocations)); { - foreach ($this->dataLocations as $iter13) + foreach ($this->dataLocations as $iter6) { - $xfer += $output->writeString($iter13); + $xfer += $output->writeString($iter6); } } $output->writeListEnd(); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/data/resource/ttypes.py ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/data/resource/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/data/resource/ttypes.py index e1cb6df..8c787ab 100644 --- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/data/resource/ttypes.py +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/data/resource/ttypes.py @@ -26,7 +26,6 @@ class DataResourceModel: - resourceSize - creationTime - lastModifiedTime - - replicaLocations """ thrift_spec = ( @@ -37,17 +36,15 @@ class DataResourceModel: (4, TType.I32, 'resourceSize', None, None, ), # 4 (5, TType.I64, 'creationTime', None, None, ), # 5 (6, TType.I64, 'lastModifiedTime', None, None, ), # 6 - (7, TType.LIST, 'replicaLocations', (TType.STRUCT,(DataReplicaLocationModel, DataReplicaLocationModel.thrift_spec)), None, ), # 7 ) - def __init__(self, resourceId=None, resourceName=None, resourceDescription=None, resourceSize=None, creationTime=None, lastModifiedTime=None, replicaLocations=None,): + def __init__(self, resourceId=None, resourceName=None, resourceDescription=None, resourceSize=None, creationTime=None, lastModifiedTime=None,): self.resourceId = resourceId self.resourceName = resourceName self.resourceDescription = resourceDescription self.resourceSize = resourceSize self.creationTime = creationTime self.lastModifiedTime = lastModifiedTime - self.replicaLocations = replicaLocations def read(self, iprot): if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None: @@ -88,17 +85,6 @@ class DataResourceModel: self.lastModifiedTime = iprot.readI64(); else: iprot.skip(ftype) - elif fid == 7: - if ftype == TType.LIST: - self.replicaLocations = [] - (_etype3, _size0) = iprot.readListBegin() - for _i4 in xrange(_size0): - _elem5 = DataReplicaLocationModel() - _elem5.read(iprot) - self.replicaLocations.append(_elem5) - iprot.readListEnd() - else: - iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -133,13 +119,6 @@ class DataResourceModel: oprot.writeFieldBegin('lastModifiedTime', TType.I64, 6) oprot.writeI64(self.lastModifiedTime) oprot.writeFieldEnd() - if self.replicaLocations is not None: - oprot.writeFieldBegin('replicaLocations', TType.LIST, 7) - oprot.writeListBegin(TType.STRUCT, len(self.replicaLocations)) - for iter6 in self.replicaLocations: - iter6.write(oprot) - oprot.writeListEnd() - oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -155,7 +134,6 @@ class DataResourceModel: value = (value * 31) ^ hash(self.resourceSize) value = (value * 31) ^ hash(self.creationTime) value = (value * 31) ^ hash(self.lastModifiedTime) - value = (value * 31) ^ hash(self.replicaLocations) return value def __repr__(self): @@ -243,10 +221,10 @@ class DataReplicaLocationModel: elif fid == 7: if ftype == TType.LIST: self.dataLocations = [] - (_etype10, _size7) = iprot.readListBegin() - for _i11 in xrange(_size7): - _elem12 = iprot.readString(); - self.dataLocations.append(_elem12) + (_etype3, _size0) = iprot.readListBegin() + for _i4 in xrange(_size0): + _elem5 = iprot.readString(); + self.dataLocations.append(_elem5) iprot.readListEnd() else: iprot.skip(ftype) @@ -287,8 +265,8 @@ class DataReplicaLocationModel: if self.dataLocations is not None: oprot.writeFieldBegin('dataLocations', TType.LIST, 7) oprot.writeListBegin(TType.STRING, len(self.dataLocations)) - for iter13 in self.dataLocations: - oprot.writeString(iter13) + for iter6 in self.dataLocations: + oprot.writeString(iter6) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java index d0bee3b..1dd79d1 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class Workflow implements org.apache.thrift.TBase<Workflow, Workflow._Fields>, java.io.Serializable, Cloneable, Comparable<Workflow> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Workflow"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/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 aa5c6d3..7f186af 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,7 +77,7 @@ import org.slf4j.LoggerFactory; * assigns to the environment variable "NAME" the value * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/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 2b4a9f9..3c8d4c5 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,7 +66,7 @@ import org.slf4j.LoggerFactory; * Descriprion of the Module * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java index 04371a0..12f178d 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * commandOrder: * Order of the command in the multiple command situation */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class CommandObject implements org.apache.thrift.TBase<CommandObject, CommandObject._Fields>, java.io.Serializable, Cloneable, Comparable<CommandObject> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CommandObject"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java index 4200bb5..e65b7f5 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java @@ -63,7 +63,7 @@ import org.slf4j.LoggerFactory; * envPathOrder: * The order of the setting of the env variables when there are multiple env variables */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class SetEnvPaths implements org.apache.thrift.TBase<SetEnvPaths, SetEnvPaths._Fields>, java.io.Serializable, Cloneable, Comparable<SetEnvPaths> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SetEnvPaths"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/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 6921691..18b1763 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,7 +64,7 @@ import org.slf4j.LoggerFactory; * Outputs generated from the application * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java index 5721cc8..852ea40 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java @@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory; * maxRunTime: * Maximum allowed run time in hours. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class BatchQueue implements org.apache.thrift.TBase<BatchQueue, BatchQueue._Fields>, java.io.Serializable, Cloneable, Comparable<BatchQueue> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BatchQueue"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java index b8d337b..2af8a59 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java @@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory; * * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class CloudJobSubmission implements org.apache.thrift.TBase<CloudJobSubmission, CloudJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<CloudJobSubmission> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CloudJobSubmission"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/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 2632fdd..53650f6 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,7 +80,7 @@ import org.slf4j.LoggerFactory; * Map of file systems type and the path. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java index 2a4d593..13b0aef 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSubmission, GlobusJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<GlobusJobSubmission> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GlobusJobSubmission"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java index eff1607..6511e85 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java @@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory; * Lower the numerical number, higher the priority * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmissionInterface, JobSubmissionInterface._Fields>, java.io.Serializable, Cloneable, Comparable<JobSubmissionInterface> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobSubmissionInterface"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java index 0d6c37b..7f1131c 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * sshPort: * If a non-default port needs to used, specify it. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission, LOCALSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALSubmission> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LOCALSubmission"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java index 7e7cd2b..841f106 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java @@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory; * An enumeration of commonly used manager commands. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobManager, ResourceJobManager._Fields>, java.io.Serializable, Cloneable, Comparable<ResourceJobManager> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ResourceJobManager"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java index e249027..6ad411a 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java @@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory; * the same. Example: *@*.example.com or *@example.com * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmission, SSHJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<SSHJobSubmission> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SSHJobSubmission"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java index b091870..ac8967f 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java @@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory; * authenticationMode * The authenticationMode defines the way certificate is fetched. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class UnicoreJobSubmission implements org.apache.thrift.TBase<UnicoreJobSubmission, UnicoreJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<UnicoreJobSubmission> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnicoreJobSubmission"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java index f24c888..8b448bd 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java @@ -85,7 +85,7 @@ import org.slf4j.LoggerFactory; * default credential store. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class ComputeResourcePreference implements org.apache.thrift.TBase<ComputeResourcePreference, ComputeResourcePreference._Fields>, java.io.Serializable, Cloneable, Comparable<ComputeResourcePreference> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputeResourcePreference"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java index c6b3297..ec88704 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java @@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory; * List of resource preferences for each of the registered compute resources. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayResourceProfile, GatewayResourceProfile._Fields>, java.io.Serializable, Cloneable, Comparable<GatewayResourceProfile> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GatewayResourceProfile"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java index ebffb10..3cc9389 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class StoragePreference implements org.apache.thrift.TBase<StoragePreference, StoragePreference._Fields>, java.io.Serializable, Cloneable, Comparable<StoragePreference> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StoragePreference"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java index f39d869..fc31112 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java @@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory; * * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class StorageResourceDescription implements org.apache.thrift.TBase<StorageResourceDescription, StorageResourceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<StorageResourceDescription> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StorageResourceDescription"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java index 4f417a7..c5c4423 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java @@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory; * Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java index ff425af..a9fa333 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java @@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory; * Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataObjectType, OutputDataObjectType._Fields>, java.io.Serializable, Cloneable, Comparable<OutputDataObjectType> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OutputDataObjectType"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java index 3f82b8e..5f6ad35 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class ErrorModel implements org.apache.thrift.TBase<ErrorModel, ErrorModel._Fields>, java.io.Serializable, Cloneable, Comparable<ErrorModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ErrorModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java index 8d293ab..0c6dd12 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class ValidationResults implements org.apache.thrift.TBase<ValidationResults, ValidationResults._Fields>, java.io.Serializable, Cloneable, Comparable<ValidationResults> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ValidationResults"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java index 4585b34..a65534d 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java @@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory; * during the experiment launch operation * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class ValidatorResult implements org.apache.thrift.TBase<ValidatorResult, ValidatorResult._Fields>, java.io.Serializable, Cloneable, Comparable<ValidatorResult> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ValidatorResult"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java index 2207052..caee0a4 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java @@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory; * Lower the numerical number, higher the priority * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class DataMovementInterface implements org.apache.thrift.TBase<DataMovementInterface, DataMovementInterface._Fields>, java.io.Serializable, Cloneable, Comparable<DataMovementInterface> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataMovementInterface"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java index 8477288..8389609 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * sshPort: * If a non-default port needs to used, specify it. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataMovement, GridFTPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<GridFTPDataMovement> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GridFTPDataMovement"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java index bd40d3a..b15759c 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * sshPort: * If a non-defualt port needs to used, specify it. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class LOCALDataMovement implements org.apache.thrift.TBase<LOCALDataMovement, LOCALDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALDataMovement> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LOCALDataMovement"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java index 874a875..c4b1876 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * sshPort: * If a non-default port needs to used, specify it. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, SCPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<SCPDataMovement> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SCPDataMovement"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java index 015a9f7..2646a6e 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java @@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory; * unicoreEndPointURL: * unicoreGateway End Point. The provider will query this service to fetch required service end points. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataMovement, UnicoreDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<UnicoreDataMovement> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnicoreDataMovement"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java index b5aeeab..1ac653d 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataReplicaLocationModel, DataReplicaLocationModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataReplicaLocationModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataReplicaLocationModel"); @@ -888,13 +888,13 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep case 7: // DATA_LOCATIONS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list8 = iprot.readListBegin(); - struct.dataLocations = new ArrayList<String>(_list8.size); - String _elem9; - for (int _i10 = 0; _i10 < _list8.size; ++_i10) + org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); + struct.dataLocations = new ArrayList<String>(_list0.size); + String _elem1; + for (int _i2 = 0; _i2 < _list0.size; ++_i2) { - _elem9 = iprot.readString(); - struct.dataLocations.add(_elem9); + _elem1 = iprot.readString(); + struct.dataLocations.add(_elem1); } iprot.readListEnd(); } @@ -959,9 +959,9 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep oprot.writeFieldBegin(DATA_LOCATIONS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.dataLocations.size())); - for (String _iter11 : struct.dataLocations) + for (String _iter3 : struct.dataLocations) { - oprot.writeString(_iter11); + oprot.writeString(_iter3); } oprot.writeListEnd(); } @@ -1029,9 +1029,9 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep if (struct.isSetDataLocations()) { { oprot.writeI32(struct.dataLocations.size()); - for (String _iter12 : struct.dataLocations) + for (String _iter4 : struct.dataLocations) { - oprot.writeString(_iter12); + oprot.writeString(_iter4); } } } @@ -1067,13 +1067,13 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep } if (incoming.get(6)) { { - org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.dataLocations = new ArrayList<String>(_list13.size); - String _elem14; - for (int _i15 = 0; _i15 < _list13.size; ++_i15) + org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.dataLocations = new ArrayList<String>(_list5.size); + String _elem6; + for (int _i7 = 0; _i7 < _list5.size; ++_i7) { - _elem14 = iprot.readString(); - struct.dataLocations.add(_elem14); + _elem6 = iprot.readString(); + struct.dataLocations.add(_elem6); } } struct.setDataLocationsIsSet(true); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java index 86bd878..a0e21f2 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class DataResourceModel implements org.apache.thrift.TBase<DataResourceModel, DataResourceModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataResourceModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataResourceModel"); @@ -61,7 +61,6 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo private static final org.apache.thrift.protocol.TField RESOURCE_SIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceSize", org.apache.thrift.protocol.TType.I32, (short)4); private static final org.apache.thrift.protocol.TField CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("creationTime", org.apache.thrift.protocol.TType.I64, (short)5); private static final org.apache.thrift.protocol.TField LAST_MODIFIED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastModifiedTime", org.apache.thrift.protocol.TType.I64, (short)6); - private static final org.apache.thrift.protocol.TField REPLICA_LOCATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("replicaLocations", org.apache.thrift.protocol.TType.LIST, (short)7); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -75,7 +74,6 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo private int resourceSize; // optional private long creationTime; // optional private long lastModifiedTime; // optional - private List<DataReplicaLocationModel> replicaLocations; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -84,8 +82,7 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo RESOURCE_DESCRIPTION((short)3, "resourceDescription"), RESOURCE_SIZE((short)4, "resourceSize"), CREATION_TIME((short)5, "creationTime"), - LAST_MODIFIED_TIME((short)6, "lastModifiedTime"), - REPLICA_LOCATIONS((short)7, "replicaLocations"); + LAST_MODIFIED_TIME((short)6, "lastModifiedTime"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -112,8 +109,6 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo return CREATION_TIME; case 6: // LAST_MODIFIED_TIME return LAST_MODIFIED_TIME; - case 7: // REPLICA_LOCATIONS - return REPLICA_LOCATIONS; default: return null; } @@ -174,9 +169,6 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.LAST_MODIFIED_TIME, new org.apache.thrift.meta_data.FieldMetaData("lastModifiedTime", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); - tmpMap.put(_Fields.REPLICA_LOCATIONS, new org.apache.thrift.meta_data.FieldMetaData("replicaLocations", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT , "DataReplicaLocationModel")))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DataResourceModel.class, metaDataMap); } @@ -184,13 +176,6 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo public DataResourceModel() { } - public DataResourceModel( - List<DataReplicaLocationModel> replicaLocations) - { - this(); - this.replicaLocations = replicaLocations; - } - /** * Performs a deep copy on <i>other</i>. */ @@ -208,13 +193,6 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo this.resourceSize = other.resourceSize; this.creationTime = other.creationTime; this.lastModifiedTime = other.lastModifiedTime; - if (other.isSetReplicaLocations()) { - List<DataReplicaLocationModel> __this__replicaLocations = new ArrayList<DataReplicaLocationModel>(other.replicaLocations.size()); - for (DataReplicaLocationModel other_element : other.replicaLocations) { - __this__replicaLocations.add(other_element); - } - this.replicaLocations = __this__replicaLocations; - } } public DataResourceModel deepCopy() { @@ -232,7 +210,6 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo this.creationTime = 0; setLastModifiedTimeIsSet(false); this.lastModifiedTime = 0; - this.replicaLocations = null; } public String getResourceId() { @@ -370,44 +347,6 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LASTMODIFIEDTIME_ISSET_ID, value); } - public int getReplicaLocationsSize() { - return (this.replicaLocations == null) ? 0 : this.replicaLocations.size(); - } - - public java.util.Iterator<DataReplicaLocationModel> getReplicaLocationsIterator() { - return (this.replicaLocations == null) ? null : this.replicaLocations.iterator(); - } - - public void addToReplicaLocations(DataReplicaLocationModel elem) { - if (this.replicaLocations == null) { - this.replicaLocations = new ArrayList<DataReplicaLocationModel>(); - } - this.replicaLocations.add(elem); - } - - public List<DataReplicaLocationModel> getReplicaLocations() { - return this.replicaLocations; - } - - public void setReplicaLocations(List<DataReplicaLocationModel> replicaLocations) { - this.replicaLocations = replicaLocations; - } - - public void unsetReplicaLocations() { - this.replicaLocations = null; - } - - /** Returns true if field replicaLocations is set (has been assigned a value) and false otherwise */ - public boolean isSetReplicaLocations() { - return this.replicaLocations != null; - } - - public void setReplicaLocationsIsSet(boolean value) { - if (!value) { - this.replicaLocations = null; - } - } - public void setFieldValue(_Fields field, Object value) { switch (field) { case RESOURCE_ID: @@ -458,14 +397,6 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo } break; - case REPLICA_LOCATIONS: - if (value == null) { - unsetReplicaLocations(); - } else { - setReplicaLocations((List<DataReplicaLocationModel>)value); - } - break; - } } @@ -489,9 +420,6 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo case LAST_MODIFIED_TIME: return Long.valueOf(getLastModifiedTime()); - case REPLICA_LOCATIONS: - return getReplicaLocations(); - } throw new IllegalStateException(); } @@ -515,8 +443,6 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo return isSetCreationTime(); case LAST_MODIFIED_TIME: return isSetLastModifiedTime(); - case REPLICA_LOCATIONS: - return isSetReplicaLocations(); } throw new IllegalStateException(); } @@ -588,15 +514,6 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo return false; } - boolean this_present_replicaLocations = true && this.isSetReplicaLocations(); - boolean that_present_replicaLocations = true && that.isSetReplicaLocations(); - if (this_present_replicaLocations || that_present_replicaLocations) { - if (!(this_present_replicaLocations && that_present_replicaLocations)) - return false; - if (!this.replicaLocations.equals(that.replicaLocations)) - return false; - } - return true; } @@ -634,11 +551,6 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo if (present_lastModifiedTime) list.add(lastModifiedTime); - boolean present_replicaLocations = true && (isSetReplicaLocations()); - list.add(present_replicaLocations); - if (present_replicaLocations) - list.add(replicaLocations); - return list.hashCode(); } @@ -710,16 +622,6 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo return lastComparison; } } - lastComparison = Boolean.valueOf(isSetReplicaLocations()).compareTo(other.isSetReplicaLocations()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetReplicaLocations()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.replicaLocations, other.replicaLocations); - if (lastComparison != 0) { - return lastComparison; - } - } return 0; } @@ -787,14 +689,6 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo sb.append(this.lastModifiedTime); first = false; } - if (!first) sb.append(", "); - sb.append("replicaLocations:"); - if (this.replicaLocations == null) { - sb.append("null"); - } else { - sb.append(this.replicaLocations); - } - first = false; sb.append(")"); return sb.toString(); } @@ -888,25 +782,6 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 7: // REPLICA_LOCATIONS - if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { - { - org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); - struct.replicaLocations = new ArrayList<DataReplicaLocationModel>(_list0.size); - DataReplicaLocationModel _elem1; - for (int _i2 = 0; _i2 < _list0.size; ++_i2) - { - _elem1 = new DataReplicaLocationModel(); - _elem1.read(iprot); - struct.replicaLocations.add(_elem1); - } - iprot.readListEnd(); - } - struct.setReplicaLocationsIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -956,18 +831,6 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo oprot.writeI64(struct.lastModifiedTime); oprot.writeFieldEnd(); } - if (struct.replicaLocations != null) { - oprot.writeFieldBegin(REPLICA_LOCATIONS_FIELD_DESC); - { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.replicaLocations.size())); - for (DataReplicaLocationModel _iter3 : struct.replicaLocations) - { - _iter3.write(oprot); - } - oprot.writeListEnd(); - } - oprot.writeFieldEnd(); - } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -1004,10 +867,7 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo if (struct.isSetLastModifiedTime()) { optionals.set(5); } - if (struct.isSetReplicaLocations()) { - optionals.set(6); - } - oprot.writeBitSet(optionals, 7); + oprot.writeBitSet(optionals, 6); if (struct.isSetResourceId()) { oprot.writeString(struct.resourceId); } @@ -1026,21 +886,12 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo if (struct.isSetLastModifiedTime()) { oprot.writeI64(struct.lastModifiedTime); } - if (struct.isSetReplicaLocations()) { - { - oprot.writeI32(struct.replicaLocations.size()); - for (DataReplicaLocationModel _iter4 : struct.replicaLocations) - { - _iter4.write(oprot); - } - } - } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, DataResourceModel struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(7); + BitSet incoming = iprot.readBitSet(6); if (incoming.get(0)) { struct.resourceId = iprot.readString(); struct.setResourceIdIsSet(true); @@ -1065,20 +916,6 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo struct.lastModifiedTime = iprot.readI64(); struct.setLastModifiedTimeIsSet(true); } - if (incoming.get(6)) { - { - org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.replicaLocations = new ArrayList<DataReplicaLocationModel>(_list5.size); - DataReplicaLocationModel _elem6; - for (int _i7 = 0; _i7 < _list5.size; ++_i7) - { - _elem6 = new DataReplicaLocationModel(); - _elem6.read(iprot); - struct.replicaLocations.add(_elem6); - } - } - struct.setReplicaLocationsIsSet(true); - } } }
