removed thrift generated client code from gfac-service module and move it to gfac-client module. Refactored module dependency of gfac
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/29cd57fd Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/29cd57fd Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/29cd57fd Branch: refs/heads/moduleRefactor Commit: 29cd57fdf1d5a707e398cc2db11c55f37c7b30e8 Parents: 30f9d70 Author: Shameera Rathanyaka <[email protected]> Authored: Thu Jun 4 11:45:37 2015 -0400 Committer: Shameera Rathanyaka <[email protected]> Committed: Thu Jun 4 11:45:37 2015 -0400 ---------------------------------------------------------------------- .../airavata-api/generate-thrift-files.sh | 2 +- .../gfac/generate-gfac-stubs.sh | 4 +- .../orchestrator/generate-orchestrator-stubs.sh | 2 +- .../apache/airavata/gfac/cpi/GfacService.java | 434 ++- .../gfac/cpi/gfac_cpi_serviceConstants.java | 3 +- modules/gfac/gfac-impl/pom.xml | 2 +- modules/gfac/gfac-service/pom.xml | 10 +- .../apache/airavata/gfac/cpi/GfacService.java | 3170 ------------------ .../gfac/cpi/gfac_cpi_serviceConstants.java | 55 - .../gfac/client/GfacClientFactoryTest.java | 15 - 10 files changed, 415 insertions(+), 3282 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/29cd57fd/component-interface-descriptions/airavata-api/generate-thrift-files.sh ---------------------------------------------------------------------- diff --git a/component-interface-descriptions/airavata-api/generate-thrift-files.sh b/component-interface-descriptions/airavata-api/generate-thrift-files.sh index a0951f9..30046c9 100755 --- a/component-interface-descriptions/airavata-api/generate-thrift-files.sh +++ b/component-interface-descriptions/airavata-api/generate-thrift-files.sh @@ -45,7 +45,7 @@ fi # Generation of thrift files will require installing Apache Thrift. Please add thrift to your path. # Verify is thrift is installed, is in the path is at a specified version. -REQUIRED_THRIFT_VERSION='0.9.1' +REQUIRED_THRIFT_VERSION='0.9.2' THRIFT_EXEC=/usr/local/bin/thrift VERSION=$($THRIFT_EXEC -version 2>/dev/null | grep -F "${REQUIRED_THRIFT_VERSION}" | wc -l) http://git-wip-us.apache.org/repos/asf/airavata/blob/29cd57fd/component-interface-descriptions/gfac/generate-gfac-stubs.sh ---------------------------------------------------------------------- diff --git a/component-interface-descriptions/gfac/generate-gfac-stubs.sh b/component-interface-descriptions/gfac/generate-gfac-stubs.sh index d34eaef..9e7483d 100755 --- a/component-interface-descriptions/gfac/generate-gfac-stubs.sh +++ b/component-interface-descriptions/gfac/generate-gfac-stubs.sh @@ -19,9 +19,9 @@ # Global Constants used across the script -REQUIRED_THRIFT_VERSION='0.9.1' +REQUIRED_THRIFT_VERSION='0.9.2' BASE_TARGET_DIR='target' -GFAC_SERVICE_DIR='../../modules/gfac/airavata-gfac-service/src/main/java/' +GFAC_SERVICE_DIR='../../modules/gfac/gfac-client/src/main/java/' # The Funcation fail prints error messages on failure and quits the script. fail() { http://git-wip-us.apache.org/repos/asf/airavata/blob/29cd57fd/component-interface-descriptions/orchestrator/generate-orchestrator-stubs.sh ---------------------------------------------------------------------- diff --git a/component-interface-descriptions/orchestrator/generate-orchestrator-stubs.sh b/component-interface-descriptions/orchestrator/generate-orchestrator-stubs.sh index df526d2..b4a4779 100755 --- a/component-interface-descriptions/orchestrator/generate-orchestrator-stubs.sh +++ b/component-interface-descriptions/orchestrator/generate-orchestrator-stubs.sh @@ -19,7 +19,7 @@ # Global Constants used across the script -REQUIRED_THRIFT_VERSION='0.9.1' +REQUIRED_THRIFT_VERSION='0.9.2' BASE_TARGET_DIR='target' ORCHESTRATOR_SERVICE_DIR='../../modules/orchestrator/orchestrator-client/src/main/java' http://git-wip-us.apache.org/repos/asf/airavata/blob/29cd57fd/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java b/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java index eb8ddf7..948bf8f 100644 --- a/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java +++ b/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java @@ -15,7 +15,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -45,9 +45,11 @@ import java.util.Collections; import java.util.BitSet; import java.nio.ByteBuffer; import java.util.Arrays; +import javax.annotation.Generated; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-3") @SuppressWarnings("all") public class GfacService { public interface Iface { @@ -73,8 +75,9 @@ import org.slf4j.LoggerFactory; * @param experimentId * @param taskId * @param gatewayId + * @param tokenId */ - public boolean submitJob(String experimentId, String taskId, String gatewayId) throws org.apache.thrift.TException; + public boolean submitJob(String experimentId, String taskId, String gatewayId, String tokenId) throws org.apache.thrift.TException; /** * * @@ -91,8 +94,10 @@ import org.slf4j.LoggerFactory; * * @param experimentId * @param taskId + * @param gatewayId + * @param tokenId */ - public boolean cancelJob(String experimentId, String taskId) throws org.apache.thrift.TException; + public boolean cancelJob(String experimentId, String taskId, String gatewayId, String tokenId) throws org.apache.thrift.TException; } @@ -100,9 +105,9 @@ import org.slf4j.LoggerFactory; public void getGFACServiceVersion(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void submitJob(String experimentId, String taskId, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void submitJob(String experimentId, String taskId, String gatewayId, String tokenId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void cancelJob(String experimentId, String taskId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void cancelJob(String experimentId, String taskId, String gatewayId, String tokenId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; } @@ -148,18 +153,19 @@ import org.slf4j.LoggerFactory; throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getGFACServiceVersion failed: unknown result"); } - public boolean submitJob(String experimentId, String taskId, String gatewayId) throws org.apache.thrift.TException + public boolean submitJob(String experimentId, String taskId, String gatewayId, String tokenId) throws org.apache.thrift.TException { - send_submitJob(experimentId, taskId, gatewayId); + send_submitJob(experimentId, taskId, gatewayId, tokenId); return recv_submitJob(); } - public void send_submitJob(String experimentId, String taskId, String gatewayId) throws org.apache.thrift.TException + public void send_submitJob(String experimentId, String taskId, String gatewayId, String tokenId) throws org.apache.thrift.TException { submitJob_args args = new submitJob_args(); args.setExperimentId(experimentId); args.setTaskId(taskId); args.setGatewayId(gatewayId); + args.setTokenId(tokenId); sendBase("submitJob", args); } @@ -173,17 +179,19 @@ import org.slf4j.LoggerFactory; throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "submitJob failed: unknown result"); } - public boolean cancelJob(String experimentId, String taskId) throws org.apache.thrift.TException + public boolean cancelJob(String experimentId, String taskId, String gatewayId, String tokenId) throws org.apache.thrift.TException { - send_cancelJob(experimentId, taskId); + send_cancelJob(experimentId, taskId, gatewayId, tokenId); return recv_cancelJob(); } - public void send_cancelJob(String experimentId, String taskId) throws org.apache.thrift.TException + public void send_cancelJob(String experimentId, String taskId, String gatewayId, String tokenId) throws org.apache.thrift.TException { cancelJob_args args = new cancelJob_args(); args.setExperimentId(experimentId); args.setTaskId(taskId); + args.setGatewayId(gatewayId); + args.setTokenId(tokenId); sendBase("cancelJob", args); } @@ -244,9 +252,9 @@ import org.slf4j.LoggerFactory; } } - public void submitJob(String experimentId, String taskId, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void submitJob(String experimentId, String taskId, String gatewayId, String tokenId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - submitJob_call method_call = new submitJob_call(experimentId, taskId, gatewayId, resultHandler, this, ___protocolFactory, ___transport); + submitJob_call method_call = new submitJob_call(experimentId, taskId, gatewayId, tokenId, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -255,11 +263,13 @@ import org.slf4j.LoggerFactory; private String experimentId; private String taskId; private String gatewayId; - public submitJob_call(String experimentId, String taskId, String gatewayId, 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 { + private String tokenId; + public submitJob_call(String experimentId, String taskId, String gatewayId, String tokenId, 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.experimentId = experimentId; this.taskId = taskId; this.gatewayId = gatewayId; + this.tokenId = tokenId; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -268,6 +278,7 @@ import org.slf4j.LoggerFactory; args.setExperimentId(experimentId); args.setTaskId(taskId); args.setGatewayId(gatewayId); + args.setTokenId(tokenId); args.write(prot); prot.writeMessageEnd(); } @@ -282,9 +293,9 @@ import org.slf4j.LoggerFactory; } } - public void cancelJob(String experimentId, String taskId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void cancelJob(String experimentId, String taskId, String gatewayId, String tokenId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - cancelJob_call method_call = new cancelJob_call(experimentId, taskId, resultHandler, this, ___protocolFactory, ___transport); + cancelJob_call method_call = new cancelJob_call(experimentId, taskId, gatewayId, tokenId, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -292,10 +303,14 @@ import org.slf4j.LoggerFactory; public static class cancelJob_call extends org.apache.thrift.async.TAsyncMethodCall { private String experimentId; private String taskId; - public cancelJob_call(String experimentId, String taskId, 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 { + private String gatewayId; + private String tokenId; + public cancelJob_call(String experimentId, String taskId, String gatewayId, String tokenId, 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.experimentId = experimentId; this.taskId = taskId; + this.gatewayId = gatewayId; + this.tokenId = tokenId; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -303,6 +318,8 @@ import org.slf4j.LoggerFactory; cancelJob_args args = new cancelJob_args(); args.setExperimentId(experimentId); args.setTaskId(taskId); + args.setGatewayId(gatewayId); + args.setTokenId(tokenId); args.write(prot); prot.writeMessageEnd(); } @@ -371,7 +388,7 @@ import org.slf4j.LoggerFactory; public submitJob_result getResult(I iface, submitJob_args args) throws org.apache.thrift.TException { submitJob_result result = new submitJob_result(); - result.success = iface.submitJob(args.experimentId, args.taskId, args.gatewayId); + result.success = iface.submitJob(args.experimentId, args.taskId, args.gatewayId, args.tokenId); result.setSuccessIsSet(true); return result; } @@ -392,7 +409,7 @@ import org.slf4j.LoggerFactory; public cancelJob_result getResult(I iface, cancelJob_args args) throws org.apache.thrift.TException { cancelJob_result result = new cancelJob_result(); - result.success = iface.cancelJob(args.experimentId, args.taskId); + result.success = iface.cancelJob(args.experimentId, args.taskId, args.gatewayId, args.tokenId); result.setSuccessIsSet(true); return result; } @@ -516,7 +533,7 @@ import org.slf4j.LoggerFactory; } public void start(I iface, submitJob_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.submitJob(args.experimentId, args.taskId, args.gatewayId,resultHandler); + iface.submitJob(args.experimentId, args.taskId, args.gatewayId, args.tokenId,resultHandler); } } @@ -568,7 +585,7 @@ import org.slf4j.LoggerFactory; } public void start(I iface, cancelJob_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.cancelJob(args.experimentId, args.taskId,resultHandler); + iface.cancelJob(args.experimentId, args.taskId, args.gatewayId, args.tokenId,resultHandler); } } @@ -704,7 +721,9 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + return list.hashCode(); } @Override @@ -1015,7 +1034,14 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_success = true && (isSetSuccess()); + list.add(present_success); + if (present_success) + list.add(success); + + return list.hashCode(); } @Override @@ -1180,6 +1206,7 @@ import org.slf4j.LoggerFactory; private static final org.apache.thrift.protocol.TField EXPERIMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentId", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField TASK_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("taskId", org.apache.thrift.protocol.TType.STRING, (short)2); private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField TOKEN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("tokenId", org.apache.thrift.protocol.TType.STRING, (short)4); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -1190,12 +1217,14 @@ import org.slf4j.LoggerFactory; public String experimentId; // required public String taskId; // required public String gatewayId; // required + public String tokenId; // 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 { EXPERIMENT_ID((short)1, "experimentId"), TASK_ID((short)2, "taskId"), - GATEWAY_ID((short)3, "gatewayId"); + GATEWAY_ID((short)3, "gatewayId"), + TOKEN_ID((short)4, "tokenId"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -1216,6 +1245,8 @@ import org.slf4j.LoggerFactory; return TASK_ID; case 3: // GATEWAY_ID return GATEWAY_ID; + case 4: // TOKEN_ID + return TOKEN_ID; default: return null; } @@ -1265,6 +1296,8 @@ import org.slf4j.LoggerFactory; new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN_ID, new org.apache.thrift.meta_data.FieldMetaData("tokenId", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(submitJob_args.class, metaDataMap); } @@ -1275,12 +1308,14 @@ import org.slf4j.LoggerFactory; public submitJob_args( String experimentId, String taskId, - String gatewayId) + String gatewayId, + String tokenId) { this(); this.experimentId = experimentId; this.taskId = taskId; this.gatewayId = gatewayId; + this.tokenId = tokenId; } /** @@ -1296,6 +1331,9 @@ import org.slf4j.LoggerFactory; if (other.isSetGatewayId()) { this.gatewayId = other.gatewayId; } + if (other.isSetTokenId()) { + this.tokenId = other.tokenId; + } } public submitJob_args deepCopy() { @@ -1307,6 +1345,7 @@ import org.slf4j.LoggerFactory; this.experimentId = null; this.taskId = null; this.gatewayId = null; + this.tokenId = null; } public String getExperimentId() { @@ -1381,6 +1420,30 @@ import org.slf4j.LoggerFactory; } } + public String getTokenId() { + return this.tokenId; + } + + public submitJob_args setTokenId(String tokenId) { + this.tokenId = tokenId; + return this; + } + + public void unsetTokenId() { + this.tokenId = null; + } + + /** Returns true if field tokenId is set (has been assigned a value) and false otherwise */ + public boolean isSetTokenId() { + return this.tokenId != null; + } + + public void setTokenIdIsSet(boolean value) { + if (!value) { + this.tokenId = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case EXPERIMENT_ID: @@ -1407,6 +1470,14 @@ import org.slf4j.LoggerFactory; } break; + case TOKEN_ID: + if (value == null) { + unsetTokenId(); + } else { + setTokenId((String)value); + } + break; + } } @@ -1421,6 +1492,9 @@ import org.slf4j.LoggerFactory; case GATEWAY_ID: return getGatewayId(); + case TOKEN_ID: + return getTokenId(); + } throw new IllegalStateException(); } @@ -1438,6 +1512,8 @@ import org.slf4j.LoggerFactory; return isSetTaskId(); case GATEWAY_ID: return isSetGatewayId(); + case TOKEN_ID: + return isSetTokenId(); } throw new IllegalStateException(); } @@ -1482,12 +1558,43 @@ import org.slf4j.LoggerFactory; return false; } + boolean this_present_tokenId = true && this.isSetTokenId(); + boolean that_present_tokenId = true && that.isSetTokenId(); + if (this_present_tokenId || that_present_tokenId) { + if (!(this_present_tokenId && that_present_tokenId)) + return false; + if (!this.tokenId.equals(that.tokenId)) + return false; + } + return true; } @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_experimentId = true && (isSetExperimentId()); + list.add(present_experimentId); + if (present_experimentId) + list.add(experimentId); + + boolean present_taskId = true && (isSetTaskId()); + list.add(present_taskId); + if (present_taskId) + list.add(taskId); + + boolean present_gatewayId = true && (isSetGatewayId()); + list.add(present_gatewayId); + if (present_gatewayId) + list.add(gatewayId); + + boolean present_tokenId = true && (isSetTokenId()); + list.add(present_tokenId); + if (present_tokenId) + list.add(tokenId); + + return list.hashCode(); } @Override @@ -1528,6 +1635,16 @@ import org.slf4j.LoggerFactory; return lastComparison; } } + lastComparison = Boolean.valueOf(isSetTokenId()).compareTo(other.isSetTokenId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetTokenId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tokenId, other.tokenId); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -1571,6 +1688,14 @@ import org.slf4j.LoggerFactory; sb.append(this.gatewayId); } first = false; + if (!first) sb.append(", "); + sb.append("tokenId:"); + if (this.tokenId == null) { + sb.append("null"); + } else { + sb.append(this.tokenId); + } + first = false; sb.append(")"); return sb.toString(); } @@ -1586,6 +1711,9 @@ import org.slf4j.LoggerFactory; if (gatewayId == null) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' was not present! Struct: " + toString()); } + if (tokenId == null) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'tokenId' was not present! Struct: " + toString()); + } // check for sub-struct validity } @@ -1647,6 +1775,14 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 4: // TOKEN_ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.tokenId = iprot.readString(); + struct.setTokenIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1677,6 +1813,11 @@ import org.slf4j.LoggerFactory; oprot.writeString(struct.gatewayId); oprot.writeFieldEnd(); } + if (struct.tokenId != null) { + oprot.writeFieldBegin(TOKEN_ID_FIELD_DESC); + oprot.writeString(struct.tokenId); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -1697,6 +1838,7 @@ import org.slf4j.LoggerFactory; oprot.writeString(struct.experimentId); oprot.writeString(struct.taskId); oprot.writeString(struct.gatewayId); + oprot.writeString(struct.tokenId); } @Override @@ -1708,6 +1850,8 @@ import org.slf4j.LoggerFactory; struct.setTaskIdIsSet(true); struct.gatewayId = iprot.readString(); struct.setGatewayIdIsSet(true); + struct.tokenId = iprot.readString(); + struct.setTokenIdIsSet(true); } } @@ -1910,7 +2054,14 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_success = true; + list.add(present_success); + if (present_success) + list.add(success); + + return list.hashCode(); } @Override @@ -2072,6 +2223,8 @@ import org.slf4j.LoggerFactory; private static final org.apache.thrift.protocol.TField EXPERIMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentId", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField TASK_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("taskId", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField TOKEN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("tokenId", org.apache.thrift.protocol.TType.STRING, (short)4); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -2081,11 +2234,15 @@ import org.slf4j.LoggerFactory; public String experimentId; // required public String taskId; // required + public String gatewayId; // required + public String tokenId; // 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 { EXPERIMENT_ID((short)1, "experimentId"), - TASK_ID((short)2, "taskId"); + TASK_ID((short)2, "taskId"), + GATEWAY_ID((short)3, "gatewayId"), + TOKEN_ID((short)4, "tokenId"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -2104,6 +2261,10 @@ import org.slf4j.LoggerFactory; return EXPERIMENT_ID; case 2: // TASK_ID return TASK_ID; + case 3: // GATEWAY_ID + return GATEWAY_ID; + case 4: // TOKEN_ID + return TOKEN_ID; default: return null; } @@ -2151,6 +2312,10 @@ import org.slf4j.LoggerFactory; new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.TASK_ID, new org.apache.thrift.meta_data.FieldMetaData("taskId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN_ID, new org.apache.thrift.meta_data.FieldMetaData("tokenId", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(cancelJob_args.class, metaDataMap); } @@ -2160,11 +2325,15 @@ import org.slf4j.LoggerFactory; public cancelJob_args( String experimentId, - String taskId) + String taskId, + String gatewayId, + String tokenId) { this(); this.experimentId = experimentId; this.taskId = taskId; + this.gatewayId = gatewayId; + this.tokenId = tokenId; } /** @@ -2177,6 +2346,12 @@ import org.slf4j.LoggerFactory; if (other.isSetTaskId()) { this.taskId = other.taskId; } + if (other.isSetGatewayId()) { + this.gatewayId = other.gatewayId; + } + if (other.isSetTokenId()) { + this.tokenId = other.tokenId; + } } public cancelJob_args deepCopy() { @@ -2187,6 +2362,8 @@ import org.slf4j.LoggerFactory; public void clear() { this.experimentId = null; this.taskId = null; + this.gatewayId = null; + this.tokenId = null; } public String getExperimentId() { @@ -2237,6 +2414,54 @@ import org.slf4j.LoggerFactory; } } + public String getGatewayId() { + return this.gatewayId; + } + + public cancelJob_args setGatewayId(String gatewayId) { + this.gatewayId = gatewayId; + return this; + } + + public void unsetGatewayId() { + this.gatewayId = null; + } + + /** Returns true if field gatewayId is set (has been assigned a value) and false otherwise */ + public boolean isSetGatewayId() { + return this.gatewayId != null; + } + + public void setGatewayIdIsSet(boolean value) { + if (!value) { + this.gatewayId = null; + } + } + + public String getTokenId() { + return this.tokenId; + } + + public cancelJob_args setTokenId(String tokenId) { + this.tokenId = tokenId; + return this; + } + + public void unsetTokenId() { + this.tokenId = null; + } + + /** Returns true if field tokenId is set (has been assigned a value) and false otherwise */ + public boolean isSetTokenId() { + return this.tokenId != null; + } + + public void setTokenIdIsSet(boolean value) { + if (!value) { + this.tokenId = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case EXPERIMENT_ID: @@ -2255,6 +2480,22 @@ import org.slf4j.LoggerFactory; } break; + case GATEWAY_ID: + if (value == null) { + unsetGatewayId(); + } else { + setGatewayId((String)value); + } + break; + + case TOKEN_ID: + if (value == null) { + unsetTokenId(); + } else { + setTokenId((String)value); + } + break; + } } @@ -2266,6 +2507,12 @@ import org.slf4j.LoggerFactory; case TASK_ID: return getTaskId(); + case GATEWAY_ID: + return getGatewayId(); + + case TOKEN_ID: + return getTokenId(); + } throw new IllegalStateException(); } @@ -2281,6 +2528,10 @@ import org.slf4j.LoggerFactory; return isSetExperimentId(); case TASK_ID: return isSetTaskId(); + case GATEWAY_ID: + return isSetGatewayId(); + case TOKEN_ID: + return isSetTokenId(); } throw new IllegalStateException(); } @@ -2316,12 +2567,52 @@ import org.slf4j.LoggerFactory; return false; } + boolean this_present_gatewayId = true && this.isSetGatewayId(); + boolean that_present_gatewayId = true && that.isSetGatewayId(); + if (this_present_gatewayId || that_present_gatewayId) { + if (!(this_present_gatewayId && that_present_gatewayId)) + return false; + if (!this.gatewayId.equals(that.gatewayId)) + return false; + } + + boolean this_present_tokenId = true && this.isSetTokenId(); + boolean that_present_tokenId = true && that.isSetTokenId(); + if (this_present_tokenId || that_present_tokenId) { + if (!(this_present_tokenId && that_present_tokenId)) + return false; + if (!this.tokenId.equals(that.tokenId)) + return false; + } + return true; } @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_experimentId = true && (isSetExperimentId()); + list.add(present_experimentId); + if (present_experimentId) + list.add(experimentId); + + boolean present_taskId = true && (isSetTaskId()); + list.add(present_taskId); + if (present_taskId) + list.add(taskId); + + boolean present_gatewayId = true && (isSetGatewayId()); + list.add(present_gatewayId); + if (present_gatewayId) + list.add(gatewayId); + + boolean present_tokenId = true && (isSetTokenId()); + list.add(present_tokenId); + if (present_tokenId) + list.add(tokenId); + + return list.hashCode(); } @Override @@ -2352,6 +2643,26 @@ import org.slf4j.LoggerFactory; return lastComparison; } } + lastComparison = Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetGatewayId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayId, other.gatewayId); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetTokenId()).compareTo(other.isSetTokenId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetTokenId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tokenId, other.tokenId); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -2387,6 +2698,22 @@ import org.slf4j.LoggerFactory; sb.append(this.taskId); } first = false; + if (!first) sb.append(", "); + sb.append("gatewayId:"); + if (this.gatewayId == null) { + sb.append("null"); + } else { + sb.append(this.gatewayId); + } + first = false; + if (!first) sb.append(", "); + sb.append("tokenId:"); + if (this.tokenId == null) { + sb.append("null"); + } else { + sb.append(this.tokenId); + } + first = false; sb.append(")"); return sb.toString(); } @@ -2399,6 +2726,12 @@ import org.slf4j.LoggerFactory; if (taskId == null) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'taskId' was not present! Struct: " + toString()); } + if (gatewayId == null) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' was not present! Struct: " + toString()); + } + if (tokenId == null) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'tokenId' was not present! Struct: " + toString()); + } // check for sub-struct validity } @@ -2452,6 +2785,22 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 3: // GATEWAY_ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.gatewayId = iprot.readString(); + struct.setGatewayIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // TOKEN_ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.tokenId = iprot.readString(); + struct.setTokenIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -2477,6 +2826,16 @@ import org.slf4j.LoggerFactory; oprot.writeString(struct.taskId); oprot.writeFieldEnd(); } + if (struct.gatewayId != null) { + oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC); + oprot.writeString(struct.gatewayId); + oprot.writeFieldEnd(); + } + if (struct.tokenId != null) { + oprot.writeFieldBegin(TOKEN_ID_FIELD_DESC); + oprot.writeString(struct.tokenId); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -2496,6 +2855,8 @@ import org.slf4j.LoggerFactory; TTupleProtocol oprot = (TTupleProtocol) prot; oprot.writeString(struct.experimentId); oprot.writeString(struct.taskId); + oprot.writeString(struct.gatewayId); + oprot.writeString(struct.tokenId); } @Override @@ -2505,6 +2866,10 @@ import org.slf4j.LoggerFactory; struct.setExperimentIdIsSet(true); struct.taskId = iprot.readString(); struct.setTaskIdIsSet(true); + struct.gatewayId = iprot.readString(); + struct.setGatewayIdIsSet(true); + struct.tokenId = iprot.readString(); + struct.setTokenIdIsSet(true); } } @@ -2707,7 +3072,14 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_success = true; + list.add(present_success); + if (present_success) + list.add(success); + + return list.hashCode(); } @Override http://git-wip-us.apache.org/repos/asf/airavata/blob/29cd57fd/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/gfac_cpi_serviceConstants.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/gfac_cpi_serviceConstants.java b/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/gfac_cpi_serviceConstants.java index 14fd7fe..9cf65c6 100644 --- a/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/gfac_cpi_serviceConstants.java +++ b/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/gfac_cpi_serviceConstants.java @@ -15,7 +15,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -45,6 +45,7 @@ import java.util.Collections; import java.util.BitSet; import java.nio.ByteBuffer; import java.util.Arrays; +import javax.annotation.Generated; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/airavata/blob/29cd57fd/modules/gfac/gfac-impl/pom.xml ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/pom.xml b/modules/gfac/gfac-impl/pom.xml index 4733253..0326782 100644 --- a/modules/gfac/gfac-impl/pom.xml +++ b/modules/gfac/gfac-impl/pom.xml @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>gfac-impl</artifactId> - <name>Airavata GFac Local implementation</name> + <name>Airavata GFac Implementation</name> <description>This is the extension of GFAC Local.</description> <url>http://airavata.apache.org/</url> http://git-wip-us.apache.org/repos/asf/airavata/blob/29cd57fd/modules/gfac/gfac-service/pom.xml ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-service/pom.xml b/modules/gfac/gfac-service/pom.xml index b911385..fefc8cd 100644 --- a/modules/gfac/gfac-service/pom.xml +++ b/modules/gfac/gfac-service/pom.xml @@ -57,6 +57,11 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> + <artifactId>gfac-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.airavata</groupId> <artifactId>gfac-core</artifactId> <version>${project.version}</version> </dependency> @@ -75,11 +80,6 @@ <artifactId>airavata-api-stubs</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>gfac-client</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-server-configuration</artifactId>
