http://git-wip-us.apache.org/repos/asf/airavata/blob/03afa2da/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 f8886a8..b794fa6 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 @@ -1929,7 +1929,7 @@ public class Airavata { * Add a Local data movement details to a compute resource * App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces. * - * @param resourceId + * @param productId * The identifier of the compute resource to which JobSubmission protocol to be added * * @param DMType @@ -1947,12 +1947,12 @@ public class Airavata { * * * @param authzToken - * @param resourceId + * @param productId * @param dataMoveType * @param priorityOrder * @param localDataMovement */ - public String addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; + public String addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; /** * @@ -1996,7 +1996,7 @@ public class Airavata { * Add a SCP data movement details to a compute resource * App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces. * - * @param resourceId + * @param productId * The identifier of the compute resource to which JobSubmission protocol to be added * * @param priorityOrder @@ -2010,12 +2010,12 @@ public class Airavata { * * * @param authzToken - * @param resourceId + * @param productId * @param dataMoveType * @param priorityOrder * @param scpDataMovement */ - public String addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; + public String addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; /** * @@ -2058,7 +2058,7 @@ public class Airavata { * Add a UNICORE data movement details to a compute resource * App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces. * - * @param resourceId + * @param productId * The identifier of the compute resource to which data movement protocol to be added * * @param priorityOrder @@ -2072,12 +2072,12 @@ public class Airavata { * * * @param authzToken - * @param resourceId + * @param productId * @param dataMoveType * @param priorityOrder * @param unicoreDataMovement */ - public String addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.UnicoreDataMovement unicoreDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; + public String addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.UnicoreDataMovement unicoreDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; /** * @@ -2122,7 +2122,7 @@ public class Airavata { * Add a GridFTP data movement details to a compute resource * App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces. * - * @param resourceId + * @param productId * The identifier of the compute resource to which dataMovement protocol to be added * * @param DMType @@ -2140,12 +2140,12 @@ public class Airavata { * * * @param authzToken - * @param resourceId + * @param productId * @param dataMoveType * @param priorityOrder * @param gridFTPDataMovement */ - public String addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.GridFTPDataMovement gridFTPDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; + public String addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.GridFTPDataMovement gridFTPDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; /** * Update the given GridFTP data movement details to a compute resource @@ -2283,11 +2283,11 @@ public class Airavata { * * * @param authzToken - * @param resourceId + * @param productId * @param dataMovementInterfaceId * @param dataMoveType */ - public boolean deleteDataMovementInterface(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, String dataMovementInterfaceId, org.apache.airavata.model.data.movement.DMType dataMoveType) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; + public boolean deleteDataMovementInterface(org.apache.airavata.model.security.AuthzToken authzToken, String productId, String dataMovementInterfaceId, org.apache.airavata.model.data.movement.DMType dataMoveType) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; public String registerResourceJobManager(org.apache.airavata.model.security.AuthzToken authzToken, 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.airavata.model.error.AuthorizationException, org.apache.thrift.TException; @@ -2819,25 +2819,25 @@ public class Airavata { public void updateUnicoreJobSubmissionDetails(org.apache.airavata.model.security.AuthzToken authzToken, String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission unicoreJobSubmission, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void updateLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String dataMovementInterfaceId, org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void getLocalDataMovement(org.apache.airavata.model.security.AuthzToken authzToken, String dataMovementId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void updateSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String dataMovementInterfaceId, org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void getSCPDataMovement(org.apache.airavata.model.security.AuthzToken authzToken, String dataMovementId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.UnicoreDataMovement unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.UnicoreDataMovement unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void updateUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String dataMovementInterfaceId, org.apache.airavata.model.data.movement.UnicoreDataMovement unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void getUnicoreDataMovement(org.apache.airavata.model.security.AuthzToken authzToken, String dataMovementId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.GridFTPDataMovement gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.GridFTPDataMovement gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void updateGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String dataMovementInterfaceId, org.apache.airavata.model.data.movement.GridFTPDataMovement gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -2853,7 +2853,7 @@ public class Airavata { public void deleteJobSubmissionInterface(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String jobSubmissionInterfaceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void deleteDataMovementInterface(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, String dataMovementInterfaceId, org.apache.airavata.model.data.movement.DMType dataMoveType, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void deleteDataMovementInterface(org.apache.airavata.model.security.AuthzToken authzToken, String productId, String dataMovementInterfaceId, org.apache.airavata.model.data.movement.DMType dataMoveType, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void registerResourceJobManager(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager resourceJobManager, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -6206,17 +6206,17 @@ public class Airavata { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateUnicoreJobSubmissionDetails failed: unknown result"); } - public String addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException + public String addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException { - send_addLocalDataMovementDetails(authzToken, resourceId, dataMoveType, priorityOrder, localDataMovement); + send_addLocalDataMovementDetails(authzToken, productId, dataMoveType, priorityOrder, localDataMovement); return recv_addLocalDataMovementDetails(); } - public void send_addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement) throws org.apache.thrift.TException + public void send_addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement) throws org.apache.thrift.TException { addLocalDataMovementDetails_args args = new addLocalDataMovementDetails_args(); args.setAuthzToken(authzToken); - args.setResourceId(resourceId); + args.setProductId(productId); args.setDataMoveType(dataMoveType); args.setPriorityOrder(priorityOrder); args.setLocalDataMovement(localDataMovement); @@ -6318,17 +6318,17 @@ public class Airavata { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getLocalDataMovement failed: unknown result"); } - public String addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException + public String addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException { - send_addSCPDataMovementDetails(authzToken, resourceId, dataMoveType, priorityOrder, scpDataMovement); + send_addSCPDataMovementDetails(authzToken, productId, dataMoveType, priorityOrder, scpDataMovement); return recv_addSCPDataMovementDetails(); } - public void send_addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement) throws org.apache.thrift.TException + public void send_addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement) throws org.apache.thrift.TException { addSCPDataMovementDetails_args args = new addSCPDataMovementDetails_args(); args.setAuthzToken(authzToken); - args.setResourceId(resourceId); + args.setProductId(productId); args.setDataMoveType(dataMoveType); args.setPriorityOrder(priorityOrder); args.setScpDataMovement(scpDataMovement); @@ -6430,17 +6430,17 @@ public class Airavata { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getSCPDataMovement failed: unknown result"); } - public String addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.UnicoreDataMovement unicoreDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException + public String addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.UnicoreDataMovement unicoreDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException { - send_addUnicoreDataMovementDetails(authzToken, resourceId, dataMoveType, priorityOrder, unicoreDataMovement); + send_addUnicoreDataMovementDetails(authzToken, productId, dataMoveType, priorityOrder, unicoreDataMovement); return recv_addUnicoreDataMovementDetails(); } - public void send_addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.UnicoreDataMovement unicoreDataMovement) throws org.apache.thrift.TException + public void send_addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.UnicoreDataMovement unicoreDataMovement) throws org.apache.thrift.TException { addUnicoreDataMovementDetails_args args = new addUnicoreDataMovementDetails_args(); args.setAuthzToken(authzToken); - args.setResourceId(resourceId); + args.setProductId(productId); args.setDataMoveType(dataMoveType); args.setPriorityOrder(priorityOrder); args.setUnicoreDataMovement(unicoreDataMovement); @@ -6542,17 +6542,17 @@ public class Airavata { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getUnicoreDataMovement failed: unknown result"); } - public String addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.GridFTPDataMovement gridFTPDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException + public String addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.GridFTPDataMovement gridFTPDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException { - send_addGridFTPDataMovementDetails(authzToken, resourceId, dataMoveType, priorityOrder, gridFTPDataMovement); + send_addGridFTPDataMovementDetails(authzToken, productId, dataMoveType, priorityOrder, gridFTPDataMovement); return recv_addGridFTPDataMovementDetails(); } - public void send_addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.GridFTPDataMovement gridFTPDataMovement) throws org.apache.thrift.TException + public void send_addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.GridFTPDataMovement gridFTPDataMovement) throws org.apache.thrift.TException { addGridFTPDataMovementDetails_args args = new addGridFTPDataMovementDetails_args(); args.setAuthzToken(authzToken); - args.setResourceId(resourceId); + args.setProductId(productId); args.setDataMoveType(dataMoveType); args.setPriorityOrder(priorityOrder); args.setGridFTPDataMovement(gridFTPDataMovement); @@ -6837,17 +6837,17 @@ public class Airavata { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteJobSubmissionInterface failed: unknown result"); } - public boolean deleteDataMovementInterface(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, String dataMovementInterfaceId, org.apache.airavata.model.data.movement.DMType dataMoveType) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException + public boolean deleteDataMovementInterface(org.apache.airavata.model.security.AuthzToken authzToken, String productId, String dataMovementInterfaceId, org.apache.airavata.model.data.movement.DMType dataMoveType) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException { - send_deleteDataMovementInterface(authzToken, resourceId, dataMovementInterfaceId, dataMoveType); + send_deleteDataMovementInterface(authzToken, productId, dataMovementInterfaceId, dataMoveType); return recv_deleteDataMovementInterface(); } - public void send_deleteDataMovementInterface(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, String dataMovementInterfaceId, org.apache.airavata.model.data.movement.DMType dataMoveType) throws org.apache.thrift.TException + public void send_deleteDataMovementInterface(org.apache.airavata.model.security.AuthzToken authzToken, String productId, String dataMovementInterfaceId, org.apache.airavata.model.data.movement.DMType dataMoveType) throws org.apache.thrift.TException { deleteDataMovementInterface_args args = new deleteDataMovementInterface_args(); args.setAuthzToken(authzToken); - args.setResourceId(resourceId); + args.setProductId(productId); args.setDataMovementInterfaceId(dataMovementInterfaceId); args.setDataMoveType(dataMoveType); sendBase("deleteDataMovementInterface", args); @@ -11221,23 +11221,23 @@ public class Airavata { } } - public void addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - addLocalDataMovementDetails_call method_call = new addLocalDataMovementDetails_call(authzToken, resourceId, dataMoveType, priorityOrder, localDataMovement, resultHandler, this, ___protocolFactory, ___transport); + addLocalDataMovementDetails_call method_call = new addLocalDataMovementDetails_call(authzToken, productId, dataMoveType, priorityOrder, localDataMovement, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class addLocalDataMovementDetails_call extends org.apache.thrift.async.TAsyncMethodCall { private org.apache.airavata.model.security.AuthzToken authzToken; - private String resourceId; + private String productId; private org.apache.airavata.model.data.movement.DMType dataMoveType; private int priorityOrder; private org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement; - public addLocalDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.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 addLocalDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken authzToken, String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.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.authzToken = authzToken; - this.resourceId = resourceId; + this.productId = productId; this.dataMoveType = dataMoveType; this.priorityOrder = priorityOrder; this.localDataMovement = localDataMovement; @@ -11247,7 +11247,7 @@ public class Airavata { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("addLocalDataMovementDetails", org.apache.thrift.protocol.TMessageType.CALL, 0)); addLocalDataMovementDetails_args args = new addLocalDataMovementDetails_args(); args.setAuthzToken(authzToken); - args.setResourceId(resourceId); + args.setProductId(productId); args.setDataMoveType(dataMoveType); args.setPriorityOrder(priorityOrder); args.setLocalDataMovement(localDataMovement); @@ -11338,23 +11338,23 @@ public class Airavata { } } - public void addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - addSCPDataMovementDetails_call method_call = new addSCPDataMovementDetails_call(authzToken, resourceId, dataMoveType, priorityOrder, scpDataMovement, resultHandler, this, ___protocolFactory, ___transport); + addSCPDataMovementDetails_call method_call = new addSCPDataMovementDetails_call(authzToken, productId, dataMoveType, priorityOrder, scpDataMovement, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class addSCPDataMovementDetails_call extends org.apache.thrift.async.TAsyncMethodCall { private org.apache.airavata.model.security.AuthzToken authzToken; - private String resourceId; + private String productId; private org.apache.airavata.model.data.movement.DMType dataMoveType; private int priorityOrder; private org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement; - public addSCPDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.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 addSCPDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken authzToken, String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.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.authzToken = authzToken; - this.resourceId = resourceId; + this.productId = productId; this.dataMoveType = dataMoveType; this.priorityOrder = priorityOrder; this.scpDataMovement = scpDataMovement; @@ -11364,7 +11364,7 @@ public class Airavata { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("addSCPDataMovementDetails", org.apache.thrift.protocol.TMessageType.CALL, 0)); addSCPDataMovementDetails_args args = new addSCPDataMovementDetails_args(); args.setAuthzToken(authzToken); - args.setResourceId(resourceId); + args.setProductId(productId); args.setDataMoveType(dataMoveType); args.setPriorityOrder(priorityOrder); args.setScpDataMovement(scpDataMovement); @@ -11455,23 +11455,23 @@ public class Airavata { } } - public void addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.UnicoreDataMovement unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.UnicoreDataMovement unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - addUnicoreDataMovementDetails_call method_call = new addUnicoreDataMovementDetails_call(authzToken, resourceId, dataMoveType, priorityOrder, unicoreDataMovement, resultHandler, this, ___protocolFactory, ___transport); + addUnicoreDataMovementDetails_call method_call = new addUnicoreDataMovementDetails_call(authzToken, productId, dataMoveType, priorityOrder, unicoreDataMovement, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class addUnicoreDataMovementDetails_call extends org.apache.thrift.async.TAsyncMethodCall { private org.apache.airavata.model.security.AuthzToken authzToken; - private String resourceId; + private String productId; private org.apache.airavata.model.data.movement.DMType dataMoveType; private int priorityOrder; private org.apache.airavata.model.data.movement.UnicoreDataMovement unicoreDataMovement; - public addUnicoreDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.UnicoreDataMovement unicoreDataMovement, 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 addUnicoreDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken authzToken, String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.UnicoreDataMovement unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.authzToken = authzToken; - this.resourceId = resourceId; + this.productId = productId; this.dataMoveType = dataMoveType; this.priorityOrder = priorityOrder; this.unicoreDataMovement = unicoreDataMovement; @@ -11481,7 +11481,7 @@ public class Airavata { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("addUnicoreDataMovementDetails", org.apache.thrift.protocol.TMessageType.CALL, 0)); addUnicoreDataMovementDetails_args args = new addUnicoreDataMovementDetails_args(); args.setAuthzToken(authzToken); - args.setResourceId(resourceId); + args.setProductId(productId); args.setDataMoveType(dataMoveType); args.setPriorityOrder(priorityOrder); args.setUnicoreDataMovement(unicoreDataMovement); @@ -11572,23 +11572,23 @@ public class Airavata { } } - public void addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.GridFTPDataMovement gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.GridFTPDataMovement gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - addGridFTPDataMovementDetails_call method_call = new addGridFTPDataMovementDetails_call(authzToken, resourceId, dataMoveType, priorityOrder, gridFTPDataMovement, resultHandler, this, ___protocolFactory, ___transport); + addGridFTPDataMovementDetails_call method_call = new addGridFTPDataMovementDetails_call(authzToken, productId, dataMoveType, priorityOrder, gridFTPDataMovement, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class addGridFTPDataMovementDetails_call extends org.apache.thrift.async.TAsyncMethodCall { private org.apache.airavata.model.security.AuthzToken authzToken; - private String resourceId; + private String productId; private org.apache.airavata.model.data.movement.DMType dataMoveType; private int priorityOrder; private org.apache.airavata.model.data.movement.GridFTPDataMovement gridFTPDataMovement; - public addGridFTPDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.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 addGridFTPDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken authzToken, String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.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.authzToken = authzToken; - this.resourceId = resourceId; + this.productId = productId; this.dataMoveType = dataMoveType; this.priorityOrder = priorityOrder; this.gridFTPDataMovement = gridFTPDataMovement; @@ -11598,7 +11598,7 @@ public class Airavata { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("addGridFTPDataMovementDetails", org.apache.thrift.protocol.TMessageType.CALL, 0)); addGridFTPDataMovementDetails_args args = new addGridFTPDataMovementDetails_args(); args.setAuthzToken(authzToken); - args.setResourceId(resourceId); + args.setProductId(productId); args.setDataMoveType(dataMoveType); args.setPriorityOrder(priorityOrder); args.setGridFTPDataMovement(gridFTPDataMovement); @@ -11873,22 +11873,22 @@ public class Airavata { } } - public void deleteDataMovementInterface(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, String dataMovementInterfaceId, org.apache.airavata.model.data.movement.DMType dataMoveType, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void deleteDataMovementInterface(org.apache.airavata.model.security.AuthzToken authzToken, String productId, String dataMovementInterfaceId, org.apache.airavata.model.data.movement.DMType dataMoveType, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - deleteDataMovementInterface_call method_call = new deleteDataMovementInterface_call(authzToken, resourceId, dataMovementInterfaceId, dataMoveType, resultHandler, this, ___protocolFactory, ___transport); + deleteDataMovementInterface_call method_call = new deleteDataMovementInterface_call(authzToken, productId, dataMovementInterfaceId, dataMoveType, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class deleteDataMovementInterface_call extends org.apache.thrift.async.TAsyncMethodCall { private org.apache.airavata.model.security.AuthzToken authzToken; - private String resourceId; + private String productId; private String dataMovementInterfaceId; private org.apache.airavata.model.data.movement.DMType dataMoveType; - public deleteDataMovementInterface_call(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, String dataMovementInterfaceId, org.apache.airavata.model.data.movement.DMType dataMoveType, 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(org.apache.airavata.model.security.AuthzToken authzToken, String productId, String dataMovementInterfaceId, org.apache.airavata.model.data.movement.DMType dataMoveType, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.authzToken = authzToken; - this.resourceId = resourceId; + this.productId = productId; this.dataMovementInterfaceId = dataMovementInterfaceId; this.dataMoveType = dataMoveType; } @@ -11897,7 +11897,7 @@ public class Airavata { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteDataMovementInterface", org.apache.thrift.protocol.TMessageType.CALL, 0)); deleteDataMovementInterface_args args = new deleteDataMovementInterface_args(); args.setAuthzToken(authzToken); - args.setResourceId(resourceId); + args.setProductId(productId); args.setDataMovementInterfaceId(dataMovementInterfaceId); args.setDataMoveType(dataMoveType); args.write(prot); @@ -15774,7 +15774,7 @@ public class Airavata { public addLocalDataMovementDetails_result getResult(I iface, addLocalDataMovementDetails_args args) throws org.apache.thrift.TException { addLocalDataMovementDetails_result result = new addLocalDataMovementDetails_result(); try { - result.success = iface.addLocalDataMovementDetails(args.authzToken, args.resourceId, args.dataMoveType, args.priorityOrder, args.localDataMovement); + result.success = iface.addLocalDataMovementDetails(args.authzToken, args.productId, args.dataMoveType, args.priorityOrder, args.localDataMovement); } catch (org.apache.airavata.model.error.InvalidRequestException ire) { result.ire = ire; } catch (org.apache.airavata.model.error.AiravataClientException ace) { @@ -15865,7 +15865,7 @@ public class Airavata { public addSCPDataMovementDetails_result getResult(I iface, addSCPDataMovementDetails_args args) throws org.apache.thrift.TException { addSCPDataMovementDetails_result result = new addSCPDataMovementDetails_result(); try { - result.success = iface.addSCPDataMovementDetails(args.authzToken, args.resourceId, args.dataMoveType, args.priorityOrder, args.scpDataMovement); + result.success = iface.addSCPDataMovementDetails(args.authzToken, args.productId, args.dataMoveType, args.priorityOrder, args.scpDataMovement); } catch (org.apache.airavata.model.error.InvalidRequestException ire) { result.ire = ire; } catch (org.apache.airavata.model.error.AiravataClientException ace) { @@ -15956,7 +15956,7 @@ public class Airavata { public addUnicoreDataMovementDetails_result getResult(I iface, addUnicoreDataMovementDetails_args args) throws org.apache.thrift.TException { addUnicoreDataMovementDetails_result result = new addUnicoreDataMovementDetails_result(); try { - result.success = iface.addUnicoreDataMovementDetails(args.authzToken, args.resourceId, args.dataMoveType, args.priorityOrder, args.unicoreDataMovement); + result.success = iface.addUnicoreDataMovementDetails(args.authzToken, args.productId, args.dataMoveType, args.priorityOrder, args.unicoreDataMovement); } catch (org.apache.airavata.model.error.InvalidRequestException ire) { result.ire = ire; } catch (org.apache.airavata.model.error.AiravataClientException ace) { @@ -16047,7 +16047,7 @@ public class Airavata { public addGridFTPDataMovementDetails_result getResult(I iface, addGridFTPDataMovementDetails_args args) throws org.apache.thrift.TException { addGridFTPDataMovementDetails_result result = new addGridFTPDataMovementDetails_result(); try { - result.success = iface.addGridFTPDataMovementDetails(args.authzToken, args.resourceId, args.dataMoveType, args.priorityOrder, args.gridFTPDataMovement); + result.success = iface.addGridFTPDataMovementDetails(args.authzToken, args.productId, args.dataMoveType, args.priorityOrder, args.gridFTPDataMovement); } catch (org.apache.airavata.model.error.InvalidRequestException ire) { result.ire = ire; } catch (org.apache.airavata.model.error.AiravataClientException ace) { @@ -16293,7 +16293,7 @@ public class Airavata { 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.authzToken, args.resourceId, args.dataMovementInterfaceId, args.dataMoveType); + result.success = iface.deleteDataMovementInterface(args.authzToken, args.productId, args.dataMovementInterfaceId, args.dataMoveType); result.setSuccessIsSet(true); } catch (org.apache.airavata.model.error.InvalidRequestException ire) { result.ire = ire; @@ -23795,7 +23795,7 @@ public class Airavata { } public void start(I iface, addLocalDataMovementDetails_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException { - iface.addLocalDataMovementDetails(args.authzToken, args.resourceId, args.dataMoveType, args.priorityOrder, args.localDataMovement,resultHandler); + iface.addLocalDataMovementDetails(args.authzToken, args.productId, args.dataMoveType, args.priorityOrder, args.localDataMovement,resultHandler); } } @@ -24012,7 +24012,7 @@ public class Airavata { } public void start(I iface, addSCPDataMovementDetails_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException { - iface.addSCPDataMovementDetails(args.authzToken, args.resourceId, args.dataMoveType, args.priorityOrder, args.scpDataMovement,resultHandler); + iface.addSCPDataMovementDetails(args.authzToken, args.productId, args.dataMoveType, args.priorityOrder, args.scpDataMovement,resultHandler); } } @@ -24229,7 +24229,7 @@ public class Airavata { } public void start(I iface, addUnicoreDataMovementDetails_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException { - iface.addUnicoreDataMovementDetails(args.authzToken, args.resourceId, args.dataMoveType, args.priorityOrder, args.unicoreDataMovement,resultHandler); + iface.addUnicoreDataMovementDetails(args.authzToken, args.productId, args.dataMoveType, args.priorityOrder, args.unicoreDataMovement,resultHandler); } } @@ -24446,7 +24446,7 @@ public class Airavata { } public void start(I iface, addGridFTPDataMovementDetails_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException { - iface.addGridFTPDataMovementDetails(args.authzToken, args.resourceId, args.dataMoveType, args.priorityOrder, args.gridFTPDataMovement,resultHandler); + iface.addGridFTPDataMovementDetails(args.authzToken, args.productId, args.dataMoveType, args.priorityOrder, args.gridFTPDataMovement,resultHandler); } } @@ -25029,7 +25029,7 @@ public class Airavata { } public void start(I iface, deleteDataMovementInterface_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.deleteDataMovementInterface(args.authzToken, args.resourceId, args.dataMovementInterfaceId, args.dataMoveType,resultHandler); + iface.deleteDataMovementInterface(args.authzToken, args.productId, args.dataMovementInterfaceId, args.dataMoveType,resultHandler); } } @@ -147483,7 +147483,7 @@ public class Airavata { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("addLocalDataMovementDetails_args"); private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceId", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField PRODUCT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("productId", org.apache.thrift.protocol.TType.STRING, (short)2); private static final org.apache.thrift.protocol.TField DATA_MOVE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMoveType", org.apache.thrift.protocol.TType.I32, (short)3); private static final org.apache.thrift.protocol.TField PRIORITY_ORDER_FIELD_DESC = new org.apache.thrift.protocol.TField("priorityOrder", org.apache.thrift.protocol.TType.I32, (short)4); 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)5); @@ -147495,7 +147495,7 @@ public class Airavata { } public org.apache.airavata.model.security.AuthzToken authzToken; // required - public String resourceId; // required + public String productId; // required /** * * @see org.apache.airavata.model.data.movement.DMType @@ -147507,7 +147507,7 @@ public class Airavata { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { AUTHZ_TOKEN((short)1, "authzToken"), - RESOURCE_ID((short)2, "resourceId"), + PRODUCT_ID((short)2, "productId"), /** * * @see org.apache.airavata.model.data.movement.DMType @@ -147531,8 +147531,8 @@ public class Airavata { switch(fieldId) { case 1: // AUTHZ_TOKEN return AUTHZ_TOKEN; - case 2: // RESOURCE_ID - return RESOURCE_ID; + case 2: // PRODUCT_ID + return PRODUCT_ID; case 3: // DATA_MOVE_TYPE return DATA_MOVE_TYPE; case 4: // PRIORITY_ORDER @@ -147586,7 +147586,7 @@ public class Airavata { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.AUTHZ_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("authzToken", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class))); - tmpMap.put(_Fields.RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("resourceId", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.PRODUCT_ID, new org.apache.thrift.meta_data.FieldMetaData("productId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.DATA_MOVE_TYPE, new org.apache.thrift.meta_data.FieldMetaData("dataMoveType", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.data.movement.DMType.class))); @@ -147603,14 +147603,14 @@ public class Airavata { public addLocalDataMovementDetails_args( org.apache.airavata.model.security.AuthzToken authzToken, - String resourceId, + String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement) { this(); this.authzToken = authzToken; - this.resourceId = resourceId; + this.productId = productId; this.dataMoveType = dataMoveType; this.priorityOrder = priorityOrder; setPriorityOrderIsSet(true); @@ -147625,8 +147625,8 @@ public class Airavata { if (other.isSetAuthzToken()) { this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken); } - if (other.isSetResourceId()) { - this.resourceId = other.resourceId; + if (other.isSetProductId()) { + this.productId = other.productId; } if (other.isSetDataMoveType()) { this.dataMoveType = other.dataMoveType; @@ -147644,7 +147644,7 @@ public class Airavata { @Override public void clear() { this.authzToken = null; - this.resourceId = null; + this.productId = null; this.dataMoveType = null; setPriorityOrderIsSet(false); this.priorityOrder = 0; @@ -147675,27 +147675,27 @@ public class Airavata { } } - public String getResourceId() { - return this.resourceId; + public String getProductId() { + return this.productId; } - public addLocalDataMovementDetails_args setResourceId(String resourceId) { - this.resourceId = resourceId; + public addLocalDataMovementDetails_args setProductId(String productId) { + this.productId = productId; return this; } - public void unsetResourceId() { - this.resourceId = null; + public void unsetProductId() { + this.productId = null; } - /** Returns true if field resourceId is set (has been assigned a value) and false otherwise */ - public boolean isSetResourceId() { - return this.resourceId != null; + /** Returns true if field productId is set (has been assigned a value) and false otherwise */ + public boolean isSetProductId() { + return this.productId != null; } - public void setResourceIdIsSet(boolean value) { + public void setProductIdIsSet(boolean value) { if (!value) { - this.resourceId = null; + this.productId = null; } } @@ -147788,11 +147788,11 @@ public class Airavata { } break; - case RESOURCE_ID: + case PRODUCT_ID: if (value == null) { - unsetResourceId(); + unsetProductId(); } else { - setResourceId((String)value); + setProductId((String)value); } break; @@ -147828,8 +147828,8 @@ public class Airavata { case AUTHZ_TOKEN: return getAuthzToken(); - case RESOURCE_ID: - return getResourceId(); + case PRODUCT_ID: + return getProductId(); case DATA_MOVE_TYPE: return getDataMoveType(); @@ -147853,8 +147853,8 @@ public class Airavata { switch (field) { case AUTHZ_TOKEN: return isSetAuthzToken(); - case RESOURCE_ID: - return isSetResourceId(); + case PRODUCT_ID: + return isSetProductId(); case DATA_MOVE_TYPE: return isSetDataMoveType(); case PRIORITY_ORDER: @@ -147887,12 +147887,12 @@ public class Airavata { return false; } - boolean this_present_resourceId = true && this.isSetResourceId(); - boolean that_present_resourceId = true && that.isSetResourceId(); - if (this_present_resourceId || that_present_resourceId) { - if (!(this_present_resourceId && that_present_resourceId)) + boolean this_present_productId = true && this.isSetProductId(); + boolean that_present_productId = true && that.isSetProductId(); + if (this_present_productId || that_present_productId) { + if (!(this_present_productId && that_present_productId)) return false; - if (!this.resourceId.equals(that.resourceId)) + if (!this.productId.equals(that.productId)) return false; } @@ -147935,10 +147935,10 @@ public class Airavata { if (present_authzToken) list.add(authzToken); - boolean present_resourceId = true && (isSetResourceId()); - list.add(present_resourceId); - if (present_resourceId) - list.add(resourceId); + boolean present_productId = true && (isSetProductId()); + list.add(present_productId); + if (present_productId) + list.add(productId); boolean present_dataMoveType = true && (isSetDataMoveType()); list.add(present_dataMoveType); @@ -147976,12 +147976,12 @@ public class Airavata { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetResourceId()).compareTo(other.isSetResourceId()); + lastComparison = Boolean.valueOf(isSetProductId()).compareTo(other.isSetProductId()); if (lastComparison != 0) { return lastComparison; } - if (isSetResourceId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceId, other.resourceId); + if (isSetProductId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.productId, other.productId); if (lastComparison != 0) { return lastComparison; } @@ -148044,11 +148044,11 @@ public class Airavata { } first = false; if (!first) sb.append(", "); - sb.append("resourceId:"); - if (this.resourceId == null) { + sb.append("productId:"); + if (this.productId == null) { sb.append("null"); } else { - sb.append(this.resourceId); + sb.append(this.productId); } first = false; if (!first) sb.append(", "); @@ -148080,8 +148080,8 @@ public class Airavata { if (authzToken == null) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'authzToken' was not present! Struct: " + toString()); } - if (resourceId == null) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'resourceId' was not present! Struct: " + toString()); + if (productId == null) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'productId' was not present! Struct: " + toString()); } if (dataMoveType == null) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'dataMoveType' was not present! Struct: " + toString()); @@ -148144,10 +148144,10 @@ public class Airavata { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // RESOURCE_ID + case 2: // PRODUCT_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.resourceId = iprot.readString(); - struct.setResourceIdIsSet(true); + struct.productId = iprot.readString(); + struct.setProductIdIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -148200,9 +148200,9 @@ public class Airavata { struct.authzToken.write(oprot); oprot.writeFieldEnd(); } - if (struct.resourceId != null) { - oprot.writeFieldBegin(RESOURCE_ID_FIELD_DESC); - oprot.writeString(struct.resourceId); + if (struct.productId != null) { + oprot.writeFieldBegin(PRODUCT_ID_FIELD_DESC); + oprot.writeString(struct.productId); oprot.writeFieldEnd(); } if (struct.dataMoveType != null) { @@ -148236,7 +148236,7 @@ public class Airavata { public void write(org.apache.thrift.protocol.TProtocol prot, addLocalDataMovementDetails_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; struct.authzToken.write(oprot); - oprot.writeString(struct.resourceId); + oprot.writeString(struct.productId); oprot.writeI32(struct.dataMoveType.getValue()); oprot.writeI32(struct.priorityOrder); struct.localDataMovement.write(oprot); @@ -148248,8 +148248,8 @@ public class Airavata { struct.authzToken = new org.apache.airavata.model.security.AuthzToken(); struct.authzToken.read(iprot); struct.setAuthzTokenIsSet(true); - struct.resourceId = iprot.readString(); - struct.setResourceIdIsSet(true); + struct.productId = iprot.readString(); + struct.setProductIdIsSet(true); struct.dataMoveType = org.apache.airavata.model.data.movement.DMType.findByValue(iprot.readI32()); struct.setDataMoveTypeIsSet(true); struct.priorityOrder = iprot.readI32(); @@ -151664,7 +151664,7 @@ public class Airavata { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("addSCPDataMovementDetails_args"); private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceId", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField PRODUCT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("productId", org.apache.thrift.protocol.TType.STRING, (short)2); private static final org.apache.thrift.protocol.TField DATA_MOVE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMoveType", org.apache.thrift.protocol.TType.I32, (short)3); private static final org.apache.thrift.protocol.TField PRIORITY_ORDER_FIELD_DESC = new org.apache.thrift.protocol.TField("priorityOrder", org.apache.thrift.protocol.TType.I32, (short)4); 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)5); @@ -151676,7 +151676,7 @@ public class Airavata { } public org.apache.airavata.model.security.AuthzToken authzToken; // required - public String resourceId; // required + public String productId; // required /** * * @see org.apache.airavata.model.data.movement.DMType @@ -151688,7 +151688,7 @@ public class Airavata { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { AUTHZ_TOKEN((short)1, "authzToken"), - RESOURCE_ID((short)2, "resourceId"), + PRODUCT_ID((short)2, "productId"), /** * * @see org.apache.airavata.model.data.movement.DMType @@ -151712,8 +151712,8 @@ public class Airavata { switch(fieldId) { case 1: // AUTHZ_TOKEN return AUTHZ_TOKEN; - case 2: // RESOURCE_ID - return RESOURCE_ID; + case 2: // PRODUCT_ID + return PRODUCT_ID; case 3: // DATA_MOVE_TYPE return DATA_MOVE_TYPE; case 4: // PRIORITY_ORDER @@ -151767,7 +151767,7 @@ public class Airavata { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.AUTHZ_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("authzToken", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class))); - tmpMap.put(_Fields.RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("resourceId", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.PRODUCT_ID, new org.apache.thrift.meta_data.FieldMetaData("productId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.DATA_MOVE_TYPE, new org.apache.thrift.meta_data.FieldMetaData("dataMoveType", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.data.movement.DMType.class))); @@ -151784,14 +151784,14 @@ public class Airavata { public addSCPDataMovementDetails_args( org.apache.airavata.model.security.AuthzToken authzToken, - String resourceId, + String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement) { this(); this.authzToken = authzToken; - this.resourceId = resourceId; + this.productId = productId; this.dataMoveType = dataMoveType; this.priorityOrder = priorityOrder; setPriorityOrderIsSet(true); @@ -151806,8 +151806,8 @@ public class Airavata { if (other.isSetAuthzToken()) { this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken); } - if (other.isSetResourceId()) { - this.resourceId = other.resourceId; + if (other.isSetProductId()) { + this.productId = other.productId; } if (other.isSetDataMoveType()) { this.dataMoveType = other.dataMoveType; @@ -151825,7 +151825,7 @@ public class Airavata { @Override public void clear() { this.authzToken = null; - this.resourceId = null; + this.productId = null; this.dataMoveType = null; setPriorityOrderIsSet(false); this.priorityOrder = 0; @@ -151856,27 +151856,27 @@ public class Airavata { } } - public String getResourceId() { - return this.resourceId; + public String getProductId() { + return this.productId; } - public addSCPDataMovementDetails_args setResourceId(String resourceId) { - this.resourceId = resourceId; + public addSCPDataMovementDetails_args setProductId(String productId) { + this.productId = productId; return this; } - public void unsetResourceId() { - this.resourceId = null; + public void unsetProductId() { + this.productId = null; } - /** Returns true if field resourceId is set (has been assigned a value) and false otherwise */ - public boolean isSetResourceId() { - return this.resourceId != null; + /** Returns true if field productId is set (has been assigned a value) and false otherwise */ + public boolean isSetProductId() { + return this.productId != null; } - public void setResourceIdIsSet(boolean value) { + public void setProductIdIsSet(boolean value) { if (!value) { - this.resourceId = null; + this.productId = null; } } @@ -151969,11 +151969,11 @@ public class Airavata { } break; - case RESOURCE_ID: + case PRODUCT_ID: if (value == null) { - unsetResourceId(); + unsetProductId(); } else { - setResourceId((String)value); + setProductId((String)value); } break; @@ -152009,8 +152009,8 @@ public class Airavata { case AUTHZ_TOKEN: return getAuthzToken(); - case RESOURCE_ID: - return getResourceId(); + case PRODUCT_ID: + return getProductId(); case DATA_MOVE_TYPE: return getDataMoveType(); @@ -152034,8 +152034,8 @@ public class Airavata { switch (field) { case AUTHZ_TOKEN: return isSetAuthzToken(); - case RESOURCE_ID: - return isSetResourceId(); + case PRODUCT_ID: + return isSetProductId(); case DATA_MOVE_TYPE: return isSetDataMoveType(); case PRIORITY_ORDER: @@ -152068,12 +152068,12 @@ public class Airavata { return false; } - boolean this_present_resourceId = true && this.isSetResourceId(); - boolean that_present_resourceId = true && that.isSetResourceId(); - if (this_present_resourceId || that_present_resourceId) { - if (!(this_present_resourceId && that_present_resourceId)) + boolean this_present_productId = true && this.isSetProductId(); + boolean that_present_productId = true && that.isSetProductId(); + if (this_present_productId || that_present_productId) { + if (!(this_present_productId && that_present_productId)) return false; - if (!this.resourceId.equals(that.resourceId)) + if (!this.productId.equals(that.productId)) return false; } @@ -152116,10 +152116,10 @@ public class Airavata { if (present_authzToken) list.add(authzToken); - boolean present_resourceId = true && (isSetResourceId()); - list.add(present_resourceId); - if (present_resourceId) - list.add(resourceId); + boolean present_productId = true && (isSetProductId()); + list.add(present_productId); + if (present_productId) + list.add(productId); boolean present_dataMoveType = true && (isSetDataMoveType()); list.add(present_dataMoveType); @@ -152157,12 +152157,12 @@ public class Airavata { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetResourceId()).compareTo(other.isSetResourceId()); + lastComparison = Boolean.valueOf(isSetProductId()).compareTo(other.isSetProductId()); if (lastComparison != 0) { return lastComparison; } - if (isSetResourceId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceId, other.resourceId); + if (isSetProductId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.productId, other.productId); if (lastComparison != 0) { return lastComparison; } @@ -152225,11 +152225,11 @@ public class Airavata { } first = false; if (!first) sb.append(", "); - sb.append("resourceId:"); - if (this.resourceId == null) { + sb.append("productId:"); + if (this.productId == null) { sb.append("null"); } else { - sb.append(this.resourceId); + sb.append(this.productId); } first = false; if (!first) sb.append(", "); @@ -152261,8 +152261,8 @@ public class Airavata { if (authzToken == null) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'authzToken' was not present! Struct: " + toString()); } - if (resourceId == null) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'resourceId' was not present! Struct: " + toString()); + if (productId == null) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'productId' was not present! Struct: " + toString()); } if (dataMoveType == null) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'dataMoveType' was not present! Struct: " + toString()); @@ -152325,10 +152325,10 @@ public class Airavata { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // RESOURCE_ID + case 2: // PRODUCT_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.resourceId = iprot.readString(); - struct.setResourceIdIsSet(true); + struct.productId = iprot.readString(); + struct.setProductIdIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -152381,9 +152381,9 @@ public class Airavata { struct.authzToken.write(oprot); oprot.writeFieldEnd(); } - if (struct.resourceId != null) { - oprot.writeFieldBegin(RESOURCE_ID_FIELD_DESC); - oprot.writeString(struct.resourceId); + if (struct.productId != null) { + oprot.writeFieldBegin(PRODUCT_ID_FIELD_DESC); + oprot.writeString(struct.productId); oprot.writeFieldEnd(); } if (struct.dataMoveType != null) { @@ -152417,7 +152417,7 @@ public class Airavata { public void write(org.apache.thrift.protocol.TProtocol prot, addSCPDataMovementDetails_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; struct.authzToken.write(oprot); - oprot.writeString(struct.resourceId); + oprot.writeString(struct.productId); oprot.writeI32(struct.dataMoveType.getValue()); oprot.writeI32(struct.priorityOrder); struct.scpDataMovement.write(oprot); @@ -152429,8 +152429,8 @@ public class Airavata { struct.authzToken = new org.apache.airavata.model.security.AuthzToken(); struct.authzToken.read(iprot); struct.setAuthzTokenIsSet(true); - struct.resourceId = iprot.readString(); - struct.setResourceIdIsSet(true); + struct.productId = iprot.readString(); + struct.setProductIdIsSet(true); struct.dataMoveType = org.apache.airavata.model.data.movement.DMType.findByValue(iprot.readI32()); struct.setDataMoveTypeIsSet(true); struct.priorityOrder = iprot.readI32(); @@ -155845,7 +155845,7 @@ public class Airavata { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("addUnicoreDataMovementDetails_args"); private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceId", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField PRODUCT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("productId", org.apache.thrift.protocol.TType.STRING, (short)2); private static final org.apache.thrift.protocol.TField DATA_MOVE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMoveType", org.apache.thrift.protocol.TType.I32, (short)3); private static final org.apache.thrift.protocol.TField PRIORITY_ORDER_FIELD_DESC = new org.apache.thrift.protocol.TField("priorityOrder", org.apache.thrift.protocol.TType.I32, (short)4); private static final org.apache.thrift.protocol.TField UNICORE_DATA_MOVEMENT_FIELD_DESC = new org.apache.thrift.protocol.TField("unicoreDataMovement", org.apache.thrift.protocol.TType.STRUCT, (short)5); @@ -155857,7 +155857,7 @@ public class Airavata { } public org.apache.airavata.model.security.AuthzToken authzToken; // required - public String resourceId; // required + public String productId; // required /** * * @see org.apache.airavata.model.data.movement.DMType @@ -155869,7 +155869,7 @@ public class Airavata { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { AUTHZ_TOKEN((short)1, "authzToken"), - RESOURCE_ID((short)2, "resourceId"), + PRODUCT_ID((short)2, "productId"), /** * * @see org.apache.airavata.model.data.movement.DMType @@ -155893,8 +155893,8 @@ public class Airavata { switch(fieldId) { case 1: // AUTHZ_TOKEN return AUTHZ_TOKEN; - case 2: // RESOURCE_ID - return RESOURCE_ID; + case 2: // PRODUCT_ID + return PRODUCT_ID; case 3: // DATA_MOVE_TYPE return DATA_MOVE_TYPE; case 4: // PRIORITY_ORDER @@ -155948,7 +155948,7 @@ public class Airavata { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.AUTHZ_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("authzToken", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class))); - tmpMap.put(_Fields.RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("resourceId", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.PRODUCT_ID, new org.apache.thrift.meta_data.FieldMetaData("productId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.DATA_MOVE_TYPE, new org.apache.thrift.meta_data.FieldMetaData("dataMoveType", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.data.movement.DMType.class))); @@ -155965,14 +155965,14 @@ public class Airavata { public addUnicoreDataMovementDetails_args( org.apache.airavata.model.security.AuthzToken authzToken, - String resourceId, + String productId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.UnicoreDataMovement unicoreDataMovement) { this(); this.authzToken = authzToken; - this.resourceId = resourceId; + this.productId = productId; this.dataMoveType = dataMoveType; this.priorityOrder = priorityOrder; setPriorityOrderIsSet(true); @@ -155987,8 +155987,8 @@ public class Airavata { if (other.isSetAuthzToken()) { this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken); } - if (other.isSetResourceId()) { - this.resourceId = other.resourceId; + if (other.isSetProductId()) { + this.productId = other.productId; } if (other.isSetDataMoveType()) { this.dataMoveType = other.dataMoveType; @@ -156006,7 +156006,7 @@ public class Airavata { @Override public void clear() { this.authzToken = null; - this.resourceId = null; + this.productId = null; this.dataMoveType = null; setPriorityOrderIsSet(false); this.priorityOrder = 0; @@ -156037,27 +156037,27 @@ public class Airavata { } } - public String getResourceId() { - return this.resourceId; + public String getProductId() { + return this.productId; } - public addUnicoreDataMovementDetails_args setResourceId(String resourceId) { - this.resourceId = resourceId; + public addUnicoreDataMovementDetails_args setProductId(String productId) { + this.productId = productId; return this; } - public void unsetResourceId() { - this.resourceId = null; + public void unsetProductId() { + this.productId = null; } - /** Returns true if field resourceId is set (has been assigned a value) and false otherwise */ - public boolean isSetResourceId() { - return this.resourceId != null; + /** Returns true if field productId is set (has been assigned a value) and false otherwise */ + public boolean isSetProductId() { + return this.productId != null; } - public void setResourceIdIsSet(boolean value) { + public void setProductIdIsSet(boolean value) { if (!value) { - this.resourceId = null; + this.productId = null; } } @@ -156150,11 +156150,11 @@ public class Airavata { } break; - case RESOURCE_ID: + case PRODUCT_ID: if (value == null) { - unsetResourceId(); + unsetProductId(); } else { - setResourceId((String)value); + setProductId((String)value); } break; @@ -156190,8 +156190,8 @@ public class Airavata { case AUTHZ_TOKEN: return getAuthzToken(); - case RESOURCE_ID: - return getResourceId(); + case PRODUCT_ID: + return getProductId(); case DATA_MOVE_TYPE: return getDataMoveType(); @@ -156215,8 +156215,8 @@ public class Airavata { switch (field) { case AUTHZ_TOKEN: return isSetAuthzToken(); - case RESOURCE_ID: - return isSetResourceId(); + case PRODUCT_ID: + return isSetProductId(); case DATA_MOVE_TYPE: return isSetDataMoveType(); case PRIORITY_ORDER: @@ -156249,12 +156249,12 @@ public class Airavata { return false; } - boolean this_present_resourceId = true && this.isSetResourceId(); - boolean that_present_resourceId = true && that.isSetResourceId(); - if (this_present_resourceId || that_present_resourceId) { - if (!(this_present_resourceId && that_present_resourceId)) + boolean this_present_productId = true && this.isSetProductId(); + boolean that_present_productId = true && that.isSetProductId(); + if (this_present_productId || that_present_productId) { + if (!(this_present_productId && that_present_productId)) return false; - if (!this.resourceId.equals(that.resourceId)) + if (!this.productId.equals(that.productId)) return false; } @@ -156297,10 +156297,10 @@ public class Airavata { if (present_authzToken) list.add(authzToken); - boolean present_resourceId = true && (isSetResourceId()); - list.add(present_resourceId); - if (present_resourceId) - list.add(resourceId); + boolean present_productId = true && (isSetProductId()); + list.add(present_productId); + if (present_productId) + list.add(productId); boolean present_dataMoveType = true && (isSetDataMoveType()); list.add(present_dataMoveType); @@ -156338,12 +156338,12 @@ public class Airavata { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetResourceId()).compareTo(other.isSetResourceId()); + lastComparison = Boolean.valueOf(isSetProductId()).compareTo(other.isSetProductId()); if (lastComparison != 0) { return lastComparison; } - if (isSetResourceId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceId, other.resourceId); + if (isSetProductId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.productId, other.productId); if (lastComparison != 0) { return lastComparison; } @@ -156406,11 +156406,11 @@ public class Airavata { } first = false; if (!first) sb.append(", "); - sb.append("resourceId:"); - if (this.resourceId == null) { + sb.append("productId:"); + if (this.productId == null) { sb.append("null"); } else { - sb.append(this.resourceId); + sb.append(this.productId); } first = false; if
<TRUNCATED>
