http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java index 44a4840..3591251 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * sshPort: * If a non-default port needs to used, specify it. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission, LOCALSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALSubmission> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LOCALSubmission");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java index aad01cb..a820b68 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java @@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory; * An enumeration of commonly used manager commands. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobManager, ResourceJobManager._Fields>, java.io.Serializable, Cloneable, Comparable<ResourceJobManager> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ResourceJobManager"); http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java index 6e7c1ff..3b087f9 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java @@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory; * the same. Example: *@*.example.com or *@example.com * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmission, SSHJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<SSHJobSubmission> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SSHJobSubmission"); http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java index d326549..31eb8dd 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java @@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory; * authenticationMode * The authenticationMode defines the way certificate is fetched. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class UnicoreJobSubmission implements org.apache.thrift.TBase<UnicoreJobSubmission, UnicoreJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<UnicoreJobSubmission> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnicoreJobSubmission"); http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java index ff80802..f3f8752 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java @@ -85,7 +85,7 @@ import org.slf4j.LoggerFactory; * default credential store. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class ComputeResourcePreference implements org.apache.thrift.TBase<ComputeResourcePreference, ComputeResourcePreference._Fields>, java.io.Serializable, Cloneable, Comparable<ComputeResourcePreference> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputeResourcePreference"); http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java index 1b1c5c0..a94b952 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java @@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory; * List of resource preferences for each of the registered compute resources. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayResourceProfile, GatewayResourceProfile._Fields>, java.io.Serializable, Cloneable, Comparable<GatewayResourceProfile> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GatewayResourceProfile"); http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java index 427d28a..e4ab458 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class StoragePreference implements org.apache.thrift.TBase<StoragePreference, StoragePreference._Fields>, java.io.Serializable, Cloneable, Comparable<StoragePreference> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StoragePreference"); http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java index 303be83..a98b3b4 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java @@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory; * * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class StorageResourceDescription implements org.apache.thrift.TBase<StorageResourceDescription, StorageResourceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<StorageResourceDescription> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StorageResourceDescription"); http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java index edadb29..74ea450 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java @@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory; * Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObjectType, InputDataObjectType._Fields>, java.io.Serializable, Cloneable, Comparable<InputDataObjectType> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InputDataObjectType"); http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java index dfef3d4..503a6f9 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java @@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory; * Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataObjectType, OutputDataObjectType._Fields>, java.io.Serializable, Cloneable, Comparable<OutputDataObjectType> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OutputDataObjectType"); http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java index 698bbee..3ddb9d0 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class ErrorModel implements org.apache.thrift.TBase<ErrorModel, ErrorModel._Fields>, java.io.Serializable, Cloneable, Comparable<ErrorModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ErrorModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java index 9c206aa..ead2eee 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class ValidationResults implements org.apache.thrift.TBase<ValidationResults, ValidationResults._Fields>, java.io.Serializable, Cloneable, Comparable<ValidationResults> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ValidationResults"); http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java index c114a8b..8028a1b 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java @@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory; * during the experiment launch operation * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class ValidatorResult implements org.apache.thrift.TBase<ValidatorResult, ValidatorResult._Fields>, java.io.Serializable, Cloneable, Comparable<ValidatorResult> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ValidatorResult"); http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java index b7b71b2..6418e4c 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java @@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory; * Lower the numerical number, higher the priority * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class DataMovementInterface implements org.apache.thrift.TBase<DataMovementInterface, DataMovementInterface._Fields>, java.io.Serializable, Cloneable, Comparable<DataMovementInterface> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataMovementInterface"); http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java index 0105657..4db2e31 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * sshPort: * If a non-default port needs to used, specify it. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataMovement, GridFTPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<GridFTPDataMovement> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GridFTPDataMovement"); http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java index bfd4b4c..c05f14c 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * sshPort: * If a non-defualt port needs to used, specify it. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class LOCALDataMovement implements org.apache.thrift.TBase<LOCALDataMovement, LOCALDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALDataMovement> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LOCALDataMovement"); http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java index 30f6121..877f159 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * sshPort: * If a non-default port needs to used, specify it. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, SCPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<SCPDataMovement> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SCPDataMovement"); http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java index 56df3fe..715e4b3 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java @@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory; * unicoreEndPointURL: * unicoreGateway End Point. The provider will query this service to fetch required service end points. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataMovement, UnicoreDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<UnicoreDataMovement> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnicoreDataMovement"); http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java index b4077f2..7d74529 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataReplicaLocationModel, DataReplicaLocationModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataReplicaLocationModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataReplicaLocationModel"); @@ -59,14 +59,15 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep 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 REPLICA_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("replicaName", org.apache.thrift.protocol.TType.STRING, (short)3); private static final org.apache.thrift.protocol.TField REPLICA_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("replicaDescription", org.apache.thrift.protocol.TType.STRING, (short)4); - private static final org.apache.thrift.protocol.TField CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("creationTime", org.apache.thrift.protocol.TType.I64, (short)5); - private static final org.apache.thrift.protocol.TField LAST_MODIFIED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastModifiedTime", org.apache.thrift.protocol.TType.I64, (short)6); - private static final org.apache.thrift.protocol.TField VALID_UNTIL_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("validUntilTime", org.apache.thrift.protocol.TType.I64, (short)7); - private static final org.apache.thrift.protocol.TField REPLICA_LOCATION_CATEGORY_FIELD_DESC = new org.apache.thrift.protocol.TField("replicaLocationCategory", org.apache.thrift.protocol.TType.I32, (short)8); - private static final org.apache.thrift.protocol.TField REPLICA_PERSISTENT_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("replicaPersistentType", org.apache.thrift.protocol.TType.I32, (short)9); - private static final org.apache.thrift.protocol.TField STORAGE_RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("storageResourceId", org.apache.thrift.protocol.TType.STRING, (short)10); - private static final org.apache.thrift.protocol.TField FILE_ABSOLUTE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("fileAbsolutePath", org.apache.thrift.protocol.TType.STRING, (short)11); - private static final org.apache.thrift.protocol.TField REPLICA_METADATA_FIELD_DESC = new org.apache.thrift.protocol.TField("replicaMetadata", org.apache.thrift.protocol.TType.MAP, (short)12); + private static final org.apache.thrift.protocol.TField SOURCE_REPLICA_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sourceReplicaId", org.apache.thrift.protocol.TType.STRING, (short)5); + private static final org.apache.thrift.protocol.TField CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("creationTime", org.apache.thrift.protocol.TType.I64, (short)6); + private static final org.apache.thrift.protocol.TField LAST_MODIFIED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastModifiedTime", org.apache.thrift.protocol.TType.I64, (short)7); + private static final org.apache.thrift.protocol.TField VALID_UNTIL_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("validUntilTime", org.apache.thrift.protocol.TType.I64, (short)8); + private static final org.apache.thrift.protocol.TField REPLICA_LOCATION_CATEGORY_FIELD_DESC = new org.apache.thrift.protocol.TField("replicaLocationCategory", org.apache.thrift.protocol.TType.I32, (short)9); + private static final org.apache.thrift.protocol.TField REPLICA_PERSISTENT_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("replicaPersistentType", org.apache.thrift.protocol.TType.I32, (short)10); + private static final org.apache.thrift.protocol.TField STORAGE_RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("storageResourceId", org.apache.thrift.protocol.TType.STRING, (short)11); + private static final org.apache.thrift.protocol.TField FILE_ABSOLUTE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("fileAbsolutePath", org.apache.thrift.protocol.TType.STRING, (short)12); + private static final org.apache.thrift.protocol.TField REPLICA_METADATA_FIELD_DESC = new org.apache.thrift.protocol.TField("replicaMetadata", org.apache.thrift.protocol.TType.MAP, (short)13); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -78,6 +79,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep private String resourceId; // optional private String replicaName; // optional private String replicaDescription; // optional + private String sourceReplicaId; // optional private long creationTime; // optional private long lastModifiedTime; // optional private long validUntilTime; // optional @@ -93,22 +95,23 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep RESOURCE_ID((short)2, "resourceId"), REPLICA_NAME((short)3, "replicaName"), REPLICA_DESCRIPTION((short)4, "replicaDescription"), - CREATION_TIME((short)5, "creationTime"), - LAST_MODIFIED_TIME((short)6, "lastModifiedTime"), - VALID_UNTIL_TIME((short)7, "validUntilTime"), + SOURCE_REPLICA_ID((short)5, "sourceReplicaId"), + CREATION_TIME((short)6, "creationTime"), + LAST_MODIFIED_TIME((short)7, "lastModifiedTime"), + VALID_UNTIL_TIME((short)8, "validUntilTime"), /** * * @see ReplicaLocationCategory */ - REPLICA_LOCATION_CATEGORY((short)8, "replicaLocationCategory"), + REPLICA_LOCATION_CATEGORY((short)9, "replicaLocationCategory"), /** * * @see ReplicaPersistentType */ - REPLICA_PERSISTENT_TYPE((short)9, "replicaPersistentType"), - STORAGE_RESOURCE_ID((short)10, "storageResourceId"), - FILE_ABSOLUTE_PATH((short)11, "fileAbsolutePath"), - REPLICA_METADATA((short)12, "replicaMetadata"); + REPLICA_PERSISTENT_TYPE((short)10, "replicaPersistentType"), + STORAGE_RESOURCE_ID((short)11, "storageResourceId"), + FILE_ABSOLUTE_PATH((short)12, "fileAbsolutePath"), + REPLICA_METADATA((short)13, "replicaMetadata"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -131,21 +134,23 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep return REPLICA_NAME; case 4: // REPLICA_DESCRIPTION return REPLICA_DESCRIPTION; - case 5: // CREATION_TIME + case 5: // SOURCE_REPLICA_ID + return SOURCE_REPLICA_ID; + case 6: // CREATION_TIME return CREATION_TIME; - case 6: // LAST_MODIFIED_TIME + case 7: // LAST_MODIFIED_TIME return LAST_MODIFIED_TIME; - case 7: // VALID_UNTIL_TIME + case 8: // VALID_UNTIL_TIME return VALID_UNTIL_TIME; - case 8: // REPLICA_LOCATION_CATEGORY + case 9: // REPLICA_LOCATION_CATEGORY return REPLICA_LOCATION_CATEGORY; - case 9: // REPLICA_PERSISTENT_TYPE + case 10: // REPLICA_PERSISTENT_TYPE return REPLICA_PERSISTENT_TYPE; - case 10: // STORAGE_RESOURCE_ID + case 11: // STORAGE_RESOURCE_ID return STORAGE_RESOURCE_ID; - case 11: // FILE_ABSOLUTE_PATH + case 12: // FILE_ABSOLUTE_PATH return FILE_ABSOLUTE_PATH; - case 12: // REPLICA_METADATA + case 13: // REPLICA_METADATA return REPLICA_METADATA; default: return null; @@ -191,7 +196,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep private static final int __LASTMODIFIEDTIME_ISSET_ID = 1; private static final int __VALIDUNTILTIME_ISSET_ID = 2; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.REPLICA_ID,_Fields.RESOURCE_ID,_Fields.REPLICA_NAME,_Fields.REPLICA_DESCRIPTION,_Fields.CREATION_TIME,_Fields.LAST_MODIFIED_TIME,_Fields.VALID_UNTIL_TIME,_Fields.REPLICA_LOCATION_CATEGORY,_Fields.REPLICA_PERSISTENT_TYPE,_Fields.STORAGE_RESOURCE_ID,_Fields.FILE_ABSOLUTE_PATH,_Fields.REPLICA_METADATA}; + private static final _Fields optionals[] = {_Fields.REPLICA_ID,_Fields.RESOURCE_ID,_Fields.REPLICA_NAME,_Fields.REPLICA_DESCRIPTION,_Fields.SOURCE_REPLICA_ID,_Fields.CREATION_TIME,_Fields.LAST_MODIFIED_TIME,_Fields.VALID_UNTIL_TIME,_Fields.REPLICA_LOCATION_CATEGORY,_Fields.REPLICA_PERSISTENT_TYPE,_Fields.STORAGE_RESOURCE_ID,_Fields.FILE_ABSOLUTE_PATH,_Fields.REPLICA_METADATA}; 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); @@ -203,6 +208,8 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.REPLICA_DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("replicaDescription", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.SOURCE_REPLICA_ID, new org.apache.thrift.meta_data.FieldMetaData("sourceReplicaId", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.CREATION_TIME, new org.apache.thrift.meta_data.FieldMetaData("creationTime", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.LAST_MODIFIED_TIME, new org.apache.thrift.meta_data.FieldMetaData("lastModifiedTime", org.apache.thrift.TFieldRequirementType.OPTIONAL, @@ -245,6 +252,9 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep if (other.isSetReplicaDescription()) { this.replicaDescription = other.replicaDescription; } + if (other.isSetSourceReplicaId()) { + this.sourceReplicaId = other.sourceReplicaId; + } this.creationTime = other.creationTime; this.lastModifiedTime = other.lastModifiedTime; this.validUntilTime = other.validUntilTime; @@ -276,6 +286,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep this.resourceId = null; this.replicaName = null; this.replicaDescription = null; + this.sourceReplicaId = null; setCreationTimeIsSet(false); this.creationTime = 0; setLastModifiedTimeIsSet(false); @@ -381,6 +392,29 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep } } + public String getSourceReplicaId() { + return this.sourceReplicaId; + } + + public void setSourceReplicaId(String sourceReplicaId) { + this.sourceReplicaId = sourceReplicaId; + } + + public void unsetSourceReplicaId() { + this.sourceReplicaId = null; + } + + /** Returns true if field sourceReplicaId is set (has been assigned a value) and false otherwise */ + public boolean isSetSourceReplicaId() { + return this.sourceReplicaId != null; + } + + public void setSourceReplicaIdIsSet(boolean value) { + if (!value) { + this.sourceReplicaId = null; + } + } + public long getCreationTime() { return this.creationTime; } @@ -623,6 +657,14 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep } break; + case SOURCE_REPLICA_ID: + if (value == null) { + unsetSourceReplicaId(); + } else { + setSourceReplicaId((String)value); + } + break; + case CREATION_TIME: if (value == null) { unsetCreationTime(); @@ -704,6 +746,9 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep case REPLICA_DESCRIPTION: return getReplicaDescription(); + case SOURCE_REPLICA_ID: + return getSourceReplicaId(); + case CREATION_TIME: return getCreationTime(); @@ -747,6 +792,8 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep return isSetReplicaName(); case REPLICA_DESCRIPTION: return isSetReplicaDescription(); + case SOURCE_REPLICA_ID: + return isSetSourceReplicaId(); case CREATION_TIME: return isSetCreationTime(); case LAST_MODIFIED_TIME: @@ -816,6 +863,15 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep return false; } + boolean this_present_sourceReplicaId = true && this.isSetSourceReplicaId(); + boolean that_present_sourceReplicaId = true && that.isSetSourceReplicaId(); + if (this_present_sourceReplicaId || that_present_sourceReplicaId) { + if (!(this_present_sourceReplicaId && that_present_sourceReplicaId)) + return false; + if (!this.sourceReplicaId.equals(that.sourceReplicaId)) + return false; + } + boolean this_present_creationTime = true && this.isSetCreationTime(); boolean that_present_creationTime = true && that.isSetCreationTime(); if (this_present_creationTime || that_present_creationTime) { @@ -915,6 +971,11 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep if (present_replicaDescription) list.add(replicaDescription); + boolean present_sourceReplicaId = true && (isSetSourceReplicaId()); + list.add(present_sourceReplicaId); + if (present_sourceReplicaId) + list.add(sourceReplicaId); + boolean present_creationTime = true && (isSetCreationTime()); list.add(present_creationTime); if (present_creationTime) @@ -1006,6 +1067,16 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep return lastComparison; } } + lastComparison = Boolean.valueOf(isSetSourceReplicaId()).compareTo(other.isSetSourceReplicaId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetSourceReplicaId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sourceReplicaId, other.sourceReplicaId); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetCreationTime()).compareTo(other.isSetCreationTime()); if (lastComparison != 0) { return lastComparison; @@ -1145,6 +1216,16 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep } first = false; } + if (isSetSourceReplicaId()) { + if (!first) sb.append(", "); + sb.append("sourceReplicaId:"); + if (this.sourceReplicaId == null) { + sb.append("null"); + } else { + sb.append(this.sourceReplicaId); + } + first = false; + } if (isSetCreationTime()) { if (!first) sb.append(", "); sb.append("creationTime:"); @@ -1290,7 +1371,15 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // CREATION_TIME + case 5: // SOURCE_REPLICA_ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.sourceReplicaId = iprot.readString(); + struct.setSourceReplicaIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 6: // CREATION_TIME if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.creationTime = iprot.readI64(); struct.setCreationTimeIsSet(true); @@ -1298,7 +1387,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 6: // LAST_MODIFIED_TIME + case 7: // LAST_MODIFIED_TIME if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.lastModifiedTime = iprot.readI64(); struct.setLastModifiedTimeIsSet(true); @@ -1306,7 +1395,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 7: // VALID_UNTIL_TIME + case 8: // VALID_UNTIL_TIME if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.validUntilTime = iprot.readI64(); struct.setValidUntilTimeIsSet(true); @@ -1314,7 +1403,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 8: // REPLICA_LOCATION_CATEGORY + case 9: // REPLICA_LOCATION_CATEGORY if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.replicaLocationCategory = org.apache.airavata.model.data.resource.ReplicaLocationCategory.findByValue(iprot.readI32()); struct.setReplicaLocationCategoryIsSet(true); @@ -1322,7 +1411,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 9: // REPLICA_PERSISTENT_TYPE + case 10: // REPLICA_PERSISTENT_TYPE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.replicaPersistentType = org.apache.airavata.model.data.resource.ReplicaPersistentType.findByValue(iprot.readI32()); struct.setReplicaPersistentTypeIsSet(true); @@ -1330,7 +1419,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 10: // STORAGE_RESOURCE_ID + case 11: // STORAGE_RESOURCE_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.storageResourceId = iprot.readString(); struct.setStorageResourceIdIsSet(true); @@ -1338,7 +1427,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 11: // FILE_ABSOLUTE_PATH + case 12: // FILE_ABSOLUTE_PATH if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.fileAbsolutePath = iprot.readString(); struct.setFileAbsolutePathIsSet(true); @@ -1346,7 +1435,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 12: // REPLICA_METADATA + case 13: // REPLICA_METADATA if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { org.apache.thrift.protocol.TMap _map26 = iprot.readMapBegin(); @@ -1407,6 +1496,13 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep oprot.writeFieldEnd(); } } + if (struct.sourceReplicaId != null) { + if (struct.isSetSourceReplicaId()) { + oprot.writeFieldBegin(SOURCE_REPLICA_ID_FIELD_DESC); + oprot.writeString(struct.sourceReplicaId); + oprot.writeFieldEnd(); + } + } if (struct.isSetCreationTime()) { oprot.writeFieldBegin(CREATION_TIME_FIELD_DESC); oprot.writeI64(struct.creationTime); @@ -1495,31 +1591,34 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep if (struct.isSetReplicaDescription()) { optionals.set(3); } - if (struct.isSetCreationTime()) { + if (struct.isSetSourceReplicaId()) { optionals.set(4); } - if (struct.isSetLastModifiedTime()) { + if (struct.isSetCreationTime()) { optionals.set(5); } - if (struct.isSetValidUntilTime()) { + if (struct.isSetLastModifiedTime()) { optionals.set(6); } - if (struct.isSetReplicaLocationCategory()) { + if (struct.isSetValidUntilTime()) { optionals.set(7); } - if (struct.isSetReplicaPersistentType()) { + if (struct.isSetReplicaLocationCategory()) { optionals.set(8); } - if (struct.isSetStorageResourceId()) { + if (struct.isSetReplicaPersistentType()) { optionals.set(9); } - if (struct.isSetFileAbsolutePath()) { + if (struct.isSetStorageResourceId()) { optionals.set(10); } - if (struct.isSetReplicaMetadata()) { + if (struct.isSetFileAbsolutePath()) { optionals.set(11); } - oprot.writeBitSet(optionals, 12); + if (struct.isSetReplicaMetadata()) { + optionals.set(12); + } + oprot.writeBitSet(optionals, 13); if (struct.isSetReplicaId()) { oprot.writeString(struct.replicaId); } @@ -1532,6 +1631,9 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep if (struct.isSetReplicaDescription()) { oprot.writeString(struct.replicaDescription); } + if (struct.isSetSourceReplicaId()) { + oprot.writeString(struct.sourceReplicaId); + } if (struct.isSetCreationTime()) { oprot.writeI64(struct.creationTime); } @@ -1568,7 +1670,7 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep @Override public void read(org.apache.thrift.protocol.TProtocol prot, DataReplicaLocationModel struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(12); + BitSet incoming = iprot.readBitSet(13); if (incoming.get(0)) { struct.replicaId = iprot.readString(); struct.setReplicaIdIsSet(true); @@ -1586,34 +1688,38 @@ public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataRep struct.setReplicaDescriptionIsSet(true); } if (incoming.get(4)) { + struct.sourceReplicaId = iprot.readString(); + struct.setSourceReplicaIdIsSet(true); + } + if (incoming.get(5)) { struct.creationTime = iprot.readI64(); struct.setCreationTimeIsSet(true); } - if (incoming.get(5)) { + if (incoming.get(6)) { struct.lastModifiedTime = iprot.readI64(); struct.setLastModifiedTimeIsSet(true); } - if (incoming.get(6)) { + if (incoming.get(7)) { struct.validUntilTime = iprot.readI64(); struct.setValidUntilTimeIsSet(true); } - if (incoming.get(7)) { + if (incoming.get(8)) { struct.replicaLocationCategory = org.apache.airavata.model.data.resource.ReplicaLocationCategory.findByValue(iprot.readI32()); struct.setReplicaLocationCategoryIsSet(true); } - if (incoming.get(8)) { + if (incoming.get(9)) { struct.replicaPersistentType = org.apache.airavata.model.data.resource.ReplicaPersistentType.findByValue(iprot.readI32()); struct.setReplicaPersistentTypeIsSet(true); } - if (incoming.get(9)) { + if (incoming.get(10)) { struct.storageResourceId = iprot.readString(); struct.setStorageResourceIdIsSet(true); } - if (incoming.get(10)) { + if (incoming.get(11)) { struct.fileAbsolutePath = iprot.readString(); struct.setFileAbsolutePathIsSet(true); } - if (incoming.get(11)) { + if (incoming.get(12)) { { org.apache.thrift.protocol.TMap _map32 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.replicaMetadata = new HashMap<String,String>(2*_map32.size); http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java index b47b174..9dc6b83 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class DataResourceModel implements org.apache.thrift.TBase<DataResourceModel, DataResourceModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataResourceModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataResourceModel"); @@ -61,13 +61,15 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo private static final org.apache.thrift.protocol.TField RESOURCE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceName", org.apache.thrift.protocol.TType.STRING, (short)4); private static final org.apache.thrift.protocol.TField RESOURCE_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceDescription", org.apache.thrift.protocol.TType.STRING, (short)5); private static final org.apache.thrift.protocol.TField OWNER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("ownerName", org.apache.thrift.protocol.TType.STRING, (short)6); - private static final org.apache.thrift.protocol.TField DATA_RESOURCE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("dataResourceType", org.apache.thrift.protocol.TType.I32, (short)7); - private static final org.apache.thrift.protocol.TField RESOURCE_SIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceSize", org.apache.thrift.protocol.TType.I32, (short)8); - private static final org.apache.thrift.protocol.TField CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("creationTime", org.apache.thrift.protocol.TType.I64, (short)9); - private static final org.apache.thrift.protocol.TField LAST_MODIFIED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastModifiedTime", org.apache.thrift.protocol.TType.I64, (short)10); - private static final org.apache.thrift.protocol.TField RESOURCE_METADATA_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceMetadata", org.apache.thrift.protocol.TType.MAP, (short)11); - private static final org.apache.thrift.protocol.TField REPLICA_LOCATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("replicaLocations", org.apache.thrift.protocol.TType.LIST, (short)12); - private static final org.apache.thrift.protocol.TField CHILD_RESOURCES_FIELD_DESC = new org.apache.thrift.protocol.TField("childResources", org.apache.thrift.protocol.TType.LIST, (short)13); + private static final org.apache.thrift.protocol.TField SHA256_CHECKSUM_FIELD_DESC = new org.apache.thrift.protocol.TField("sha256Checksum", org.apache.thrift.protocol.TType.STRING, (short)7); + private static final org.apache.thrift.protocol.TField DATA_RESOURCE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("dataResourceType", org.apache.thrift.protocol.TType.I32, (short)8); + private static final org.apache.thrift.protocol.TField RESOURCE_SIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceSize", org.apache.thrift.protocol.TType.I32, (short)9); + private static final org.apache.thrift.protocol.TField NATIVE_FORMAT_FIELD_DESC = new org.apache.thrift.protocol.TField("nativeFormat", org.apache.thrift.protocol.TType.STRING, (short)10); + private static final org.apache.thrift.protocol.TField CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("creationTime", org.apache.thrift.protocol.TType.I64, (short)11); + private static final org.apache.thrift.protocol.TField LAST_MODIFIED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastModifiedTime", org.apache.thrift.protocol.TType.I64, (short)12); + private static final org.apache.thrift.protocol.TField RESOURCE_METADATA_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceMetadata", org.apache.thrift.protocol.TType.MAP, (short)13); + private static final org.apache.thrift.protocol.TField REPLICA_LOCATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("replicaLocations", org.apache.thrift.protocol.TType.LIST, (short)14); + private static final org.apache.thrift.protocol.TField CHILD_RESOURCES_FIELD_DESC = new org.apache.thrift.protocol.TField("childResources", org.apache.thrift.protocol.TType.LIST, (short)15); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -81,8 +83,10 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo private String resourceName; // optional private String resourceDescription; // optional private String ownerName; // optional + private String sha256Checksum; // optional private DataResourceType dataResourceType; // optional private int resourceSize; // optional + private String nativeFormat; // optional private long creationTime; // optional private long lastModifiedTime; // optional private Map<String,String> resourceMetadata; // optional @@ -97,17 +101,19 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo RESOURCE_NAME((short)4, "resourceName"), RESOURCE_DESCRIPTION((short)5, "resourceDescription"), OWNER_NAME((short)6, "ownerName"), + SHA256_CHECKSUM((short)7, "sha256Checksum"), /** * * @see DataResourceType */ - DATA_RESOURCE_TYPE((short)7, "dataResourceType"), - RESOURCE_SIZE((short)8, "resourceSize"), - CREATION_TIME((short)9, "creationTime"), - LAST_MODIFIED_TIME((short)10, "lastModifiedTime"), - RESOURCE_METADATA((short)11, "resourceMetadata"), - REPLICA_LOCATIONS((short)12, "replicaLocations"), - CHILD_RESOURCES((short)13, "childResources"); + DATA_RESOURCE_TYPE((short)8, "dataResourceType"), + RESOURCE_SIZE((short)9, "resourceSize"), + NATIVE_FORMAT((short)10, "nativeFormat"), + CREATION_TIME((short)11, "creationTime"), + LAST_MODIFIED_TIME((short)12, "lastModifiedTime"), + RESOURCE_METADATA((short)13, "resourceMetadata"), + REPLICA_LOCATIONS((short)14, "replicaLocations"), + CHILD_RESOURCES((short)15, "childResources"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -134,19 +140,23 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo return RESOURCE_DESCRIPTION; case 6: // OWNER_NAME return OWNER_NAME; - case 7: // DATA_RESOURCE_TYPE + case 7: // SHA256_CHECKSUM + return SHA256_CHECKSUM; + case 8: // DATA_RESOURCE_TYPE return DATA_RESOURCE_TYPE; - case 8: // RESOURCE_SIZE + case 9: // RESOURCE_SIZE return RESOURCE_SIZE; - case 9: // CREATION_TIME + case 10: // NATIVE_FORMAT + return NATIVE_FORMAT; + case 11: // CREATION_TIME return CREATION_TIME; - case 10: // LAST_MODIFIED_TIME + case 12: // LAST_MODIFIED_TIME return LAST_MODIFIED_TIME; - case 11: // RESOURCE_METADATA + case 13: // RESOURCE_METADATA return RESOURCE_METADATA; - case 12: // REPLICA_LOCATIONS + case 14: // REPLICA_LOCATIONS return REPLICA_LOCATIONS; - case 13: // CHILD_RESOURCES + case 15: // CHILD_RESOURCES return CHILD_RESOURCES; default: return null; @@ -192,7 +202,7 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo private static final int __CREATIONTIME_ISSET_ID = 1; private static final int __LASTMODIFIEDTIME_ISSET_ID = 2; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.RESOURCE_ID,_Fields.GATEWAY_ID,_Fields.PARENT_RESOURCE_ID,_Fields.RESOURCE_NAME,_Fields.RESOURCE_DESCRIPTION,_Fields.OWNER_NAME,_Fields.DATA_RESOURCE_TYPE,_Fields.RESOURCE_SIZE,_Fields.CREATION_TIME,_Fields.LAST_MODIFIED_TIME,_Fields.RESOURCE_METADATA,_Fields.REPLICA_LOCATIONS,_Fields.CHILD_RESOURCES}; + private static final _Fields optionals[] = {_Fields.RESOURCE_ID,_Fields.GATEWAY_ID,_Fields.PARENT_RESOURCE_ID,_Fields.RESOURCE_NAME,_Fields.RESOURCE_DESCRIPTION,_Fields.OWNER_NAME,_Fields.SHA256_CHECKSUM,_Fields.DATA_RESOURCE_TYPE,_Fields.RESOURCE_SIZE,_Fields.NATIVE_FORMAT,_Fields.CREATION_TIME,_Fields.LAST_MODIFIED_TIME,_Fields.RESOURCE_METADATA,_Fields.REPLICA_LOCATIONS,_Fields.CHILD_RESOURCES}; 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); @@ -208,10 +218,14 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.OWNER_NAME, new org.apache.thrift.meta_data.FieldMetaData("ownerName", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.SHA256_CHECKSUM, new org.apache.thrift.meta_data.FieldMetaData("sha256Checksum", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.DATA_RESOURCE_TYPE, new org.apache.thrift.meta_data.FieldMetaData("dataResourceType", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, DataResourceType.class))); tmpMap.put(_Fields.RESOURCE_SIZE, new org.apache.thrift.meta_data.FieldMetaData("resourceSize", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.NATIVE_FORMAT, new org.apache.thrift.meta_data.FieldMetaData("nativeFormat", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.CREATION_TIME, new org.apache.thrift.meta_data.FieldMetaData("creationTime", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.LAST_MODIFIED_TIME, new org.apache.thrift.meta_data.FieldMetaData("lastModifiedTime", org.apache.thrift.TFieldRequirementType.OPTIONAL, @@ -256,10 +270,16 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo if (other.isSetOwnerName()) { this.ownerName = other.ownerName; } + if (other.isSetSha256Checksum()) { + this.sha256Checksum = other.sha256Checksum; + } if (other.isSetDataResourceType()) { this.dataResourceType = other.dataResourceType; } this.resourceSize = other.resourceSize; + if (other.isSetNativeFormat()) { + this.nativeFormat = other.nativeFormat; + } this.creationTime = other.creationTime; this.lastModifiedTime = other.lastModifiedTime; if (other.isSetResourceMetadata()) { @@ -294,9 +314,11 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo this.resourceName = null; this.resourceDescription = null; this.ownerName = null; + this.sha256Checksum = null; this.dataResourceType = null; setResourceSizeIsSet(false); this.resourceSize = 0; + this.nativeFormat = null; setCreationTimeIsSet(false); this.creationTime = 0; setLastModifiedTimeIsSet(false); @@ -444,6 +466,29 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo } } + public String getSha256Checksum() { + return this.sha256Checksum; + } + + public void setSha256Checksum(String sha256Checksum) { + this.sha256Checksum = sha256Checksum; + } + + public void unsetSha256Checksum() { + this.sha256Checksum = null; + } + + /** Returns true if field sha256Checksum is set (has been assigned a value) and false otherwise */ + public boolean isSetSha256Checksum() { + return this.sha256Checksum != null; + } + + public void setSha256ChecksumIsSet(boolean value) { + if (!value) { + this.sha256Checksum = null; + } + } + /** * * @see DataResourceType @@ -497,6 +542,29 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __RESOURCESIZE_ISSET_ID, value); } + public String getNativeFormat() { + return this.nativeFormat; + } + + public void setNativeFormat(String nativeFormat) { + this.nativeFormat = nativeFormat; + } + + public void unsetNativeFormat() { + this.nativeFormat = null; + } + + /** Returns true if field nativeFormat is set (has been assigned a value) and false otherwise */ + public boolean isSetNativeFormat() { + return this.nativeFormat != null; + } + + public void setNativeFormatIsSet(boolean value) { + if (!value) { + this.nativeFormat = null; + } + } + public long getCreationTime() { return this.creationTime; } @@ -701,6 +769,14 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo } break; + case SHA256_CHECKSUM: + if (value == null) { + unsetSha256Checksum(); + } else { + setSha256Checksum((String)value); + } + break; + case DATA_RESOURCE_TYPE: if (value == null) { unsetDataResourceType(); @@ -717,6 +793,14 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo } break; + case NATIVE_FORMAT: + if (value == null) { + unsetNativeFormat(); + } else { + setNativeFormat((String)value); + } + break; + case CREATION_TIME: if (value == null) { unsetCreationTime(); @@ -780,12 +864,18 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo case OWNER_NAME: return getOwnerName(); + case SHA256_CHECKSUM: + return getSha256Checksum(); + case DATA_RESOURCE_TYPE: return getDataResourceType(); case RESOURCE_SIZE: return getResourceSize(); + case NATIVE_FORMAT: + return getNativeFormat(); + case CREATION_TIME: return getCreationTime(); @@ -824,10 +914,14 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo return isSetResourceDescription(); case OWNER_NAME: return isSetOwnerName(); + case SHA256_CHECKSUM: + return isSetSha256Checksum(); case DATA_RESOURCE_TYPE: return isSetDataResourceType(); case RESOURCE_SIZE: return isSetResourceSize(); + case NATIVE_FORMAT: + return isSetNativeFormat(); case CREATION_TIME: return isSetCreationTime(); case LAST_MODIFIED_TIME: @@ -909,6 +1003,15 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo return false; } + boolean this_present_sha256Checksum = true && this.isSetSha256Checksum(); + boolean that_present_sha256Checksum = true && that.isSetSha256Checksum(); + if (this_present_sha256Checksum || that_present_sha256Checksum) { + if (!(this_present_sha256Checksum && that_present_sha256Checksum)) + return false; + if (!this.sha256Checksum.equals(that.sha256Checksum)) + return false; + } + boolean this_present_dataResourceType = true && this.isSetDataResourceType(); boolean that_present_dataResourceType = true && that.isSetDataResourceType(); if (this_present_dataResourceType || that_present_dataResourceType) { @@ -927,6 +1030,15 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo return false; } + boolean this_present_nativeFormat = true && this.isSetNativeFormat(); + boolean that_present_nativeFormat = true && that.isSetNativeFormat(); + if (this_present_nativeFormat || that_present_nativeFormat) { + if (!(this_present_nativeFormat && that_present_nativeFormat)) + return false; + if (!this.nativeFormat.equals(that.nativeFormat)) + return false; + } + boolean this_present_creationTime = true && this.isSetCreationTime(); boolean that_present_creationTime = true && that.isSetCreationTime(); if (this_present_creationTime || that_present_creationTime) { @@ -1009,6 +1121,11 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo if (present_ownerName) list.add(ownerName); + boolean present_sha256Checksum = true && (isSetSha256Checksum()); + list.add(present_sha256Checksum); + if (present_sha256Checksum) + list.add(sha256Checksum); + boolean present_dataResourceType = true && (isSetDataResourceType()); list.add(present_dataResourceType); if (present_dataResourceType) @@ -1019,6 +1136,11 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo if (present_resourceSize) list.add(resourceSize); + boolean present_nativeFormat = true && (isSetNativeFormat()); + list.add(present_nativeFormat); + if (present_nativeFormat) + list.add(nativeFormat); + boolean present_creationTime = true && (isSetCreationTime()); list.add(present_creationTime); if (present_creationTime) @@ -1115,6 +1237,16 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo return lastComparison; } } + lastComparison = Boolean.valueOf(isSetSha256Checksum()).compareTo(other.isSetSha256Checksum()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetSha256Checksum()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sha256Checksum, other.sha256Checksum); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetDataResourceType()).compareTo(other.isSetDataResourceType()); if (lastComparison != 0) { return lastComparison; @@ -1135,6 +1267,16 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo return lastComparison; } } + lastComparison = Boolean.valueOf(isSetNativeFormat()).compareTo(other.isSetNativeFormat()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetNativeFormat()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.nativeFormat, other.nativeFormat); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetCreationTime()).compareTo(other.isSetCreationTime()); if (lastComparison != 0) { return lastComparison; @@ -1264,6 +1406,16 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo } first = false; } + if (isSetSha256Checksum()) { + if (!first) sb.append(", "); + sb.append("sha256Checksum:"); + if (this.sha256Checksum == null) { + sb.append("null"); + } else { + sb.append(this.sha256Checksum); + } + first = false; + } if (isSetDataResourceType()) { if (!first) sb.append(", "); sb.append("dataResourceType:"); @@ -1280,6 +1432,16 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo sb.append(this.resourceSize); first = false; } + if (isSetNativeFormat()) { + if (!first) sb.append(", "); + sb.append("nativeFormat:"); + if (this.nativeFormat == null) { + sb.append("null"); + } else { + sb.append(this.nativeFormat); + } + first = false; + } if (isSetCreationTime()) { if (!first) sb.append(", "); sb.append("creationTime:"); @@ -1415,7 +1577,15 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 7: // DATA_RESOURCE_TYPE + case 7: // SHA256_CHECKSUM + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.sha256Checksum = iprot.readString(); + struct.setSha256ChecksumIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 8: // DATA_RESOURCE_TYPE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.dataResourceType = org.apache.airavata.model.data.resource.DataResourceType.findByValue(iprot.readI32()); struct.setDataResourceTypeIsSet(true); @@ -1423,7 +1593,7 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 8: // RESOURCE_SIZE + case 9: // RESOURCE_SIZE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.resourceSize = iprot.readI32(); struct.setResourceSizeIsSet(true); @@ -1431,7 +1601,15 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 9: // CREATION_TIME + case 10: // NATIVE_FORMAT + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.nativeFormat = iprot.readString(); + struct.setNativeFormatIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 11: // CREATION_TIME if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.creationTime = iprot.readI64(); struct.setCreationTimeIsSet(true); @@ -1439,7 +1617,7 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 10: // LAST_MODIFIED_TIME + case 12: // LAST_MODIFIED_TIME if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.lastModifiedTime = iprot.readI64(); struct.setLastModifiedTimeIsSet(true); @@ -1447,7 +1625,7 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 11: // RESOURCE_METADATA + case 13: // RESOURCE_METADATA if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { org.apache.thrift.protocol.TMap _map0 = iprot.readMapBegin(); @@ -1467,7 +1645,7 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 12: // REPLICA_LOCATIONS + case 14: // REPLICA_LOCATIONS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list4 = iprot.readListBegin(); @@ -1486,7 +1664,7 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 13: // CHILD_RESOURCES + case 15: // CHILD_RESOURCES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list7 = iprot.readListBegin(); @@ -1560,6 +1738,13 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo oprot.writeFieldEnd(); } } + if (struct.sha256Checksum != null) { + if (struct.isSetSha256Checksum()) { + oprot.writeFieldBegin(SHA256_CHECKSUM_FIELD_DESC); + oprot.writeString(struct.sha256Checksum); + oprot.writeFieldEnd(); + } + } if (struct.dataResourceType != null) { if (struct.isSetDataResourceType()) { oprot.writeFieldBegin(DATA_RESOURCE_TYPE_FIELD_DESC); @@ -1572,6 +1757,13 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo oprot.writeI32(struct.resourceSize); oprot.writeFieldEnd(); } + if (struct.nativeFormat != null) { + if (struct.isSetNativeFormat()) { + oprot.writeFieldBegin(NATIVE_FORMAT_FIELD_DESC); + oprot.writeString(struct.nativeFormat); + oprot.writeFieldEnd(); + } + } if (struct.isSetCreationTime()) { oprot.writeFieldBegin(CREATION_TIME_FIELD_DESC); oprot.writeI64(struct.creationTime); @@ -1661,28 +1853,34 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo if (struct.isSetOwnerName()) { optionals.set(5); } - if (struct.isSetDataResourceType()) { + if (struct.isSetSha256Checksum()) { optionals.set(6); } - if (struct.isSetResourceSize()) { + if (struct.isSetDataResourceType()) { optionals.set(7); } - if (struct.isSetCreationTime()) { + if (struct.isSetResourceSize()) { optionals.set(8); } - if (struct.isSetLastModifiedTime()) { + if (struct.isSetNativeFormat()) { optionals.set(9); } - if (struct.isSetResourceMetadata()) { + if (struct.isSetCreationTime()) { optionals.set(10); } - if (struct.isSetReplicaLocations()) { + if (struct.isSetLastModifiedTime()) { optionals.set(11); } - if (struct.isSetChildResources()) { + if (struct.isSetResourceMetadata()) { optionals.set(12); } - oprot.writeBitSet(optionals, 13); + if (struct.isSetReplicaLocations()) { + optionals.set(13); + } + if (struct.isSetChildResources()) { + optionals.set(14); + } + oprot.writeBitSet(optionals, 15); if (struct.isSetResourceId()) { oprot.writeString(struct.resourceId); } @@ -1701,12 +1899,18 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo if (struct.isSetOwnerName()) { oprot.writeString(struct.ownerName); } + if (struct.isSetSha256Checksum()) { + oprot.writeString(struct.sha256Checksum); + } if (struct.isSetDataResourceType()) { oprot.writeI32(struct.dataResourceType.getValue()); } if (struct.isSetResourceSize()) { oprot.writeI32(struct.resourceSize); } + if (struct.isSetNativeFormat()) { + oprot.writeString(struct.nativeFormat); + } if (struct.isSetCreationTime()) { oprot.writeI64(struct.creationTime); } @@ -1746,7 +1950,7 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo @Override public void read(org.apache.thrift.protocol.TProtocol prot, DataResourceModel struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(13); + BitSet incoming = iprot.readBitSet(15); if (incoming.get(0)) { struct.resourceId = iprot.readString(); struct.setResourceIdIsSet(true); @@ -1772,22 +1976,30 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo struct.setOwnerNameIsSet(true); } if (incoming.get(6)) { + struct.sha256Checksum = iprot.readString(); + struct.setSha256ChecksumIsSet(true); + } + if (incoming.get(7)) { struct.dataResourceType = org.apache.airavata.model.data.resource.DataResourceType.findByValue(iprot.readI32()); struct.setDataResourceTypeIsSet(true); } - if (incoming.get(7)) { + if (incoming.get(8)) { struct.resourceSize = iprot.readI32(); struct.setResourceSizeIsSet(true); } - if (incoming.get(8)) { + if (incoming.get(9)) { + struct.nativeFormat = iprot.readString(); + struct.setNativeFormatIsSet(true); + } + if (incoming.get(10)) { struct.creationTime = iprot.readI64(); struct.setCreationTimeIsSet(true); } - if (incoming.get(9)) { + if (incoming.get(11)) { struct.lastModifiedTime = iprot.readI64(); struct.setLastModifiedTimeIsSet(true); } - if (incoming.get(10)) { + if (incoming.get(12)) { { org.apache.thrift.protocol.TMap _map16 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.resourceMetadata = new HashMap<String,String>(2*_map16.size); @@ -1802,7 +2014,7 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo } struct.setResourceMetadataIsSet(true); } - if (incoming.get(11)) { + if (incoming.get(13)) { { org.apache.thrift.protocol.TList _list20 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.replicaLocations = new ArrayList<DataReplicaLocationModel>(_list20.size); @@ -1816,7 +2028,7 @@ public class DataResourceModel implements org.apache.thrift.TBase<DataResourceMo } struct.setReplicaLocationsIsSet(true); } - if (incoming.get(12)) { + if (incoming.get(14)) { { org.apache.thrift.protocol.TList _list23 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.childResources = new ArrayList<DataResourceModel>(_list23.size); http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java index 66fe38c..700b875 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java @@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory; * parameter: If the error applied to a particular input parameter, this will * indicate which parameter. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class AiravataClientException extends TException implements org.apache.thrift.TBase<AiravataClientException, AiravataClientException._Fields>, java.io.Serializable, Cloneable, Comparable<AiravataClientException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AiravataClientException"); http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java index c9b6c6c..892eed1 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java @@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory; * message: This may contain additional information about the error * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class AiravataSystemException extends TException implements org.apache.thrift.TBase<AiravataSystemException, AiravataSystemException._Fields>, java.io.Serializable, Cloneable, Comparable<AiravataSystemException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AiravataSystemException"); http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java index fef1241..6b73164 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java @@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory; * * message: contains the cause of the authorization failure. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class AuthenticationException extends TException implements org.apache.thrift.TBase<AuthenticationException, AuthenticationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthenticationException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthenticationException"); http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java index 6e498af..aa0c52a 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java @@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory; * * message: contains the authorization failure message */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class AuthorizationException extends TException implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthorizationException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthorizationException"); http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a0772f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java index 43c736a..da2dac8 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java @@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory; * * key: The value passed from the client in the identifier, which was not found. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-22") public class ExperimentNotFoundException extends TException implements org.apache.thrift.TBase<ExperimentNotFoundException, ExperimentNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentNotFoundException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentNotFoundException");
