Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 56B4618844 for ; Thu, 17 Dec 2015 15:45:55 +0000 (UTC) Received: (qmail 22671 invoked by uid 500); 17 Dec 2015 15:45:55 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 22354 invoked by uid 500); 17 Dec 2015 15:45:54 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 22044 invoked by uid 99); 17 Dec 2015 15:45:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Dec 2015 15:45:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D9618E5CE5; Thu, 17 Dec 2015 15:45:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: scnakandala@apache.org To: commits@airavata.apache.org Date: Thu, 17 Dec 2015 15:45:58 -0000 Message-Id: In-Reply-To: <1048eab4372946948eab5133d0bd10f7@git.apache.org> References: <1048eab4372946948eab5133d0bd10f7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/46] airavata git commit: removing duplicate copy of data models http://git-wip-us.apache.org/repos/asf/airavata/blob/b490671e/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.cpp index 30ba1e9..dba3511 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.cpp @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -107,11 +107,9 @@ void TaskModel::__set_jobs(const std::vector< ::apache::airavata::model::job::Jo __isset.jobs = true; } -const char* TaskModel::ascii_fingerprint = "BA52131C9C867CBF7281F29EDD7DDB6F"; -const uint8_t TaskModel::binary_fingerprint[16] = {0xBA,0x52,0x13,0x1C,0x9C,0x86,0x7C,0xBF,0x72,0x81,0xF2,0x9E,0xDD,0x7D,0xDB,0x6F}; - uint32_t TaskModel::read(::apache::thrift::protocol::TProtocol* iprot) { + apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; std::string fname; ::apache::thrift::protocol::TType ftype; @@ -256,7 +254,7 @@ uint32_t TaskModel::read(::apache::thrift::protocol::TProtocol* iprot) { uint32_t TaskModel::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; - oprot->incrementRecursionDepth(); + apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); xfer += oprot->writeStructBegin("TaskModel"); xfer += oprot->writeFieldBegin("taskId", ::apache::thrift::protocol::T_STRING, 1); @@ -313,7 +311,6 @@ uint32_t TaskModel::write(::apache::thrift::protocol::TProtocol* oprot) const { } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); - oprot->decrementRecursionDepth(); return xfer; } @@ -359,21 +356,20 @@ TaskModel& TaskModel::operator=(const TaskModel& other8) { __isset = other8.__isset; return *this; } -std::ostream& operator<<(std::ostream& out, const TaskModel& obj) { - using apache::thrift::to_string; +void TaskModel::printTo(std::ostream& out) const { + using ::apache::thrift::to_string; out << "TaskModel("; - out << "taskId=" << to_string(obj.taskId); - out << ", " << "taskType=" << to_string(obj.taskType); - out << ", " << "parentProcessId=" << to_string(obj.parentProcessId); - out << ", " << "creationTime=" << to_string(obj.creationTime); - out << ", " << "lastUpdateTime=" << to_string(obj.lastUpdateTime); - out << ", " << "taskStatus=" << to_string(obj.taskStatus); - out << ", " << "taskDetail="; (obj.__isset.taskDetail ? (out << to_string(obj.taskDetail)) : (out << "")); - out << ", " << "subTaskModel="; (obj.__isset.subTaskModel ? (out << to_string(obj.subTaskModel)) : (out << "")); - out << ", " << "taskError="; (obj.__isset.taskError ? (out << to_string(obj.taskError)) : (out << "")); - out << ", " << "jobs="; (obj.__isset.jobs ? (out << to_string(obj.jobs)) : (out << "")); + out << "taskId=" << to_string(taskId); + out << ", " << "taskType=" << to_string(taskType); + out << ", " << "parentProcessId=" << to_string(parentProcessId); + out << ", " << "creationTime=" << to_string(creationTime); + out << ", " << "lastUpdateTime=" << to_string(lastUpdateTime); + out << ", " << "taskStatus=" << to_string(taskStatus); + out << ", " << "taskDetail="; (__isset.taskDetail ? (out << to_string(taskDetail)) : (out << "")); + out << ", " << "subTaskModel="; (__isset.subTaskModel ? (out << to_string(subTaskModel)) : (out << "")); + out << ", " << "taskError="; (__isset.taskError ? (out << to_string(taskError)) : (out << "")); + out << ", " << "jobs="; (__isset.jobs ? (out << to_string(jobs)) : (out << "")); out << ")"; - return out; } @@ -418,11 +414,9 @@ void DataStagingTaskModel::__set_processOutput(const ::apache::airavata::model: __isset.processOutput = true; } -const char* DataStagingTaskModel::ascii_fingerprint = "ACF0A091382F299B453E77765150F8C9"; -const uint8_t DataStagingTaskModel::binary_fingerprint[16] = {0xAC,0xF0,0xA0,0x91,0x38,0x2F,0x29,0x9B,0x45,0x3E,0x77,0x76,0x51,0x50,0xF8,0xC9}; - uint32_t DataStagingTaskModel::read(::apache::thrift::protocol::TProtocol* iprot) { + apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; std::string fname; ::apache::thrift::protocol::TType ftype; @@ -530,7 +524,7 @@ uint32_t DataStagingTaskModel::read(::apache::thrift::protocol::TProtocol* iprot uint32_t DataStagingTaskModel::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; - oprot->incrementRecursionDepth(); + apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); xfer += oprot->writeStructBegin("DataStagingTaskModel"); xfer += oprot->writeFieldBegin("source", ::apache::thrift::protocol::T_STRING, 1); @@ -572,7 +566,6 @@ uint32_t DataStagingTaskModel::write(::apache::thrift::protocol::TProtocol* opro } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); - oprot->decrementRecursionDepth(); return xfer; } @@ -612,19 +605,18 @@ DataStagingTaskModel& DataStagingTaskModel::operator=(const DataStagingTaskModel __isset = other11.__isset; return *this; } -std::ostream& operator<<(std::ostream& out, const DataStagingTaskModel& obj) { - using apache::thrift::to_string; +void DataStagingTaskModel::printTo(std::ostream& out) const { + using ::apache::thrift::to_string; out << "DataStagingTaskModel("; - out << "source=" << to_string(obj.source); - out << ", " << "destination=" << to_string(obj.destination); - out << ", " << "type=" << to_string(obj.type); - out << ", " << "transferStartTime="; (obj.__isset.transferStartTime ? (out << to_string(obj.transferStartTime)) : (out << "")); - out << ", " << "transferEndTime="; (obj.__isset.transferEndTime ? (out << to_string(obj.transferEndTime)) : (out << "")); - out << ", " << "transferRate="; (obj.__isset.transferRate ? (out << to_string(obj.transferRate)) : (out << "")); - out << ", " << "processInput="; (obj.__isset.processInput ? (out << to_string(obj.processInput)) : (out << "")); - out << ", " << "processOutput="; (obj.__isset.processOutput ? (out << to_string(obj.processOutput)) : (out << "")); + out << "source=" << to_string(source); + out << ", " << "destination=" << to_string(destination); + out << ", " << "type=" << to_string(type); + out << ", " << "transferStartTime="; (__isset.transferStartTime ? (out << to_string(transferStartTime)) : (out << "")); + out << ", " << "transferEndTime="; (__isset.transferEndTime ? (out << to_string(transferEndTime)) : (out << "")); + out << ", " << "transferRate="; (__isset.transferRate ? (out << to_string(transferRate)) : (out << "")); + out << ", " << "processInput="; (__isset.processInput ? (out << to_string(processInput)) : (out << "")); + out << ", " << "processOutput="; (__isset.processOutput ? (out << to_string(processOutput)) : (out << "")); out << ")"; - return out; } @@ -640,11 +632,9 @@ void EnvironmentSetupTaskModel::__set_protocol(const ::apache::airavata::model: this->protocol = val; } -const char* EnvironmentSetupTaskModel::ascii_fingerprint = "D6FD826D949221396F4FFC3ECCD3D192"; -const uint8_t EnvironmentSetupTaskModel::binary_fingerprint[16] = {0xD6,0xFD,0x82,0x6D,0x94,0x92,0x21,0x39,0x6F,0x4F,0xFC,0x3E,0xCC,0xD3,0xD1,0x92}; - uint32_t EnvironmentSetupTaskModel::read(::apache::thrift::protocol::TProtocol* iprot) { + apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; std::string fname; ::apache::thrift::protocol::TType ftype; @@ -701,7 +691,7 @@ uint32_t EnvironmentSetupTaskModel::read(::apache::thrift::protocol::TProtocol* uint32_t EnvironmentSetupTaskModel::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; - oprot->incrementRecursionDepth(); + apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); xfer += oprot->writeStructBegin("EnvironmentSetupTaskModel"); xfer += oprot->writeFieldBegin("location", ::apache::thrift::protocol::T_STRING, 1); @@ -714,7 +704,6 @@ uint32_t EnvironmentSetupTaskModel::write(::apache::thrift::protocol::TProtocol* xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); - oprot->decrementRecursionDepth(); return xfer; } @@ -733,13 +722,12 @@ EnvironmentSetupTaskModel& EnvironmentSetupTaskModel::operator=(const Environmen protocol = other14.protocol; return *this; } -std::ostream& operator<<(std::ostream& out, const EnvironmentSetupTaskModel& obj) { - using apache::thrift::to_string; +void EnvironmentSetupTaskModel::printTo(std::ostream& out) const { + using ::apache::thrift::to_string; out << "EnvironmentSetupTaskModel("; - out << "location=" << to_string(obj.location); - out << ", " << "protocol=" << to_string(obj.protocol); + out << "location=" << to_string(location); + out << ", " << "protocol=" << to_string(protocol); out << ")"; - return out; } @@ -760,11 +748,9 @@ void JobSubmissionTaskModel::__set_wallTime(const int32_t val) { __isset.wallTime = true; } -const char* JobSubmissionTaskModel::ascii_fingerprint = "AEF3E1D4E4ADDD8D31BD954A62F3809C"; -const uint8_t JobSubmissionTaskModel::binary_fingerprint[16] = {0xAE,0xF3,0xE1,0xD4,0xE4,0xAD,0xDD,0x8D,0x31,0xBD,0x95,0x4A,0x62,0xF3,0x80,0x9C}; - uint32_t JobSubmissionTaskModel::read(::apache::thrift::protocol::TProtocol* iprot) { + apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; std::string fname; ::apache::thrift::protocol::TType ftype; @@ -831,7 +817,7 @@ uint32_t JobSubmissionTaskModel::read(::apache::thrift::protocol::TProtocol* ipr uint32_t JobSubmissionTaskModel::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; - oprot->incrementRecursionDepth(); + apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); xfer += oprot->writeStructBegin("JobSubmissionTaskModel"); xfer += oprot->writeFieldBegin("jobSubmissionProtocol", ::apache::thrift::protocol::T_I32, 1); @@ -849,7 +835,6 @@ uint32_t JobSubmissionTaskModel::write(::apache::thrift::protocol::TProtocol* op } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); - oprot->decrementRecursionDepth(); return xfer; } @@ -874,14 +859,13 @@ JobSubmissionTaskModel& JobSubmissionTaskModel::operator=(const JobSubmissionTas __isset = other18.__isset; return *this; } -std::ostream& operator<<(std::ostream& out, const JobSubmissionTaskModel& obj) { - using apache::thrift::to_string; +void JobSubmissionTaskModel::printTo(std::ostream& out) const { + using ::apache::thrift::to_string; out << "JobSubmissionTaskModel("; - out << "jobSubmissionProtocol=" << to_string(obj.jobSubmissionProtocol); - out << ", " << "monitorMode=" << to_string(obj.monitorMode); - out << ", " << "wallTime="; (obj.__isset.wallTime ? (out << to_string(obj.wallTime)) : (out << "")); + out << "jobSubmissionProtocol=" << to_string(jobSubmissionProtocol); + out << ", " << "monitorMode=" << to_string(monitorMode); + out << ", " << "wallTime="; (__isset.wallTime ? (out << to_string(wallTime)) : (out << "")); out << ")"; - return out; } @@ -893,11 +877,9 @@ void MonitorTaskModel::__set_monitorMode(const ::apache::airavata::model::appca this->monitorMode = val; } -const char* MonitorTaskModel::ascii_fingerprint = "8BBB3D0C3B370CB38F2D1340BB79F0AA"; -const uint8_t MonitorTaskModel::binary_fingerprint[16] = {0x8B,0xBB,0x3D,0x0C,0x3B,0x37,0x0C,0xB3,0x8F,0x2D,0x13,0x40,0xBB,0x79,0xF0,0xAA}; - uint32_t MonitorTaskModel::read(::apache::thrift::protocol::TProtocol* iprot) { + apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; std::string fname; ::apache::thrift::protocol::TType ftype; @@ -943,7 +925,7 @@ uint32_t MonitorTaskModel::read(::apache::thrift::protocol::TProtocol* iprot) { uint32_t MonitorTaskModel::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; - oprot->incrementRecursionDepth(); + apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); xfer += oprot->writeStructBegin("MonitorTaskModel"); xfer += oprot->writeFieldBegin("monitorMode", ::apache::thrift::protocol::T_I32, 1); @@ -952,7 +934,6 @@ uint32_t MonitorTaskModel::write(::apache::thrift::protocol::TProtocol* oprot) c xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); - oprot->decrementRecursionDepth(); return xfer; } @@ -968,12 +949,11 @@ MonitorTaskModel& MonitorTaskModel::operator=(const MonitorTaskModel& other21) { monitorMode = other21.monitorMode; return *this; } -std::ostream& operator<<(std::ostream& out, const MonitorTaskModel& obj) { - using apache::thrift::to_string; +void MonitorTaskModel::printTo(std::ostream& out) const { + using ::apache::thrift::to_string; out << "MonitorTaskModel("; - out << "monitorMode=" << to_string(obj.monitorMode); + out << "monitorMode=" << to_string(monitorMode); out << ")"; - return out; } }}}} // namespace http://git-wip-us.apache.org/repos/asf/airavata/blob/b490671e/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h index c54c227..913ada9 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -85,9 +85,6 @@ typedef struct _TaskModel__isset { class TaskModel { public: - static const char* ascii_fingerprint; // = "BA52131C9C867CBF7281F29EDD7DDB6F"; - static const uint8_t binary_fingerprint[16]; // = {0xBA,0x52,0x13,0x1C,0x9C,0x86,0x7C,0xBF,0x72,0x81,0xF2,0x9E,0xDD,0x7D,0xDB,0x6F}; - TaskModel(const TaskModel&); TaskModel& operator=(const TaskModel&); TaskModel() : taskId("DO_NOT_SET_AT_CLIENTS"), taskType((TaskTypes::type)0), parentProcessId(), creationTime(0), lastUpdateTime(0), taskDetail(), subTaskModel() { @@ -168,11 +165,17 @@ class TaskModel { uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; - friend std::ostream& operator<<(std::ostream& out, const TaskModel& obj); + virtual void printTo(std::ostream& out) const; }; void swap(TaskModel &a, TaskModel &b); +inline std::ostream& operator<<(std::ostream& out, const TaskModel& obj) +{ + obj.printTo(out); + return out; +} + typedef struct _DataStagingTaskModel__isset { _DataStagingTaskModel__isset() : transferStartTime(false), transferEndTime(false), transferRate(false), processInput(false), processOutput(false) {} bool transferStartTime :1; @@ -185,9 +188,6 @@ typedef struct _DataStagingTaskModel__isset { class DataStagingTaskModel { public: - static const char* ascii_fingerprint; // = "ACF0A091382F299B453E77765150F8C9"; - static const uint8_t binary_fingerprint[16]; // = {0xAC,0xF0,0xA0,0x91,0x38,0x2F,0x29,0x9B,0x45,0x3E,0x77,0x76,0x51,0x50,0xF8,0xC9}; - DataStagingTaskModel(const DataStagingTaskModel&); DataStagingTaskModel& operator=(const DataStagingTaskModel&); DataStagingTaskModel() : source(), destination(), type((DataStageType::type)0), transferStartTime(0), transferEndTime(0), transferRate() { @@ -260,18 +260,21 @@ class DataStagingTaskModel { uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; - friend std::ostream& operator<<(std::ostream& out, const DataStagingTaskModel& obj); + virtual void printTo(std::ostream& out) const; }; void swap(DataStagingTaskModel &a, DataStagingTaskModel &b); +inline std::ostream& operator<<(std::ostream& out, const DataStagingTaskModel& obj) +{ + obj.printTo(out); + return out; +} + class EnvironmentSetupTaskModel { public: - static const char* ascii_fingerprint; // = "D6FD826D949221396F4FFC3ECCD3D192"; - static const uint8_t binary_fingerprint[16]; // = {0xD6,0xFD,0x82,0x6D,0x94,0x92,0x21,0x39,0x6F,0x4F,0xFC,0x3E,0xCC,0xD3,0xD1,0x92}; - EnvironmentSetupTaskModel(const EnvironmentSetupTaskModel&); EnvironmentSetupTaskModel& operator=(const EnvironmentSetupTaskModel&); EnvironmentSetupTaskModel() : location(), protocol(( ::apache::airavata::model::data::movement::SecurityProtocol::type)0) { @@ -302,11 +305,17 @@ class EnvironmentSetupTaskModel { uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; - friend std::ostream& operator<<(std::ostream& out, const EnvironmentSetupTaskModel& obj); + virtual void printTo(std::ostream& out) const; }; void swap(EnvironmentSetupTaskModel &a, EnvironmentSetupTaskModel &b); +inline std::ostream& operator<<(std::ostream& out, const EnvironmentSetupTaskModel& obj) +{ + obj.printTo(out); + return out; +} + typedef struct _JobSubmissionTaskModel__isset { _JobSubmissionTaskModel__isset() : wallTime(false) {} bool wallTime :1; @@ -315,9 +324,6 @@ typedef struct _JobSubmissionTaskModel__isset { class JobSubmissionTaskModel { public: - static const char* ascii_fingerprint; // = "AEF3E1D4E4ADDD8D31BD954A62F3809C"; - static const uint8_t binary_fingerprint[16]; // = {0xAE,0xF3,0xE1,0xD4,0xE4,0xAD,0xDD,0x8D,0x31,0xBD,0x95,0x4A,0x62,0xF3,0x80,0x9C}; - JobSubmissionTaskModel(const JobSubmissionTaskModel&); JobSubmissionTaskModel& operator=(const JobSubmissionTaskModel&); JobSubmissionTaskModel() : jobSubmissionProtocol(( ::apache::airavata::model::appcatalog::computeresource::JobSubmissionProtocol::type)0), monitorMode(( ::apache::airavata::model::appcatalog::computeresource::MonitorMode::type)0), wallTime(0) { @@ -357,18 +363,21 @@ class JobSubmissionTaskModel { uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; - friend std::ostream& operator<<(std::ostream& out, const JobSubmissionTaskModel& obj); + virtual void printTo(std::ostream& out) const; }; void swap(JobSubmissionTaskModel &a, JobSubmissionTaskModel &b); +inline std::ostream& operator<<(std::ostream& out, const JobSubmissionTaskModel& obj) +{ + obj.printTo(out); + return out; +} + class MonitorTaskModel { public: - static const char* ascii_fingerprint; // = "8BBB3D0C3B370CB38F2D1340BB79F0AA"; - static const uint8_t binary_fingerprint[16]; // = {0x8B,0xBB,0x3D,0x0C,0x3B,0x37,0x0C,0xB3,0x8F,0x2D,0x13,0x40,0xBB,0x79,0xF0,0xAA}; - MonitorTaskModel(const MonitorTaskModel&); MonitorTaskModel& operator=(const MonitorTaskModel&); MonitorTaskModel() : monitorMode(( ::apache::airavata::model::appcatalog::computeresource::MonitorMode::type)0) { @@ -394,11 +403,17 @@ class MonitorTaskModel { uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; - friend std::ostream& operator<<(std::ostream& out, const MonitorTaskModel& obj); + virtual void printTo(std::ostream& out) const; }; void swap(MonitorTaskModel &a, MonitorTaskModel &b); +inline std::ostream& operator<<(std::ostream& out, const MonitorTaskModel& obj) +{ + obj.printTo(out); + return out; +} + }}}} // namespace #endif http://git-wip-us.apache.org/repos/asf/airavata/blob/b490671e/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_constants.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_constants.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_constants.cpp index c8e5a35..55026bd 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_constants.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_constants.cpp @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated http://git-wip-us.apache.org/repos/asf/airavata/blob/b490671e/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_constants.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_constants.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_constants.h index e4b294a..1e9b0f9 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_constants.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_constants.h @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated http://git-wip-us.apache.org/repos/asf/airavata/blob/b490671e/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_types.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_types.cpp index ce3e222..6c8c6cc 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_types.cpp @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -63,11 +63,9 @@ void Workflow::__set_workflowOutputs(const std::vector< ::apache::airavata::mode __isset.workflowOutputs = true; } -const char* Workflow::ascii_fingerprint = "4F0AB4949EE98B62A8284152D7EB4657"; -const uint8_t Workflow::binary_fingerprint[16] = {0x4F,0x0A,0xB4,0x94,0x9E,0xE9,0x8B,0x62,0xA8,0x28,0x41,0x52,0xD7,0xEB,0x46,0x57}; - uint32_t Workflow::read(::apache::thrift::protocol::TProtocol* iprot) { + apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; std::string fname; ::apache::thrift::protocol::TType ftype; @@ -178,7 +176,7 @@ uint32_t Workflow::read(::apache::thrift::protocol::TProtocol* iprot) { uint32_t Workflow::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; - oprot->incrementRecursionDepth(); + apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); xfer += oprot->writeStructBegin("Workflow"); xfer += oprot->writeFieldBegin("templateId", ::apache::thrift::protocol::T_STRING, 1); @@ -227,7 +225,6 @@ uint32_t Workflow::write(::apache::thrift::protocol::TProtocol* oprot) const { } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); - oprot->decrementRecursionDepth(); return xfer; } @@ -261,17 +258,16 @@ Workflow& Workflow::operator=(const Workflow& other13) { __isset = other13.__isset; return *this; } -std::ostream& operator<<(std::ostream& out, const Workflow& obj) { - using apache::thrift::to_string; +void Workflow::printTo(std::ostream& out) const { + using ::apache::thrift::to_string; out << "Workflow("; - out << "templateId=" << to_string(obj.templateId); - out << ", " << "name=" << to_string(obj.name); - out << ", " << "graph="; (obj.__isset.graph ? (out << to_string(obj.graph)) : (out << "")); - out << ", " << "image="; (obj.__isset.image ? (out << to_string(obj.image)) : (out << "")); - out << ", " << "workflowInputs="; (obj.__isset.workflowInputs ? (out << to_string(obj.workflowInputs)) : (out << "")); - out << ", " << "workflowOutputs="; (obj.__isset.workflowOutputs ? (out << to_string(obj.workflowOutputs)) : (out << "")); + out << "templateId=" << to_string(templateId); + out << ", " << "name=" << to_string(name); + out << ", " << "graph="; (__isset.graph ? (out << to_string(graph)) : (out << "")); + out << ", " << "image="; (__isset.image ? (out << to_string(image)) : (out << "")); + out << ", " << "workflowInputs="; (__isset.workflowInputs ? (out << to_string(workflowInputs)) : (out << "")); + out << ", " << "workflowOutputs="; (__isset.workflowOutputs ? (out << to_string(workflowOutputs)) : (out << "")); out << ")"; - return out; } http://git-wip-us.apache.org/repos/asf/airavata/blob/b490671e/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_types.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_types.h index 0c4fd49..9ef1ada 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_types.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_types.h @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -51,9 +51,6 @@ typedef struct _Workflow__isset { class Workflow { public: - static const char* ascii_fingerprint; // = "4F0AB4949EE98B62A8284152D7EB4657"; - static const uint8_t binary_fingerprint[16]; // = {0x4F,0x0A,0xB4,0x94,0x9E,0xE9,0x8B,0x62,0xA8,0x28,0x41,0x52,0xD7,0xEB,0x46,0x57}; - Workflow(const Workflow&); Workflow& operator=(const Workflow&); Workflow() : templateId("DO_NOT_SET_AT_CLIENTS"), name(), graph(), image() { @@ -114,11 +111,17 @@ class Workflow { uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; - friend std::ostream& operator<<(std::ostream& out, const Workflow& obj); + virtual void printTo(std::ostream& out) const; }; void swap(Workflow &a, Workflow &b); +inline std::ostream& operator<<(std::ostream& out, const Workflow& obj) +{ + obj.printTo(out); + return out; +} + #endif http://git-wip-us.apache.org/repos/asf/airavata/blob/b490671e/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_constants.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_constants.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_constants.cpp index f687bff..38ba5a9 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_constants.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_constants.cpp @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated http://git-wip-us.apache.org/repos/asf/airavata/blob/b490671e/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_constants.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_constants.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_constants.h index 1a55565..ea3aef5 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_constants.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_constants.h @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated http://git-wip-us.apache.org/repos/asf/airavata/blob/b490671e/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp index b66293f..cb74008 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -44,11 +44,9 @@ void Group::__set_description(const std::string& val) { __isset.description = true; } -const char* Group::ascii_fingerprint = "5B708A954C550ECA9C1A49D3C5CAFAB9"; -const uint8_t Group::binary_fingerprint[16] = {0x5B,0x70,0x8A,0x95,0x4C,0x55,0x0E,0xCA,0x9C,0x1A,0x49,0xD3,0xC5,0xCA,0xFA,0xB9}; - uint32_t Group::read(::apache::thrift::protocol::TProtocol* iprot) { + apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; std::string fname; ::apache::thrift::protocol::TType ftype; @@ -100,7 +98,7 @@ uint32_t Group::read(::apache::thrift::protocol::TProtocol* iprot) { uint32_t Group::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; - oprot->incrementRecursionDepth(); + apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); xfer += oprot->writeStructBegin("Group"); xfer += oprot->writeFieldBegin("groupName", ::apache::thrift::protocol::T_STRING, 1); @@ -114,7 +112,6 @@ uint32_t Group::write(::apache::thrift::protocol::TProtocol* oprot) const { } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); - oprot->decrementRecursionDepth(); return xfer; } @@ -136,13 +133,12 @@ Group& Group::operator=(const Group& other1) { __isset = other1.__isset; return *this; } -std::ostream& operator<<(std::ostream& out, const Group& obj) { - using apache::thrift::to_string; +void Group::printTo(std::ostream& out) const { + using ::apache::thrift::to_string; out << "Group("; - out << "groupName=" << to_string(obj.groupName); - out << ", " << "description="; (obj.__isset.description ? (out << to_string(obj.description)) : (out << "")); + out << "groupName=" << to_string(groupName); + out << ", " << "description="; (__isset.description ? (out << to_string(description)) : (out << "")); out << ")"; - return out; } @@ -182,11 +178,9 @@ void Project::__set_sharedGroups(const std::vector & val) { __isset.sharedGroups = true; } -const char* Project::ascii_fingerprint = "AFD8090DE564134035942D450F918628"; -const uint8_t Project::binary_fingerprint[16] = {0xAF,0xD8,0x09,0x0D,0xE5,0x64,0x13,0x40,0x35,0x94,0x2D,0x45,0x0F,0x91,0x86,0x28}; - uint32_t Project::read(::apache::thrift::protocol::TProtocol* iprot) { + apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; std::string fname; ::apache::thrift::protocol::TType ftype; @@ -308,7 +302,7 @@ uint32_t Project::read(::apache::thrift::protocol::TProtocol* iprot) { uint32_t Project::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; - oprot->incrementRecursionDepth(); + apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); xfer += oprot->writeStructBegin("Project"); xfer += oprot->writeFieldBegin("projectID", ::apache::thrift::protocol::T_STRING, 1); @@ -361,7 +355,6 @@ uint32_t Project::write(::apache::thrift::protocol::TProtocol* oprot) const { } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); - oprot->decrementRecursionDepth(); return xfer; } @@ -398,18 +391,17 @@ Project& Project::operator=(const Project& other15) { __isset = other15.__isset; return *this; } -std::ostream& operator<<(std::ostream& out, const Project& obj) { - using apache::thrift::to_string; +void Project::printTo(std::ostream& out) const { + using ::apache::thrift::to_string; out << "Project("; - out << "projectID=" << to_string(obj.projectID); - out << ", " << "owner=" << to_string(obj.owner); - out << ", " << "name=" << to_string(obj.name); - out << ", " << "description="; (obj.__isset.description ? (out << to_string(obj.description)) : (out << "")); - out << ", " << "creationTime="; (obj.__isset.creationTime ? (out << to_string(obj.creationTime)) : (out << "")); - out << ", " << "sharedUsers="; (obj.__isset.sharedUsers ? (out << to_string(obj.sharedUsers)) : (out << "")); - out << ", " << "sharedGroups="; (obj.__isset.sharedGroups ? (out << to_string(obj.sharedGroups)) : (out << "")); + out << "projectID=" << to_string(projectID); + out << ", " << "owner=" << to_string(owner); + out << ", " << "name=" << to_string(name); + out << ", " << "description="; (__isset.description ? (out << to_string(description)) : (out << "")); + out << ", " << "creationTime="; (__isset.creationTime ? (out << to_string(creationTime)) : (out << "")); + out << ", " << "sharedUsers="; (__isset.sharedUsers ? (out << to_string(sharedUsers)) : (out << "")); + out << ", " << "sharedGroups="; (__isset.sharedGroups ? (out << to_string(sharedGroups)) : (out << "")); out << ")"; - return out; } @@ -426,11 +418,9 @@ void User::__set_groupList(const std::vector & val) { __isset.groupList = true; } -const char* User::ascii_fingerprint = "D7DA282D6B2F08CB02B4E3CF47DB44E5"; -const uint8_t User::binary_fingerprint[16] = {0xD7,0xDA,0x28,0x2D,0x6B,0x2F,0x08,0xCB,0x02,0xB4,0xE3,0xCF,0x47,0xDB,0x44,0xE5}; - uint32_t User::read(::apache::thrift::protocol::TProtocol* iprot) { + apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; std::string fname; ::apache::thrift::protocol::TType ftype; @@ -494,7 +484,7 @@ uint32_t User::read(::apache::thrift::protocol::TProtocol* iprot) { uint32_t User::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; - oprot->incrementRecursionDepth(); + apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); xfer += oprot->writeStructBegin("User"); xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 1); @@ -516,7 +506,6 @@ uint32_t User::write(::apache::thrift::protocol::TProtocol* oprot) const { } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); - oprot->decrementRecursionDepth(); return xfer; } @@ -538,13 +527,12 @@ User& User::operator=(const User& other23) { __isset = other23.__isset; return *this; } -std::ostream& operator<<(std::ostream& out, const User& obj) { - using apache::thrift::to_string; +void User::printTo(std::ostream& out) const { + using ::apache::thrift::to_string; out << "User("; - out << "userName=" << to_string(obj.userName); - out << ", " << "groupList="; (obj.__isset.groupList ? (out << to_string(obj.groupList)) : (out << "")); + out << "userName=" << to_string(userName); + out << ", " << "groupList="; (__isset.groupList ? (out << to_string(groupList)) : (out << "")); out << ")"; - return out; } @@ -571,11 +559,9 @@ void Gateway::__set_emailAddress(const std::string& val) { __isset.emailAddress = true; } -const char* Gateway::ascii_fingerprint = "6BA700CA2E5FC52A8DA5ADCF811DC8DA"; -const uint8_t Gateway::binary_fingerprint[16] = {0x6B,0xA7,0x00,0xCA,0x2E,0x5F,0xC5,0x2A,0x8D,0xA5,0xAD,0xCF,0x81,0x1D,0xC8,0xDA}; - uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) { + apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; std::string fname; ::apache::thrift::protocol::TType ftype; @@ -643,7 +629,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) { uint32_t Gateway::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; - oprot->incrementRecursionDepth(); + apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); xfer += oprot->writeStructBegin("Gateway"); xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 1); @@ -667,7 +653,6 @@ uint32_t Gateway::write(::apache::thrift::protocol::TProtocol* oprot) const { } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); - oprot->decrementRecursionDepth(); return xfer; } @@ -695,15 +680,14 @@ Gateway& Gateway::operator=(const Gateway& other25) { __isset = other25.__isset; return *this; } -std::ostream& operator<<(std::ostream& out, const Gateway& obj) { - using apache::thrift::to_string; +void Gateway::printTo(std::ostream& out) const { + using ::apache::thrift::to_string; out << "Gateway("; - out << "gatewayId=" << to_string(obj.gatewayId); - out << ", " << "gatewayName="; (obj.__isset.gatewayName ? (out << to_string(obj.gatewayName)) : (out << "")); - out << ", " << "domain="; (obj.__isset.domain ? (out << to_string(obj.domain)) : (out << "")); - out << ", " << "emailAddress="; (obj.__isset.emailAddress ? (out << to_string(obj.emailAddress)) : (out << "")); + out << "gatewayId=" << to_string(gatewayId); + out << ", " << "gatewayName="; (__isset.gatewayName ? (out << to_string(gatewayName)) : (out << "")); + out << ", " << "domain="; (__isset.domain ? (out << to_string(domain)) : (out << "")); + out << ", " << "emailAddress="; (__isset.emailAddress ? (out << to_string(emailAddress)) : (out << "")); out << ")"; - return out; } }}}} // namespace http://git-wip-us.apache.org/repos/asf/airavata/blob/b490671e/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h index 148a753..4e624af 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -53,9 +53,6 @@ typedef struct _Group__isset { class Group { public: - static const char* ascii_fingerprint; // = "5B708A954C550ECA9C1A49D3C5CAFAB9"; - static const uint8_t binary_fingerprint[16]; // = {0x5B,0x70,0x8A,0x95,0x4C,0x55,0x0E,0xCA,0x9C,0x1A,0x49,0xD3,0xC5,0xCA,0xFA,0xB9}; - Group(const Group&); Group& operator=(const Group&); Group() : groupName(), description() { @@ -90,11 +87,17 @@ class Group { uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; - friend std::ostream& operator<<(std::ostream& out, const Group& obj); + virtual void printTo(std::ostream& out) const; }; void swap(Group &a, Group &b); +inline std::ostream& operator<<(std::ostream& out, const Group& obj) +{ + obj.printTo(out); + return out; +} + typedef struct _Project__isset { _Project__isset() : description(false), creationTime(false), sharedUsers(false), sharedGroups(false) {} bool description :1; @@ -106,9 +109,6 @@ typedef struct _Project__isset { class Project { public: - static const char* ascii_fingerprint; // = "AFD8090DE564134035942D450F918628"; - static const uint8_t binary_fingerprint[16]; // = {0xAF,0xD8,0x09,0x0D,0xE5,0x64,0x13,0x40,0x35,0x94,0x2D,0x45,0x0F,0x91,0x86,0x28}; - Project(const Project&); Project& operator=(const Project&); Project() : projectID("DO_NOT_SET_AT_CLIENTS"), owner(), name(), description(), creationTime(0) { @@ -174,11 +174,17 @@ class Project { uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; - friend std::ostream& operator<<(std::ostream& out, const Project& obj); + virtual void printTo(std::ostream& out) const; }; void swap(Project &a, Project &b); +inline std::ostream& operator<<(std::ostream& out, const Project& obj) +{ + obj.printTo(out); + return out; +} + typedef struct _User__isset { _User__isset() : groupList(false) {} bool groupList :1; @@ -187,9 +193,6 @@ typedef struct _User__isset { class User { public: - static const char* ascii_fingerprint; // = "D7DA282D6B2F08CB02B4E3CF47DB44E5"; - static const uint8_t binary_fingerprint[16]; // = {0xD7,0xDA,0x28,0x2D,0x6B,0x2F,0x08,0xCB,0x02,0xB4,0xE3,0xCF,0x47,0xDB,0x44,0xE5}; - User(const User&); User& operator=(const User&); User() : userName() { @@ -224,11 +227,17 @@ class User { uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; - friend std::ostream& operator<<(std::ostream& out, const User& obj); + virtual void printTo(std::ostream& out) const; }; void swap(User &a, User &b); +inline std::ostream& operator<<(std::ostream& out, const User& obj) +{ + obj.printTo(out); + return out; +} + typedef struct _Gateway__isset { _Gateway__isset() : gatewayName(false), domain(false), emailAddress(false) {} bool gatewayName :1; @@ -239,9 +248,6 @@ typedef struct _Gateway__isset { class Gateway { public: - static const char* ascii_fingerprint; // = "6BA700CA2E5FC52A8DA5ADCF811DC8DA"; - static const uint8_t binary_fingerprint[16]; // = {0x6B,0xA7,0x00,0xCA,0x2E,0x5F,0xC5,0x2A,0x8D,0xA5,0xAD,0xCF,0x81,0x1D,0xC8,0xDA}; - Gateway(const Gateway&); Gateway& operator=(const Gateway&); Gateway() : gatewayId(), gatewayName(), domain(), emailAddress() { @@ -290,11 +296,17 @@ class Gateway { uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; - friend std::ostream& operator<<(std::ostream& out, const Gateway& obj); + virtual void printTo(std::ostream& out) const; }; void swap(Gateway &a, Gateway &b); +inline std::ostream& operator<<(std::ostream& out, const Gateway& obj) +{ + obj.printTo(out); + return out; +} + }}}} // namespace #endif http://git-wip-us.apache.org/repos/asf/airavata/blob/b490671e/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php index 52f2310..4cc073b 100644 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php +++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php @@ -1,7 +1,7 @@