http://git-wip-us.apache.org/repos/asf/airavata/blob/a3cef493/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 132c420..acd303a 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 @@ -992,8 +992,8 @@ import org.slf4j.LoggerFactory; /** * Update the given Local data movement details * - * @param jobSubmissionInterfaceId - * The identifier of the JobSubmission Interface to be updated. + * @param dataMovementInterfaceId + * The identifier of the data movement Interface to be updated. * * @param localDataMovement * The LOCALDataMovement object to be updated. @@ -1002,10 +1002,10 @@ import org.slf4j.LoggerFactory; * Returns a success/failure of the update. * * - * @param jobSubmissionInterfaceId + * @param dataMovementInterfaceId * @param localDataMovement */ - public boolean updateLocalDataMovementDetails(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException; + public boolean updateLocalDataMovementDetails(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException; /** * * This method returns local datamovement object @@ -1045,8 +1045,8 @@ import org.slf4j.LoggerFactory; * Update the given scp data movement details * App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces. * - * @param jobSubmissionInterfaceId - * The identifier of the JobSubmission Interface to be updated. + * @param dataMovementInterfaceId + * The identifier of the data movement Interface to be updated. * * @param scpDataMovement * The SCPDataMovement object to be updated. @@ -1055,10 +1055,10 @@ import org.slf4j.LoggerFactory; * Returns a success/failure of the update. * * - * @param jobSubmissionInterfaceId + * @param dataMovementInterfaceId * @param scpDataMovement */ - public boolean updateSCPDataMovementDetails(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException; + public boolean updateSCPDataMovementDetails(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException; /** * * This method returns SCP datamovement object @@ -1098,8 +1098,8 @@ import org.slf4j.LoggerFactory; * Update the given GridFTP data movement details to a compute resource * App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces. * - * @param jobSubmissionInterfaceId - * The identifier of the JobSubmission Interface to be updated. + * @param dataMovementInterfaceId + * The identifier of the data movement Interface to be updated. * * @param gridFTPDataMovement * The GridFTPDataMovement object to be updated. @@ -1108,10 +1108,10 @@ import org.slf4j.LoggerFactory; * Returns a success/failure of the updation. * * - * @param jobSubmissionInterfaceId + * @param dataMovementInterfaceId * @param gridFTPDataMovement */ - public boolean updateGridFTPDataMovementDetails(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException; + public boolean updateGridFTPDataMovementDetails(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException; /** * * This method returns GridFTP datamovement object @@ -1198,9 +1198,10 @@ import org.slf4j.LoggerFactory; * Returns a success/failure of the deletion. * * + * @param computeResourceId * @param jobSubmissionInterfaceId */ - public boolean deleteJobSubmissionInterface(String jobSubmissionInterfaceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException; + public boolean deleteJobSubmissionInterface(String computeResourceId, String jobSubmissionInterfaceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException; /** * Delete a given data movement interface @@ -1212,9 +1213,10 @@ import org.slf4j.LoggerFactory; * Returns a success/failure of the deletion. * * + * @param computeResourceId * @param dataMovementInterfaceId */ - public boolean deleteDataMovementInterface(String dataMovementInterfaceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException; + public boolean deleteDataMovementInterface(String computeResourceId, String dataMovementInterfaceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException; public String registerResourceJobManager(org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager resourceJobManager) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException; @@ -1511,19 +1513,19 @@ import org.slf4j.LoggerFactory; public void addLocalDataMovementDetails(String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void updateLocalDataMovementDetails(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void updateLocalDataMovementDetails(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void getLocalDataMovement(String dataMovementId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void addSCPDataMovementDetails(String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void updateSCPDataMovementDetails(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void updateSCPDataMovementDetails(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void getSCPDataMovement(String dataMovementId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void addGridFTPDataMovementDetails(String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void updateGridFTPDataMovementDetails(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void updateGridFTPDataMovementDetails(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void getGridFTPDataMovement(String dataMovementId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -1535,9 +1537,9 @@ import org.slf4j.LoggerFactory; public void changeDataMovementPriorities(Map<String,Integer> dataMovementPriorityMap, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void deleteJobSubmissionInterface(String jobSubmissionInterfaceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void deleteJobSubmissionInterface(String computeResourceId, String jobSubmissionInterfaceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void deleteDataMovementInterface(String dataMovementInterfaceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void deleteDataMovementInterface(String computeResourceId, String dataMovementInterfaceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void registerResourceJobManager(org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager resourceJobManager, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -3639,16 +3641,16 @@ import org.slf4j.LoggerFactory; throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "addLocalDataMovementDetails failed: unknown result"); } - public boolean updateLocalDataMovementDetails(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException + public boolean updateLocalDataMovementDetails(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException { - send_updateLocalDataMovementDetails(jobSubmissionInterfaceId, localDataMovement); + send_updateLocalDataMovementDetails(dataMovementInterfaceId, localDataMovement); return recv_updateLocalDataMovementDetails(); } - public void send_updateLocalDataMovementDetails(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement) throws org.apache.thrift.TException + public void send_updateLocalDataMovementDetails(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement) throws org.apache.thrift.TException { updateLocalDataMovementDetails_args args = new updateLocalDataMovementDetails_args(); - args.setJobSubmissionInterfaceId(jobSubmissionInterfaceId); + args.setDataMovementInterfaceId(dataMovementInterfaceId); args.setLocalDataMovement(localDataMovement); sendBase("updateLocalDataMovementDetails", args); } @@ -3738,16 +3740,16 @@ import org.slf4j.LoggerFactory; throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "addSCPDataMovementDetails failed: unknown result"); } - public boolean updateSCPDataMovementDetails(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException + public boolean updateSCPDataMovementDetails(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException { - send_updateSCPDataMovementDetails(jobSubmissionInterfaceId, scpDataMovement); + send_updateSCPDataMovementDetails(dataMovementInterfaceId, scpDataMovement); return recv_updateSCPDataMovementDetails(); } - public void send_updateSCPDataMovementDetails(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement) throws org.apache.thrift.TException + public void send_updateSCPDataMovementDetails(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement) throws org.apache.thrift.TException { updateSCPDataMovementDetails_args args = new updateSCPDataMovementDetails_args(); - args.setJobSubmissionInterfaceId(jobSubmissionInterfaceId); + args.setDataMovementInterfaceId(dataMovementInterfaceId); args.setScpDataMovement(scpDataMovement); sendBase("updateSCPDataMovementDetails", args); } @@ -3837,16 +3839,16 @@ import org.slf4j.LoggerFactory; throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "addGridFTPDataMovementDetails failed: unknown result"); } - public boolean updateGridFTPDataMovementDetails(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException + public boolean updateGridFTPDataMovementDetails(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException { - send_updateGridFTPDataMovementDetails(jobSubmissionInterfaceId, gridFTPDataMovement); + send_updateGridFTPDataMovementDetails(dataMovementInterfaceId, gridFTPDataMovement); return recv_updateGridFTPDataMovementDetails(); } - public void send_updateGridFTPDataMovementDetails(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement) throws org.apache.thrift.TException + public void send_updateGridFTPDataMovementDetails(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement) throws org.apache.thrift.TException { updateGridFTPDataMovementDetails_args args = new updateGridFTPDataMovementDetails_args(); - args.setJobSubmissionInterfaceId(jobSubmissionInterfaceId); + args.setDataMovementInterfaceId(dataMovementInterfaceId); args.setGridFTPDataMovement(gridFTPDataMovement); sendBase("updateGridFTPDataMovementDetails", args); } @@ -4032,15 +4034,16 @@ import org.slf4j.LoggerFactory; throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "changeDataMovementPriorities failed: unknown result"); } - public boolean deleteJobSubmissionInterface(String jobSubmissionInterfaceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException + public boolean deleteJobSubmissionInterface(String computeResourceId, String jobSubmissionInterfaceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException { - send_deleteJobSubmissionInterface(jobSubmissionInterfaceId); + send_deleteJobSubmissionInterface(computeResourceId, jobSubmissionInterfaceId); return recv_deleteJobSubmissionInterface(); } - public void send_deleteJobSubmissionInterface(String jobSubmissionInterfaceId) throws org.apache.thrift.TException + public void send_deleteJobSubmissionInterface(String computeResourceId, String jobSubmissionInterfaceId) throws org.apache.thrift.TException { deleteJobSubmissionInterface_args args = new deleteJobSubmissionInterface_args(); + args.setComputeResourceId(computeResourceId); args.setJobSubmissionInterfaceId(jobSubmissionInterfaceId); sendBase("deleteJobSubmissionInterface", args); } @@ -4064,15 +4067,16 @@ import org.slf4j.LoggerFactory; throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteJobSubmissionInterface failed: unknown result"); } - public boolean deleteDataMovementInterface(String dataMovementInterfaceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException + public boolean deleteDataMovementInterface(String computeResourceId, String dataMovementInterfaceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException { - send_deleteDataMovementInterface(dataMovementInterfaceId); + send_deleteDataMovementInterface(computeResourceId, dataMovementInterfaceId); return recv_deleteDataMovementInterface(); } - public void send_deleteDataMovementInterface(String dataMovementInterfaceId) throws org.apache.thrift.TException + public void send_deleteDataMovementInterface(String computeResourceId, String dataMovementInterfaceId) throws org.apache.thrift.TException { deleteDataMovementInterface_args args = new deleteDataMovementInterface_args(); + args.setComputeResourceId(computeResourceId); args.setDataMovementInterfaceId(dataMovementInterfaceId); sendBase("deleteDataMovementInterface", args); } @@ -6635,26 +6639,26 @@ import org.slf4j.LoggerFactory; } } - public void updateLocalDataMovementDetails(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void updateLocalDataMovementDetails(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - updateLocalDataMovementDetails_call method_call = new updateLocalDataMovementDetails_call(jobSubmissionInterfaceId, localDataMovement, resultHandler, this, ___protocolFactory, ___transport); + updateLocalDataMovementDetails_call method_call = new updateLocalDataMovementDetails_call(dataMovementInterfaceId, localDataMovement, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class updateLocalDataMovementDetails_call extends org.apache.thrift.async.TAsyncMethodCall { - private String jobSubmissionInterfaceId; + private String dataMovementInterfaceId; private org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement; - public updateLocalDataMovementDetails_call(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement, 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 updateLocalDataMovementDetails_call(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement, 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.jobSubmissionInterfaceId = jobSubmissionInterfaceId; + this.dataMovementInterfaceId = dataMovementInterfaceId; this.localDataMovement = localDataMovement; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("updateLocalDataMovementDetails", org.apache.thrift.protocol.TMessageType.CALL, 0)); updateLocalDataMovementDetails_args args = new updateLocalDataMovementDetails_args(); - args.setJobSubmissionInterfaceId(jobSubmissionInterfaceId); + args.setDataMovementInterfaceId(dataMovementInterfaceId); args.setLocalDataMovement(localDataMovement); args.write(prot); prot.writeMessageEnd(); @@ -6740,26 +6744,26 @@ import org.slf4j.LoggerFactory; } } - public void updateSCPDataMovementDetails(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void updateSCPDataMovementDetails(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - updateSCPDataMovementDetails_call method_call = new updateSCPDataMovementDetails_call(jobSubmissionInterfaceId, scpDataMovement, resultHandler, this, ___protocolFactory, ___transport); + updateSCPDataMovementDetails_call method_call = new updateSCPDataMovementDetails_call(dataMovementInterfaceId, scpDataMovement, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class updateSCPDataMovementDetails_call extends org.apache.thrift.async.TAsyncMethodCall { - private String jobSubmissionInterfaceId; + private String dataMovementInterfaceId; private org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement; - public updateSCPDataMovementDetails_call(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement, 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 updateSCPDataMovementDetails_call(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement, 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.jobSubmissionInterfaceId = jobSubmissionInterfaceId; + this.dataMovementInterfaceId = dataMovementInterfaceId; this.scpDataMovement = scpDataMovement; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("updateSCPDataMovementDetails", org.apache.thrift.protocol.TMessageType.CALL, 0)); updateSCPDataMovementDetails_args args = new updateSCPDataMovementDetails_args(); - args.setJobSubmissionInterfaceId(jobSubmissionInterfaceId); + args.setDataMovementInterfaceId(dataMovementInterfaceId); args.setScpDataMovement(scpDataMovement); args.write(prot); prot.writeMessageEnd(); @@ -6845,26 +6849,26 @@ import org.slf4j.LoggerFactory; } } - public void updateGridFTPDataMovementDetails(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void updateGridFTPDataMovementDetails(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - updateGridFTPDataMovementDetails_call method_call = new updateGridFTPDataMovementDetails_call(jobSubmissionInterfaceId, gridFTPDataMovement, resultHandler, this, ___protocolFactory, ___transport); + updateGridFTPDataMovementDetails_call method_call = new updateGridFTPDataMovementDetails_call(dataMovementInterfaceId, gridFTPDataMovement, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class updateGridFTPDataMovementDetails_call extends org.apache.thrift.async.TAsyncMethodCall { - private String jobSubmissionInterfaceId; + private String dataMovementInterfaceId; private org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement; - public updateGridFTPDataMovementDetails_call(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement, 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 updateGridFTPDataMovementDetails_call(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement, 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.jobSubmissionInterfaceId = jobSubmissionInterfaceId; + this.dataMovementInterfaceId = dataMovementInterfaceId; this.gridFTPDataMovement = gridFTPDataMovement; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("updateGridFTPDataMovementDetails", org.apache.thrift.protocol.TMessageType.CALL, 0)); updateGridFTPDataMovementDetails_args args = new updateGridFTPDataMovementDetails_args(); - args.setJobSubmissionInterfaceId(jobSubmissionInterfaceId); + args.setDataMovementInterfaceId(dataMovementInterfaceId); args.setGridFTPDataMovement(gridFTPDataMovement); args.write(prot); prot.writeMessageEnd(); @@ -7046,23 +7050,26 @@ import org.slf4j.LoggerFactory; } } - public void deleteJobSubmissionInterface(String jobSubmissionInterfaceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void deleteJobSubmissionInterface(String computeResourceId, String jobSubmissionInterfaceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - deleteJobSubmissionInterface_call method_call = new deleteJobSubmissionInterface_call(jobSubmissionInterfaceId, resultHandler, this, ___protocolFactory, ___transport); + deleteJobSubmissionInterface_call method_call = new deleteJobSubmissionInterface_call(computeResourceId, jobSubmissionInterfaceId, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class deleteJobSubmissionInterface_call extends org.apache.thrift.async.TAsyncMethodCall { + private String computeResourceId; private String jobSubmissionInterfaceId; - public deleteJobSubmissionInterface_call(String jobSubmissionInterfaceId, 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 deleteJobSubmissionInterface_call(String computeResourceId, String jobSubmissionInterfaceId, 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.computeResourceId = computeResourceId; this.jobSubmissionInterfaceId = jobSubmissionInterfaceId; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteJobSubmissionInterface", org.apache.thrift.protocol.TMessageType.CALL, 0)); deleteJobSubmissionInterface_args args = new deleteJobSubmissionInterface_args(); + args.setComputeResourceId(computeResourceId); args.setJobSubmissionInterfaceId(jobSubmissionInterfaceId); args.write(prot); prot.writeMessageEnd(); @@ -7078,23 +7085,26 @@ import org.slf4j.LoggerFactory; } } - public void deleteDataMovementInterface(String dataMovementInterfaceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void deleteDataMovementInterface(String computeResourceId, String dataMovementInterfaceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - deleteDataMovementInterface_call method_call = new deleteDataMovementInterface_call(dataMovementInterfaceId, resultHandler, this, ___protocolFactory, ___transport); + deleteDataMovementInterface_call method_call = new deleteDataMovementInterface_call(computeResourceId, dataMovementInterfaceId, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class deleteDataMovementInterface_call extends org.apache.thrift.async.TAsyncMethodCall { + private String computeResourceId; private String dataMovementInterfaceId; - public deleteDataMovementInterface_call(String dataMovementInterfaceId, 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 deleteDataMovementInterface_call(String computeResourceId, String dataMovementInterfaceId, 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.computeResourceId = computeResourceId; this.dataMovementInterfaceId = dataMovementInterfaceId; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteDataMovementInterface", org.apache.thrift.protocol.TMessageType.CALL, 0)); deleteDataMovementInterface_args args = new deleteDataMovementInterface_args(); + args.setComputeResourceId(computeResourceId); args.setDataMovementInterfaceId(dataMovementInterfaceId); args.write(prot); prot.writeMessageEnd(); @@ -9462,7 +9472,7 @@ import org.slf4j.LoggerFactory; public updateLocalDataMovementDetails_result getResult(I iface, updateLocalDataMovementDetails_args args) throws org.apache.thrift.TException { updateLocalDataMovementDetails_result result = new updateLocalDataMovementDetails_result(); try { - result.success = iface.updateLocalDataMovementDetails(args.jobSubmissionInterfaceId, args.localDataMovement); + result.success = iface.updateLocalDataMovementDetails(args.dataMovementInterfaceId, args.localDataMovement); result.setSuccessIsSet(true); } catch (org.apache.airavata.model.error.InvalidRequestException ire) { result.ire = ire; @@ -9547,7 +9557,7 @@ import org.slf4j.LoggerFactory; public updateSCPDataMovementDetails_result getResult(I iface, updateSCPDataMovementDetails_args args) throws org.apache.thrift.TException { updateSCPDataMovementDetails_result result = new updateSCPDataMovementDetails_result(); try { - result.success = iface.updateSCPDataMovementDetails(args.jobSubmissionInterfaceId, args.scpDataMovement); + result.success = iface.updateSCPDataMovementDetails(args.dataMovementInterfaceId, args.scpDataMovement); result.setSuccessIsSet(true); } catch (org.apache.airavata.model.error.InvalidRequestException ire) { result.ire = ire; @@ -9632,7 +9642,7 @@ import org.slf4j.LoggerFactory; public updateGridFTPDataMovementDetails_result getResult(I iface, updateGridFTPDataMovementDetails_args args) throws org.apache.thrift.TException { updateGridFTPDataMovementDetails_result result = new updateGridFTPDataMovementDetails_result(); try { - result.success = iface.updateGridFTPDataMovementDetails(args.jobSubmissionInterfaceId, args.gridFTPDataMovement); + result.success = iface.updateGridFTPDataMovementDetails(args.dataMovementInterfaceId, args.gridFTPDataMovement); result.setSuccessIsSet(true); } catch (org.apache.airavata.model.error.InvalidRequestException ire) { result.ire = ire; @@ -9805,7 +9815,7 @@ import org.slf4j.LoggerFactory; public deleteJobSubmissionInterface_result getResult(I iface, deleteJobSubmissionInterface_args args) throws org.apache.thrift.TException { deleteJobSubmissionInterface_result result = new deleteJobSubmissionInterface_result(); try { - result.success = iface.deleteJobSubmissionInterface(args.jobSubmissionInterfaceId); + result.success = iface.deleteJobSubmissionInterface(args.computeResourceId, args.jobSubmissionInterfaceId); result.setSuccessIsSet(true); } catch (org.apache.airavata.model.error.InvalidRequestException ire) { result.ire = ire; @@ -9834,7 +9844,7 @@ import org.slf4j.LoggerFactory; public deleteDataMovementInterface_result getResult(I iface, deleteDataMovementInterface_args args) throws org.apache.thrift.TException { deleteDataMovementInterface_result result = new deleteDataMovementInterface_result(); try { - result.success = iface.deleteDataMovementInterface(args.dataMovementInterfaceId); + result.success = iface.deleteDataMovementInterface(args.computeResourceId, args.dataMovementInterfaceId); result.setSuccessIsSet(true); } catch (org.apache.airavata.model.error.InvalidRequestException ire) { result.ire = ire; @@ -14658,7 +14668,7 @@ import org.slf4j.LoggerFactory; } public void start(I iface, updateLocalDataMovementDetails_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.updateLocalDataMovementDetails(args.jobSubmissionInterfaceId, args.localDataMovement,resultHandler); + iface.updateLocalDataMovementDetails(args.dataMovementInterfaceId, args.localDataMovement,resultHandler); } } @@ -14860,7 +14870,7 @@ import org.slf4j.LoggerFactory; } public void start(I iface, updateSCPDataMovementDetails_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.updateSCPDataMovementDetails(args.jobSubmissionInterfaceId, args.scpDataMovement,resultHandler); + iface.updateSCPDataMovementDetails(args.dataMovementInterfaceId, args.scpDataMovement,resultHandler); } } @@ -15062,7 +15072,7 @@ import org.slf4j.LoggerFactory; } public void start(I iface, updateGridFTPDataMovementDetails_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.updateGridFTPDataMovementDetails(args.jobSubmissionInterfaceId, args.gridFTPDataMovement,resultHandler); + iface.updateGridFTPDataMovementDetails(args.dataMovementInterfaceId, args.gridFTPDataMovement,resultHandler); } } @@ -15469,7 +15479,7 @@ import org.slf4j.LoggerFactory; } public void start(I iface, deleteJobSubmissionInterface_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.deleteJobSubmissionInterface(args.jobSubmissionInterfaceId,resultHandler); + iface.deleteJobSubmissionInterface(args.computeResourceId, args.jobSubmissionInterfaceId,resultHandler); } } @@ -15537,7 +15547,7 @@ import org.slf4j.LoggerFactory; } public void start(I iface, deleteDataMovementInterface_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.deleteDataMovementInterface(args.dataMovementInterfaceId,resultHandler); + iface.deleteDataMovementInterface(args.computeResourceId, args.dataMovementInterfaceId,resultHandler); } } @@ -84061,7 +84071,7 @@ import org.slf4j.LoggerFactory; public static class updateLocalDataMovementDetails_args implements org.apache.thrift.TBase<updateLocalDataMovementDetails_args, updateLocalDataMovementDetails_args._Fields>, java.io.Serializable, Cloneable, Comparable<updateLocalDataMovementDetails_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("updateLocalDataMovementDetails_args"); - private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("jobSubmissionInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovementInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField LOCAL_DATA_MOVEMENT_FIELD_DESC = new org.apache.thrift.protocol.TField("localDataMovement", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); @@ -84070,12 +84080,12 @@ import org.slf4j.LoggerFactory; schemes.put(TupleScheme.class, new updateLocalDataMovementDetails_argsTupleSchemeFactory()); } - public String jobSubmissionInterfaceId; // required + public String dataMovementInterfaceId; // required public org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement; // 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 { - JOB_SUBMISSION_INTERFACE_ID((short)1, "jobSubmissionInterfaceId"), + DATA_MOVEMENT_INTERFACE_ID((short)1, "dataMovementInterfaceId"), LOCAL_DATA_MOVEMENT((short)2, "localDataMovement"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -84091,8 +84101,8 @@ import org.slf4j.LoggerFactory; */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // JOB_SUBMISSION_INTERFACE_ID - return JOB_SUBMISSION_INTERFACE_ID; + case 1: // DATA_MOVEMENT_INTERFACE_ID + return DATA_MOVEMENT_INTERFACE_ID; case 2: // LOCAL_DATA_MOVEMENT return LOCAL_DATA_MOVEMENT; default: @@ -84138,7 +84148,7 @@ import org.slf4j.LoggerFactory; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.JOB_SUBMISSION_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("jobSubmissionInterfaceId", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.DATA_MOVEMENT_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("dataMovementInterfaceId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.LOCAL_DATA_MOVEMENT, new org.apache.thrift.meta_data.FieldMetaData("localDataMovement", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement.class))); @@ -84150,11 +84160,11 @@ import org.slf4j.LoggerFactory; } public updateLocalDataMovementDetails_args( - String jobSubmissionInterfaceId, + String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement) { this(); - this.jobSubmissionInterfaceId = jobSubmissionInterfaceId; + this.dataMovementInterfaceId = dataMovementInterfaceId; this.localDataMovement = localDataMovement; } @@ -84162,8 +84172,8 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on <i>other</i>. */ public updateLocalDataMovementDetails_args(updateLocalDataMovementDetails_args other) { - if (other.isSetJobSubmissionInterfaceId()) { - this.jobSubmissionInterfaceId = other.jobSubmissionInterfaceId; + if (other.isSetDataMovementInterfaceId()) { + this.dataMovementInterfaceId = other.dataMovementInterfaceId; } if (other.isSetLocalDataMovement()) { this.localDataMovement = new org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement(other.localDataMovement); @@ -84176,31 +84186,31 @@ import org.slf4j.LoggerFactory; @Override public void clear() { - this.jobSubmissionInterfaceId = null; + this.dataMovementInterfaceId = null; this.localDataMovement = null; } - public String getJobSubmissionInterfaceId() { - return this.jobSubmissionInterfaceId; + public String getDataMovementInterfaceId() { + return this.dataMovementInterfaceId; } - public updateLocalDataMovementDetails_args setJobSubmissionInterfaceId(String jobSubmissionInterfaceId) { - this.jobSubmissionInterfaceId = jobSubmissionInterfaceId; + public updateLocalDataMovementDetails_args setDataMovementInterfaceId(String dataMovementInterfaceId) { + this.dataMovementInterfaceId = dataMovementInterfaceId; return this; } - public void unsetJobSubmissionInterfaceId() { - this.jobSubmissionInterfaceId = null; + public void unsetDataMovementInterfaceId() { + this.dataMovementInterfaceId = null; } - /** Returns true if field jobSubmissionInterfaceId is set (has been assigned a value) and false otherwise */ - public boolean isSetJobSubmissionInterfaceId() { - return this.jobSubmissionInterfaceId != null; + /** Returns true if field dataMovementInterfaceId is set (has been assigned a value) and false otherwise */ + public boolean isSetDataMovementInterfaceId() { + return this.dataMovementInterfaceId != null; } - public void setJobSubmissionInterfaceIdIsSet(boolean value) { + public void setDataMovementInterfaceIdIsSet(boolean value) { if (!value) { - this.jobSubmissionInterfaceId = null; + this.dataMovementInterfaceId = null; } } @@ -84230,11 +84240,11 @@ import org.slf4j.LoggerFactory; public void setFieldValue(_Fields field, Object value) { switch (field) { - case JOB_SUBMISSION_INTERFACE_ID: + case DATA_MOVEMENT_INTERFACE_ID: if (value == null) { - unsetJobSubmissionInterfaceId(); + unsetDataMovementInterfaceId(); } else { - setJobSubmissionInterfaceId((String)value); + setDataMovementInterfaceId((String)value); } break; @@ -84251,8 +84261,8 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { - case JOB_SUBMISSION_INTERFACE_ID: - return getJobSubmissionInterfaceId(); + case DATA_MOVEMENT_INTERFACE_ID: + return getDataMovementInterfaceId(); case LOCAL_DATA_MOVEMENT: return getLocalDataMovement(); @@ -84268,8 +84278,8 @@ import org.slf4j.LoggerFactory; } switch (field) { - case JOB_SUBMISSION_INTERFACE_ID: - return isSetJobSubmissionInterfaceId(); + case DATA_MOVEMENT_INTERFACE_ID: + return isSetDataMovementInterfaceId(); case LOCAL_DATA_MOVEMENT: return isSetLocalDataMovement(); } @@ -84289,12 +84299,12 @@ import org.slf4j.LoggerFactory; if (that == null) return false; - boolean this_present_jobSubmissionInterfaceId = true && this.isSetJobSubmissionInterfaceId(); - boolean that_present_jobSubmissionInterfaceId = true && that.isSetJobSubmissionInterfaceId(); - if (this_present_jobSubmissionInterfaceId || that_present_jobSubmissionInterfaceId) { - if (!(this_present_jobSubmissionInterfaceId && that_present_jobSubmissionInterfaceId)) + boolean this_present_dataMovementInterfaceId = true && this.isSetDataMovementInterfaceId(); + boolean that_present_dataMovementInterfaceId = true && that.isSetDataMovementInterfaceId(); + if (this_present_dataMovementInterfaceId || that_present_dataMovementInterfaceId) { + if (!(this_present_dataMovementInterfaceId && that_present_dataMovementInterfaceId)) return false; - if (!this.jobSubmissionInterfaceId.equals(that.jobSubmissionInterfaceId)) + if (!this.dataMovementInterfaceId.equals(that.dataMovementInterfaceId)) return false; } @@ -84323,12 +84333,12 @@ import org.slf4j.LoggerFactory; int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetJobSubmissionInterfaceId()).compareTo(other.isSetJobSubmissionInterfaceId()); + lastComparison = Boolean.valueOf(isSetDataMovementInterfaceId()).compareTo(other.isSetDataMovementInterfaceId()); if (lastComparison != 0) { return lastComparison; } - if (isSetJobSubmissionInterfaceId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jobSubmissionInterfaceId, other.jobSubmissionInterfaceId); + if (isSetDataMovementInterfaceId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataMovementInterfaceId, other.dataMovementInterfaceId); if (lastComparison != 0) { return lastComparison; } @@ -84363,11 +84373,11 @@ import org.slf4j.LoggerFactory; StringBuilder sb = new StringBuilder("updateLocalDataMovementDetails_args("); boolean first = true; - sb.append("jobSubmissionInterfaceId:"); - if (this.jobSubmissionInterfaceId == null) { + sb.append("dataMovementInterfaceId:"); + if (this.dataMovementInterfaceId == null) { sb.append("null"); } else { - sb.append(this.jobSubmissionInterfaceId); + sb.append(this.dataMovementInterfaceId); } first = false; if (!first) sb.append(", "); @@ -84384,8 +84394,8 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields - if (jobSubmissionInterfaceId == null) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'jobSubmissionInterfaceId' was not present! Struct: " + toString()); + if (dataMovementInterfaceId == null) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'dataMovementInterfaceId' was not present! Struct: " + toString()); } if (localDataMovement == null) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'localDataMovement' was not present! Struct: " + toString()); @@ -84430,10 +84440,10 @@ import org.slf4j.LoggerFactory; break; } switch (schemeField.id) { - case 1: // JOB_SUBMISSION_INTERFACE_ID + case 1: // DATA_MOVEMENT_INTERFACE_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.jobSubmissionInterfaceId = iprot.readString(); - struct.setJobSubmissionInterfaceIdIsSet(true); + struct.dataMovementInterfaceId = iprot.readString(); + struct.setDataMovementInterfaceIdIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -84462,9 +84472,9 @@ import org.slf4j.LoggerFactory; struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.jobSubmissionInterfaceId != null) { - oprot.writeFieldBegin(JOB_SUBMISSION_INTERFACE_ID_FIELD_DESC); - oprot.writeString(struct.jobSubmissionInterfaceId); + if (struct.dataMovementInterfaceId != null) { + oprot.writeFieldBegin(DATA_MOVEMENT_INTERFACE_ID_FIELD_DESC); + oprot.writeString(struct.dataMovementInterfaceId); oprot.writeFieldEnd(); } if (struct.localDataMovement != null) { @@ -84489,15 +84499,15 @@ import org.slf4j.LoggerFactory; @Override public void write(org.apache.thrift.protocol.TProtocol prot, updateLocalDataMovementDetails_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; - oprot.writeString(struct.jobSubmissionInterfaceId); + oprot.writeString(struct.dataMovementInterfaceId); struct.localDataMovement.write(oprot); } @Override public void read(org.apache.thrift.protocol.TProtocol prot, updateLocalDataMovementDetails_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - struct.jobSubmissionInterfaceId = iprot.readString(); - struct.setJobSubmissionInterfaceIdIsSet(true); + struct.dataMovementInterfaceId = iprot.readString(); + struct.setDataMovementInterfaceIdIsSet(true); struct.localDataMovement = new org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement(); struct.localDataMovement.read(iprot); struct.setLocalDataMovementIsSet(true); @@ -87384,7 +87394,7 @@ import org.slf4j.LoggerFactory; public static class updateSCPDataMovementDetails_args implements org.apache.thrift.TBase<updateSCPDataMovementDetails_args, updateSCPDataMovementDetails_args._Fields>, java.io.Serializable, Cloneable, Comparable<updateSCPDataMovementDetails_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("updateSCPDataMovementDetails_args"); - private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("jobSubmissionInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovementInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField SCP_DATA_MOVEMENT_FIELD_DESC = new org.apache.thrift.protocol.TField("scpDataMovement", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); @@ -87393,12 +87403,12 @@ import org.slf4j.LoggerFactory; schemes.put(TupleScheme.class, new updateSCPDataMovementDetails_argsTupleSchemeFactory()); } - public String jobSubmissionInterfaceId; // required + public String dataMovementInterfaceId; // required public org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement; // 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 { - JOB_SUBMISSION_INTERFACE_ID((short)1, "jobSubmissionInterfaceId"), + DATA_MOVEMENT_INTERFACE_ID((short)1, "dataMovementInterfaceId"), SCP_DATA_MOVEMENT((short)2, "scpDataMovement"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -87414,8 +87424,8 @@ import org.slf4j.LoggerFactory; */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // JOB_SUBMISSION_INTERFACE_ID - return JOB_SUBMISSION_INTERFACE_ID; + case 1: // DATA_MOVEMENT_INTERFACE_ID + return DATA_MOVEMENT_INTERFACE_ID; case 2: // SCP_DATA_MOVEMENT return SCP_DATA_MOVEMENT; default: @@ -87461,7 +87471,7 @@ import org.slf4j.LoggerFactory; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.JOB_SUBMISSION_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("jobSubmissionInterfaceId", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.DATA_MOVEMENT_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("dataMovementInterfaceId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.SCP_DATA_MOVEMENT, new org.apache.thrift.meta_data.FieldMetaData("scpDataMovement", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement.class))); @@ -87473,11 +87483,11 @@ import org.slf4j.LoggerFactory; } public updateSCPDataMovementDetails_args( - String jobSubmissionInterfaceId, + String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement scpDataMovement) { this(); - this.jobSubmissionInterfaceId = jobSubmissionInterfaceId; + this.dataMovementInterfaceId = dataMovementInterfaceId; this.scpDataMovement = scpDataMovement; } @@ -87485,8 +87495,8 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on <i>other</i>. */ public updateSCPDataMovementDetails_args(updateSCPDataMovementDetails_args other) { - if (other.isSetJobSubmissionInterfaceId()) { - this.jobSubmissionInterfaceId = other.jobSubmissionInterfaceId; + if (other.isSetDataMovementInterfaceId()) { + this.dataMovementInterfaceId = other.dataMovementInterfaceId; } if (other.isSetScpDataMovement()) { this.scpDataMovement = new org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement(other.scpDataMovement); @@ -87499,31 +87509,31 @@ import org.slf4j.LoggerFactory; @Override public void clear() { - this.jobSubmissionInterfaceId = null; + this.dataMovementInterfaceId = null; this.scpDataMovement = null; } - public String getJobSubmissionInterfaceId() { - return this.jobSubmissionInterfaceId; + public String getDataMovementInterfaceId() { + return this.dataMovementInterfaceId; } - public updateSCPDataMovementDetails_args setJobSubmissionInterfaceId(String jobSubmissionInterfaceId) { - this.jobSubmissionInterfaceId = jobSubmissionInterfaceId; + public updateSCPDataMovementDetails_args setDataMovementInterfaceId(String dataMovementInterfaceId) { + this.dataMovementInterfaceId = dataMovementInterfaceId; return this; } - public void unsetJobSubmissionInterfaceId() { - this.jobSubmissionInterfaceId = null; + public void unsetDataMovementInterfaceId() { + this.dataMovementInterfaceId = null; } - /** Returns true if field jobSubmissionInterfaceId is set (has been assigned a value) and false otherwise */ - public boolean isSetJobSubmissionInterfaceId() { - return this.jobSubmissionInterfaceId != null; + /** Returns true if field dataMovementInterfaceId is set (has been assigned a value) and false otherwise */ + public boolean isSetDataMovementInterfaceId() { + return this.dataMovementInterfaceId != null; } - public void setJobSubmissionInterfaceIdIsSet(boolean value) { + public void setDataMovementInterfaceIdIsSet(boolean value) { if (!value) { - this.jobSubmissionInterfaceId = null; + this.dataMovementInterfaceId = null; } } @@ -87553,11 +87563,11 @@ import org.slf4j.LoggerFactory; public void setFieldValue(_Fields field, Object value) { switch (field) { - case JOB_SUBMISSION_INTERFACE_ID: + case DATA_MOVEMENT_INTERFACE_ID: if (value == null) { - unsetJobSubmissionInterfaceId(); + unsetDataMovementInterfaceId(); } else { - setJobSubmissionInterfaceId((String)value); + setDataMovementInterfaceId((String)value); } break; @@ -87574,8 +87584,8 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { - case JOB_SUBMISSION_INTERFACE_ID: - return getJobSubmissionInterfaceId(); + case DATA_MOVEMENT_INTERFACE_ID: + return getDataMovementInterfaceId(); case SCP_DATA_MOVEMENT: return getScpDataMovement(); @@ -87591,8 +87601,8 @@ import org.slf4j.LoggerFactory; } switch (field) { - case JOB_SUBMISSION_INTERFACE_ID: - return isSetJobSubmissionInterfaceId(); + case DATA_MOVEMENT_INTERFACE_ID: + return isSetDataMovementInterfaceId(); case SCP_DATA_MOVEMENT: return isSetScpDataMovement(); } @@ -87612,12 +87622,12 @@ import org.slf4j.LoggerFactory; if (that == null) return false; - boolean this_present_jobSubmissionInterfaceId = true && this.isSetJobSubmissionInterfaceId(); - boolean that_present_jobSubmissionInterfaceId = true && that.isSetJobSubmissionInterfaceId(); - if (this_present_jobSubmissionInterfaceId || that_present_jobSubmissionInterfaceId) { - if (!(this_present_jobSubmissionInterfaceId && that_present_jobSubmissionInterfaceId)) + boolean this_present_dataMovementInterfaceId = true && this.isSetDataMovementInterfaceId(); + boolean that_present_dataMovementInterfaceId = true && that.isSetDataMovementInterfaceId(); + if (this_present_dataMovementInterfaceId || that_present_dataMovementInterfaceId) { + if (!(this_present_dataMovementInterfaceId && that_present_dataMovementInterfaceId)) return false; - if (!this.jobSubmissionInterfaceId.equals(that.jobSubmissionInterfaceId)) + if (!this.dataMovementInterfaceId.equals(that.dataMovementInterfaceId)) return false; } @@ -87646,12 +87656,12 @@ import org.slf4j.LoggerFactory; int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetJobSubmissionInterfaceId()).compareTo(other.isSetJobSubmissionInterfaceId()); + lastComparison = Boolean.valueOf(isSetDataMovementInterfaceId()).compareTo(other.isSetDataMovementInterfaceId()); if (lastComparison != 0) { return lastComparison; } - if (isSetJobSubmissionInterfaceId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jobSubmissionInterfaceId, other.jobSubmissionInterfaceId); + if (isSetDataMovementInterfaceId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataMovementInterfaceId, other.dataMovementInterfaceId); if (lastComparison != 0) { return lastComparison; } @@ -87686,11 +87696,11 @@ import org.slf4j.LoggerFactory; StringBuilder sb = new StringBuilder("updateSCPDataMovementDetails_args("); boolean first = true; - sb.append("jobSubmissionInterfaceId:"); - if (this.jobSubmissionInterfaceId == null) { + sb.append("dataMovementInterfaceId:"); + if (this.dataMovementInterfaceId == null) { sb.append("null"); } else { - sb.append(this.jobSubmissionInterfaceId); + sb.append(this.dataMovementInterfaceId); } first = false; if (!first) sb.append(", "); @@ -87707,8 +87717,8 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields - if (jobSubmissionInterfaceId == null) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'jobSubmissionInterfaceId' was not present! Struct: " + toString()); + if (dataMovementInterfaceId == null) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'dataMovementInterfaceId' was not present! Struct: " + toString()); } if (scpDataMovement == null) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'scpDataMovement' was not present! Struct: " + toString()); @@ -87753,10 +87763,10 @@ import org.slf4j.LoggerFactory; break; } switch (schemeField.id) { - case 1: // JOB_SUBMISSION_INTERFACE_ID + case 1: // DATA_MOVEMENT_INTERFACE_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.jobSubmissionInterfaceId = iprot.readString(); - struct.setJobSubmissionInterfaceIdIsSet(true); + struct.dataMovementInterfaceId = iprot.readString(); + struct.setDataMovementInterfaceIdIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -87785,9 +87795,9 @@ import org.slf4j.LoggerFactory; struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.jobSubmissionInterfaceId != null) { - oprot.writeFieldBegin(JOB_SUBMISSION_INTERFACE_ID_FIELD_DESC); - oprot.writeString(struct.jobSubmissionInterfaceId); + if (struct.dataMovementInterfaceId != null) { + oprot.writeFieldBegin(DATA_MOVEMENT_INTERFACE_ID_FIELD_DESC); + oprot.writeString(struct.dataMovementInterfaceId); oprot.writeFieldEnd(); } if (struct.scpDataMovement != null) { @@ -87812,15 +87822,15 @@ import org.slf4j.LoggerFactory; @Override public void write(org.apache.thrift.protocol.TProtocol prot, updateSCPDataMovementDetails_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; - oprot.writeString(struct.jobSubmissionInterfaceId); + oprot.writeString(struct.dataMovementInterfaceId); struct.scpDataMovement.write(oprot); } @Override public void read(org.apache.thrift.protocol.TProtocol prot, updateSCPDataMovementDetails_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - struct.jobSubmissionInterfaceId = iprot.readString(); - struct.setJobSubmissionInterfaceIdIsSet(true); + struct.dataMovementInterfaceId = iprot.readString(); + struct.setDataMovementInterfaceIdIsSet(true); struct.scpDataMovement = new org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement(); struct.scpDataMovement.read(iprot); struct.setScpDataMovementIsSet(true); @@ -90707,7 +90717,7 @@ import org.slf4j.LoggerFactory; public static class updateGridFTPDataMovementDetails_args implements org.apache.thrift.TBase<updateGridFTPDataMovementDetails_args, updateGridFTPDataMovementDetails_args._Fields>, java.io.Serializable, Cloneable, Comparable<updateGridFTPDataMovementDetails_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("updateGridFTPDataMovementDetails_args"); - private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("jobSubmissionInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovementInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField GRID_FTPDATA_MOVEMENT_FIELD_DESC = new org.apache.thrift.protocol.TField("gridFTPDataMovement", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); @@ -90716,12 +90726,12 @@ import org.slf4j.LoggerFactory; schemes.put(TupleScheme.class, new updateGridFTPDataMovementDetails_argsTupleSchemeFactory()); } - public String jobSubmissionInterfaceId; // required + public String dataMovementInterfaceId; // required public org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement; // 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 { - JOB_SUBMISSION_INTERFACE_ID((short)1, "jobSubmissionInterfaceId"), + DATA_MOVEMENT_INTERFACE_ID((short)1, "dataMovementInterfaceId"), GRID_FTPDATA_MOVEMENT((short)2, "gridFTPDataMovement"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -90737,8 +90747,8 @@ import org.slf4j.LoggerFactory; */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // JOB_SUBMISSION_INTERFACE_ID - return JOB_SUBMISSION_INTERFACE_ID; + case 1: // DATA_MOVEMENT_INTERFACE_ID + return DATA_MOVEMENT_INTERFACE_ID; case 2: // GRID_FTPDATA_MOVEMENT return GRID_FTPDATA_MOVEMENT; default: @@ -90784,7 +90794,7 @@ import org.slf4j.LoggerFactory; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.JOB_SUBMISSION_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("jobSubmissionInterfaceId", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.DATA_MOVEMENT_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("dataMovementInterfaceId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.GRID_FTPDATA_MOVEMENT, new org.apache.thrift.meta_data.FieldMetaData("gridFTPDataMovement", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement.class))); @@ -90796,11 +90806,11 @@ import org.slf4j.LoggerFactory; } public updateGridFTPDataMovementDetails_args( - String jobSubmissionInterfaceId, + String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement) { this(); - this.jobSubmissionInterfaceId = jobSubmissionInterfaceId; + this.dataMovementInterfaceId = dataMovementInterfaceId; this.gridFTPDataMovement = gridFTPDataMovement; } @@ -90808,8 +90818,8 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on <i>other</i>. */ public updateGridFTPDataMovementDetails_args(updateGridFTPDataMovementDetails_args other) { - if (other.isSetJobSubmissionInterfaceId()) { - this.jobSubmissionInterfaceId = other.jobSubmissionInterfaceId; + if (other.isSetDataMovementInterfaceId()) { + this.dataMovementInterfaceId = other.dataMovementInterfaceId; } if (other.isSetGridFTPDataMovement()) { this.gridFTPDataMovement = new org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement(other.gridFTPDataMovement); @@ -90822,31 +90832,31 @@ import org.slf4j.LoggerFactory; @Override public void clear() { - this.jobSubmissionInterfaceId = null; + this.dataMovementInterfaceId = null; this.gridFTPDataMovement = null; } - public String getJobSubmissionInterfaceId() { - return this.jobSubmissionInterfaceId; + public String getDataMovementInterfaceId() { + return this.dataMovementInterfaceId; } - public updateGridFTPDataMovementDetails_args setJobSubmissionInterfaceId(String jobSubmissionInterfaceId) { - this.jobSubmissionInterfaceId = jobSubmissionInterfaceId; + public updateGridFTPDataMovementDetails_args setDataMovementInterfaceId(String dataMovementInterfaceId) { + this.dataMovementInterfaceId = dataMovementInterfaceId; return this; } - public void unsetJobSubmissionInterfaceId() { - this.jobSubmissionInterfaceId = null; + public void unsetDataMovementInterfaceId() { + this.dataMovementInterfaceId = null; } - /** Returns true if field jobSubmissionInterfaceId is set (has been assigned a value) and false otherwise */ - public boolean isSetJobSubmissionInterfaceId() { - return this.jobSubmissionInterfaceId != null; + /** Returns true if field dataMovementInterfaceId is set (has been assigned a value) and false otherwise */ + public boolean isSetDataMovementInterfaceId() { + return this.dataMovementInterfaceId != null; } - public void setJobSubmissionInterfaceIdIsSet(boolean value) { + public void setDataMovementInterfaceIdIsSet(boolean value) { if (!value) { - this.jobSubmissionInterfaceId = null; + this.dataMovementInterfaceId = null; } } @@ -90876,11 +90886,11 @@ import org.slf4j.LoggerFactory; public void setFieldValue(_Fields field, Object value) { switch (field) { - case JOB_SUBMISSION_INTERFACE_ID: + case DATA_MOVEMENT_INTERFACE_ID: if (value == null) { - unsetJobSubmissionInterfaceId(); + unsetDataMovementInterfaceId(); } else { - setJobSubmissionInterfaceId((String)value); + setDataMovementInterfaceId((String)value); } break; @@ -90897,8 +90907,8 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { - case JOB_SUBMISSION_INTERFACE_ID: - return getJobSubmissionInterfaceId(); + case DATA_MOVEMENT_INTERFACE_ID: + return getDataMovementInterfaceId(); case GRID_FTPDATA_MOVEMENT: return getGridFTPDataMovement(); @@ -90914,8 +90924,8 @@ import org.slf4j.LoggerFactory; } switch (field) { - case JOB_SUBMISSION_INTERFACE_ID: - return isSetJobSubmissionInterfaceId(); + case DATA_MOVEMENT_INTERFACE_ID: + return isSetDataMovementInterfaceId(); case GRID_FTPDATA_MOVEMENT: return isSetGridFTPDataMovement(); } @@ -90935,12 +90945,12 @@ import org.slf4j.LoggerFactory; if (that == null) return false; - boolean this_present_jobSubmissionInterfaceId = true && this.isSetJobSubmissionInterfaceId(); - boolean that_present_jobSubmissionInterfaceId = true && that.isSetJobSubmissionInterfaceId(); - if (this_present_jobSubmissionInterfaceId || that_present_jobSubmissionInterfaceId) { - if (!(this_present_jobSubmissionInterfaceId && that_present_jobSubmissionInterfaceId)) + boolean this_present_dataMovementInterfaceId = true && this.isSetDataMovementInterfaceId(); + boolean that_present_dataMovementInterfaceId = true && that.isSetDataMovementInterfaceId(); + if (this_present_dataMovementInterfaceId || that_present_dataMovementInterfaceId) { + if (!(this_present_dataMovementInterfaceId && that_present_dataMovementInterfaceId)) return false; - if (!this.jobSubmissionInterfaceId.equals(that.jobSubmissionInterfaceId)) + if (!this.dataMovementInterfaceId.equals(that.dataMovementInterfaceId)) return false; } @@ -90969,12 +90979,12 @@ import org.slf4j.LoggerFactory; int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetJobSubmissionInterfaceId()).compareTo(other.isSetJobSubmissionInterfaceId()); + lastComparison = Boolean.valueOf(isSetDataMovementInterfaceId()).compareTo(other.isSetDataMovementInterfaceId()); if (lastComparison != 0) { return lastComparison; } - if (isSetJobSubmissionInterfaceId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jobSubmissionInterfaceId, other.jobSubmissionInterfaceId); + if (isSetDataMovementInterfaceId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataMovementInterfaceId, other.dataMovementInterfaceId); if (lastComparison != 0) { return lastComparison; } @@ -91009,11 +91019,11 @@ import org.slf4j.LoggerFactory; StringBuilder sb = new StringBuilder("updateGridFTPDataMovementDetails_args("); boolean first = true; - sb.append("jobSubmissionInterfaceId:"); - if (this.jobSubmissionInterfaceId == null) { + sb.append("dataMovementInterfaceId:"); + if (this.dataMovementInterfaceId == null) { sb.append("null"); } else { - sb.append(this.jobSubmissionInterfaceId); + sb.append(this.dataMovementInterfaceId); } first = false; if (!first) sb.append(", "); @@ -91030,8 +91040,8 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields - if (jobSubmissionInterfaceId == null) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'jobSubmissionInterfaceId' was not present! Struct: " + toString()); + if (dataMovementInterfaceId == null) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'dataMovementInterfaceId' was not present! Struct: " + toString()); } if (gridFTPDataMovement == null) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'gridFTPDataMovement' was not present! Struct: " + toString()); @@ -91076,10 +91086,10 @@ import org.slf4j.LoggerFactory; break; } switch (schemeField.id) { - case 1: // JOB_SUBMISSION_INTERFACE_ID + case 1: // DATA_MOVEMENT_INTERFACE_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.jobSubmissionInterfaceId = iprot.readString(); - struct.setJobSubmissionInterfaceIdIsSet(true); + struct.dataMovementInterfaceId = iprot.readString(); + struct.setDataMovementInterfaceIdIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -91108,9 +91118,9 @@ import org.slf4j.LoggerFactory; struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.jobSubmissionInterfaceId != null) { - oprot.writeFieldBegin(JOB_SUBMISSION_INTERFACE_ID_FIELD_DESC); - oprot.writeString(struct.jobSubmissionInterfaceId); + if (struct.dataMovementInterfaceId != null) { + oprot.writeFieldBegin(DATA_MOVEMENT_INTERFACE_ID_FIELD_DESC); + oprot.writeString(struct.dataMovementInterfaceId); oprot.writeFieldEnd(); } if (struct.gridFTPDataMovement != null) { @@ -91135,15 +91145,15 @@ import org.slf4j.LoggerFactory; @Override public void write(org.apache.thrift.protocol.TProtocol prot, updateGridFTPDataMovementDetails_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; - oprot.writeString(struct.jobSubmissionInterfaceId); + oprot.writeString(struct.dataMovementInterfaceId); struct.gridFTPDataMovement.write(oprot); } @Override public void read(org.apache.thrift.protocol.TProtocol prot, updateGridFTPDataMovementDetails_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - struct.jobSubmissionInterfaceId = iprot.readString(); - struct.setJobSubmissionInterfaceIdIsSet(true); + struct.dataMovementInterfaceId = iprot.readString(); + struct.setDataMovementInterfaceIdIsSet(true); struct.gridFTPDataMovement = new org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement(); struct.gridFTPDataMovement.read(iprot); struct.setGridFTPDataMovementIsSet(true); @@ -97149,7 +97159,8 @@ import org.slf4j.LoggerFactory; public static class deleteJobSubmissionInterface_args implements org.apache.thrift.TBase<deleteJobSubmissionInterface_args, deleteJobSubmissionInterface_args._Fields>, java.io.Serializable, Cloneable, Comparable<deleteJobSubmissionInterface_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteJobSubmissionInterface_args"); - private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("jobSubmissionInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField COMPUTE_RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("computeResourceId", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("jobSubmissionInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -97157,11 +97168,13 @@ import org.slf4j.LoggerFactory; schemes.put(TupleScheme.class, new deleteJobSubmissionInterface_argsTupleSchemeFactory()); } + public String computeResourceId; // required public String jobSubmissionInterfaceId; // 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 { - JOB_SUBMISSION_INTERFACE_ID((short)1, "jobSubmissionInterfaceId"); + COMPUTE_RESOURCE_ID((short)1, "computeResourceId"), + JOB_SUBMISSION_INTERFACE_ID((short)2, "jobSubmissionInterfaceId"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -97176,7 +97189,9 @@ import org.slf4j.LoggerFactory; */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // JOB_SUBMISSION_INTERFACE_ID + case 1: // COMPUTE_RESOURCE_ID + return COMPUTE_RESOURCE_ID; + case 2: // JOB_SUBMISSION_INTERFACE_ID return JOB_SUBMISSION_INTERFACE_ID; default: return null; @@ -97221,6 +97236,8 @@ import org.slf4j.LoggerFactory; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.COMPUTE_RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("computeResourceId", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.JOB_SUBMISSION_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("jobSubmissionInterfaceId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); @@ -97231,9 +97248,11 @@ import org.slf4j.LoggerFactory; } public deleteJobSubmissionInterface_args( + String computeResourceId, String jobSubmissionInterfaceId) { this(); + this.computeResourceId = computeResourceId; this.jobSubmissionInterfaceId = jobSubmissionInterfaceId; } @@ -97241,6 +97260,9 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on <i>other</i>. */ public deleteJobSubmissionInterface_args(deleteJobSubmissionInterface_args other) { + if (other.isSetComputeResourceId()) { + this.computeResourceId = other.computeResourceId; + } if (other.isSetJobSubmissionInterfaceId()) { this.jobSubmissionInterfaceId = other.jobSubmissionInterfaceId; } @@ -97252,9 +97274,34 @@ import org.slf4j.LoggerFactory; @Override public void clear() { + this.computeResourceId = null; this.jobSubmissionInterfaceId = null; } + public String getComputeResourceId() { + return this.computeResourceId; + } + + public deleteJobSubmissionInterface_args setComputeResourceId(String computeResourceId) { + this.computeResourceId = computeResourceId; + return this; + } + + public void unsetComputeResourceId() { + this.computeResourceId = null; + } + + /** Returns true if field computeResourceId is set (has been assigned a value) and false otherwise */ + public boolean isSetComputeResourceId() { + return this.computeResourceId != null; + } + + public void setComputeResourceIdIsSet(boolean value) { + if (!value) { + this.computeResourceId = null; + } + } + public String getJobSubmissionInterfaceId() { return this.jobSubmissionInterfaceId; } @@ -97281,6 +97328,14 @@ import org.slf4j.LoggerFactory; public void setFieldValue(_Fields field, Object value) { switch (field) { + case COMPUTE_RESOURCE_ID: + if (value == null) { + unsetComputeResourceId(); + } else { + setComputeResourceId((String)value); + } + break; + case JOB_SUBMISSION_INTERFACE_ID: if (value == null) { unsetJobSubmissionInterfaceId(); @@ -97294,6 +97349,9 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { + case COMPUTE_RESOURCE_ID: + return getComputeResourceId(); + case JOB_SUBMISSION_INTERFACE_ID: return getJobSubmissionInterfaceId(); @@ -97308,6 +97366,8 @@ import org.slf4j.LoggerFactory; } switch (field) { + case COMPUTE_RESOURCE_ID: + return isSetComputeResourceId(); case JOB_SUBMISSION_INTERFACE_ID: return isSetJobSubmissionInterfaceId(); } @@ -97327,6 +97387,15 @@ import org.slf4j.LoggerFactory; if (that == null) return false; + boolean this_present_computeResourceId = true && this.isSetComputeResourceId(); + boolean that_present_computeResourceId = true && that.isSetComputeResourceId(); + if (this_present_computeResourceId || that_present_computeResourceId) { + if (!(this_present_computeResourceId && that_present_computeResourceId)) + return false; + if (!this.computeResourceId.equals(that.computeResourceId)) + return false; + } + boolean this_present_jobSubmissionInterfaceId = true && this.isSetJobSubmissionInterfaceId(); boolean that_present_jobSubmissionInterfaceId = true && that.isSetJobSubmissionInterfaceId(); if (this_present_jobSubmissionInterfaceId || that_present_jobSubmissionInterfaceId) { @@ -97352,6 +97421,16 @@ import org.slf4j.LoggerFactory; int lastComparison = 0; + lastComparison = Boolean.valueOf(isSetComputeResourceId()).compareTo(other.isSetComputeResourceId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetComputeResourceId()) { + lastCompar
<TRUNCATED>
