moving data-manager relatedthings to a service
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/047a448a Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/047a448a Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/047a448a Branch: refs/heads/data-manager Commit: 047a448a3753f482c0d631ecf7a429908d4a7c7a Parents: 2d9483f Author: scnakandala <[email protected]> Authored: Tue Jan 12 17:03:37 2016 -0500 Committer: scnakandala <[email protected]> Committed: Tue Jan 12 17:03:37 2016 -0500 ---------------------------------------------------------------------- .../lib/airavata/airavata_errors_types.cpp | 97 ++ .../lib/airavata/airavata_errors_types.h | 44 + .../lib/airavata/metadata_models_types.cpp | 92 +- .../lib/airavata/metadata_models_types.h | 28 +- .../resources/lib/Airavata/API/Error/Types.php | 75 ++ .../lib/Airavata/Model/Data/metadata/Types.php | 109 +- .../lib/apache/airavata/api/error/ttypes.py | 70 + .../airavata/model/data/metadata/ttypes.py | 81 +- .../model/data/metadata/MetadataModel.java | 387 +++++- .../error/DataManagerServiceException.java | 406 ++++++ .../data/manager/core/DataManagerFactory.java | 34 + .../data/manager/core/DataManagerImpl.java | 77 ++ .../data/manager/core/FileManagerFactory.java | 34 - .../data/manager/core/FileManagerImpl.java | 78 -- .../manager/core/MetadataCatalogService.java | 76 -- .../core/MetadataCatalogServiceImpl.java | 34 +- .../conversion/AbstractThriftDeserializer.java | 3 +- .../data/manager/core/db/dao/MetadataDao.java | 16 + .../manager/cpi/MetadataCatalogService.java | 13 + .../data-manager/data-manager-service/pom.xml | 10 + .../server/DataManagerServerHandler.java | 37 + .../data/manager/cpi/DataManagerService.java | 1261 +++++++++++++++++- pom.xml | 1 - .../airavata-apis/airavata_errors.thrift | 4 + .../component-cpis/data-manager-cpi.thrift | 7 + .../data-manager-models/metadata_models.thrift | 19 +- 26 files changed, 2787 insertions(+), 306 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/047a448a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_errors_types.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_errors_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_errors_types.cpp index 08c02cf..4339bc4 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_errors_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_errors_types.cpp @@ -1220,4 +1220,101 @@ const char* AiravataSystemException::what() const throw() { } } + +DataManagerServiceException::~DataManagerServiceException() throw() { +} + + +void DataManagerServiceException::__set_message(const std::string& val) { + this->message = val; +} + +uint32_t DataManagerServiceException::read(::apache::thrift::protocol::TProtocol* iprot) { + + apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); + uint32_t xfer = 0; + std::string fname; + ::apache::thrift::protocol::TType ftype; + int16_t fid; + + xfer += iprot->readStructBegin(fname); + + using ::apache::thrift::protocol::TProtocolException; + + bool isset_message = false; + + while (true) + { + xfer += iprot->readFieldBegin(fname, ftype, fid); + if (ftype == ::apache::thrift::protocol::T_STOP) { + break; + } + switch (fid) + { + case 1: + if (ftype == ::apache::thrift::protocol::T_STRING) { + xfer += iprot->readString(this->message); + isset_message = true; + } else { + xfer += iprot->skip(ftype); + } + break; + default: + xfer += iprot->skip(ftype); + break; + } + xfer += iprot->readFieldEnd(); + } + + xfer += iprot->readStructEnd(); + + if (!isset_message) + throw TProtocolException(TProtocolException::INVALID_DATA); + return xfer; +} + +uint32_t DataManagerServiceException::write(::apache::thrift::protocol::TProtocol* oprot) const { + uint32_t xfer = 0; + apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); + xfer += oprot->writeStructBegin("DataManagerServiceException"); + + xfer += oprot->writeFieldBegin("message", ::apache::thrift::protocol::T_STRING, 1); + xfer += oprot->writeString(this->message); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldStop(); + xfer += oprot->writeStructEnd(); + return xfer; +} + +void swap(DataManagerServiceException &a, DataManagerServiceException &b) { + using ::std::swap; + swap(a.message, b.message); +} + +DataManagerServiceException::DataManagerServiceException(const DataManagerServiceException& other30) : TException() { + message = other30.message; +} +DataManagerServiceException& DataManagerServiceException::operator=(const DataManagerServiceException& other31) { + message = other31.message; + return *this; +} +void DataManagerServiceException::printTo(std::ostream& out) const { + using ::apache::thrift::to_string; + out << "DataManagerServiceException("; + out << "message=" << to_string(message); + out << ")"; +} + +const char* DataManagerServiceException::what() const throw() { + try { + std::stringstream ss; + ss << "TException - service has thrown: " << *this; + this->thriftTExceptionMessageHolder_ = ss.str(); + return this->thriftTExceptionMessageHolder_.c_str(); + } catch (const std::exception&) { + return "TException - service has thrown: DataManagerServiceException"; + } +} + }}}} // namespace http://git-wip-us.apache.org/repos/asf/airavata/blob/047a448a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_errors_types.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_errors_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_errors_types.h index e756d0a..c2fa605 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_errors_types.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_errors_types.h @@ -74,6 +74,8 @@ class LaunchValidationException; class AiravataSystemException; +class DataManagerServiceException; + class ExperimentNotFoundException : public ::apache::thrift::TException { public: @@ -584,6 +586,48 @@ inline std::ostream& operator<<(std::ostream& out, const AiravataSystemException return out; } + +class DataManagerServiceException : public ::apache::thrift::TException { + public: + + DataManagerServiceException(const DataManagerServiceException&); + DataManagerServiceException& operator=(const DataManagerServiceException&); + DataManagerServiceException() : message() { + } + + virtual ~DataManagerServiceException() throw(); + std::string message; + + void __set_message(const std::string& val); + + bool operator == (const DataManagerServiceException & rhs) const + { + if (!(message == rhs.message)) + return false; + return true; + } + bool operator != (const DataManagerServiceException &rhs) const { + return !(*this == rhs); + } + + bool operator < (const DataManagerServiceException & ) const; + + uint32_t read(::apache::thrift::protocol::TProtocol* iprot); + uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; + + virtual void printTo(std::ostream& out) const; + mutable std::string thriftTExceptionMessageHolder_; + const char* what() const throw(); +}; + +void swap(DataManagerServiceException &a, DataManagerServiceException &b); + +inline std::ostream& operator<<(std::ostream& out, const DataManagerServiceException& obj) +{ + obj.printTo(out); + return out; +} + }}}} // namespace #endif http://git-wip-us.apache.org/repos/asf/airavata/blob/047a448a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/metadata_models_types.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/metadata_models_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/metadata_models_types.cpp index f7d964e..b111fa7 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/metadata_models_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/metadata_models_types.cpp @@ -60,6 +60,11 @@ void MetadataModel::__set_username(const std::string& val) { __isset.username = true; } +void MetadataModel::__set_size(const double val) { + this->size = val; +__isset.size = true; +} + void MetadataModel::__set_sharedUsers(const std::vector<std::string> & val) { this->sharedUsers = val; __isset.sharedUsers = true; @@ -95,6 +100,16 @@ void MetadataModel::__set_customInformation(const std::map<std::string, std::str __isset.customInformation = true; } +void MetadataModel::__set_creationTime(const int64_t val) { + this->creationTime = val; +__isset.creationTime = true; +} + +void MetadataModel::__set_lastModifiedTime(const int64_t val) { + this->lastModifiedTime = val; +__isset.lastModifiedTime = true; +} + uint32_t MetadataModel::read(::apache::thrift::protocol::TProtocol* iprot) { apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); @@ -141,6 +156,14 @@ uint32_t MetadataModel::read(::apache::thrift::protocol::TProtocol* iprot) { } break; case 4: + if (ftype == ::apache::thrift::protocol::T_DOUBLE) { + xfer += iprot->readDouble(this->size); + this->__isset.size = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 5: if (ftype == ::apache::thrift::protocol::T_LIST) { { this->sharedUsers.clear(); @@ -160,7 +183,7 @@ uint32_t MetadataModel::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 5: + case 6: if (ftype == ::apache::thrift::protocol::T_BOOL) { xfer += iprot->readBool(this->sharedPublic); this->__isset.sharedPublic = true; @@ -168,7 +191,7 @@ uint32_t MetadataModel::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 6: + case 7: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->userFriendlyName); this->__isset.userFriendlyName = true; @@ -176,7 +199,7 @@ uint32_t MetadataModel::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 7: + case 8: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->userFriendlyDescription); this->__isset.userFriendlyDescription = true; @@ -184,7 +207,7 @@ uint32_t MetadataModel::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 8: + case 9: if (ftype == ::apache::thrift::protocol::T_I32) { int32_t ecast5; xfer += iprot->readI32(ecast5); @@ -194,7 +217,7 @@ uint32_t MetadataModel::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 9: + case 10: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->associatedEntityId); this->__isset.associatedEntityId = true; @@ -202,7 +225,7 @@ uint32_t MetadataModel::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 10: + case 11: if (ftype == ::apache::thrift::protocol::T_MAP) { { this->customInformation.clear(); @@ -225,6 +248,22 @@ uint32_t MetadataModel::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; + case 12: + if (ftype == ::apache::thrift::protocol::T_I64) { + xfer += iprot->readI64(this->creationTime); + this->__isset.creationTime = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 13: + if (ftype == ::apache::thrift::protocol::T_I64) { + xfer += iprot->readI64(this->lastModifiedTime); + this->__isset.lastModifiedTime = true; + } else { + xfer += iprot->skip(ftype); + } + break; default: xfer += iprot->skip(ftype); break; @@ -257,8 +296,13 @@ uint32_t MetadataModel::write(::apache::thrift::protocol::TProtocol* oprot) cons xfer += oprot->writeString(this->username); xfer += oprot->writeFieldEnd(); } + if (this->__isset.size) { + xfer += oprot->writeFieldBegin("size", ::apache::thrift::protocol::T_DOUBLE, 4); + xfer += oprot->writeDouble(this->size); + xfer += oprot->writeFieldEnd(); + } if (this->__isset.sharedUsers) { - xfer += oprot->writeFieldBegin("sharedUsers", ::apache::thrift::protocol::T_LIST, 4); + xfer += oprot->writeFieldBegin("sharedUsers", ::apache::thrift::protocol::T_LIST, 5); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->sharedUsers.size())); std::vector<std::string> ::const_iterator _iter13; @@ -271,32 +315,32 @@ uint32_t MetadataModel::write(::apache::thrift::protocol::TProtocol* oprot) cons xfer += oprot->writeFieldEnd(); } if (this->__isset.sharedPublic) { - xfer += oprot->writeFieldBegin("sharedPublic", ::apache::thrift::protocol::T_BOOL, 5); + xfer += oprot->writeFieldBegin("sharedPublic", ::apache::thrift::protocol::T_BOOL, 6); xfer += oprot->writeBool(this->sharedPublic); xfer += oprot->writeFieldEnd(); } if (this->__isset.userFriendlyName) { - xfer += oprot->writeFieldBegin("userFriendlyName", ::apache::thrift::protocol::T_STRING, 6); + xfer += oprot->writeFieldBegin("userFriendlyName", ::apache::thrift::protocol::T_STRING, 7); xfer += oprot->writeString(this->userFriendlyName); xfer += oprot->writeFieldEnd(); } if (this->__isset.userFriendlyDescription) { - xfer += oprot->writeFieldBegin("userFriendlyDescription", ::apache::thrift::protocol::T_STRING, 7); + xfer += oprot->writeFieldBegin("userFriendlyDescription", ::apache::thrift::protocol::T_STRING, 8); xfer += oprot->writeString(this->userFriendlyDescription); xfer += oprot->writeFieldEnd(); } if (this->__isset.metadataType) { - xfer += oprot->writeFieldBegin("metadataType", ::apache::thrift::protocol::T_I32, 8); + xfer += oprot->writeFieldBegin("metadataType", ::apache::thrift::protocol::T_I32, 9); xfer += oprot->writeI32((int32_t)this->metadataType); xfer += oprot->writeFieldEnd(); } if (this->__isset.associatedEntityId) { - xfer += oprot->writeFieldBegin("associatedEntityId", ::apache::thrift::protocol::T_STRING, 9); + xfer += oprot->writeFieldBegin("associatedEntityId", ::apache::thrift::protocol::T_STRING, 10); xfer += oprot->writeString(this->associatedEntityId); xfer += oprot->writeFieldEnd(); } if (this->__isset.customInformation) { - xfer += oprot->writeFieldBegin("customInformation", ::apache::thrift::protocol::T_MAP, 10); + xfer += oprot->writeFieldBegin("customInformation", ::apache::thrift::protocol::T_MAP, 11); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->customInformation.size())); std::map<std::string, std::string> ::const_iterator _iter14; @@ -309,6 +353,16 @@ uint32_t MetadataModel::write(::apache::thrift::protocol::TProtocol* oprot) cons } xfer += oprot->writeFieldEnd(); } + if (this->__isset.creationTime) { + xfer += oprot->writeFieldBegin("creationTime", ::apache::thrift::protocol::T_I64, 12); + xfer += oprot->writeI64(this->creationTime); + xfer += oprot->writeFieldEnd(); + } + if (this->__isset.lastModifiedTime) { + xfer += oprot->writeFieldBegin("lastModifiedTime", ::apache::thrift::protocol::T_I64, 13); + xfer += oprot->writeI64(this->lastModifiedTime); + xfer += oprot->writeFieldEnd(); + } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); return xfer; @@ -319,6 +373,7 @@ void swap(MetadataModel &a, MetadataModel &b) { swap(a.metadataId, b.metadataId); swap(a.gatewayId, b.gatewayId); swap(a.username, b.username); + swap(a.size, b.size); swap(a.sharedUsers, b.sharedUsers); swap(a.sharedPublic, b.sharedPublic); swap(a.userFriendlyName, b.userFriendlyName); @@ -326,6 +381,8 @@ void swap(MetadataModel &a, MetadataModel &b) { swap(a.metadataType, b.metadataType); swap(a.associatedEntityId, b.associatedEntityId); swap(a.customInformation, b.customInformation); + swap(a.creationTime, b.creationTime); + swap(a.lastModifiedTime, b.lastModifiedTime); swap(a.__isset, b.__isset); } @@ -333,6 +390,7 @@ MetadataModel::MetadataModel(const MetadataModel& other15) { metadataId = other15.metadataId; gatewayId = other15.gatewayId; username = other15.username; + size = other15.size; sharedUsers = other15.sharedUsers; sharedPublic = other15.sharedPublic; userFriendlyName = other15.userFriendlyName; @@ -340,12 +398,15 @@ MetadataModel::MetadataModel(const MetadataModel& other15) { metadataType = other15.metadataType; associatedEntityId = other15.associatedEntityId; customInformation = other15.customInformation; + creationTime = other15.creationTime; + lastModifiedTime = other15.lastModifiedTime; __isset = other15.__isset; } MetadataModel& MetadataModel::operator=(const MetadataModel& other16) { metadataId = other16.metadataId; gatewayId = other16.gatewayId; username = other16.username; + size = other16.size; sharedUsers = other16.sharedUsers; sharedPublic = other16.sharedPublic; userFriendlyName = other16.userFriendlyName; @@ -353,6 +414,8 @@ MetadataModel& MetadataModel::operator=(const MetadataModel& other16) { metadataType = other16.metadataType; associatedEntityId = other16.associatedEntityId; customInformation = other16.customInformation; + creationTime = other16.creationTime; + lastModifiedTime = other16.lastModifiedTime; __isset = other16.__isset; return *this; } @@ -362,6 +425,7 @@ void MetadataModel::printTo(std::ostream& out) const { out << "metadataId="; (__isset.metadataId ? (out << to_string(metadataId)) : (out << "<null>")); out << ", " << "gatewayId="; (__isset.gatewayId ? (out << to_string(gatewayId)) : (out << "<null>")); out << ", " << "username="; (__isset.username ? (out << to_string(username)) : (out << "<null>")); + out << ", " << "size="; (__isset.size ? (out << to_string(size)) : (out << "<null>")); out << ", " << "sharedUsers="; (__isset.sharedUsers ? (out << to_string(sharedUsers)) : (out << "<null>")); out << ", " << "sharedPublic="; (__isset.sharedPublic ? (out << to_string(sharedPublic)) : (out << "<null>")); out << ", " << "userFriendlyName="; (__isset.userFriendlyName ? (out << to_string(userFriendlyName)) : (out << "<null>")); @@ -369,6 +433,8 @@ void MetadataModel::printTo(std::ostream& out) const { out << ", " << "metadataType="; (__isset.metadataType ? (out << to_string(metadataType)) : (out << "<null>")); out << ", " << "associatedEntityId="; (__isset.associatedEntityId ? (out << to_string(associatedEntityId)) : (out << "<null>")); out << ", " << "customInformation="; (__isset.customInformation ? (out << to_string(customInformation)) : (out << "<null>")); + out << ", " << "creationTime="; (__isset.creationTime ? (out << to_string(creationTime)) : (out << "<null>")); + out << ", " << "lastModifiedTime="; (__isset.lastModifiedTime ? (out << to_string(lastModifiedTime)) : (out << "<null>")); out << ")"; } http://git-wip-us.apache.org/repos/asf/airavata/blob/047a448a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/metadata_models_types.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/metadata_models_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/metadata_models_types.h index 2be82d9..71866e7 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/metadata_models_types.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/metadata_models_types.h @@ -48,10 +48,11 @@ extern const std::map<int, const char*> _MetadataType_VALUES_TO_NAMES; class MetadataModel; typedef struct _MetadataModel__isset { - _MetadataModel__isset() : metadataId(false), gatewayId(false), username(false), sharedUsers(false), sharedPublic(false), userFriendlyName(false), userFriendlyDescription(false), metadataType(false), associatedEntityId(false), customInformation(false) {} + _MetadataModel__isset() : metadataId(false), gatewayId(false), username(false), size(false), sharedUsers(false), sharedPublic(false), userFriendlyName(false), userFriendlyDescription(false), metadataType(false), associatedEntityId(false), customInformation(false), creationTime(false), lastModifiedTime(false) {} bool metadataId :1; bool gatewayId :1; bool username :1; + bool size :1; bool sharedUsers :1; bool sharedPublic :1; bool userFriendlyName :1; @@ -59,6 +60,8 @@ typedef struct _MetadataModel__isset { bool metadataType :1; bool associatedEntityId :1; bool customInformation :1; + bool creationTime :1; + bool lastModifiedTime :1; } _MetadataModel__isset; class MetadataModel { @@ -66,13 +69,14 @@ class MetadataModel { MetadataModel(const MetadataModel&); MetadataModel& operator=(const MetadataModel&); - MetadataModel() : metadataId(), gatewayId(), username(), sharedPublic(0), userFriendlyName(), userFriendlyDescription(), metadataType((MetadataType::type)0), associatedEntityId() { + MetadataModel() : metadataId(), gatewayId(), username(), size(0), sharedPublic(0), userFriendlyName(), userFriendlyDescription(), metadataType((MetadataType::type)0), associatedEntityId(), creationTime(0), lastModifiedTime(0) { } virtual ~MetadataModel() throw(); std::string metadataId; std::string gatewayId; std::string username; + double size; std::vector<std::string> sharedUsers; bool sharedPublic; std::string userFriendlyName; @@ -80,6 +84,8 @@ class MetadataModel { MetadataType::type metadataType; std::string associatedEntityId; std::map<std::string, std::string> customInformation; + int64_t creationTime; + int64_t lastModifiedTime; _MetadataModel__isset __isset; @@ -89,6 +95,8 @@ class MetadataModel { void __set_username(const std::string& val); + void __set_size(const double val); + void __set_sharedUsers(const std::vector<std::string> & val); void __set_sharedPublic(const bool val); @@ -103,6 +111,10 @@ class MetadataModel { void __set_customInformation(const std::map<std::string, std::string> & val); + void __set_creationTime(const int64_t val); + + void __set_lastModifiedTime(const int64_t val); + bool operator == (const MetadataModel & rhs) const { if (__isset.metadataId != rhs.__isset.metadataId) @@ -117,6 +129,10 @@ class MetadataModel { return false; else if (__isset.username && !(username == rhs.username)) return false; + if (__isset.size != rhs.__isset.size) + return false; + else if (__isset.size && !(size == rhs.size)) + return false; if (__isset.sharedUsers != rhs.__isset.sharedUsers) return false; else if (__isset.sharedUsers && !(sharedUsers == rhs.sharedUsers)) @@ -145,6 +161,14 @@ class MetadataModel { return false; else if (__isset.customInformation && !(customInformation == rhs.customInformation)) return false; + if (__isset.creationTime != rhs.__isset.creationTime) + return false; + else if (__isset.creationTime && !(creationTime == rhs.creationTime)) + return false; + if (__isset.lastModifiedTime != rhs.__isset.lastModifiedTime) + return false; + else if (__isset.lastModifiedTime && !(lastModifiedTime == rhs.lastModifiedTime)) + return false; return true; } bool operator != (const MetadataModel &rhs) const { http://git-wip-us.apache.org/repos/asf/airavata/blob/047a448a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Error/Types.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Error/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Error/Types.php index edaa6de..15ed5fa 100644 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Error/Types.php +++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Error/Types.php @@ -1061,4 +1061,79 @@ class AiravataSystemException extends TException { } +class DataManagerServiceException extends TException { + static $_TSPEC; + + /** + * @var string + */ + public $message = null; + + public function __construct($vals=null) { + if (!isset(self::$_TSPEC)) { + self::$_TSPEC = array( + 1 => array( + 'var' => 'message', + 'type' => TType::STRING, + ), + ); + } + if (is_array($vals)) { + if (isset($vals['message'])) { + $this->message = $vals['message']; + } + } + } + + public function getName() { + return 'DataManagerServiceException'; + } + + public function read($input) + { + $xfer = 0; + $fname = null; + $ftype = 0; + $fid = 0; + $xfer += $input->readStructBegin($fname); + while (true) + { + $xfer += $input->readFieldBegin($fname, $ftype, $fid); + if ($ftype == TType::STOP) { + break; + } + switch ($fid) + { + case 1: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->message); + } else { + $xfer += $input->skip($ftype); + } + break; + default: + $xfer += $input->skip($ftype); + break; + } + $xfer += $input->readFieldEnd(); + } + $xfer += $input->readStructEnd(); + return $xfer; + } + + public function write($output) { + $xfer = 0; + $xfer += $output->writeStructBegin('DataManagerServiceException'); + if ($this->message !== null) { + $xfer += $output->writeFieldBegin('message', TType::STRING, 1); + $xfer += $output->writeString($this->message); + $xfer += $output->writeFieldEnd(); + } + $xfer += $output->writeFieldStop(); + $xfer += $output->writeStructEnd(); + return $xfer; + } + +} + http://git-wip-us.apache.org/repos/asf/airavata/blob/047a448a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/metadata/Types.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/metadata/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/metadata/Types.php index bb99359..ccc9ede 100644 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/metadata/Types.php +++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/metadata/Types.php @@ -1,5 +1,5 @@ <?php -namespace Airavata\Model\data\metadata; +namespace Airavata\Model\Data\Metadata; /** * Autogenerated by Thrift Compiler (0.9.3) @@ -42,6 +42,10 @@ class MetadataModel { */ public $username = null; /** + * @var double + */ + public $size = null; + /** * @var string[] */ public $sharedUsers = null; @@ -69,6 +73,14 @@ class MetadataModel { * @var array */ public $customInformation = null; + /** + * @var int + */ + public $creationTime = null; + /** + * @var int + */ + public $lastModifiedTime = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -86,6 +98,10 @@ class MetadataModel { 'type' => TType::STRING, ), 4 => array( + 'var' => 'size', + 'type' => TType::DOUBLE, + ), + 5 => array( 'var' => 'sharedUsers', 'type' => TType::LST, 'etype' => TType::STRING, @@ -93,27 +109,27 @@ class MetadataModel { 'type' => TType::STRING, ), ), - 5 => array( + 6 => array( 'var' => 'sharedPublic', 'type' => TType::BOOL, ), - 6 => array( + 7 => array( 'var' => 'userFriendlyName', 'type' => TType::STRING, ), - 7 => array( + 8 => array( 'var' => 'userFriendlyDescription', 'type' => TType::STRING, ), - 8 => array( + 9 => array( 'var' => 'metadataType', 'type' => TType::I32, ), - 9 => array( + 10 => array( 'var' => 'associatedEntityId', 'type' => TType::STRING, ), - 10 => array( + 11 => array( 'var' => 'customInformation', 'type' => TType::MAP, 'ktype' => TType::STRING, @@ -125,6 +141,14 @@ class MetadataModel { 'type' => TType::STRING, ), ), + 12 => array( + 'var' => 'creationTime', + 'type' => TType::I64, + ), + 13 => array( + 'var' => 'lastModifiedTime', + 'type' => TType::I64, + ), ); } if (is_array($vals)) { @@ -137,6 +161,9 @@ class MetadataModel { if (isset($vals['username'])) { $this->username = $vals['username']; } + if (isset($vals['size'])) { + $this->size = $vals['size']; + } if (isset($vals['sharedUsers'])) { $this->sharedUsers = $vals['sharedUsers']; } @@ -158,6 +185,12 @@ class MetadataModel { if (isset($vals['customInformation'])) { $this->customInformation = $vals['customInformation']; } + if (isset($vals['creationTime'])) { + $this->creationTime = $vals['creationTime']; + } + if (isset($vals['lastModifiedTime'])) { + $this->lastModifiedTime = $vals['lastModifiedTime']; + } } } @@ -202,6 +235,13 @@ class MetadataModel { } break; case 4: + if ($ftype == TType::DOUBLE) { + $xfer += $input->readDouble($this->size); + } else { + $xfer += $input->skip($ftype); + } + break; + case 5: if ($ftype == TType::LST) { $this->sharedUsers = array(); $_size0 = 0; @@ -218,42 +258,42 @@ class MetadataModel { $xfer += $input->skip($ftype); } break; - case 5: + case 6: if ($ftype == TType::BOOL) { $xfer += $input->readBool($this->sharedPublic); } else { $xfer += $input->skip($ftype); } break; - case 6: + case 7: if ($ftype == TType::STRING) { $xfer += $input->readString($this->userFriendlyName); } else { $xfer += $input->skip($ftype); } break; - case 7: + case 8: if ($ftype == TType::STRING) { $xfer += $input->readString($this->userFriendlyDescription); } else { $xfer += $input->skip($ftype); } break; - case 8: + case 9: if ($ftype == TType::I32) { $xfer += $input->readI32($this->metadataType); } else { $xfer += $input->skip($ftype); } break; - case 9: + case 10: if ($ftype == TType::STRING) { $xfer += $input->readString($this->associatedEntityId); } else { $xfer += $input->skip($ftype); } break; - case 10: + case 11: if ($ftype == TType::MAP) { $this->customInformation = array(); $_size6 = 0; @@ -273,6 +313,20 @@ class MetadataModel { $xfer += $input->skip($ftype); } break; + case 12: + if ($ftype == TType::I64) { + $xfer += $input->readI64($this->creationTime); + } else { + $xfer += $input->skip($ftype); + } + break; + case 13: + if ($ftype == TType::I64) { + $xfer += $input->readI64($this->lastModifiedTime); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -301,11 +355,16 @@ class MetadataModel { $xfer += $output->writeString($this->username); $xfer += $output->writeFieldEnd(); } + if ($this->size !== null) { + $xfer += $output->writeFieldBegin('size', TType::DOUBLE, 4); + $xfer += $output->writeDouble($this->size); + $xfer += $output->writeFieldEnd(); + } if ($this->sharedUsers !== null) { if (!is_array($this->sharedUsers)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('sharedUsers', TType::LST, 4); + $xfer += $output->writeFieldBegin('sharedUsers', TType::LST, 5); { $output->writeListBegin(TType::STRING, count($this->sharedUsers)); { @@ -319,27 +378,27 @@ class MetadataModel { $xfer += $output->writeFieldEnd(); } if ($this->sharedPublic !== null) { - $xfer += $output->writeFieldBegin('sharedPublic', TType::BOOL, 5); + $xfer += $output->writeFieldBegin('sharedPublic', TType::BOOL, 6); $xfer += $output->writeBool($this->sharedPublic); $xfer += $output->writeFieldEnd(); } if ($this->userFriendlyName !== null) { - $xfer += $output->writeFieldBegin('userFriendlyName', TType::STRING, 6); + $xfer += $output->writeFieldBegin('userFriendlyName', TType::STRING, 7); $xfer += $output->writeString($this->userFriendlyName); $xfer += $output->writeFieldEnd(); } if ($this->userFriendlyDescription !== null) { - $xfer += $output->writeFieldBegin('userFriendlyDescription', TType::STRING, 7); + $xfer += $output->writeFieldBegin('userFriendlyDescription', TType::STRING, 8); $xfer += $output->writeString($this->userFriendlyDescription); $xfer += $output->writeFieldEnd(); } if ($this->metadataType !== null) { - $xfer += $output->writeFieldBegin('metadataType', TType::I32, 8); + $xfer += $output->writeFieldBegin('metadataType', TType::I32, 9); $xfer += $output->writeI32($this->metadataType); $xfer += $output->writeFieldEnd(); } if ($this->associatedEntityId !== null) { - $xfer += $output->writeFieldBegin('associatedEntityId', TType::STRING, 9); + $xfer += $output->writeFieldBegin('associatedEntityId', TType::STRING, 10); $xfer += $output->writeString($this->associatedEntityId); $xfer += $output->writeFieldEnd(); } @@ -347,7 +406,7 @@ class MetadataModel { if (!is_array($this->customInformation)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('customInformation', TType::MAP, 10); + $xfer += $output->writeFieldBegin('customInformation', TType::MAP, 11); { $output->writeMapBegin(TType::STRING, TType::STRING, count($this->customInformation)); { @@ -361,6 +420,16 @@ class MetadataModel { } $xfer += $output->writeFieldEnd(); } + if ($this->creationTime !== null) { + $xfer += $output->writeFieldBegin('creationTime', TType::I64, 12); + $xfer += $output->writeI64($this->creationTime); + $xfer += $output->writeFieldEnd(); + } + if ($this->lastModifiedTime !== null) { + $xfer += $output->writeFieldBegin('lastModifiedTime', TType::I64, 13); + $xfer += $output->writeI64($this->lastModifiedTime); + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; http://git-wip-us.apache.org/repos/asf/airavata/blob/047a448a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/error/ttypes.py ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/error/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/error/ttypes.py index 522cc18..dc2ca9d 100644 --- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/error/ttypes.py +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/error/ttypes.py @@ -938,3 +938,73 @@ class AiravataSystemException(TException): def __ne__(self, other): return not (self == other) + +class DataManagerServiceException(TException): + """ + Attributes: + - message + """ + + thrift_spec = ( + None, # 0 + (1, TType.STRING, 'message', None, None, ), # 1 + ) + + def __init__(self, message=None,): + self.message = message + + 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: + fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec)) + return + iprot.readStructBegin() + while True: + (fname, ftype, fid) = iprot.readFieldBegin() + if ftype == TType.STOP: + break + if fid == 1: + if ftype == TType.STRING: + self.message = iprot.readString() + else: + iprot.skip(ftype) + else: + iprot.skip(ftype) + iprot.readFieldEnd() + iprot.readStructEnd() + + def write(self, oprot): + if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None: + oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec))) + return + oprot.writeStructBegin('DataManagerServiceException') + if self.message is not None: + oprot.writeFieldBegin('message', TType.STRING, 1) + oprot.writeString(self.message) + oprot.writeFieldEnd() + oprot.writeFieldStop() + oprot.writeStructEnd() + + def validate(self): + if self.message is None: + raise TProtocol.TProtocolException(message='Required field message is unset!') + return + + + def __str__(self): + return repr(self) + + def __hash__(self): + value = 17 + value = (value * 31) ^ hash(self.message) + return value + + def __repr__(self): + L = ['%s=%r' % (key, value) + for key, value in self.__dict__.iteritems()] + return '%s(%s)' % (self.__class__.__name__, ', '.join(L)) + + def __eq__(self, other): + return isinstance(other, self.__class__) and self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not (self == other) http://git-wip-us.apache.org/repos/asf/airavata/blob/047a448a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/data/metadata/ttypes.py ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/data/metadata/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/data/metadata/ttypes.py index b50ac94..863a2aa 100644 --- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/data/metadata/ttypes.py +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/data/metadata/ttypes.py @@ -37,6 +37,7 @@ class MetadataModel: - metadataId - gatewayId - username + - size - sharedUsers - sharedPublic - userFriendlyName @@ -44,6 +45,8 @@ class MetadataModel: - metadataType - associatedEntityId - customInformation + - creationTime + - lastModifiedTime """ thrift_spec = ( @@ -51,19 +54,23 @@ class MetadataModel: (1, TType.STRING, 'metadataId', None, None, ), # 1 (2, TType.STRING, 'gatewayId', None, None, ), # 2 (3, TType.STRING, 'username', None, None, ), # 3 - (4, TType.LIST, 'sharedUsers', (TType.STRING,None), None, ), # 4 - (5, TType.BOOL, 'sharedPublic', None, None, ), # 5 - (6, TType.STRING, 'userFriendlyName', None, None, ), # 6 - (7, TType.STRING, 'userFriendlyDescription', None, None, ), # 7 - (8, TType.I32, 'metadataType', None, None, ), # 8 - (9, TType.STRING, 'associatedEntityId', None, None, ), # 9 - (10, TType.MAP, 'customInformation', (TType.STRING,None,TType.STRING,None), None, ), # 10 + (4, TType.DOUBLE, 'size', None, None, ), # 4 + (5, TType.LIST, 'sharedUsers', (TType.STRING,None), None, ), # 5 + (6, TType.BOOL, 'sharedPublic', None, None, ), # 6 + (7, TType.STRING, 'userFriendlyName', None, None, ), # 7 + (8, TType.STRING, 'userFriendlyDescription', None, None, ), # 8 + (9, TType.I32, 'metadataType', None, None, ), # 9 + (10, TType.STRING, 'associatedEntityId', None, None, ), # 10 + (11, TType.MAP, 'customInformation', (TType.STRING,None,TType.STRING,None), None, ), # 11 + (12, TType.I64, 'creationTime', None, None, ), # 12 + (13, TType.I64, 'lastModifiedTime', None, None, ), # 13 ) - def __init__(self, metadataId=None, gatewayId=None, username=None, sharedUsers=None, sharedPublic=None, userFriendlyName=None, userFriendlyDescription=None, metadataType=None, associatedEntityId=None, customInformation=None,): + def __init__(self, metadataId=None, gatewayId=None, username=None, size=None, sharedUsers=None, sharedPublic=None, userFriendlyName=None, userFriendlyDescription=None, metadataType=None, associatedEntityId=None, customInformation=None, creationTime=None, lastModifiedTime=None,): self.metadataId = metadataId self.gatewayId = gatewayId self.username = username + self.size = size self.sharedUsers = sharedUsers self.sharedPublic = sharedPublic self.userFriendlyName = userFriendlyName @@ -71,6 +78,8 @@ class MetadataModel: self.metadataType = metadataType self.associatedEntityId = associatedEntityId self.customInformation = customInformation + self.creationTime = creationTime + self.lastModifiedTime = lastModifiedTime 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: @@ -97,6 +106,11 @@ class MetadataModel: else: iprot.skip(ftype) elif fid == 4: + if ftype == TType.DOUBLE: + self.size = iprot.readDouble() + else: + iprot.skip(ftype) + elif fid == 5: if ftype == TType.LIST: self.sharedUsers = [] (_etype3, _size0) = iprot.readListBegin() @@ -106,32 +120,32 @@ class MetadataModel: iprot.readListEnd() else: iprot.skip(ftype) - elif fid == 5: + elif fid == 6: if ftype == TType.BOOL: self.sharedPublic = iprot.readBool() else: iprot.skip(ftype) - elif fid == 6: + elif fid == 7: if ftype == TType.STRING: self.userFriendlyName = iprot.readString() else: iprot.skip(ftype) - elif fid == 7: + elif fid == 8: if ftype == TType.STRING: self.userFriendlyDescription = iprot.readString() else: iprot.skip(ftype) - elif fid == 8: + elif fid == 9: if ftype == TType.I32: self.metadataType = iprot.readI32() else: iprot.skip(ftype) - elif fid == 9: + elif fid == 10: if ftype == TType.STRING: self.associatedEntityId = iprot.readString() else: iprot.skip(ftype) - elif fid == 10: + elif fid == 11: if ftype == TType.MAP: self.customInformation = {} (_ktype7, _vtype8, _size6 ) = iprot.readMapBegin() @@ -142,6 +156,16 @@ class MetadataModel: iprot.readMapEnd() else: iprot.skip(ftype) + elif fid == 12: + if ftype == TType.I64: + self.creationTime = iprot.readI64() + else: + iprot.skip(ftype) + elif fid == 13: + if ftype == TType.I64: + self.lastModifiedTime = iprot.readI64() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -164,41 +188,53 @@ class MetadataModel: oprot.writeFieldBegin('username', TType.STRING, 3) oprot.writeString(self.username) oprot.writeFieldEnd() + if self.size is not None: + oprot.writeFieldBegin('size', TType.DOUBLE, 4) + oprot.writeDouble(self.size) + oprot.writeFieldEnd() if self.sharedUsers is not None: - oprot.writeFieldBegin('sharedUsers', TType.LIST, 4) + oprot.writeFieldBegin('sharedUsers', TType.LIST, 5) oprot.writeListBegin(TType.STRING, len(self.sharedUsers)) for iter13 in self.sharedUsers: oprot.writeString(iter13) oprot.writeListEnd() oprot.writeFieldEnd() if self.sharedPublic is not None: - oprot.writeFieldBegin('sharedPublic', TType.BOOL, 5) + oprot.writeFieldBegin('sharedPublic', TType.BOOL, 6) oprot.writeBool(self.sharedPublic) oprot.writeFieldEnd() if self.userFriendlyName is not None: - oprot.writeFieldBegin('userFriendlyName', TType.STRING, 6) + oprot.writeFieldBegin('userFriendlyName', TType.STRING, 7) oprot.writeString(self.userFriendlyName) oprot.writeFieldEnd() if self.userFriendlyDescription is not None: - oprot.writeFieldBegin('userFriendlyDescription', TType.STRING, 7) + oprot.writeFieldBegin('userFriendlyDescription', TType.STRING, 8) oprot.writeString(self.userFriendlyDescription) oprot.writeFieldEnd() if self.metadataType is not None: - oprot.writeFieldBegin('metadataType', TType.I32, 8) + oprot.writeFieldBegin('metadataType', TType.I32, 9) oprot.writeI32(self.metadataType) oprot.writeFieldEnd() if self.associatedEntityId is not None: - oprot.writeFieldBegin('associatedEntityId', TType.STRING, 9) + oprot.writeFieldBegin('associatedEntityId', TType.STRING, 10) oprot.writeString(self.associatedEntityId) oprot.writeFieldEnd() if self.customInformation is not None: - oprot.writeFieldBegin('customInformation', TType.MAP, 10) + oprot.writeFieldBegin('customInformation', TType.MAP, 11) oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.customInformation)) for kiter14,viter15 in self.customInformation.items(): oprot.writeString(kiter14) oprot.writeString(viter15) oprot.writeMapEnd() oprot.writeFieldEnd() + if self.creationTime is not None: + oprot.writeFieldBegin('creationTime', TType.I64, 12) + oprot.writeI64(self.creationTime) + oprot.writeFieldEnd() + if self.lastModifiedTime is not None: + oprot.writeFieldBegin('lastModifiedTime', TType.I64, 13) + oprot.writeI64(self.lastModifiedTime) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -211,6 +247,7 @@ class MetadataModel: value = (value * 31) ^ hash(self.metadataId) value = (value * 31) ^ hash(self.gatewayId) value = (value * 31) ^ hash(self.username) + value = (value * 31) ^ hash(self.size) value = (value * 31) ^ hash(self.sharedUsers) value = (value * 31) ^ hash(self.sharedPublic) value = (value * 31) ^ hash(self.userFriendlyName) @@ -218,6 +255,8 @@ class MetadataModel: value = (value * 31) ^ hash(self.metadataType) value = (value * 31) ^ hash(self.associatedEntityId) value = (value * 31) ^ hash(self.customInformation) + value = (value * 31) ^ hash(self.creationTime) + value = (value * 31) ^ hash(self.lastModifiedTime) return value def __repr__(self): http://git-wip-us.apache.org/repos/asf/airavata/blob/047a448a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/metadata/MetadataModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/metadata/MetadataModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/metadata/MetadataModel.java index d6688e8..d1e3c01 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/metadata/MetadataModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/metadata/MetadataModel.java @@ -58,13 +58,16 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met private static final org.apache.thrift.protocol.TField METADATA_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("metadataId", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)2); private static final org.apache.thrift.protocol.TField USERNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("username", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField SHARED_USERS_FIELD_DESC = new org.apache.thrift.protocol.TField("sharedUsers", org.apache.thrift.protocol.TType.LIST, (short)4); - private static final org.apache.thrift.protocol.TField SHARED_PUBLIC_FIELD_DESC = new org.apache.thrift.protocol.TField("sharedPublic", org.apache.thrift.protocol.TType.BOOL, (short)5); - private static final org.apache.thrift.protocol.TField USER_FRIENDLY_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userFriendlyName", org.apache.thrift.protocol.TType.STRING, (short)6); - private static final org.apache.thrift.protocol.TField USER_FRIENDLY_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("userFriendlyDescription", org.apache.thrift.protocol.TType.STRING, (short)7); - private static final org.apache.thrift.protocol.TField METADATA_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("metadataType", org.apache.thrift.protocol.TType.I32, (short)8); - private static final org.apache.thrift.protocol.TField ASSOCIATED_ENTITY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("associatedEntityId", org.apache.thrift.protocol.TType.STRING, (short)9); - private static final org.apache.thrift.protocol.TField CUSTOM_INFORMATION_FIELD_DESC = new org.apache.thrift.protocol.TField("customInformation", org.apache.thrift.protocol.TType.MAP, (short)10); + private static final org.apache.thrift.protocol.TField SIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("size", org.apache.thrift.protocol.TType.DOUBLE, (short)4); + private static final org.apache.thrift.protocol.TField SHARED_USERS_FIELD_DESC = new org.apache.thrift.protocol.TField("sharedUsers", org.apache.thrift.protocol.TType.LIST, (short)5); + private static final org.apache.thrift.protocol.TField SHARED_PUBLIC_FIELD_DESC = new org.apache.thrift.protocol.TField("sharedPublic", org.apache.thrift.protocol.TType.BOOL, (short)6); + private static final org.apache.thrift.protocol.TField USER_FRIENDLY_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userFriendlyName", org.apache.thrift.protocol.TType.STRING, (short)7); + private static final org.apache.thrift.protocol.TField USER_FRIENDLY_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("userFriendlyDescription", org.apache.thrift.protocol.TType.STRING, (short)8); + private static final org.apache.thrift.protocol.TField METADATA_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("metadataType", org.apache.thrift.protocol.TType.I32, (short)9); + private static final org.apache.thrift.protocol.TField ASSOCIATED_ENTITY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("associatedEntityId", org.apache.thrift.protocol.TType.STRING, (short)10); + private static final org.apache.thrift.protocol.TField CUSTOM_INFORMATION_FIELD_DESC = new org.apache.thrift.protocol.TField("customInformation", org.apache.thrift.protocol.TType.MAP, (short)11); + 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)12); + 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)13); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -75,6 +78,7 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met private String metadataId; // optional private String gatewayId; // optional private String username; // optional + private double size; // optional private List<String> sharedUsers; // optional private boolean sharedPublic; // optional private String userFriendlyName; // optional @@ -82,23 +86,28 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met private MetadataType metadataType; // optional private String associatedEntityId; // optional private Map<String,String> customInformation; // optional + private long creationTime; // optional + private long lastModifiedTime; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { METADATA_ID((short)1, "metadataId"), GATEWAY_ID((short)2, "gatewayId"), USERNAME((short)3, "username"), - SHARED_USERS((short)4, "sharedUsers"), - SHARED_PUBLIC((short)5, "sharedPublic"), - USER_FRIENDLY_NAME((short)6, "userFriendlyName"), - USER_FRIENDLY_DESCRIPTION((short)7, "userFriendlyDescription"), + SIZE((short)4, "size"), + SHARED_USERS((short)5, "sharedUsers"), + SHARED_PUBLIC((short)6, "sharedPublic"), + USER_FRIENDLY_NAME((short)7, "userFriendlyName"), + USER_FRIENDLY_DESCRIPTION((short)8, "userFriendlyDescription"), /** * * @see MetadataType */ - METADATA_TYPE((short)8, "metadataType"), - ASSOCIATED_ENTITY_ID((short)9, "associatedEntityId"), - CUSTOM_INFORMATION((short)10, "customInformation"); + METADATA_TYPE((short)9, "metadataType"), + ASSOCIATED_ENTITY_ID((short)10, "associatedEntityId"), + CUSTOM_INFORMATION((short)11, "customInformation"), + CREATION_TIME((short)12, "creationTime"), + LAST_MODIFIED_TIME((short)13, "lastModifiedTime"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -119,20 +128,26 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met return GATEWAY_ID; case 3: // USERNAME return USERNAME; - case 4: // SHARED_USERS + case 4: // SIZE + return SIZE; + case 5: // SHARED_USERS return SHARED_USERS; - case 5: // SHARED_PUBLIC + case 6: // SHARED_PUBLIC return SHARED_PUBLIC; - case 6: // USER_FRIENDLY_NAME + case 7: // USER_FRIENDLY_NAME return USER_FRIENDLY_NAME; - case 7: // USER_FRIENDLY_DESCRIPTION + case 8: // USER_FRIENDLY_DESCRIPTION return USER_FRIENDLY_DESCRIPTION; - case 8: // METADATA_TYPE + case 9: // METADATA_TYPE return METADATA_TYPE; - case 9: // ASSOCIATED_ENTITY_ID + case 10: // ASSOCIATED_ENTITY_ID return ASSOCIATED_ENTITY_ID; - case 10: // CUSTOM_INFORMATION + case 11: // CUSTOM_INFORMATION return CUSTOM_INFORMATION; + case 12: // CREATION_TIME + return CREATION_TIME; + case 13: // LAST_MODIFIED_TIME + return LAST_MODIFIED_TIME; default: return null; } @@ -173,9 +188,12 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met } // isset id assignments - private static final int __SHAREDPUBLIC_ISSET_ID = 0; + private static final int __SIZE_ISSET_ID = 0; + private static final int __SHAREDPUBLIC_ISSET_ID = 1; + private static final int __CREATIONTIME_ISSET_ID = 2; + private static final int __LASTMODIFIEDTIME_ISSET_ID = 3; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.METADATA_ID,_Fields.GATEWAY_ID,_Fields.USERNAME,_Fields.SHARED_USERS,_Fields.SHARED_PUBLIC,_Fields.USER_FRIENDLY_NAME,_Fields.USER_FRIENDLY_DESCRIPTION,_Fields.METADATA_TYPE,_Fields.ASSOCIATED_ENTITY_ID,_Fields.CUSTOM_INFORMATION}; + private static final _Fields optionals[] = {_Fields.METADATA_ID,_Fields.GATEWAY_ID,_Fields.USERNAME,_Fields.SIZE,_Fields.SHARED_USERS,_Fields.SHARED_PUBLIC,_Fields.USER_FRIENDLY_NAME,_Fields.USER_FRIENDLY_DESCRIPTION,_Fields.METADATA_TYPE,_Fields.ASSOCIATED_ENTITY_ID,_Fields.CUSTOM_INFORMATION,_Fields.CREATION_TIME,_Fields.LAST_MODIFIED_TIME}; 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); @@ -185,6 +203,8 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.USERNAME, new org.apache.thrift.meta_data.FieldMetaData("username", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.SIZE, new org.apache.thrift.meta_data.FieldMetaData("size", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE))); tmpMap.put(_Fields.SHARED_USERS, new org.apache.thrift.meta_data.FieldMetaData("sharedUsers", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); @@ -202,6 +222,10 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); + tmpMap.put(_Fields.CREATION_TIME, new org.apache.thrift.meta_data.FieldMetaData("creationTime", org.apache.thrift.TFieldRequirementType.OPTIONAL, + 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))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(MetadataModel.class, metaDataMap); } @@ -223,6 +247,7 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met if (other.isSetUsername()) { this.username = other.username; } + this.size = other.size; if (other.isSetSharedUsers()) { List<String> __this__sharedUsers = new ArrayList<String>(other.sharedUsers); this.sharedUsers = __this__sharedUsers; @@ -244,6 +269,8 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met Map<String,String> __this__customInformation = new HashMap<String,String>(other.customInformation); this.customInformation = __this__customInformation; } + this.creationTime = other.creationTime; + this.lastModifiedTime = other.lastModifiedTime; } public MetadataModel deepCopy() { @@ -255,6 +282,8 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met this.metadataId = null; this.gatewayId = null; this.username = null; + setSizeIsSet(false); + this.size = 0.0; this.sharedUsers = null; setSharedPublicIsSet(false); this.sharedPublic = false; @@ -263,6 +292,10 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met this.metadataType = null; this.associatedEntityId = null; this.customInformation = null; + setCreationTimeIsSet(false); + this.creationTime = 0; + setLastModifiedTimeIsSet(false); + this.lastModifiedTime = 0; } public String getMetadataId() { @@ -334,6 +367,28 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met } } + public double getSize() { + return this.size; + } + + public void setSize(double size) { + this.size = size; + setSizeIsSet(true); + } + + public void unsetSize() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SIZE_ISSET_ID); + } + + /** Returns true if field size is set (has been assigned a value) and false otherwise */ + public boolean isSetSize() { + return EncodingUtils.testBit(__isset_bitfield, __SIZE_ISSET_ID); + } + + public void setSizeIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SIZE_ISSET_ID, value); + } + public int getSharedUsersSize() { return (this.sharedUsers == null) ? 0 : this.sharedUsers.size(); } @@ -528,6 +583,50 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met } } + public long getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(long creationTime) { + this.creationTime = creationTime; + setCreationTimeIsSet(true); + } + + public void unsetCreationTime() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __CREATIONTIME_ISSET_ID); + } + + /** Returns true if field creationTime is set (has been assigned a value) and false otherwise */ + public boolean isSetCreationTime() { + return EncodingUtils.testBit(__isset_bitfield, __CREATIONTIME_ISSET_ID); + } + + public void setCreationTimeIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CREATIONTIME_ISSET_ID, value); + } + + public long getLastModifiedTime() { + return this.lastModifiedTime; + } + + public void setLastModifiedTime(long lastModifiedTime) { + this.lastModifiedTime = lastModifiedTime; + setLastModifiedTimeIsSet(true); + } + + public void unsetLastModifiedTime() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LASTMODIFIEDTIME_ISSET_ID); + } + + /** Returns true if field lastModifiedTime is set (has been assigned a value) and false otherwise */ + public boolean isSetLastModifiedTime() { + return EncodingUtils.testBit(__isset_bitfield, __LASTMODIFIEDTIME_ISSET_ID); + } + + public void setLastModifiedTimeIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LASTMODIFIEDTIME_ISSET_ID, value); + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case METADATA_ID: @@ -554,6 +653,14 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met } break; + case SIZE: + if (value == null) { + unsetSize(); + } else { + setSize((Double)value); + } + break; + case SHARED_USERS: if (value == null) { unsetSharedUsers(); @@ -610,6 +717,22 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met } break; + case CREATION_TIME: + if (value == null) { + unsetCreationTime(); + } else { + setCreationTime((Long)value); + } + break; + + case LAST_MODIFIED_TIME: + if (value == null) { + unsetLastModifiedTime(); + } else { + setLastModifiedTime((Long)value); + } + break; + } } @@ -624,6 +747,9 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met case USERNAME: return getUsername(); + case SIZE: + return getSize(); + case SHARED_USERS: return getSharedUsers(); @@ -645,6 +771,12 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met case CUSTOM_INFORMATION: return getCustomInformation(); + case CREATION_TIME: + return getCreationTime(); + + case LAST_MODIFIED_TIME: + return getLastModifiedTime(); + } throw new IllegalStateException(); } @@ -662,6 +794,8 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met return isSetGatewayId(); case USERNAME: return isSetUsername(); + case SIZE: + return isSetSize(); case SHARED_USERS: return isSetSharedUsers(); case SHARED_PUBLIC: @@ -676,6 +810,10 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met return isSetAssociatedEntityId(); case CUSTOM_INFORMATION: return isSetCustomInformation(); + case CREATION_TIME: + return isSetCreationTime(); + case LAST_MODIFIED_TIME: + return isSetLastModifiedTime(); } throw new IllegalStateException(); } @@ -720,6 +858,15 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met return false; } + boolean this_present_size = true && this.isSetSize(); + boolean that_present_size = true && that.isSetSize(); + if (this_present_size || that_present_size) { + if (!(this_present_size && that_present_size)) + return false; + if (this.size != that.size) + return false; + } + boolean this_present_sharedUsers = true && this.isSetSharedUsers(); boolean that_present_sharedUsers = true && that.isSetSharedUsers(); if (this_present_sharedUsers || that_present_sharedUsers) { @@ -783,6 +930,24 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met return false; } + boolean this_present_creationTime = true && this.isSetCreationTime(); + boolean that_present_creationTime = true && that.isSetCreationTime(); + if (this_present_creationTime || that_present_creationTime) { + if (!(this_present_creationTime && that_present_creationTime)) + return false; + if (this.creationTime != that.creationTime) + return false; + } + + boolean this_present_lastModifiedTime = true && this.isSetLastModifiedTime(); + boolean that_present_lastModifiedTime = true && that.isSetLastModifiedTime(); + if (this_present_lastModifiedTime || that_present_lastModifiedTime) { + if (!(this_present_lastModifiedTime && that_present_lastModifiedTime)) + return false; + if (this.lastModifiedTime != that.lastModifiedTime) + return false; + } + return true; } @@ -805,6 +970,11 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met if (present_username) list.add(username); + boolean present_size = true && (isSetSize()); + list.add(present_size); + if (present_size) + list.add(size); + boolean present_sharedUsers = true && (isSetSharedUsers()); list.add(present_sharedUsers); if (present_sharedUsers) @@ -840,6 +1010,16 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met if (present_customInformation) list.add(customInformation); + boolean present_creationTime = true && (isSetCreationTime()); + list.add(present_creationTime); + if (present_creationTime) + list.add(creationTime); + + boolean present_lastModifiedTime = true && (isSetLastModifiedTime()); + list.add(present_lastModifiedTime); + if (present_lastModifiedTime) + list.add(lastModifiedTime); + return list.hashCode(); } @@ -881,6 +1061,16 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met return lastComparison; } } + lastComparison = Boolean.valueOf(isSetSize()).compareTo(other.isSetSize()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetSize()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.size, other.size); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetSharedUsers()).compareTo(other.isSetSharedUsers()); if (lastComparison != 0) { return lastComparison; @@ -951,6 +1141,26 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met return lastComparison; } } + lastComparison = Boolean.valueOf(isSetCreationTime()).compareTo(other.isSetCreationTime()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetCreationTime()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.creationTime, other.creationTime); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetLastModifiedTime()).compareTo(other.isSetLastModifiedTime()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetLastModifiedTime()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastModifiedTime, other.lastModifiedTime); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -1000,6 +1210,12 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met } first = false; } + if (isSetSize()) { + if (!first) sb.append(", "); + sb.append("size:"); + sb.append(this.size); + first = false; + } if (isSetSharedUsers()) { if (!first) sb.append(", "); sb.append("sharedUsers:"); @@ -1066,6 +1282,18 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met } first = false; } + if (isSetCreationTime()) { + if (!first) sb.append(", "); + sb.append("creationTime:"); + sb.append(this.creationTime); + first = false; + } + if (isSetLastModifiedTime()) { + if (!first) sb.append(", "); + sb.append("lastModifiedTime:"); + sb.append(this.lastModifiedTime); + first = false; + } sb.append(")"); return sb.toString(); } @@ -1135,7 +1363,15 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // SHARED_USERS + case 4: // SIZE + if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) { + struct.size = iprot.readDouble(); + struct.setSizeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 5: // SHARED_USERS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); @@ -1153,7 +1389,7 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // SHARED_PUBLIC + case 6: // SHARED_PUBLIC if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.sharedPublic = iprot.readBool(); struct.setSharedPublicIsSet(true); @@ -1161,7 +1397,7 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 6: // USER_FRIENDLY_NAME + case 7: // USER_FRIENDLY_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.userFriendlyName = iprot.readString(); struct.setUserFriendlyNameIsSet(true); @@ -1169,7 +1405,7 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 7: // USER_FRIENDLY_DESCRIPTION + case 8: // USER_FRIENDLY_DESCRIPTION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.userFriendlyDescription = iprot.readString(); struct.setUserFriendlyDescriptionIsSet(true); @@ -1177,7 +1413,7 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 8: // METADATA_TYPE + case 9: // METADATA_TYPE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.metadataType = org.apache.airavata.model.data.metadata.MetadataType.findByValue(iprot.readI32()); struct.setMetadataTypeIsSet(true); @@ -1185,7 +1421,7 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 9: // ASSOCIATED_ENTITY_ID + case 10: // ASSOCIATED_ENTITY_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.associatedEntityId = iprot.readString(); struct.setAssociatedEntityIdIsSet(true); @@ -1193,7 +1429,7 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 10: // CUSTOM_INFORMATION + case 11: // CUSTOM_INFORMATION if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { org.apache.thrift.protocol.TMap _map3 = iprot.readMapBegin(); @@ -1213,6 +1449,22 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 12: // CREATION_TIME + if (schemeField.type == org.apache.thrift.protocol.TType.I64) { + struct.creationTime = iprot.readI64(); + struct.setCreationTimeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 13: // LAST_MODIFIED_TIME + if (schemeField.type == org.apache.thrift.protocol.TType.I64) { + struct.lastModifiedTime = iprot.readI64(); + struct.setLastModifiedTimeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1247,6 +1499,11 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met oprot.writeFieldEnd(); } } + if (struct.isSetSize()) { + oprot.writeFieldBegin(SIZE_FIELD_DESC); + oprot.writeDouble(struct.size); + oprot.writeFieldEnd(); + } if (struct.sharedUsers != null) { if (struct.isSetSharedUsers()) { oprot.writeFieldBegin(SHARED_USERS_FIELD_DESC); @@ -1309,6 +1566,16 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met oprot.writeFieldEnd(); } } + if (struct.isSetCreationTime()) { + oprot.writeFieldBegin(CREATION_TIME_FIELD_DESC); + oprot.writeI64(struct.creationTime); + oprot.writeFieldEnd(); + } + if (struct.isSetLastModifiedTime()) { + oprot.writeFieldBegin(LAST_MODIFIED_TIME_FIELD_DESC); + oprot.writeI64(struct.lastModifiedTime); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -1336,28 +1603,37 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met if (struct.isSetUsername()) { optionals.set(2); } - if (struct.isSetSharedUsers()) { + if (struct.isSetSize()) { optionals.set(3); } - if (struct.isSetSharedPublic()) { + if (struct.isSetSharedUsers()) { optionals.set(4); } - if (struct.isSetUserFriendlyName()) { + if (struct.isSetSharedPublic()) { optionals.set(5); } - if (struct.isSetUserFriendlyDescription()) { + if (struct.isSetUserFriendlyName()) { optionals.set(6); } - if (struct.isSetMetadataType()) { + if (struct.isSetUserFriendlyDescription()) { optionals.set(7); } - if (struct.isSetAssociatedEntityId()) { + if (struct.isSetMetadataType()) { optionals.set(8); } - if (struct.isSetCustomInformation()) { + if (struct.isSetAssociatedEntityId()) { optionals.set(9); } - oprot.writeBitSet(optionals, 10); + if (struct.isSetCustomInformation()) { + optionals.set(10); + } + if (struct.isSetCreationTime()) { + optionals.set(11); + } + if (struct.isSetLastModifiedTime()) { + optionals.set(12); + } + oprot.writeBitSet(optionals, 13); if (struct.isSetMetadataId()) { oprot.writeString(struct.metadataId); } @@ -1367,6 +1643,9 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met if (struct.isSetUsername()) { oprot.writeString(struct.username); } + if (struct.isSetSize()) { + oprot.writeDouble(struct.size); + } if (struct.isSetSharedUsers()) { { oprot.writeI32(struct.sharedUsers.size()); @@ -1401,12 +1680,18 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met } } } + if (struct.isSetCreationTime()) { + oprot.writeI64(struct.creationTime); + } + if (struct.isSetLastModifiedTime()) { + oprot.writeI64(struct.lastModifiedTime); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, MetadataModel struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(10); + BitSet incoming = iprot.readBitSet(13); if (incoming.get(0)) { struct.metadataId = iprot.readString(); struct.setMetadataIdIsSet(true); @@ -1420,6 +1705,10 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met struct.setUsernameIsSet(true); } if (incoming.get(3)) { + struct.size = iprot.readDouble(); + struct.setSizeIsSet(true); + } + if (incoming.get(4)) { { org.apache.thrift.protocol.TList _list11 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.sharedUsers = new ArrayList<String>(_list11.size); @@ -1432,27 +1721,27 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met } struct.setSharedUsersIsSet(true); } - if (incoming.get(4)) { + if (incoming.get(5)) { struct.sharedPublic = iprot.readBool(); struct.setSharedPublicIsSet(true); } - if (incoming.get(5)) { + if (incoming.get(6)) { struct.userFriendlyName = iprot.readString(); struct.setUserFriendlyNameIsSet(true); } - if (incoming.get(6)) { + if (incoming.get(7)) { struct.userFriendlyDescription = iprot.readString(); struct.setUserFriendlyDescriptionIsSet(true); } - if (incoming.get(7)) { + if (incoming.get(8)) { struct.metadataType = org.apache.airavata.model.data.metadata.MetadataType.findByValue(iprot.readI32()); struct.setMetadataTypeIsSet(true); } - if (incoming.get(8)) { + if (incoming.get(9)) { struct.associatedEntityId = iprot.readString(); struct.setAssociatedEntityIdIsSet(true); } - if (incoming.get(9)) { + if (incoming.get(10)) { { org.apache.thrift.protocol.TMap _map14 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.customInformation = new HashMap<String,String>(2*_map14.size); @@ -1467,6 +1756,14 @@ public class MetadataModel implements org.apache.thrift.TBase<MetadataModel, Met } struct.setCustomInformationIsSet(true); } + if (incoming.get(11)) { + struct.creationTime = iprot.readI64(); + struct.setCreationTimeIsSet(true); + } + if (incoming.get(12)) { + struct.lastModifiedTime = iprot.readI64(); + struct.setLastModifiedTimeIsSet(true); + } } }
