You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2014/05/22 21:53:57 UTC
git commit: Changing the case of GetAPIVersion to make it conistant
with remaining method names.
Repository: airavata
Updated Branches:
refs/heads/master fc9d7629c -> f06e75f4c
Changing the case of GetAPIVersion to make it conistant with remaining method names.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f06e75f4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f06e75f4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f06e75f4
Branch: refs/heads/master
Commit: f06e75f4c063789d40090363f59dda8567a5bf8d
Parents: fc9d762
Author: Suresh Marru <sm...@apache.org>
Authored: Thu May 22 15:53:49 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Thu May 22 15:53:49 2014 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 3 +-
.../java/org/apache/airavata/api/Airavata.java | 533 +++++++++++++++----
.../src/main/resources/lib/Airavata.cpp | 142 +++--
.../src/main/resources/lib/Airavata.h | 98 ++--
.../resources/lib/Airavata_server.skeleton.cpp | 4 +-
.../resources/lib/Airavata/API/Airavata.php | 111 +++-
.../client/samples/CreateLaunchExperiment.java | 2 +-
.../samples/CreateLaunchExperimentUS3.java | 2 +-
.../airavataAPI.thrift | 5 +-
9 files changed, 713 insertions(+), 187 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/f06e75f4/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index 2c949f8..0dd33af 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -51,11 +51,12 @@ public class AiravataServerHandler implements Airavata.Iface {
public static final String ORCHESTRATOR_SERVER_HOST = "localhost";
//FIXME: these go in a configuration file or a "constants" class.
public static final int ORCHESTRATOR_SERVER_PORT = 8940;
+
/**
* Query Airavata to fetch the API version
*/
@Override
- public String GetAPIVersion() throws TException {
+ public String getAPIVersion() throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
return airavataAPIConstants.AIRAVATA_API_VERSION;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/f06e75f4/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 8460631..476fb0c 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
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
/**
* Query Airavata to fetch the API version
*/
- public String GetAPIVersion() throws 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.thrift.TException;
/**
* Create a Project
@@ -418,7 +418,7 @@ import org.slf4j.LoggerFactory;
public interface AsyncIface {
- public void GetAPIVersion(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 createProject(org.apache.airavata.model.workspace.Project project, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
@@ -486,26 +486,35 @@ import org.slf4j.LoggerFactory;
super(iprot, oprot);
}
- public String GetAPIVersion() throws 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.thrift.TException
{
- send_GetAPIVersion();
- return recv_GetAPIVersion();
+ send_getAPIVersion();
+ return recv_getAPIVersion();
}
- public void send_GetAPIVersion() throws org.apache.thrift.TException
+ public void send_getAPIVersion() throws org.apache.thrift.TException
{
- GetAPIVersion_args args = new GetAPIVersion_args();
- sendBase("GetAPIVersion", args);
+ getAPIVersion_args args = new getAPIVersion_args();
+ sendBase("getAPIVersion", args);
}
- public String recv_GetAPIVersion() throws org.apache.thrift.TException
+ public String recv_getAPIVersion() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
{
- GetAPIVersion_result result = new GetAPIVersion_result();
- receiveBase(result, "GetAPIVersion");
+ getAPIVersion_result result = new getAPIVersion_result();
+ receiveBase(result, "getAPIVersion");
if (result.isSetSuccess()) {
return result.success;
}
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "GetAPIVersion failed: unknown result");
+ if (result.ire != null) {
+ throw result.ire;
+ }
+ if (result.ace != null) {
+ throw result.ace;
+ }
+ if (result.ase != null) {
+ throw result.ase;
+ }
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAPIVersion failed: unknown result");
}
public String createProject(org.apache.airavata.model.workspace.Project project) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
@@ -1210,32 +1219,32 @@ import org.slf4j.LoggerFactory;
super(protocolFactory, clientManager, transport);
}
- public void GetAPIVersion(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(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 {
- 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 {
+ public static class getAPIVersion_call extends org.apache.thrift.async.TAsyncMethodCall {
+ 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);
}
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();
+ prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getAPIVersion", org.apache.thrift.protocol.TMessageType.CALL, 0));
+ getAPIVersion_args args = new getAPIVersion_args();
args.write(prot);
prot.writeMessageEnd();
}
- public String getResult() throws org.apache.thrift.TException {
+ public String getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException {
if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
throw new IllegalStateException("Method call not finished!");
}
org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
- return (new Client(prot)).recv_GetAPIVersion();
+ return (new Client(prot)).recv_getAPIVersion();
}
}
@@ -1986,7 +1995,7 @@ import org.slf4j.LoggerFactory;
}
private static <I extends Iface> Map<String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> getProcessMap(Map<String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> processMap) {
- processMap.put("GetAPIVersion", new GetAPIVersion());
+ processMap.put("getAPIVersion", new getAPIVersion());
processMap.put("createProject", new createProject());
processMap.put("updateProject", new updateProject());
processMap.put("getProject", new getProject());
@@ -2012,22 +2021,30 @@ import org.slf4j.LoggerFactory;
return processMap;
}
- public static class GetAPIVersion<I extends Iface> extends org.apache.thrift.ProcessFunction<I, GetAPIVersion_args> {
- public GetAPIVersion() {
- super("GetAPIVersion");
+ public static class getAPIVersion<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAPIVersion_args> {
+ public getAPIVersion() {
+ super("getAPIVersion");
}
- public GetAPIVersion_args getEmptyArgsInstance() {
- return new GetAPIVersion_args();
+ public getAPIVersion_args getEmptyArgsInstance() {
+ return new getAPIVersion_args();
}
protected boolean isOneway() {
return false;
}
- public GetAPIVersion_result getResult(I iface, GetAPIVersion_args args) throws org.apache.thrift.TException {
- GetAPIVersion_result result = new GetAPIVersion_result();
- result.success = iface.GetAPIVersion();
+ 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();
+ } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
+ result.ire = ire;
+ } catch (org.apache.airavata.model.error.AiravataClientException ace) {
+ result.ace = ace;
+ } catch (org.apache.airavata.model.error.AiravataSystemException ase) {
+ result.ase = ase;
+ }
return result;
}
}
@@ -2646,7 +2663,7 @@ import org.slf4j.LoggerFactory;
}
private static <I extends AsyncIface> Map<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase,?>> getProcessMap(Map<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>> processMap) {
- processMap.put("GetAPIVersion", new GetAPIVersion());
+ processMap.put("getAPIVersion", new getAPIVersion());
processMap.put("createProject", new createProject());
processMap.put("updateProject", new updateProject());
processMap.put("getProject", new getProject());
@@ -2672,20 +2689,20 @@ import org.slf4j.LoggerFactory;
return processMap;
}
- public static class GetAPIVersion<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, GetAPIVersion_args, String> {
- public GetAPIVersion() {
- super("GetAPIVersion");
+ public static class getAPIVersion<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAPIVersion_args, String> {
+ public getAPIVersion() {
+ super("getAPIVersion");
}
- public GetAPIVersion_args getEmptyArgsInstance() {
- return new GetAPIVersion_args();
+ public getAPIVersion_args getEmptyArgsInstance() {
+ return new getAPIVersion_args();
}
public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
return new AsyncMethodCallback<String>() {
public void onComplete(String o) {
- GetAPIVersion_result result = new GetAPIVersion_result();
+ getAPIVersion_result result = new getAPIVersion_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -2698,7 +2715,23 @@ import org.slf4j.LoggerFactory;
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- GetAPIVersion_result result = new GetAPIVersion_result();
+ getAPIVersion_result result = new getAPIVersion_result();
+ if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
+ result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
+ result.setIreIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataClientException) {
+ result.ace = (org.apache.airavata.model.error.AiravataClientException) e;
+ result.setAceIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataSystemException) {
+ result.ase = (org.apache.airavata.model.error.AiravataSystemException) e;
+ result.setAseIsSet(true);
+ msg = result;
+ }
+ else
{
msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
@@ -2718,8 +2751,8 @@ import org.slf4j.LoggerFactory;
return false;
}
- public void start(I iface, GetAPIVersion_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
- iface.GetAPIVersion(resultHandler);
+ public void start(I iface, getAPIVersion_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
+ iface.getAPIVersion(resultHandler);
}
}
@@ -4170,14 +4203,14 @@ import org.slf4j.LoggerFactory;
}
- 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");
+ 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 Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
- schemes.put(StandardScheme.class, new GetAPIVersion_argsStandardSchemeFactory());
- schemes.put(TupleScheme.class, new GetAPIVersion_argsTupleSchemeFactory());
+ schemes.put(StandardScheme.class, new getAPIVersion_argsStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new getAPIVersion_argsTupleSchemeFactory());
}
@@ -4240,20 +4273,20 @@ import org.slf4j.LoggerFactory;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
metaDataMap = Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GetAPIVersion_args.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAPIVersion_args.class, metaDataMap);
}
- public GetAPIVersion_args() {
+ public getAPIVersion_args() {
}
/**
* Performs a deep copy on <i>other</i>.
*/
- public GetAPIVersion_args(GetAPIVersion_args other) {
+ public getAPIVersion_args(getAPIVersion_args other) {
}
- public GetAPIVersion_args deepCopy() {
- return new GetAPIVersion_args(this);
+ public getAPIVersion_args deepCopy() {
+ return new getAPIVersion_args(this);
}
@Override
@@ -4286,12 +4319,12 @@ import org.slf4j.LoggerFactory;
public boolean equals(Object that) {
if (that == null)
return false;
- if (that instanceof GetAPIVersion_args)
- return this.equals((GetAPIVersion_args)that);
+ if (that instanceof getAPIVersion_args)
+ return this.equals((getAPIVersion_args)that);
return false;
}
- public boolean equals(GetAPIVersion_args that) {
+ public boolean equals(getAPIVersion_args that) {
if (that == null)
return false;
@@ -4304,7 +4337,7 @@ import org.slf4j.LoggerFactory;
}
@Override
- public int compareTo(GetAPIVersion_args other) {
+ public int compareTo(getAPIVersion_args other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
@@ -4328,7 +4361,7 @@ import org.slf4j.LoggerFactory;
@Override
public String toString() {
- StringBuilder sb = new StringBuilder("GetAPIVersion_args(");
+ StringBuilder sb = new StringBuilder("getAPIVersion_args(");
boolean first = true;
sb.append(")");
@@ -4356,15 +4389,15 @@ import org.slf4j.LoggerFactory;
}
}
- private static class GetAPIVersion_argsStandardSchemeFactory implements SchemeFactory {
- public GetAPIVersion_argsStandardScheme getScheme() {
- return new GetAPIVersion_argsStandardScheme();
+ private static class getAPIVersion_argsStandardSchemeFactory implements SchemeFactory {
+ public getAPIVersion_argsStandardScheme getScheme() {
+ return new getAPIVersion_argsStandardScheme();
}
}
- private static class GetAPIVersion_argsStandardScheme extends StandardScheme<GetAPIVersion_args> {
+ private static class getAPIVersion_argsStandardScheme extends StandardScheme<getAPIVersion_args> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, GetAPIVersion_args struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, getAPIVersion_args struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -4385,7 +4418,7 @@ import org.slf4j.LoggerFactory;
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, GetAPIVersion_args struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, getAPIVersion_args struct) throws org.apache.thrift.TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -4395,43 +4428,52 @@ import org.slf4j.LoggerFactory;
}
- private static class GetAPIVersion_argsTupleSchemeFactory implements SchemeFactory {
- public GetAPIVersion_argsTupleScheme getScheme() {
- return new GetAPIVersion_argsTupleScheme();
+ private static class getAPIVersion_argsTupleSchemeFactory implements SchemeFactory {
+ public getAPIVersion_argsTupleScheme getScheme() {
+ return new getAPIVersion_argsTupleScheme();
}
}
- private static class GetAPIVersion_argsTupleScheme extends TupleScheme<GetAPIVersion_args> {
+ private static class getAPIVersion_argsTupleScheme extends TupleScheme<getAPIVersion_args> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, GetAPIVersion_args struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, getAPIVersion_args struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, GetAPIVersion_args struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, getAPIVersion_args struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
}
}
}
- public static class GetAPIVersion_result implements org.apache.thrift.TBase<GetAPIVersion_result, GetAPIVersion_result._Fields>, java.io.Serializable, Cloneable, Comparable<GetAPIVersion_result> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetAPIVersion_result");
+ public static class getAPIVersion_result implements org.apache.thrift.TBase<getAPIVersion_result, getAPIVersion_result._Fields>, java.io.Serializable, Cloneable, Comparable<getAPIVersion_result> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getAPIVersion_result");
private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0);
+ private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+ private static final org.apache.thrift.protocol.TField ACE_FIELD_DESC = new org.apache.thrift.protocol.TField("ace", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+ private static final org.apache.thrift.protocol.TField ASE_FIELD_DESC = new org.apache.thrift.protocol.TField("ase", org.apache.thrift.protocol.TType.STRUCT, (short)3);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
- schemes.put(StandardScheme.class, new GetAPIVersion_resultStandardSchemeFactory());
- schemes.put(TupleScheme.class, new GetAPIVersion_resultTupleSchemeFactory());
+ schemes.put(StandardScheme.class, new getAPIVersion_resultStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new getAPIVersion_resultTupleSchemeFactory());
}
public String success; // required
+ public org.apache.airavata.model.error.InvalidRequestException ire; // required
+ public org.apache.airavata.model.error.AiravataClientException ace; // required
+ public org.apache.airavata.model.error.AiravataSystemException ase; // 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 {
- SUCCESS((short)0, "success");
+ SUCCESS((short)0, "success"),
+ IRE((short)1, "ire"),
+ ACE((short)2, "ace"),
+ ASE((short)3, "ase");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -4448,6 +4490,12 @@ import org.slf4j.LoggerFactory;
switch(fieldId) {
case 0: // SUCCESS
return SUCCESS;
+ case 1: // IRE
+ return IRE;
+ case 2: // ACE
+ return ACE;
+ case 3: // ASE
+ return ASE;
default:
return null;
}
@@ -4493,43 +4541,67 @@ import org.slf4j.LoggerFactory;
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.IRE, new org.apache.thrift.meta_data.FieldMetaData("ire", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+ tmpMap.put(_Fields.ACE, new org.apache.thrift.meta_data.FieldMetaData("ace", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+ tmpMap.put(_Fields.ASE, new org.apache.thrift.meta_data.FieldMetaData("ase", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GetAPIVersion_result.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAPIVersion_result.class, metaDataMap);
}
- public GetAPIVersion_result() {
+ public getAPIVersion_result() {
}
- public GetAPIVersion_result(
- String success)
+ public getAPIVersion_result(
+ String success,
+ org.apache.airavata.model.error.InvalidRequestException ire,
+ org.apache.airavata.model.error.AiravataClientException ace,
+ org.apache.airavata.model.error.AiravataSystemException ase)
{
this();
this.success = success;
+ this.ire = ire;
+ this.ace = ace;
+ this.ase = ase;
}
/**
* Performs a deep copy on <i>other</i>.
*/
- public GetAPIVersion_result(GetAPIVersion_result other) {
+ public getAPIVersion_result(getAPIVersion_result other) {
if (other.isSetSuccess()) {
this.success = other.success;
}
+ if (other.isSetIre()) {
+ this.ire = new org.apache.airavata.model.error.InvalidRequestException(other.ire);
+ }
+ if (other.isSetAce()) {
+ this.ace = new org.apache.airavata.model.error.AiravataClientException(other.ace);
+ }
+ if (other.isSetAse()) {
+ this.ase = new org.apache.airavata.model.error.AiravataSystemException(other.ase);
+ }
}
- public GetAPIVersion_result deepCopy() {
- return new GetAPIVersion_result(this);
+ public getAPIVersion_result deepCopy() {
+ return new getAPIVersion_result(this);
}
@Override
public void clear() {
this.success = null;
+ this.ire = null;
+ this.ace = null;
+ this.ase = null;
}
public String getSuccess() {
return this.success;
}
- public GetAPIVersion_result setSuccess(String success) {
+ public getAPIVersion_result setSuccess(String success) {
this.success = success;
return this;
}
@@ -4549,6 +4621,78 @@ import org.slf4j.LoggerFactory;
}
}
+ public org.apache.airavata.model.error.InvalidRequestException getIre() {
+ return this.ire;
+ }
+
+ public getAPIVersion_result setIre(org.apache.airavata.model.error.InvalidRequestException ire) {
+ this.ire = ire;
+ return this;
+ }
+
+ public void unsetIre() {
+ this.ire = null;
+ }
+
+ /** Returns true if field ire is set (has been assigned a value) and false otherwise */
+ public boolean isSetIre() {
+ return this.ire != null;
+ }
+
+ public void setIreIsSet(boolean value) {
+ if (!value) {
+ this.ire = null;
+ }
+ }
+
+ public org.apache.airavata.model.error.AiravataClientException getAce() {
+ return this.ace;
+ }
+
+ public getAPIVersion_result setAce(org.apache.airavata.model.error.AiravataClientException ace) {
+ this.ace = ace;
+ return this;
+ }
+
+ public void unsetAce() {
+ this.ace = null;
+ }
+
+ /** Returns true if field ace is set (has been assigned a value) and false otherwise */
+ public boolean isSetAce() {
+ return this.ace != null;
+ }
+
+ public void setAceIsSet(boolean value) {
+ if (!value) {
+ this.ace = null;
+ }
+ }
+
+ public org.apache.airavata.model.error.AiravataSystemException getAse() {
+ return this.ase;
+ }
+
+ public getAPIVersion_result setAse(org.apache.airavata.model.error.AiravataSystemException ase) {
+ this.ase = ase;
+ return this;
+ }
+
+ public void unsetAse() {
+ this.ase = null;
+ }
+
+ /** Returns true if field ase is set (has been assigned a value) and false otherwise */
+ public boolean isSetAse() {
+ return this.ase != null;
+ }
+
+ public void setAseIsSet(boolean value) {
+ if (!value) {
+ this.ase = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case SUCCESS:
@@ -4559,6 +4703,30 @@ import org.slf4j.LoggerFactory;
}
break;
+ case IRE:
+ if (value == null) {
+ unsetIre();
+ } else {
+ setIre((org.apache.airavata.model.error.InvalidRequestException)value);
+ }
+ break;
+
+ case ACE:
+ if (value == null) {
+ unsetAce();
+ } else {
+ setAce((org.apache.airavata.model.error.AiravataClientException)value);
+ }
+ break;
+
+ case ASE:
+ if (value == null) {
+ unsetAse();
+ } else {
+ setAse((org.apache.airavata.model.error.AiravataSystemException)value);
+ }
+ break;
+
}
}
@@ -4567,6 +4735,15 @@ import org.slf4j.LoggerFactory;
case SUCCESS:
return getSuccess();
+ case IRE:
+ return getIre();
+
+ case ACE:
+ return getAce();
+
+ case ASE:
+ return getAse();
+
}
throw new IllegalStateException();
}
@@ -4580,6 +4757,12 @@ import org.slf4j.LoggerFactory;
switch (field) {
case SUCCESS:
return isSetSuccess();
+ case IRE:
+ return isSetIre();
+ case ACE:
+ return isSetAce();
+ case ASE:
+ return isSetAse();
}
throw new IllegalStateException();
}
@@ -4588,12 +4771,12 @@ import org.slf4j.LoggerFactory;
public boolean equals(Object that) {
if (that == null)
return false;
- if (that instanceof GetAPIVersion_result)
- return this.equals((GetAPIVersion_result)that);
+ if (that instanceof getAPIVersion_result)
+ return this.equals((getAPIVersion_result)that);
return false;
}
- public boolean equals(GetAPIVersion_result that) {
+ public boolean equals(getAPIVersion_result that) {
if (that == null)
return false;
@@ -4606,6 +4789,33 @@ import org.slf4j.LoggerFactory;
return false;
}
+ boolean this_present_ire = true && this.isSetIre();
+ boolean that_present_ire = true && that.isSetIre();
+ if (this_present_ire || that_present_ire) {
+ if (!(this_present_ire && that_present_ire))
+ return false;
+ if (!this.ire.equals(that.ire))
+ return false;
+ }
+
+ boolean this_present_ace = true && this.isSetAce();
+ boolean that_present_ace = true && that.isSetAce();
+ if (this_present_ace || that_present_ace) {
+ if (!(this_present_ace && that_present_ace))
+ return false;
+ if (!this.ace.equals(that.ace))
+ return false;
+ }
+
+ boolean this_present_ase = true && this.isSetAse();
+ boolean that_present_ase = true && that.isSetAse();
+ if (this_present_ase || that_present_ase) {
+ if (!(this_present_ase && that_present_ase))
+ return false;
+ if (!this.ase.equals(that.ase))
+ return false;
+ }
+
return true;
}
@@ -4615,7 +4825,7 @@ import org.slf4j.LoggerFactory;
}
@Override
- public int compareTo(GetAPIVersion_result other) {
+ public int compareTo(getAPIVersion_result other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
@@ -4632,6 +4842,36 @@ import org.slf4j.LoggerFactory;
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetIre()).compareTo(other.isSetIre());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetIre()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ire, other.ire);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetAce()).compareTo(other.isSetAce());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetAce()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ace, other.ace);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetAse()).compareTo(other.isSetAse());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetAse()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ase, other.ase);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -4649,7 +4889,7 @@ import org.slf4j.LoggerFactory;
@Override
public String toString() {
- StringBuilder sb = new StringBuilder("GetAPIVersion_result(");
+ StringBuilder sb = new StringBuilder("getAPIVersion_result(");
boolean first = true;
sb.append("success:");
@@ -4659,6 +4899,30 @@ import org.slf4j.LoggerFactory;
sb.append(this.success);
}
first = false;
+ if (!first) sb.append(", ");
+ sb.append("ire:");
+ if (this.ire == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.ire);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("ace:");
+ if (this.ace == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.ace);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("ase:");
+ if (this.ase == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.ase);
+ }
+ first = false;
sb.append(")");
return sb.toString();
}
@@ -4684,15 +4948,15 @@ import org.slf4j.LoggerFactory;
}
}
- private static class GetAPIVersion_resultStandardSchemeFactory implements SchemeFactory {
- public GetAPIVersion_resultStandardScheme getScheme() {
- return new GetAPIVersion_resultStandardScheme();
+ private static class getAPIVersion_resultStandardSchemeFactory implements SchemeFactory {
+ public getAPIVersion_resultStandardScheme getScheme() {
+ return new getAPIVersion_resultStandardScheme();
}
}
- private static class GetAPIVersion_resultStandardScheme extends StandardScheme<GetAPIVersion_result> {
+ private static class getAPIVersion_resultStandardScheme extends StandardScheme<getAPIVersion_result> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, GetAPIVersion_result struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, getAPIVersion_result struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -4710,6 +4974,33 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 1: // IRE
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.ire = new org.apache.airavata.model.error.InvalidRequestException();
+ struct.ire.read(iprot);
+ struct.setIreIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // ACE
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.ace = new org.apache.airavata.model.error.AiravataClientException();
+ struct.ace.read(iprot);
+ struct.setAceIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // ASE
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.ase = new org.apache.airavata.model.error.AiravataSystemException();
+ struct.ase.read(iprot);
+ struct.setAseIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -4721,7 +5012,7 @@ import org.slf4j.LoggerFactory;
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, GetAPIVersion_result struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, getAPIVersion_result struct) throws org.apache.thrift.TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -4730,41 +5021,89 @@ import org.slf4j.LoggerFactory;
oprot.writeString(struct.success);
oprot.writeFieldEnd();
}
+ if (struct.ire != null) {
+ oprot.writeFieldBegin(IRE_FIELD_DESC);
+ struct.ire.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ if (struct.ace != null) {
+ oprot.writeFieldBegin(ACE_FIELD_DESC);
+ struct.ace.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ if (struct.ase != null) {
+ oprot.writeFieldBegin(ASE_FIELD_DESC);
+ struct.ase.write(oprot);
+ oprot.writeFieldEnd();
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
}
- private static class GetAPIVersion_resultTupleSchemeFactory implements SchemeFactory {
- public GetAPIVersion_resultTupleScheme getScheme() {
- return new GetAPIVersion_resultTupleScheme();
+ private static class getAPIVersion_resultTupleSchemeFactory implements SchemeFactory {
+ public getAPIVersion_resultTupleScheme getScheme() {
+ return new getAPIVersion_resultTupleScheme();
}
}
- private static class GetAPIVersion_resultTupleScheme extends TupleScheme<GetAPIVersion_result> {
+ private static class getAPIVersion_resultTupleScheme extends TupleScheme<getAPIVersion_result> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, GetAPIVersion_result struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, getAPIVersion_result struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
BitSet optionals = new BitSet();
if (struct.isSetSuccess()) {
optionals.set(0);
}
- oprot.writeBitSet(optionals, 1);
+ if (struct.isSetIre()) {
+ optionals.set(1);
+ }
+ if (struct.isSetAce()) {
+ optionals.set(2);
+ }
+ if (struct.isSetAse()) {
+ optionals.set(3);
+ }
+ oprot.writeBitSet(optionals, 4);
if (struct.isSetSuccess()) {
oprot.writeString(struct.success);
}
+ if (struct.isSetIre()) {
+ struct.ire.write(oprot);
+ }
+ if (struct.isSetAce()) {
+ struct.ace.write(oprot);
+ }
+ if (struct.isSetAse()) {
+ struct.ase.write(oprot);
+ }
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, GetAPIVersion_result struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, getAPIVersion_result struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(1);
+ BitSet incoming = iprot.readBitSet(4);
if (incoming.get(0)) {
struct.success = iprot.readString();
struct.setSuccessIsSet(true);
}
+ if (incoming.get(1)) {
+ struct.ire = new org.apache.airavata.model.error.InvalidRequestException();
+ struct.ire.read(iprot);
+ struct.setIreIsSet(true);
+ }
+ if (incoming.get(2)) {
+ struct.ace = new org.apache.airavata.model.error.AiravataClientException();
+ struct.ace.read(iprot);
+ struct.setAceIsSet(true);
+ }
+ if (incoming.get(3)) {
+ struct.ase = new org.apache.airavata.model.error.AiravataSystemException();
+ struct.ase.read(iprot);
+ struct.setAseIsSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/f06e75f4/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.cpp
index bfbbe0b..9d87756 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.cpp
@@ -8,7 +8,7 @@
namespace airavata { namespace api {
-uint32_t Airavata_GetAPIVersion_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getAPIVersion_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -35,25 +35,25 @@ uint32_t Airavata_GetAPIVersion_args::read(::apache::thrift::protocol::TProtocol
return xfer;
}
-uint32_t Airavata_GetAPIVersion_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getAPIVersion_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_GetAPIVersion_args");
+ xfer += oprot->writeStructBegin("Airavata_getAPIVersion_args");
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
}
-uint32_t Airavata_GetAPIVersion_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getAPIVersion_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_GetAPIVersion_pargs");
+ xfer += oprot->writeStructBegin("Airavata_getAPIVersion_pargs");
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
}
-uint32_t Airavata_GetAPIVersion_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getAPIVersion_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -81,6 +81,30 @@ uint32_t Airavata_GetAPIVersion_result::read(::apache::thrift::protocol::TProtoc
xfer += iprot->skip(ftype);
}
break;
+ case 1:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ire.read(iprot);
+ this->__isset.ire = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ace.read(iprot);
+ this->__isset.ace = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ase.read(iprot);
+ this->__isset.ase = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
default:
xfer += iprot->skip(ftype);
break;
@@ -93,23 +117,35 @@ uint32_t Airavata_GetAPIVersion_result::read(::apache::thrift::protocol::TProtoc
return xfer;
}
-uint32_t Airavata_GetAPIVersion_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getAPIVersion_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_GetAPIVersion_result");
+ xfer += oprot->writeStructBegin("Airavata_getAPIVersion_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRING, 0);
xfer += oprot->writeString(this->success);
xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.ire) {
+ xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += this->ire.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.ace) {
+ xfer += oprot->writeFieldBegin("ace", ::apache::thrift::protocol::T_STRUCT, 2);
+ xfer += this->ace.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.ase) {
+ xfer += oprot->writeFieldBegin("ase", ::apache::thrift::protocol::T_STRUCT, 3);
+ xfer += this->ase.write(oprot);
+ xfer += oprot->writeFieldEnd();
}
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
}
-uint32_t Airavata_GetAPIVersion_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getAPIVersion_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -137,6 +173,30 @@ uint32_t Airavata_GetAPIVersion_presult::read(::apache::thrift::protocol::TProto
xfer += iprot->skip(ftype);
}
break;
+ case 1:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ire.read(iprot);
+ this->__isset.ire = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ace.read(iprot);
+ this->__isset.ace = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ase.read(iprot);
+ this->__isset.ase = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
default:
xfer += iprot->skip(ftype);
break;
@@ -5353,18 +5413,18 @@ uint32_t Airavata_terminateExperiment_presult::read(::apache::thrift::protocol::
return xfer;
}
-void AiravataClient::GetAPIVersion(std::string& _return)
+void AiravataClient::getAPIVersion(std::string& _return)
{
- send_GetAPIVersion();
- recv_GetAPIVersion(_return);
+ send_getAPIVersion();
+ recv_getAPIVersion(_return);
}
-void AiravataClient::send_GetAPIVersion()
+void AiravataClient::send_getAPIVersion()
{
int32_t cseqid = 0;
- oprot_->writeMessageBegin("GetAPIVersion", ::apache::thrift::protocol::T_CALL, cseqid);
+ oprot_->writeMessageBegin("getAPIVersion", ::apache::thrift::protocol::T_CALL, cseqid);
- Airavata_GetAPIVersion_pargs args;
+ Airavata_getAPIVersion_pargs args;
args.write(oprot_);
oprot_->writeMessageEnd();
@@ -5372,7 +5432,7 @@ void AiravataClient::send_GetAPIVersion()
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_GetAPIVersion(std::string& _return)
+void AiravataClient::recv_getAPIVersion(std::string& _return)
{
int32_t rseqid = 0;
@@ -5392,12 +5452,12 @@ void AiravataClient::recv_GetAPIVersion(std::string& _return)
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- if (fname.compare("GetAPIVersion") != 0) {
+ if (fname.compare("getAPIVersion") != 0) {
iprot_->skip(::apache::thrift::protocol::T_STRUCT);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- Airavata_GetAPIVersion_presult result;
+ Airavata_getAPIVersion_presult result;
result.success = &_return;
result.read(iprot_);
iprot_->readMessageEnd();
@@ -5407,7 +5467,16 @@ void AiravataClient::recv_GetAPIVersion(std::string& _return)
// _return pointer has now been filled
return;
}
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "GetAPIVersion failed: unknown result");
+ if (result.__isset.ire) {
+ throw result.ire;
+ }
+ if (result.__isset.ace) {
+ throw result.ace;
+ }
+ if (result.__isset.ase) {
+ throw result.ase;
+ }
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAPIVersion failed: unknown result");
}
void AiravataClient::createProject(std::string& _return, const ::Project& project)
@@ -6871,38 +6940,47 @@ bool AiravataProcessor::dispatchCall(::apache::thrift::protocol::TProtocol* ipro
return true;
}
-void AiravataProcessor::process_GetAPIVersion(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+void AiravataProcessor::process_getAPIVersion(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
{
void* ctx = NULL;
if (this->eventHandler_.get() != NULL) {
- ctx = this->eventHandler_->getContext("Airavata.GetAPIVersion", callContext);
+ ctx = this->eventHandler_->getContext("Airavata.getAPIVersion", callContext);
}
- ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "Airavata.GetAPIVersion");
+ ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "Airavata.getAPIVersion");
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->preRead(ctx, "Airavata.GetAPIVersion");
+ this->eventHandler_->preRead(ctx, "Airavata.getAPIVersion");
}
- Airavata_GetAPIVersion_args args;
+ Airavata_getAPIVersion_args args;
args.read(iprot);
iprot->readMessageEnd();
uint32_t bytes = iprot->getTransport()->readEnd();
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->postRead(ctx, "Airavata.GetAPIVersion", bytes);
+ this->eventHandler_->postRead(ctx, "Airavata.getAPIVersion", bytes);
}
- Airavata_GetAPIVersion_result result;
+ Airavata_getAPIVersion_result result;
try {
- iface_->GetAPIVersion(result.success);
+ iface_->getAPIVersion(result.success);
result.__isset.success = true;
+ } catch ( ::airavata::api::error::InvalidRequestException &ire) {
+ result.ire = ire;
+ result.__isset.ire = true;
+ } catch ( ::airavata::api::error::AiravataClientException &ace) {
+ result.ace = ace;
+ result.__isset.ace = true;
+ } catch ( ::airavata::api::error::AiravataSystemException &ase) {
+ result.ase = ase;
+ result.__isset.ase = true;
} catch (const std::exception& e) {
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->handlerError(ctx, "Airavata.GetAPIVersion");
+ this->eventHandler_->handlerError(ctx, "Airavata.getAPIVersion");
}
::apache::thrift::TApplicationException x(e.what());
- oprot->writeMessageBegin("GetAPIVersion", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+ oprot->writeMessageBegin("getAPIVersion", ::apache::thrift::protocol::T_EXCEPTION, seqid);
x.write(oprot);
oprot->writeMessageEnd();
oprot->getTransport()->writeEnd();
@@ -6911,17 +6989,17 @@ void AiravataProcessor::process_GetAPIVersion(int32_t seqid, ::apache::thrift::p
}
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->preWrite(ctx, "Airavata.GetAPIVersion");
+ this->eventHandler_->preWrite(ctx, "Airavata.getAPIVersion");
}
- oprot->writeMessageBegin("GetAPIVersion", ::apache::thrift::protocol::T_REPLY, seqid);
+ oprot->writeMessageBegin("getAPIVersion", ::apache::thrift::protocol::T_REPLY, seqid);
result.write(oprot);
oprot->writeMessageEnd();
bytes = oprot->getTransport()->writeEnd();
oprot->getTransport()->flush();
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->postWrite(ctx, "Airavata.GetAPIVersion", bytes);
+ this->eventHandler_->postWrite(ctx, "Airavata.getAPIVersion", bytes);
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/f06e75f4/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.h
index ac16b6e..9176a7e 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.h
@@ -15,7 +15,7 @@ namespace airavata { namespace api {
class AiravataIf {
public:
virtual ~AiravataIf() {}
- virtual void GetAPIVersion(std::string& _return) = 0;
+ virtual void getAPIVersion(std::string& _return) = 0;
virtual void createProject(std::string& _return, const ::Project& project) = 0;
virtual void updateProject(const std::string& projectId, const ::Project& updatedProject) = 0;
virtual void getProject( ::Project& _return, const std::string& projectId) = 0;
@@ -67,7 +67,7 @@ class AiravataIfSingletonFactory : virtual public AiravataIfFactory {
class AiravataNull : virtual public AiravataIf {
public:
virtual ~AiravataNull() {}
- void GetAPIVersion(std::string& /* _return */) {
+ void getAPIVersion(std::string& /* _return */) {
return;
}
void createProject(std::string& /* _return */, const ::Project& /* project */) {
@@ -140,24 +140,24 @@ class AiravataNull : virtual public AiravataIf {
};
-class Airavata_GetAPIVersion_args {
+class Airavata_getAPIVersion_args {
public:
- Airavata_GetAPIVersion_args() {
+ Airavata_getAPIVersion_args() {
}
- virtual ~Airavata_GetAPIVersion_args() throw() {}
+ virtual ~Airavata_getAPIVersion_args() throw() {}
- bool operator == (const Airavata_GetAPIVersion_args & /* rhs */) const
+ bool operator == (const Airavata_getAPIVersion_args & /* rhs */) const
{
return true;
}
- bool operator != (const Airavata_GetAPIVersion_args &rhs) const {
+ bool operator != (const Airavata_getAPIVersion_args &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_GetAPIVersion_args & ) const;
+ bool operator < (const Airavata_getAPIVersion_args & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -165,69 +165,99 @@ class Airavata_GetAPIVersion_args {
};
-class Airavata_GetAPIVersion_pargs {
+class Airavata_getAPIVersion_pargs {
public:
- virtual ~Airavata_GetAPIVersion_pargs() throw() {}
+ virtual ~Airavata_getAPIVersion_pargs() throw() {}
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
};
-typedef struct _Airavata_GetAPIVersion_result__isset {
- _Airavata_GetAPIVersion_result__isset() : success(false) {}
+typedef struct _Airavata_getAPIVersion_result__isset {
+ _Airavata_getAPIVersion_result__isset() : success(false), ire(false), ace(false), ase(false) {}
bool success;
-} _Airavata_GetAPIVersion_result__isset;
+ bool ire;
+ bool ace;
+ bool ase;
+} _Airavata_getAPIVersion_result__isset;
-class Airavata_GetAPIVersion_result {
+class Airavata_getAPIVersion_result {
public:
- Airavata_GetAPIVersion_result() : success() {
+ Airavata_getAPIVersion_result() : success() {
}
- virtual ~Airavata_GetAPIVersion_result() throw() {}
+ virtual ~Airavata_getAPIVersion_result() throw() {}
std::string success;
+ ::airavata::api::error::InvalidRequestException ire;
+ ::airavata::api::error::AiravataClientException ace;
+ ::airavata::api::error::AiravataSystemException ase;
- _Airavata_GetAPIVersion_result__isset __isset;
+ _Airavata_getAPIVersion_result__isset __isset;
void __set_success(const std::string& val) {
success = val;
}
- bool operator == (const Airavata_GetAPIVersion_result & rhs) const
+ void __set_ire(const ::airavata::api::error::InvalidRequestException& val) {
+ ire = val;
+ }
+
+ void __set_ace(const ::airavata::api::error::AiravataClientException& val) {
+ ace = val;
+ }
+
+ void __set_ase(const ::airavata::api::error::AiravataSystemException& val) {
+ ase = val;
+ }
+
+ bool operator == (const Airavata_getAPIVersion_result & rhs) const
{
if (!(success == rhs.success))
return false;
+ if (!(ire == rhs.ire))
+ return false;
+ if (!(ace == rhs.ace))
+ return false;
+ if (!(ase == rhs.ase))
+ return false;
return true;
}
- bool operator != (const Airavata_GetAPIVersion_result &rhs) const {
+ bool operator != (const Airavata_getAPIVersion_result &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_GetAPIVersion_result & ) const;
+ bool operator < (const Airavata_getAPIVersion_result & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
};
-typedef struct _Airavata_GetAPIVersion_presult__isset {
- _Airavata_GetAPIVersion_presult__isset() : success(false) {}
+typedef struct _Airavata_getAPIVersion_presult__isset {
+ _Airavata_getAPIVersion_presult__isset() : success(false), ire(false), ace(false), ase(false) {}
bool success;
-} _Airavata_GetAPIVersion_presult__isset;
+ bool ire;
+ bool ace;
+ bool ase;
+} _Airavata_getAPIVersion_presult__isset;
-class Airavata_GetAPIVersion_presult {
+class Airavata_getAPIVersion_presult {
public:
- virtual ~Airavata_GetAPIVersion_presult() throw() {}
+ virtual ~Airavata_getAPIVersion_presult() throw() {}
std::string* success;
+ ::airavata::api::error::InvalidRequestException ire;
+ ::airavata::api::error::AiravataClientException ace;
+ ::airavata::api::error::AiravataSystemException ase;
- _Airavata_GetAPIVersion_presult__isset __isset;
+ _Airavata_getAPIVersion_presult__isset __isset;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
@@ -3130,9 +3160,9 @@ class AiravataClient : virtual public AiravataIf {
boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getOutputProtocol() {
return poprot_;
}
- void GetAPIVersion(std::string& _return);
- void send_GetAPIVersion();
- void recv_GetAPIVersion(std::string& _return);
+ void getAPIVersion(std::string& _return);
+ void send_getAPIVersion();
+ void recv_getAPIVersion(std::string& _return);
void createProject(std::string& _return, const ::Project& project);
void send_createProject(const ::Project& project);
void recv_createProject(std::string& _return);
@@ -3214,7 +3244,7 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor {
typedef void (AiravataProcessor::*ProcessFunction)(int32_t, ::apache::thrift::protocol::TProtocol*, ::apache::thrift::protocol::TProtocol*, void*);
typedef std::map<std::string, ProcessFunction> ProcessMap;
ProcessMap processMap_;
- void process_GetAPIVersion(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+ void process_getAPIVersion(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_createProject(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_updateProject(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_getProject(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
@@ -3240,7 +3270,7 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor {
public:
AiravataProcessor(boost::shared_ptr<AiravataIf> iface) :
iface_(iface) {
- processMap_["GetAPIVersion"] = &AiravataProcessor::process_GetAPIVersion;
+ processMap_["getAPIVersion"] = &AiravataProcessor::process_getAPIVersion;
processMap_["createProject"] = &AiravataProcessor::process_createProject;
processMap_["updateProject"] = &AiravataProcessor::process_updateProject;
processMap_["getProject"] = &AiravataProcessor::process_getProject;
@@ -3291,13 +3321,13 @@ class AiravataMultiface : virtual public AiravataIf {
ifaces_.push_back(iface);
}
public:
- void GetAPIVersion(std::string& _return) {
+ void getAPIVersion(std::string& _return) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
- ifaces_[i]->GetAPIVersion(_return);
+ ifaces_[i]->getAPIVersion(_return);
}
- ifaces_[i]->GetAPIVersion(_return);
+ ifaces_[i]->getAPIVersion(_return);
return;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/f06e75f4/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata_server.skeleton.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata_server.skeleton.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata_server.skeleton.cpp
index c19c034..c5f131d 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata_server.skeleton.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata_server.skeleton.cpp
@@ -22,9 +22,9 @@ class AiravataHandler : virtual public AiravataIf {
// Your initialization goes here
}
- void GetAPIVersion(std::string& _return) {
+ void getAPIVersion(std::string& _return) {
// Your implementation goes here
- printf("GetAPIVersion\n");
+ printf("getAPIVersion\n");
}
void createProject(std::string& _return, const ::Project& project) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/f06e75f4/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 fcb75a7..0dbe0b8 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
@@ -17,7 +17,7 @@ use Thrift\Exception\TApplicationException;
interface AiravataIf {
- public function GetAPIVersion();
+ public function getAPIVersion();
public function createProject(\Airavata\Model\Workspace\Project $project);
public function updateProject($projectId, \Airavata\Model\Workspace\Project $updatedProject);
public function getProject($projectId);
@@ -53,33 +53,33 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->output_ = $output ? $output : $input;
}
- public function GetAPIVersion()
+ public function getAPIVersion()
{
- $this->send_GetAPIVersion();
- return $this->recv_GetAPIVersion();
+ $this->send_getAPIVersion();
+ return $this->recv_getAPIVersion();
}
- public function send_GetAPIVersion()
+ public function send_getAPIVersion()
{
- $args = new \Airavata\API\Airavata_GetAPIVersion_args();
+ $args = new \Airavata\API\Airavata_getAPIVersion_args();
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'GetAPIVersion', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'getAPIVersion', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('GetAPIVersion', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('getAPIVersion', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_GetAPIVersion()
+ public function recv_getAPIVersion()
{
$bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
- if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_GetAPIVersion_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getAPIVersion_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -93,14 +93,23 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_GetAPIVersion_result();
+ $result = new \Airavata\API\Airavata_getAPIVersion_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
if ($result->success !== null) {
return $result->success;
}
- throw new \Exception("GetAPIVersion failed: unknown result");
+ if ($result->ire !== null) {
+ throw $result->ire;
+ }
+ if ($result->ace !== null) {
+ throw $result->ace;
+ }
+ if ($result->ase !== null) {
+ throw $result->ase;
+ }
+ throw new \Exception("getAPIVersion failed: unknown result");
}
public function createProject(\Airavata\Model\Workspace\Project $project)
@@ -1407,7 +1416,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
// HELPER FUNCTIONS AND STRUCTURES
-class Airavata_GetAPIVersion_args {
+class Airavata_getAPIVersion_args {
static $_TSPEC;
@@ -1419,7 +1428,7 @@ class Airavata_GetAPIVersion_args {
}
public function getName() {
- return 'Airavata_GetAPIVersion_args';
+ return 'Airavata_getAPIVersion_args';
}
public function read($input)
@@ -1449,7 +1458,7 @@ class Airavata_GetAPIVersion_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_GetAPIVersion_args');
+ $xfer += $output->writeStructBegin('Airavata_getAPIVersion_args');
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -1457,10 +1466,13 @@ class Airavata_GetAPIVersion_args {
}
-class Airavata_GetAPIVersion_result {
+class Airavata_getAPIVersion_result {
static $_TSPEC;
public $success = null;
+ public $ire = null;
+ public $ace = null;
+ public $ase = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -1469,17 +1481,41 @@ class Airavata_GetAPIVersion_result {
'var' => 'success',
'type' => TType::STRING,
),
+ 1 => array(
+ 'var' => 'ire',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\InvalidRequestException',
+ ),
+ 2 => array(
+ 'var' => 'ace',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AiravataClientException',
+ ),
+ 3 => array(
+ 'var' => 'ase',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AiravataSystemException',
+ ),
);
}
if (is_array($vals)) {
if (isset($vals['success'])) {
$this->success = $vals['success'];
}
+ if (isset($vals['ire'])) {
+ $this->ire = $vals['ire'];
+ }
+ if (isset($vals['ace'])) {
+ $this->ace = $vals['ace'];
+ }
+ if (isset($vals['ase'])) {
+ $this->ase = $vals['ase'];
+ }
}
}
public function getName() {
- return 'Airavata_GetAPIVersion_result';
+ return 'Airavata_getAPIVersion_result';
}
public function read($input)
@@ -1504,6 +1540,30 @@ class Airavata_GetAPIVersion_result {
$xfer += $input->skip($ftype);
}
break;
+ case 1:
+ if ($ftype == TType::STRUCT) {
+ $this->ire = new \Airavata\API\Error\InvalidRequestException();
+ $xfer += $this->ire->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRUCT) {
+ $this->ace = new \Airavata\API\Error\AiravataClientException();
+ $xfer += $this->ace->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRUCT) {
+ $this->ase = new \Airavata\API\Error\AiravataSystemException();
+ $xfer += $this->ase->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -1516,12 +1576,27 @@ class Airavata_GetAPIVersion_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_GetAPIVersion_result');
+ $xfer += $output->writeStructBegin('Airavata_getAPIVersion_result');
if ($this->success !== null) {
$xfer += $output->writeFieldBegin('success', TType::STRING, 0);
$xfer += $output->writeString($this->success);
$xfer += $output->writeFieldEnd();
}
+ if ($this->ire !== null) {
+ $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
+ $xfer += $this->ire->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ace !== null) {
+ $xfer += $output->writeFieldBegin('ace', TType::STRUCT, 2);
+ $xfer += $this->ace->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ase !== null) {
+ $xfer += $output->writeFieldBegin('ase', TType::STRUCT, 3);
+ $xfer += $this->ase->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata/blob/f06e75f4/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index 08fa6f6..38eae1d 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@ -57,7 +57,7 @@ public class CreateLaunchExperiment {
try {
AiravataUtils.setExecutionAsClient();
final Airavata.Client airavata = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
- System.out.println("API version is " + airavata.GetAPIVersion());
+ System.out.println("API version is " + airavata.getAPIVersion());
addDescriptors();
// final String expId = createExperimentForSSHHost(airavata);
http://git-wip-us.apache.org/repos/asf/airavata/blob/f06e75f4/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
index 7a512f2..691a66f 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
@@ -38,7 +38,7 @@ public class CreateLaunchExperimentUS3 {
try {
AiravataUtils.setExecutionAsClient();
final Airavata.Client airavata = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
- System.out.println("API version is " + airavata.GetAPIVersion());
+ System.out.println("API version is " + airavata.getAPIVersion());
// addDescriptors();
// final String expId = createExperimentForTrestles(airavata);
final String expId = createUS3ExperimentForTrestles(airavata);
http://git-wip-us.apache.org/repos/asf/airavata/blob/f06e75f4/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/airavataAPI.thrift b/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
index 5f1ffae..76359aa 100644
--- a/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
+++ b/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
@@ -59,7 +59,10 @@ service Airavata {
*/
/** Query Airavata to fetch the API version */
- string GetAPIVersion(),
+ string getAPIVersion()
+ throws (1: airavataErrors.InvalidRequestException ire,
+ 2: airavataErrors.AiravataClientException ace,
+ 3: airavataErrors.AiravataSystemException ase)
/**
* Create a Project