You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2014/07/09 21:35:50 UTC
git commit: updated thrift generated file
Repository: airavata
Updated Branches:
refs/heads/master b04478b36 -> 40d6a8517
updated thrift generated file
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/40d6a851
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/40d6a851
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/40d6a851
Branch: refs/heads/master
Commit: 40d6a8517dad40e8f9fc88eaf299cc693cb1c980
Parents: b04478b
Author: samindaw <sa...@gmail.com>
Authored: Wed Jul 9 12:35:31 2014 -0700
Committer: samindaw <sa...@gmail.com>
Committed: Wed Jul 9 12:35:31 2014 -0700
----------------------------------------------------------------------
.../apache/airavata/api/workflow/Workflow.java | 128 ++-----------------
.../src/main/resources/lib/Workflow.cpp | 32 +----
.../src/main/resources/lib/Workflow.h | 24 ++--
.../resources/lib/Workflow_server.skeleton.cpp | 2 +-
.../lib/Airavata/API/Workflow/Workflow.php | 31 +----
5 files changed, 34 insertions(+), 183 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/40d6a851/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/workflow/Workflow.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/workflow/Workflow.java b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/workflow/Workflow.java
index f47bc53..63a8154 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/workflow/Workflow.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/workflow/Workflow.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
public void deleteWorkflow(String workflowTemplateId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
- public String registerWorkflow(String workflowTemplateId, org.apache.airavata.model.Workflow workflow) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
+ public String registerWorkflow(org.apache.airavata.model.Workflow workflow) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
public void updateWorkflow(String workflowTemplateId, org.apache.airavata.model.Workflow workflow) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
@@ -76,7 +76,7 @@ import org.slf4j.LoggerFactory;
public void deleteWorkflow(String workflowTemplateId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void registerWorkflow(String workflowTemplateId, org.apache.airavata.model.Workflow workflow, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void registerWorkflow(org.apache.airavata.model.Workflow workflow, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void updateWorkflow(String workflowTemplateId, org.apache.airavata.model.Workflow workflow, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
@@ -198,16 +198,15 @@ import org.slf4j.LoggerFactory;
return;
}
- public String registerWorkflow(String workflowTemplateId, org.apache.airavata.model.Workflow workflow) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ public String registerWorkflow(org.apache.airavata.model.Workflow workflow) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
{
- send_registerWorkflow(workflowTemplateId, workflow);
+ send_registerWorkflow(workflow);
return recv_registerWorkflow();
}
- public void send_registerWorkflow(String workflowTemplateId, org.apache.airavata.model.Workflow workflow) throws org.apache.thrift.TException
+ public void send_registerWorkflow(org.apache.airavata.model.Workflow workflow) throws org.apache.thrift.TException
{
registerWorkflow_args args = new registerWorkflow_args();
- args.setWorkflowTemplateId(workflowTemplateId);
args.setWorkflow(workflow);
sendBase("registerWorkflow", args);
}
@@ -436,26 +435,23 @@ import org.slf4j.LoggerFactory;
}
}
- public void registerWorkflow(String workflowTemplateId, org.apache.airavata.model.Workflow workflow, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void registerWorkflow(org.apache.airavata.model.Workflow workflow, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- registerWorkflow_call method_call = new registerWorkflow_call(workflowTemplateId, workflow, resultHandler, this, ___protocolFactory, ___transport);
+ registerWorkflow_call method_call = new registerWorkflow_call(workflow, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
public static class registerWorkflow_call extends org.apache.thrift.async.TAsyncMethodCall {
- private String workflowTemplateId;
private org.apache.airavata.model.Workflow workflow;
- public registerWorkflow_call(String workflowTemplateId, org.apache.airavata.model.Workflow workflow, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public registerWorkflow_call(org.apache.airavata.model.Workflow workflow, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
- this.workflowTemplateId = workflowTemplateId;
this.workflow = workflow;
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("registerWorkflow", org.apache.thrift.protocol.TMessageType.CALL, 0));
registerWorkflow_args args = new registerWorkflow_args();
- args.setWorkflowTemplateId(workflowTemplateId);
args.setWorkflow(workflow);
args.write(prot);
prot.writeMessageEnd();
@@ -693,7 +689,7 @@ import org.slf4j.LoggerFactory;
public registerWorkflow_result getResult(I iface, registerWorkflow_args args) throws org.apache.thrift.TException {
registerWorkflow_result result = new registerWorkflow_result();
try {
- result.success = iface.registerWorkflow(args.workflowTemplateId, args.workflow);
+ result.success = iface.registerWorkflow(args.workflow);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
} catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -1076,7 +1072,7 @@ import org.slf4j.LoggerFactory;
}
public void start(I iface, registerWorkflow_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
- iface.registerWorkflow(args.workflowTemplateId, args.workflow,resultHandler);
+ iface.registerWorkflow(args.workflow,resultHandler);
}
}
@@ -4160,8 +4156,7 @@ import org.slf4j.LoggerFactory;
public static class registerWorkflow_args implements org.apache.thrift.TBase<registerWorkflow_args, registerWorkflow_args._Fields>, java.io.Serializable, Cloneable, Comparable<registerWorkflow_args> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("registerWorkflow_args");
- private static final org.apache.thrift.protocol.TField WORKFLOW_TEMPLATE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("workflowTemplateId", org.apache.thrift.protocol.TType.STRING, (short)1);
- private static final org.apache.thrift.protocol.TField WORKFLOW_FIELD_DESC = new org.apache.thrift.protocol.TField("workflow", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+ private static final org.apache.thrift.protocol.TField WORKFLOW_FIELD_DESC = new org.apache.thrift.protocol.TField("workflow", org.apache.thrift.protocol.TType.STRUCT, (short)1);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -4169,13 +4164,11 @@ import org.slf4j.LoggerFactory;
schemes.put(TupleScheme.class, new registerWorkflow_argsTupleSchemeFactory());
}
- public String workflowTemplateId; // required
public org.apache.airavata.model.Workflow workflow; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
- WORKFLOW_TEMPLATE_ID((short)1, "workflowTemplateId"),
- WORKFLOW((short)2, "workflow");
+ WORKFLOW((short)1, "workflow");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -4190,9 +4183,7 @@ import org.slf4j.LoggerFactory;
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
- case 1: // WORKFLOW_TEMPLATE_ID
- return WORKFLOW_TEMPLATE_ID;
- case 2: // WORKFLOW
+ case 1: // WORKFLOW
return WORKFLOW;
default:
return null;
@@ -4237,8 +4228,6 @@ import org.slf4j.LoggerFactory;
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.WORKFLOW_TEMPLATE_ID, new org.apache.thrift.meta_data.FieldMetaData("workflowTemplateId", org.apache.thrift.TFieldRequirementType.REQUIRED,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.WORKFLOW, new org.apache.thrift.meta_data.FieldMetaData("workflow", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.Workflow.class)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -4249,11 +4238,9 @@ import org.slf4j.LoggerFactory;
}
public registerWorkflow_args(
- String workflowTemplateId,
org.apache.airavata.model.Workflow workflow)
{
this();
- this.workflowTemplateId = workflowTemplateId;
this.workflow = workflow;
}
@@ -4261,9 +4248,6 @@ import org.slf4j.LoggerFactory;
* Performs a deep copy on <i>other</i>.
*/
public registerWorkflow_args(registerWorkflow_args other) {
- if (other.isSetWorkflowTemplateId()) {
- this.workflowTemplateId = other.workflowTemplateId;
- }
if (other.isSetWorkflow()) {
this.workflow = new org.apache.airavata.model.Workflow(other.workflow);
}
@@ -4275,34 +4259,9 @@ import org.slf4j.LoggerFactory;
@Override
public void clear() {
- this.workflowTemplateId = null;
this.workflow = null;
}
- public String getWorkflowTemplateId() {
- return this.workflowTemplateId;
- }
-
- public registerWorkflow_args setWorkflowTemplateId(String workflowTemplateId) {
- this.workflowTemplateId = workflowTemplateId;
- return this;
- }
-
- public void unsetWorkflowTemplateId() {
- this.workflowTemplateId = null;
- }
-
- /** Returns true if field workflowTemplateId is set (has been assigned a value) and false otherwise */
- public boolean isSetWorkflowTemplateId() {
- return this.workflowTemplateId != null;
- }
-
- public void setWorkflowTemplateIdIsSet(boolean value) {
- if (!value) {
- this.workflowTemplateId = null;
- }
- }
-
public org.apache.airavata.model.Workflow getWorkflow() {
return this.workflow;
}
@@ -4329,14 +4288,6 @@ import org.slf4j.LoggerFactory;
public void setFieldValue(_Fields field, Object value) {
switch (field) {
- case WORKFLOW_TEMPLATE_ID:
- if (value == null) {
- unsetWorkflowTemplateId();
- } else {
- setWorkflowTemplateId((String)value);
- }
- break;
-
case WORKFLOW:
if (value == null) {
unsetWorkflow();
@@ -4350,9 +4301,6 @@ import org.slf4j.LoggerFactory;
public Object getFieldValue(_Fields field) {
switch (field) {
- case WORKFLOW_TEMPLATE_ID:
- return getWorkflowTemplateId();
-
case WORKFLOW:
return getWorkflow();
@@ -4367,8 +4315,6 @@ import org.slf4j.LoggerFactory;
}
switch (field) {
- case WORKFLOW_TEMPLATE_ID:
- return isSetWorkflowTemplateId();
case WORKFLOW:
return isSetWorkflow();
}
@@ -4388,15 +4334,6 @@ import org.slf4j.LoggerFactory;
if (that == null)
return false;
- boolean this_present_workflowTemplateId = true && this.isSetWorkflowTemplateId();
- boolean that_present_workflowTemplateId = true && that.isSetWorkflowTemplateId();
- if (this_present_workflowTemplateId || that_present_workflowTemplateId) {
- if (!(this_present_workflowTemplateId && that_present_workflowTemplateId))
- return false;
- if (!this.workflowTemplateId.equals(that.workflowTemplateId))
- return false;
- }
-
boolean this_present_workflow = true && this.isSetWorkflow();
boolean that_present_workflow = true && that.isSetWorkflow();
if (this_present_workflow || that_present_workflow) {
@@ -4422,16 +4359,6 @@ import org.slf4j.LoggerFactory;
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetWorkflowTemplateId()).compareTo(other.isSetWorkflowTemplateId());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetWorkflowTemplateId()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.workflowTemplateId, other.workflowTemplateId);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
lastComparison = Boolean.valueOf(isSetWorkflow()).compareTo(other.isSetWorkflow());
if (lastComparison != 0) {
return lastComparison;
@@ -4462,14 +4389,6 @@ import org.slf4j.LoggerFactory;
StringBuilder sb = new StringBuilder("registerWorkflow_args(");
boolean first = true;
- sb.append("workflowTemplateId:");
- if (this.workflowTemplateId == null) {
- sb.append("null");
- } else {
- sb.append(this.workflowTemplateId);
- }
- first = false;
- if (!first) sb.append(", ");
sb.append("workflow:");
if (this.workflow == null) {
sb.append("null");
@@ -4483,9 +4402,6 @@ import org.slf4j.LoggerFactory;
public void validate() throws org.apache.thrift.TException {
// check for required fields
- if (workflowTemplateId == null) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'workflowTemplateId' was not present! Struct: " + toString());
- }
if (workflow == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'workflow' was not present! Struct: " + toString());
}
@@ -4529,15 +4445,7 @@ import org.slf4j.LoggerFactory;
break;
}
switch (schemeField.id) {
- case 1: // WORKFLOW_TEMPLATE_ID
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.workflowTemplateId = iprot.readString();
- struct.setWorkflowTemplateIdIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 2: // WORKFLOW
+ case 1: // WORKFLOW
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
struct.workflow = new org.apache.airavata.model.Workflow();
struct.workflow.read(iprot);
@@ -4561,11 +4469,6 @@ import org.slf4j.LoggerFactory;
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
- if (struct.workflowTemplateId != null) {
- oprot.writeFieldBegin(WORKFLOW_TEMPLATE_ID_FIELD_DESC);
- oprot.writeString(struct.workflowTemplateId);
- oprot.writeFieldEnd();
- }
if (struct.workflow != null) {
oprot.writeFieldBegin(WORKFLOW_FIELD_DESC);
struct.workflow.write(oprot);
@@ -4588,15 +4491,12 @@ import org.slf4j.LoggerFactory;
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, registerWorkflow_args struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
- oprot.writeString(struct.workflowTemplateId);
struct.workflow.write(oprot);
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, registerWorkflow_args struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- struct.workflowTemplateId = iprot.readString();
- struct.setWorkflowTemplateIdIsSet(true);
struct.workflow = new org.apache.airavata.model.Workflow();
struct.workflow.read(iprot);
struct.setWorkflowIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/40d6a851/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Workflow.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Workflow.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Workflow.cpp
index 609007c..7453c90 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Workflow.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Workflow.cpp
@@ -682,7 +682,6 @@ uint32_t Workflow_registerWorkflow_args::read(::apache::thrift::protocol::TProto
using ::apache::thrift::protocol::TProtocolException;
- bool isset_workflowTemplateId = false;
bool isset_workflow = false;
while (true)
@@ -694,14 +693,6 @@ uint32_t Workflow_registerWorkflow_args::read(::apache::thrift::protocol::TProto
switch (fid)
{
case 1:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->workflowTemplateId);
- isset_workflowTemplateId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->workflow.read(iprot);
isset_workflow = true;
@@ -718,8 +709,6 @@ uint32_t Workflow_registerWorkflow_args::read(::apache::thrift::protocol::TProto
xfer += iprot->readStructEnd();
- if (!isset_workflowTemplateId)
- throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_workflow)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
@@ -729,11 +718,7 @@ uint32_t Workflow_registerWorkflow_args::write(::apache::thrift::protocol::TProt
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("Workflow_registerWorkflow_args");
- xfer += oprot->writeFieldBegin("workflowTemplateId", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString(this->workflowTemplateId);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("workflow", ::apache::thrift::protocol::T_STRUCT, 2);
+ xfer += oprot->writeFieldBegin("workflow", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->workflow.write(oprot);
xfer += oprot->writeFieldEnd();
@@ -746,11 +731,7 @@ uint32_t Workflow_registerWorkflow_pargs::write(::apache::thrift::protocol::TPro
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("Workflow_registerWorkflow_pargs");
- xfer += oprot->writeFieldBegin("workflowTemplateId", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString((*(this->workflowTemplateId)));
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("workflow", ::apache::thrift::protocol::T_STRUCT, 2);
+ xfer += oprot->writeFieldBegin("workflow", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += (*(this->workflow)).write(oprot);
xfer += oprot->writeFieldEnd();
@@ -1784,19 +1765,18 @@ void WorkflowClient::recv_deleteWorkflow()
return;
}
-void WorkflowClient::registerWorkflow(std::string& _return, const std::string& workflowTemplateId, const ::Workflow& workflow)
+void WorkflowClient::registerWorkflow(std::string& _return, const ::Workflow& workflow)
{
- send_registerWorkflow(workflowTemplateId, workflow);
+ send_registerWorkflow(workflow);
recv_registerWorkflow(_return);
}
-void WorkflowClient::send_registerWorkflow(const std::string& workflowTemplateId, const ::Workflow& workflow)
+void WorkflowClient::send_registerWorkflow(const ::Workflow& workflow)
{
int32_t cseqid = 0;
oprot_->writeMessageBegin("registerWorkflow", ::apache::thrift::protocol::T_CALL, cseqid);
Workflow_registerWorkflow_pargs args;
- args.workflowTemplateId = &workflowTemplateId;
args.workflow = &workflow;
args.write(oprot_);
@@ -2279,7 +2259,7 @@ void WorkflowProcessor::process_registerWorkflow(int32_t seqid, ::apache::thrift
Workflow_registerWorkflow_result result;
try {
- iface_->registerWorkflow(result.success, args.workflowTemplateId, args.workflow);
+ iface_->registerWorkflow(result.success, args.workflow);
result.__isset.success = true;
} catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
result.ire = ire;
http://git-wip-us.apache.org/repos/asf/airavata/blob/40d6a851/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Workflow.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Workflow.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Workflow.h
index 3a2781c..a63a9d1 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Workflow.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Workflow.h
@@ -18,7 +18,7 @@ class WorkflowIf {
virtual void getAllWorkflows(std::vector<std::string> & _return) = 0;
virtual void getWorkflow( ::Workflow& _return, const std::string& workflowTemplateId) = 0;
virtual void deleteWorkflow(const std::string& workflowTemplateId) = 0;
- virtual void registerWorkflow(std::string& _return, const std::string& workflowTemplateId, const ::Workflow& workflow) = 0;
+ virtual void registerWorkflow(std::string& _return, const ::Workflow& workflow) = 0;
virtual void updateWorkflow(const std::string& workflowTemplateId, const ::Workflow& workflow) = 0;
virtual void getWorkflowTemplateId(std::string& _return, const std::string& workflowName) = 0;
virtual bool isWorkflowExistWithName(const std::string& workflowName) = 0;
@@ -60,7 +60,7 @@ class WorkflowNull : virtual public WorkflowIf {
void deleteWorkflow(const std::string& /* workflowTemplateId */) {
return;
}
- void registerWorkflow(std::string& /* _return */, const std::string& /* workflowTemplateId */, const ::Workflow& /* workflow */) {
+ void registerWorkflow(std::string& /* _return */, const ::Workflow& /* workflow */) {
return;
}
void updateWorkflow(const std::string& /* workflowTemplateId */, const ::Workflow& /* workflow */) {
@@ -457,26 +457,19 @@ class Workflow_deleteWorkflow_presult {
class Workflow_registerWorkflow_args {
public:
- Workflow_registerWorkflow_args() : workflowTemplateId() {
+ Workflow_registerWorkflow_args() {
}
virtual ~Workflow_registerWorkflow_args() throw() {}
- std::string workflowTemplateId;
::Workflow workflow;
- void __set_workflowTemplateId(const std::string& val) {
- workflowTemplateId = val;
- }
-
void __set_workflow(const ::Workflow& val) {
workflow = val;
}
bool operator == (const Workflow_registerWorkflow_args & rhs) const
{
- if (!(workflowTemplateId == rhs.workflowTemplateId))
- return false;
if (!(workflow == rhs.workflow))
return false;
return true;
@@ -499,7 +492,6 @@ class Workflow_registerWorkflow_pargs {
virtual ~Workflow_registerWorkflow_pargs() throw() {}
- const std::string* workflowTemplateId;
const ::Workflow* workflow;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -1016,8 +1008,8 @@ class WorkflowClient : virtual public WorkflowIf {
void deleteWorkflow(const std::string& workflowTemplateId);
void send_deleteWorkflow(const std::string& workflowTemplateId);
void recv_deleteWorkflow();
- void registerWorkflow(std::string& _return, const std::string& workflowTemplateId, const ::Workflow& workflow);
- void send_registerWorkflow(const std::string& workflowTemplateId, const ::Workflow& workflow);
+ void registerWorkflow(std::string& _return, const ::Workflow& workflow);
+ void send_registerWorkflow(const ::Workflow& workflow);
void recv_registerWorkflow(std::string& _return);
void updateWorkflow(const std::string& workflowTemplateId, const ::Workflow& workflow);
void send_updateWorkflow(const std::string& workflowTemplateId, const ::Workflow& workflow);
@@ -1117,13 +1109,13 @@ class WorkflowMultiface : virtual public WorkflowIf {
ifaces_[i]->deleteWorkflow(workflowTemplateId);
}
- void registerWorkflow(std::string& _return, const std::string& workflowTemplateId, const ::Workflow& workflow) {
+ void registerWorkflow(std::string& _return, const ::Workflow& workflow) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
- ifaces_[i]->registerWorkflow(_return, workflowTemplateId, workflow);
+ ifaces_[i]->registerWorkflow(_return, workflow);
}
- ifaces_[i]->registerWorkflow(_return, workflowTemplateId, workflow);
+ ifaces_[i]->registerWorkflow(_return, workflow);
return;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/40d6a851/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Workflow_server.skeleton.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Workflow_server.skeleton.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Workflow_server.skeleton.cpp
index 6a73041..4883b7b 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Workflow_server.skeleton.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Workflow_server.skeleton.cpp
@@ -37,7 +37,7 @@ class WorkflowHandler : virtual public WorkflowIf {
printf("deleteWorkflow\n");
}
- void registerWorkflow(std::string& _return, const std::string& workflowTemplateId, const ::Workflow& workflow) {
+ void registerWorkflow(std::string& _return, const ::Workflow& workflow) {
// Your implementation goes here
printf("registerWorkflow\n");
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/40d6a851/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Workflow/Workflow.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Workflow/Workflow.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Workflow/Workflow.php
index a1b9f7d..4a5833e 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Workflow/Workflow.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Workflow/Workflow.php
@@ -20,7 +20,7 @@ interface WorkflowIf {
public function getAllWorkflows();
public function getWorkflow($workflowTemplateId);
public function deleteWorkflow($workflowTemplateId);
- public function registerWorkflow($workflowTemplateId, \Airavata\Model\Workflow $workflow);
+ public function registerWorkflow(\Airavata\Model\Workflow $workflow);
public function updateWorkflow($workflowTemplateId, \Airavata\Model\Workflow $workflow);
public function getWorkflowTemplateId($workflowName);
public function isWorkflowExistWithName($workflowName);
@@ -213,16 +213,15 @@ class WorkflowClient implements \Airavata\API\Workflow\WorkflowIf {
return;
}
- public function registerWorkflow($workflowTemplateId, \Airavata\Model\Workflow $workflow)
+ public function registerWorkflow(\Airavata\Model\Workflow $workflow)
{
- $this->send_registerWorkflow($workflowTemplateId, $workflow);
+ $this->send_registerWorkflow($workflow);
return $this->recv_registerWorkflow();
}
- public function send_registerWorkflow($workflowTemplateId, \Airavata\Model\Workflow $workflow)
+ public function send_registerWorkflow(\Airavata\Model\Workflow $workflow)
{
$args = new \Airavata\API\Workflow\Workflow_registerWorkflow_args();
- $args->workflowTemplateId = $workflowTemplateId;
$args->workflow = $workflow;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
@@ -1078,17 +1077,12 @@ class Workflow_deleteWorkflow_result {
class Workflow_registerWorkflow_args {
static $_TSPEC;
- public $workflowTemplateId = null;
public $workflow = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
1 => array(
- 'var' => 'workflowTemplateId',
- 'type' => TType::STRING,
- ),
- 2 => array(
'var' => 'workflow',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Workflow',
@@ -1096,9 +1090,6 @@ class Workflow_registerWorkflow_args {
);
}
if (is_array($vals)) {
- if (isset($vals['workflowTemplateId'])) {
- $this->workflowTemplateId = $vals['workflowTemplateId'];
- }
if (isset($vals['workflow'])) {
$this->workflow = $vals['workflow'];
}
@@ -1125,13 +1116,6 @@ class Workflow_registerWorkflow_args {
switch ($fid)
{
case 1:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->workflowTemplateId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
if ($ftype == TType::STRUCT) {
$this->workflow = new \Airavata\Model\Workflow();
$xfer += $this->workflow->read($input);
@@ -1152,16 +1136,11 @@ class Workflow_registerWorkflow_args {
public function write($output) {
$xfer = 0;
$xfer += $output->writeStructBegin('Workflow_registerWorkflow_args');
- if ($this->workflowTemplateId !== null) {
- $xfer += $output->writeFieldBegin('workflowTemplateId', TType::STRING, 1);
- $xfer += $output->writeString($this->workflowTemplateId);
- $xfer += $output->writeFieldEnd();
- }
if ($this->workflow !== null) {
if (!is_object($this->workflow)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('workflow', TType::STRUCT, 2);
+ $xfer += $output->writeFieldBegin('workflow', TType::STRUCT, 1);
$xfer += $this->workflow->write($output);
$xfer += $output->writeFieldEnd();
}