Repository: airavata Updated Branches: refs/heads/master 75c4cf4ba -> d11dda1ac
removing the getAPIVersion method from Airavata API Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d11dda1a Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d11dda1a Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d11dda1a Branch: refs/heads/master Commit: d11dda1acc3ca89efdeb1cef064625d327de4126 Parents: 75c4cf4 Author: Supun Nakandala <[email protected]> Authored: Thu Sep 3 15:33:06 2015 +0530 Committer: Supun Nakandala <[email protected]> Committed: Thu Sep 3 15:33:06 2015 +0530 ---------------------------------------------------------------------- .../java/org/apache/airavata/api/Airavata.java | 141 ++----------------- .../main/resources/lib/airavata/Airavata.cpp | 35 +---- .../src/main/resources/lib/airavata/Airavata.h | 32 ++--- .../lib/airavata/Airavata_server.skeleton.cpp | 4 +- .../resources/lib/Airavata/API/Airavata.php | 42 +----- .../lib/apache/airavata/api/Airavata-remote | 8 +- .../lib/apache/airavata/api/Airavata.py | 39 +---- 7 files changed, 44 insertions(+), 257 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/d11dda1a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java index 9b85c0b..dff0a04 100644 --- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java +++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java @@ -51,17 +51,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-31") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3") public class Airavata { public interface Iface { /** * Fetch Apache Airavata API version - * - * @param authzToken */ - public String getAPIVersion(org.apache.airavata.model.security.AuthzToken authzToken) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; + public String getAPIVersion() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; public String addGateway(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.workspace.Gateway gateway) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; @@ -1773,7 +1771,7 @@ public class Airavata { public interface AsyncIface { - public void getAPIVersion(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getAPIVersion(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void addGateway(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.workspace.Gateway gateway, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -2031,16 +2029,15 @@ public class Airavata { super(iprot, oprot); } - public String getAPIVersion(org.apache.airavata.model.security.AuthzToken authzToken) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException + public String getAPIVersion() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException { - send_getAPIVersion(authzToken); + send_getAPIVersion(); return recv_getAPIVersion(); } - public void send_getAPIVersion(org.apache.airavata.model.security.AuthzToken authzToken) throws org.apache.thrift.TException + public void send_getAPIVersion() throws org.apache.thrift.TException { getAPIVersion_args args = new getAPIVersion_args(); - args.setAuthzToken(authzToken); sendBase("getAPIVersion", args); } @@ -6387,24 +6384,21 @@ public class Airavata { super(protocolFactory, clientManager, transport); } - public void getAPIVersion(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getAPIVersion(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getAPIVersion_call method_call = new getAPIVersion_call(authzToken, resultHandler, this, ___protocolFactory, ___transport); + getAPIVersion_call method_call = new getAPIVersion_call(resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class getAPIVersion_call extends org.apache.thrift.async.TAsyncMethodCall { - private org.apache.airavata.model.security.AuthzToken authzToken; - public getAPIVersion_call(org.apache.airavata.model.security.AuthzToken authzToken, 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 getAPIVersion_call(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.authzToken = authzToken; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getAPIVersion", org.apache.thrift.protocol.TMessageType.CALL, 0)); getAPIVersion_args args = new getAPIVersion_args(); - args.setAuthzToken(authzToken); args.write(prot); prot.writeMessageEnd(); } @@ -10964,7 +10958,7 @@ public class Airavata { public getAPIVersion_result getResult(I iface, getAPIVersion_args args) throws org.apache.thrift.TException { getAPIVersion_result result = new getAPIVersion_result(); try { - result.success = iface.getAPIVersion(args.authzToken); + result.success = iface.getAPIVersion(); } catch (org.apache.airavata.model.error.InvalidRequestException ire) { result.ire = ire; } catch (org.apache.airavata.model.error.AiravataClientException ace) { @@ -14737,7 +14731,7 @@ public class Airavata { } public void start(I iface, getAPIVersion_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException { - iface.getAPIVersion(args.authzToken,resultHandler); + iface.getAPIVersion(resultHandler); } } @@ -23226,7 +23220,6 @@ public class Airavata { public static class getAPIVersion_args implements org.apache.thrift.TBase<getAPIVersion_args, getAPIVersion_args._Fields>, java.io.Serializable, Cloneable, Comparable<getAPIVersion_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getAPIVersion_args"); - private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -23234,11 +23227,10 @@ public class Airavata { schemes.put(TupleScheme.class, new getAPIVersion_argsTupleSchemeFactory()); } - public org.apache.airavata.model.security.AuthzToken authzToken; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - AUTHZ_TOKEN((short)1, "authzToken"); +; private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -23253,8 +23245,6 @@ public class Airavata { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // AUTHZ_TOKEN - return AUTHZ_TOKEN; default: return null; } @@ -23293,13 +23283,9 @@ public class Airavata { return _fieldName; } } - - // isset id assignments 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.AUTHZ_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("authzToken", org.apache.thrift.TFieldRequirementType.REQUIRED, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAPIVersion_args.class, metaDataMap); } @@ -23307,20 +23293,10 @@ public class Airavata { public getAPIVersion_args() { } - public getAPIVersion_args( - org.apache.airavata.model.security.AuthzToken authzToken) - { - this(); - this.authzToken = authzToken; - } - /** * Performs a deep copy on <i>other</i>. */ public getAPIVersion_args(getAPIVersion_args other) { - if (other.isSetAuthzToken()) { - this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken); - } } public getAPIVersion_args deepCopy() { @@ -23329,51 +23305,15 @@ public class Airavata { @Override public void clear() { - this.authzToken = null; - } - - public org.apache.airavata.model.security.AuthzToken getAuthzToken() { - return this.authzToken; - } - - public getAPIVersion_args setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) { - this.authzToken = authzToken; - return this; - } - - public void unsetAuthzToken() { - this.authzToken = null; - } - - /** Returns true if field authzToken is set (has been assigned a value) and false otherwise */ - public boolean isSetAuthzToken() { - return this.authzToken != null; - } - - public void setAuthzTokenIsSet(boolean value) { - if (!value) { - this.authzToken = null; - } } public void setFieldValue(_Fields field, Object value) { switch (field) { - case AUTHZ_TOKEN: - if (value == null) { - unsetAuthzToken(); - } else { - setAuthzToken((org.apache.airavata.model.security.AuthzToken)value); - } - break; - } } public Object getFieldValue(_Fields field) { switch (field) { - case AUTHZ_TOKEN: - return getAuthzToken(); - } throw new IllegalStateException(); } @@ -23385,8 +23325,6 @@ public class Airavata { } switch (field) { - case AUTHZ_TOKEN: - return isSetAuthzToken(); } throw new IllegalStateException(); } @@ -23404,15 +23342,6 @@ public class Airavata { if (that == null) return false; - boolean this_present_authzToken = true && this.isSetAuthzToken(); - boolean that_present_authzToken = true && that.isSetAuthzToken(); - if (this_present_authzToken || that_present_authzToken) { - if (!(this_present_authzToken && that_present_authzToken)) - return false; - if (!this.authzToken.equals(that.authzToken)) - return false; - } - return true; } @@ -23420,11 +23349,6 @@ public class Airavata { public int hashCode() { List<Object> list = new ArrayList<Object>(); - boolean present_authzToken = true && (isSetAuthzToken()); - list.add(present_authzToken); - if (present_authzToken) - list.add(authzToken); - return list.hashCode(); } @@ -23436,16 +23360,6 @@ public class Airavata { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetAuthzToken()).compareTo(other.isSetAuthzToken()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetAuthzToken()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authzToken, other.authzToken); - if (lastComparison != 0) { - return lastComparison; - } - } return 0; } @@ -23466,26 +23380,13 @@ public class Airavata { StringBuilder sb = new StringBuilder("getAPIVersion_args("); boolean first = true; - sb.append("authzToken:"); - if (this.authzToken == null) { - sb.append("null"); - } else { - sb.append(this.authzToken); - } - first = false; sb.append(")"); return sb.toString(); } public void validate() throws org.apache.thrift.TException { // check for required fields - if (authzToken == null) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'authzToken' was not present! Struct: " + toString()); - } // check for sub-struct validity - if (authzToken != null) { - authzToken.validate(); - } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -23522,15 +23423,6 @@ public class Airavata { break; } switch (schemeField.id) { - case 1: // AUTHZ_TOKEN - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.authzToken = new org.apache.airavata.model.security.AuthzToken(); - struct.authzToken.read(iprot); - struct.setAuthzTokenIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -23546,11 +23438,6 @@ public class Airavata { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.authzToken != null) { - oprot.writeFieldBegin(AUTHZ_TOKEN_FIELD_DESC); - struct.authzToken.write(oprot); - oprot.writeFieldEnd(); - } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -23568,15 +23455,11 @@ public class Airavata { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getAPIVersion_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; - struct.authzToken.write(oprot); } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getAPIVersion_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - struct.authzToken = new org.apache.airavata.model.security.AuthzToken(); - struct.authzToken.read(iprot); - struct.setAuthzTokenIsSet(true); } } http://git-wip-us.apache.org/repos/asf/airavata/blob/d11dda1a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp index 160b94f..a2f86b2 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp @@ -41,7 +41,6 @@ uint32_t Airavata_getAPIVersion_args::read(::apache::thrift::protocol::TProtocol using ::apache::thrift::protocol::TProtocolException; - bool isset_authzToken = false; while (true) { @@ -49,27 +48,12 @@ uint32_t Airavata_getAPIVersion_args::read(::apache::thrift::protocol::TProtocol if (ftype == ::apache::thrift::protocol::T_STOP) { break; } - switch (fid) - { - case 1: - if (ftype == ::apache::thrift::protocol::T_STRUCT) { - xfer += this->authzToken.read(iprot); - isset_authzToken = true; - } else { - xfer += iprot->skip(ftype); - } - break; - default: - xfer += iprot->skip(ftype); - break; - } + xfer += iprot->skip(ftype); xfer += iprot->readFieldEnd(); } xfer += iprot->readStructEnd(); - if (!isset_authzToken) - throw TProtocolException(TProtocolException::INVALID_DATA); return xfer; } @@ -78,10 +62,6 @@ uint32_t Airavata_getAPIVersion_args::write(::apache::thrift::protocol::TProtoco oprot->incrementRecursionDepth(); xfer += oprot->writeStructBegin("Airavata_getAPIVersion_args"); - xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1); - xfer += this->authzToken.write(oprot); - xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); oprot->decrementRecursionDepth(); @@ -98,10 +78,6 @@ uint32_t Airavata_getAPIVersion_pargs::write(::apache::thrift::protocol::TProtoc oprot->incrementRecursionDepth(); xfer += oprot->writeStructBegin("Airavata_getAPIVersion_pargs"); - xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1); - xfer += (*(this->authzToken)).write(oprot); - xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); oprot->decrementRecursionDepth(); @@ -36881,19 +36857,18 @@ uint32_t Airavata_isWorkflowExistWithName_presult::read(::apache::thrift::protoc return xfer; } -void AiravataClient::getAPIVersion(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken) +void AiravataClient::getAPIVersion(std::string& _return) { - send_getAPIVersion(authzToken); + send_getAPIVersion(); recv_getAPIVersion(_return); } -void AiravataClient::send_getAPIVersion(const ::apache::airavata::model::security::AuthzToken& authzToken) +void AiravataClient::send_getAPIVersion() { int32_t cseqid = 0; oprot_->writeMessageBegin("getAPIVersion", ::apache::thrift::protocol::T_CALL, cseqid); Airavata_getAPIVersion_pargs args; - args.authzToken = &authzToken; args.write(oprot_); oprot_->writeMessageEnd(); @@ -45373,7 +45348,7 @@ void AiravataProcessor::process_getAPIVersion(int32_t seqid, ::apache::thrift::p Airavata_getAPIVersion_result result; try { - iface_->getAPIVersion(result.success, args.authzToken); + iface_->getAPIVersion(result.success); result.__isset.success = true; } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) { result.ire = ire; http://git-wip-us.apache.org/repos/asf/airavata/blob/d11dda1a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h index a1a84e7..4a3ca63 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h @@ -35,10 +35,8 @@ class AiravataIf { /** * Fetch Apache Airavata API version - * - * @param authzToken */ - virtual void getAPIVersion(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken) = 0; + virtual void getAPIVersion(std::string& _return) = 0; virtual void addGateway(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::workspace::Gateway& gateway) = 0; virtual void updateGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const ::apache::airavata::model::workspace::Gateway& updatedGateway) = 0; virtual void getGateway( ::apache::airavata::model::workspace::Gateway& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId) = 0; @@ -1741,7 +1739,7 @@ class AiravataIfSingletonFactory : virtual public AiravataIfFactory { class AiravataNull : virtual public AiravataIf { public: virtual ~AiravataNull() {} - void getAPIVersion(std::string& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */) { + void getAPIVersion(std::string& /* _return */) { return; } void addGateway(std::string& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const ::apache::airavata::model::workspace::Gateway& /* gateway */) { @@ -2136,8 +2134,8 @@ class AiravataNull : virtual public AiravataIf { class Airavata_getAPIVersion_args { public: - static const char* ascii_fingerprint; // = "75A7E945AEBB96C8FA8998CBCEB31C27"; - static const uint8_t binary_fingerprint[16]; // = {0x75,0xA7,0xE9,0x45,0xAE,0xBB,0x96,0xC8,0xFA,0x89,0x98,0xCB,0xCE,0xB3,0x1C,0x27}; + static const char* ascii_fingerprint; // = "99914B932BD37A50B983C5E7C90AE93B"; + static const uint8_t binary_fingerprint[16]; // = {0x99,0x91,0x4B,0x93,0x2B,0xD3,0x7A,0x50,0xB9,0x83,0xC5,0xE7,0xC9,0x0A,0xE9,0x3B}; Airavata_getAPIVersion_args(const Airavata_getAPIVersion_args&); Airavata_getAPIVersion_args& operator=(const Airavata_getAPIVersion_args&); @@ -2145,14 +2143,9 @@ class Airavata_getAPIVersion_args { } virtual ~Airavata_getAPIVersion_args() throw(); - ::apache::airavata::model::security::AuthzToken authzToken; - - void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val); - bool operator == (const Airavata_getAPIVersion_args & rhs) const + bool operator == (const Airavata_getAPIVersion_args & /* rhs */) const { - if (!(authzToken == rhs.authzToken)) - return false; return true; } bool operator != (const Airavata_getAPIVersion_args &rhs) const { @@ -2171,12 +2164,11 @@ class Airavata_getAPIVersion_args { class Airavata_getAPIVersion_pargs { public: - static const char* ascii_fingerprint; // = "75A7E945AEBB96C8FA8998CBCEB31C27"; - static const uint8_t binary_fingerprint[16]; // = {0x75,0xA7,0xE9,0x45,0xAE,0xBB,0x96,0xC8,0xFA,0x89,0x98,0xCB,0xCE,0xB3,0x1C,0x27}; + static const char* ascii_fingerprint; // = "99914B932BD37A50B983C5E7C90AE93B"; + static const uint8_t binary_fingerprint[16]; // = {0x99,0x91,0x4B,0x93,0x2B,0xD3,0x7A,0x50,0xB9,0x83,0xC5,0xE7,0xC9,0x0A,0xE9,0x3B}; virtual ~Airavata_getAPIVersion_pargs() throw(); - const ::apache::airavata::model::security::AuthzToken* authzToken; uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; @@ -20683,8 +20675,8 @@ class AiravataClient : virtual public AiravataIf { boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getOutputProtocol() { return poprot_; } - void getAPIVersion(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken); - void send_getAPIVersion(const ::apache::airavata::model::security::AuthzToken& authzToken); + void getAPIVersion(std::string& _return); + void send_getAPIVersion(); void recv_getAPIVersion(std::string& _return); void addGateway(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::workspace::Gateway& gateway); void send_addGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::workspace::Gateway& gateway); @@ -21319,13 +21311,13 @@ class AiravataMultiface : virtual public AiravataIf { ifaces_.push_back(iface); } public: - void getAPIVersion(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken) { + void getAPIVersion(std::string& _return) { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->getAPIVersion(_return, authzToken); + ifaces_[i]->getAPIVersion(_return); } - ifaces_[i]->getAPIVersion(_return, authzToken); + ifaces_[i]->getAPIVersion(_return); return; } http://git-wip-us.apache.org/repos/asf/airavata/blob/d11dda1a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp index a1c5143..9649554 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp @@ -41,10 +41,8 @@ class AiravataHandler : virtual public AiravataIf { /** * Fetch Apache Airavata API version - * - * @param authzToken */ - void getAPIVersion(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken) { + void getAPIVersion(std::string& _return) { // Your implementation goes here printf("getAPIVersion\n"); } http://git-wip-us.apache.org/repos/asf/airavata/blob/d11dda1a/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 cab3cef..c068aa6 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 @@ -20,14 +20,13 @@ interface AiravataIf { /** * Fetch Apache Airavata API version * - * @param \Airavata\Model\Security\AuthzToken $authzToken * @return string * @throws \Airavata\API\Error\InvalidRequestException * @throws \Airavata\API\Error\AiravataClientException * @throws \Airavata\API\Error\AiravataSystemException * @throws \Airavata\API\Error\AuthorizationException */ - public function getAPIVersion(\Airavata\Model\Security\AuthzToken $authzToken); + public function getAPIVersion(); /** * @param \Airavata\Model\Security\AuthzToken $authzToken * @param \Airavata\Model\Workspace\Gateway $gateway @@ -2555,16 +2554,15 @@ class AiravataClient implements \Airavata\API\AiravataIf { $this->output_ = $output ? $output : $input; } - public function getAPIVersion(\Airavata\Model\Security\AuthzToken $authzToken) + public function getAPIVersion() { - $this->send_getAPIVersion($authzToken); + $this->send_getAPIVersion(); return $this->recv_getAPIVersion(); } - public function send_getAPIVersion(\Airavata\Model\Security\AuthzToken $authzToken) + public function send_getAPIVersion() { $args = new \Airavata\API\Airavata_getAPIVersion_args(); - $args->authzToken = $authzToken; $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary'); if ($bin_accel) { @@ -10204,26 +10202,12 @@ class AiravataClient implements \Airavata\API\AiravataIf { class Airavata_getAPIVersion_args { static $_TSPEC; - /** - * @var \Airavata\Model\Security\AuthzToken - */ - public $authzToken = null; - public function __construct($vals=null) { + public function __construct() { if (!isset(self::$_TSPEC)) { self::$_TSPEC = array( - 1 => array( - 'var' => 'authzToken', - 'type' => TType::STRUCT, - 'class' => '\Airavata\Model\Security\AuthzToken', - ), ); } - if (is_array($vals)) { - if (isset($vals['authzToken'])) { - $this->authzToken = $vals['authzToken']; - } - } } public function getName() { @@ -10245,14 +10229,6 @@ class Airavata_getAPIVersion_args { } switch ($fid) { - case 1: - if ($ftype == TType::STRUCT) { - $this->authzToken = new \Airavata\Model\Security\AuthzToken(); - $xfer += $this->authzToken->read($input); - } else { - $xfer += $input->skip($ftype); - } - break; default: $xfer += $input->skip($ftype); break; @@ -10266,14 +10242,6 @@ class Airavata_getAPIVersion_args { public function write($output) { $xfer = 0; $xfer += $output->writeStructBegin('Airavata_getAPIVersion_args'); - if ($this->authzToken !== null) { - if (!is_object($this->authzToken)) { - throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); - } - $xfer += $output->writeFieldBegin('authzToken', TType::STRUCT, 1); - $xfer += $this->authzToken->write($output); - $xfer += $output->writeFieldEnd(); - } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; http://git-wip-us.apache.org/repos/asf/airavata/blob/d11dda1a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote index 1cb2251..d67b26e 100755 --- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote @@ -24,7 +24,7 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help': print('Usage: ' + sys.argv[0] + ' [-h host[:port]] [-u url] [-f[ramed]] [-s[sl]] function [arg1 [arg2...]]') print('') print('Functions:') - print(' string getAPIVersion(AuthzToken authzToken)') + print(' string getAPIVersion()') print(' string addGateway(AuthzToken authzToken, Gateway gateway)') print(' void updateGateway(AuthzToken authzToken, string gatewayId, Gateway updatedGateway)') print(' Gateway getGateway(AuthzToken authzToken, string gatewayId)') @@ -199,10 +199,10 @@ client = Airavata.Client(protocol) transport.open() if cmd == 'getAPIVersion': - if len(args) != 1: - print('getAPIVersion requires 1 args') + if len(args) != 0: + print('getAPIVersion requires 0 args') sys.exit(1) - pp.pprint(client.getAPIVersion(eval(args[0]),)) + pp.pprint(client.getAPIVersion()) elif cmd == 'addGateway': if len(args) != 2: http://git-wip-us.apache.org/repos/asf/airavata/blob/d11dda1a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py index 505e10b..99344f2 100644 --- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py @@ -18,12 +18,9 @@ except: class Iface: - def getAPIVersion(self, authzToken): + def getAPIVersion(self): """ Fetch Apache Airavata API version - - Parameters: - - authzToken """ pass @@ -2118,20 +2115,16 @@ class Client(Iface): self._oprot = oprot self._seqid = 0 - def getAPIVersion(self, authzToken): + def getAPIVersion(self): """ Fetch Apache Airavata API version - - Parameters: - - authzToken """ - self.send_getAPIVersion(authzToken) + self.send_getAPIVersion() return self.recv_getAPIVersion() - def send_getAPIVersion(self, authzToken): + def send_getAPIVersion(self): self._oprot.writeMessageBegin('getAPIVersion', TMessageType.CALL, self._seqid) args = getAPIVersion_args() - args.authzToken = authzToken args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() @@ -8342,7 +8335,7 @@ class Processor(Iface, TProcessor): iprot.readMessageEnd() result = getAPIVersion_result() try: - result.success = self._handler.getAPIVersion(args.authzToken) + result.success = self._handler.getAPIVersion() except apache.airavata.api.error.ttypes.InvalidRequestException, ire: result.ire = ire except apache.airavata.api.error.ttypes.AiravataClientException, ace: @@ -10712,19 +10705,10 @@ class Processor(Iface, TProcessor): # HELPER FUNCTIONS AND STRUCTURES class getAPIVersion_args: - """ - Attributes: - - authzToken - """ thrift_spec = ( - None, # 0 - (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1 ) - def __init__(self, authzToken=None,): - self.authzToken = authzToken - 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)) @@ -10734,12 +10718,6 @@ class getAPIVersion_args: (fname, ftype, fid) = iprot.readFieldBegin() if ftype == TType.STOP: break - if fid == 1: - if ftype == TType.STRUCT: - self.authzToken = apache.airavata.model.security.ttypes.AuthzToken() - self.authzToken.read(iprot) - else: - iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -10750,22 +10728,15 @@ class getAPIVersion_args: oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec))) return oprot.writeStructBegin('getAPIVersion_args') - if self.authzToken is not None: - oprot.writeFieldBegin('authzToken', TType.STRUCT, 1) - self.authzToken.write(oprot) - oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() def validate(self): - if self.authzToken is None: - raise TProtocol.TProtocolException(message='Required field authzToken is unset!') return def __hash__(self): value = 17 - value = (value * 31) ^ hash(self.authzToken) return value def __repr__(self):
