http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java index 5faeaef..3ed3077 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.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 = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class JobStatusChangeRequestEvent implements org.apache.thrift.TBase<JobStatusChangeRequestEvent, JobStatusChangeRequestEvent._Fields>, java.io.Serializable, Cloneable, Comparable<JobStatusChangeRequestEvent> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobStatusChangeRequestEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java index 8901f85..c76f795 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.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 = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class Message implements org.apache.thrift.TBase<Message, Message._Fields>, java.io.Serializable, Cloneable, Comparable<Message> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Message"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java index b0b3169..bc41613 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.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 = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class ProcessIdentifier implements org.apache.thrift.TBase<ProcessIdentifier, ProcessIdentifier._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessIdentifier> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessIdentifier"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java index f1e97ec..32475fa 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.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 = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class ProcessStatusChangeEvent implements org.apache.thrift.TBase<ProcessStatusChangeEvent, ProcessStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessStatusChangeEvent> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatusChangeEvent"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java index 8b6da4b..e54a93e 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.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 = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class ProcessStatusChangeRequestEvent implements org.apache.thrift.TBase<ProcessStatusChangeRequestEvent, ProcessStatusChangeRequestEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessStatusChangeRequestEvent> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatusChangeRequestEvent"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java index ace3c91..1e6c4e2 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.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 = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class ProcessSubmitEvent implements org.apache.thrift.TBase<ProcessSubmitEvent, ProcessSubmitEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessSubmitEvent> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessSubmitEvent"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java index 367820d..d4aa5fa 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.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 = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class ProcessTerminateEvent implements org.apache.thrift.TBase<ProcessTerminateEvent, ProcessTerminateEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessTerminateEvent> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessTerminateEvent"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java index 140c404..35039ee 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.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 = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, TaskIdentifier._Fields>, java.io.Serializable, Cloneable, Comparable<TaskIdentifier> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskIdentifier"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java index 714f267..1cf29e9 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.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 = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class TaskOutputChangeEvent implements org.apache.thrift.TBase<TaskOutputChangeEvent, TaskOutputChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskOutputChangeEvent> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskOutputChangeEvent"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java index 20fdd62..5238aed 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.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 = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class TaskStatusChangeEvent implements org.apache.thrift.TBase<TaskStatusChangeEvent, TaskStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatusChangeEvent> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatusChangeEvent"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java index 0ea390b..c42a616 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.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 = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class TaskStatusChangeRequestEvent implements org.apache.thrift.TBase<TaskStatusChangeRequestEvent, TaskStatusChangeRequestEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatusChangeRequestEvent> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatusChangeRequestEvent"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java index 006d391..98d5235 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, ProcessModel._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java index 5214e17..b8ac4dc 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java @@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory; * * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class ComputationalResourceSchedulingModel implements org.apache.thrift.TBase<ComputationalResourceSchedulingModel, ComputationalResourceSchedulingModel._Fields>, java.io.Serializable, Cloneable, Comparable<ComputationalResourceSchedulingModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputationalResourceSchedulingModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java index 87a90c3..2615829 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.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 = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class AuthzToken implements org.apache.thrift.TBase<AuthzToken, AuthzToken._Fields>, java.io.Serializable, Cloneable, Comparable<AuthzToken> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthzToken"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java index b6a4fcf..c3b1f2e 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java @@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory; * User friendly reason on how the state is inferred. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class ExperimentStatus implements org.apache.thrift.TBase<ExperimentStatus, ExperimentStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatus"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java index ad5d994..4f26729 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.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 = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class JobStatus implements org.apache.thrift.TBase<JobStatus, JobStatus._Fields>, java.io.Serializable, Cloneable, Comparable<JobStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobStatus"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java index 01a1932..74c6a46 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.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 = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, ProcessStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatus"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java index a46a3c6..4288f8b 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.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 = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class TaskStatus implements org.apache.thrift.TBase<TaskStatus, TaskStatus._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatus"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java index 2858048..64b0f75 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.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 = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStagingTaskModel, DataStagingTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataStagingTaskModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataStagingTaskModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java index 4286a11..9645612 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java @@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory; * EnvironmentSetupTaskModel: A structure holding the environment creation task details * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class EnvironmentSetupTaskModel implements org.apache.thrift.TBase<EnvironmentSetupTaskModel, EnvironmentSetupTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<EnvironmentSetupTaskModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EnvironmentSetupTaskModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java index a7fc645..be575ad 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.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 = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class JobSubmissionTaskModel implements org.apache.thrift.TBase<JobSubmissionTaskModel, JobSubmissionTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<JobSubmissionTaskModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobSubmissionTaskModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java index f455b3a..68995c5 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.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 = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class MonitorTaskModel implements org.apache.thrift.TBase<MonitorTaskModel, MonitorTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<MonitorTaskModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MonitorTaskModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java index ab3a5f6..63c5770 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * subTaskModel: * A generic byte object for the Task developer to store internal serialized data into registry catalogs. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<TaskModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java index 0a13976..e017c4a 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java @@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory; * * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class NSFDemographics implements org.apache.thrift.TBase<NSFDemographics, NSFDemographics._Fields>, java.io.Serializable, Cloneable, Comparable<NSFDemographics> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NSFDemographics"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java index ff2b2cb..ff357a2 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java @@ -103,7 +103,7 @@ import org.slf4j.LoggerFactory; * * Userâs preferred timezone - IANA Timezone Databases - http://www.iana.org/time-zones. * * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserProfile._Fields>, java.io.Serializable, Cloneable, Comparable<UserProfile> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserProfile"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java index 272f096..2c84a76 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.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 = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields>, java.io.Serializable, Cloneable, Comparable<Gateway> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Gateway"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java index c493a32..90034ae 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.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 = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class Group implements org.apache.thrift.TBase<Group, Group._Fields>, java.io.Serializable, Cloneable, Comparable<Group> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Group"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java index 5d7a764..832b792 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.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 = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class Notification implements org.apache.thrift.TBase<Notification, Notification._Fields>, java.io.Serializable, Cloneable, Comparable<Notification> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Notification"); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java index 3b09f70..e19e107 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java @@ -51,17 +51,18 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class Project implements org.apache.thrift.TBase<Project, Project._Fields>, java.io.Serializable, Cloneable, Comparable<Project> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Project"); private static final org.apache.thrift.protocol.TField PROJECT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("projectID", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField OWNER_FIELD_DESC = new org.apache.thrift.protocol.TField("owner", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", 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 SHARED_USERS_FIELD_DESC = new org.apache.thrift.protocol.TField("sharedUsers", org.apache.thrift.protocol.TType.LIST, (short)6); - private static final org.apache.thrift.protocol.TField SHARED_GROUPS_FIELD_DESC = new org.apache.thrift.protocol.TField("sharedGroups", org.apache.thrift.protocol.TType.LIST, (short)7); + private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", 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 SHARED_USERS_FIELD_DESC = new org.apache.thrift.protocol.TField("sharedUsers", org.apache.thrift.protocol.TType.LIST, (short)7); + private static final org.apache.thrift.protocol.TField SHARED_GROUPS_FIELD_DESC = new org.apache.thrift.protocol.TField("sharedGroups", org.apache.thrift.protocol.TType.LIST, (short)8); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -71,6 +72,7 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields private String projectID; // required private String owner; // required + private String gatewayId; // required private String name; // required private String description; // optional private long creationTime; // optional @@ -81,11 +83,12 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields public enum _Fields implements org.apache.thrift.TFieldIdEnum { PROJECT_ID((short)1, "projectID"), OWNER((short)2, "owner"), - NAME((short)3, "name"), - DESCRIPTION((short)4, "description"), - CREATION_TIME((short)5, "creationTime"), - SHARED_USERS((short)6, "sharedUsers"), - SHARED_GROUPS((short)7, "sharedGroups"); + GATEWAY_ID((short)3, "gatewayId"), + NAME((short)4, "name"), + DESCRIPTION((short)5, "description"), + CREATION_TIME((short)6, "creationTime"), + SHARED_USERS((short)7, "sharedUsers"), + SHARED_GROUPS((short)8, "sharedGroups"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -104,15 +107,17 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields return PROJECT_ID; case 2: // OWNER return OWNER; - case 3: // NAME + case 3: // GATEWAY_ID + return GATEWAY_ID; + case 4: // NAME return NAME; - case 4: // DESCRIPTION + case 5: // DESCRIPTION return DESCRIPTION; - case 5: // CREATION_TIME + case 6: // CREATION_TIME return CREATION_TIME; - case 6: // SHARED_USERS + case 7: // SHARED_USERS return SHARED_USERS; - case 7: // SHARED_GROUPS + case 8: // SHARED_GROUPS return SHARED_GROUPS; default: return null; @@ -164,6 +169,8 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.OWNER, new org.apache.thrift.meta_data.FieldMetaData("owner", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("description", org.apache.thrift.TFieldRequirementType.OPTIONAL, @@ -188,11 +195,13 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields public Project( String projectID, String owner, + String gatewayId, String name) { this(); this.projectID = projectID; this.owner = owner; + this.gatewayId = gatewayId; this.name = name; } @@ -207,6 +216,9 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields if (other.isSetOwner()) { this.owner = other.owner; } + if (other.isSetGatewayId()) { + this.gatewayId = other.gatewayId; + } if (other.isSetName()) { this.name = other.name; } @@ -233,6 +245,7 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields this.projectID = "DO_NOT_SET_AT_CLIENTS"; this.owner = null; + this.gatewayId = null; this.name = null; this.description = null; setCreationTimeIsSet(false); @@ -287,6 +300,29 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields } } + public String getGatewayId() { + return this.gatewayId; + } + + public void setGatewayId(String gatewayId) { + this.gatewayId = gatewayId; + } + + public void unsetGatewayId() { + this.gatewayId = null; + } + + /** Returns true if field gatewayId is set (has been assigned a value) and false otherwise */ + public boolean isSetGatewayId() { + return this.gatewayId != null; + } + + public void setGatewayIdIsSet(boolean value) { + if (!value) { + this.gatewayId = null; + } + } + public String getName() { return this.name; } @@ -449,6 +485,14 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields } break; + case GATEWAY_ID: + if (value == null) { + unsetGatewayId(); + } else { + setGatewayId((String)value); + } + break; + case NAME: if (value == null) { unsetName(); @@ -500,6 +544,9 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields case OWNER: return getOwner(); + case GATEWAY_ID: + return getGatewayId(); + case NAME: return getName(); @@ -530,6 +577,8 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields return isSetProjectID(); case OWNER: return isSetOwner(); + case GATEWAY_ID: + return isSetGatewayId(); case NAME: return isSetName(); case DESCRIPTION: @@ -575,6 +624,15 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields return false; } + boolean this_present_gatewayId = true && this.isSetGatewayId(); + boolean that_present_gatewayId = true && that.isSetGatewayId(); + if (this_present_gatewayId || that_present_gatewayId) { + if (!(this_present_gatewayId && that_present_gatewayId)) + return false; + if (!this.gatewayId.equals(that.gatewayId)) + return false; + } + boolean this_present_name = true && this.isSetName(); boolean that_present_name = true && that.isSetName(); if (this_present_name || that_present_name) { @@ -637,6 +695,11 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields if (present_owner) list.add(owner); + boolean present_gatewayId = true && (isSetGatewayId()); + list.add(present_gatewayId); + if (present_gatewayId) + list.add(gatewayId); + boolean present_name = true && (isSetName()); list.add(present_name); if (present_name) @@ -693,6 +756,16 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields return lastComparison; } } + lastComparison = Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetGatewayId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayId, other.gatewayId); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName()); if (lastComparison != 0) { return lastComparison; @@ -779,6 +852,14 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields } first = false; if (!first) sb.append(", "); + sb.append("gatewayId:"); + if (this.gatewayId == null) { + sb.append("null"); + } else { + sb.append(this.gatewayId); + } + first = false; + if (!first) sb.append(", "); sb.append("name:"); if (this.name == null) { sb.append("null"); @@ -836,6 +917,10 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields throw new org.apache.thrift.protocol.TProtocolException("Required field 'owner' is unset! Struct:" + toString()); } + if (!isSetGatewayId()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' is unset! Struct:" + toString()); + } + if (!isSetName()) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString()); } @@ -895,7 +980,15 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // NAME + case 3: // GATEWAY_ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.gatewayId = iprot.readString(); + struct.setGatewayIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.name = iprot.readString(); struct.setNameIsSet(true); @@ -903,7 +996,7 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // DESCRIPTION + case 5: // DESCRIPTION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.description = iprot.readString(); struct.setDescriptionIsSet(true); @@ -911,7 +1004,7 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // CREATION_TIME + case 6: // CREATION_TIME if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.creationTime = iprot.readI64(); struct.setCreationTimeIsSet(true); @@ -919,7 +1012,7 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 6: // SHARED_USERS + case 7: // SHARED_USERS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); @@ -937,7 +1030,7 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 7: // SHARED_GROUPS + case 8: // SHARED_GROUPS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list3 = iprot.readListBegin(); @@ -978,6 +1071,11 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields oprot.writeString(struct.owner); oprot.writeFieldEnd(); } + if (struct.gatewayId != null) { + oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC); + oprot.writeString(struct.gatewayId); + oprot.writeFieldEnd(); + } if (struct.name != null) { oprot.writeFieldBegin(NAME_FIELD_DESC); oprot.writeString(struct.name); @@ -1042,6 +1140,7 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields TTupleProtocol oprot = (TTupleProtocol) prot; oprot.writeString(struct.projectID); oprot.writeString(struct.owner); + oprot.writeString(struct.gatewayId); oprot.writeString(struct.name); BitSet optionals = new BitSet(); if (struct.isSetDescription()) { @@ -1090,6 +1189,8 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields struct.setProjectIDIsSet(true); struct.owner = iprot.readString(); struct.setOwnerIsSet(true); + struct.gatewayId = iprot.readString(); + struct.setGatewayIdIsSet(true); struct.name = iprot.readString(); struct.setNameIsSet(true); BitSet incoming = iprot.readBitSet(4); http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java index ddf6b84..c18a498 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java @@ -51,12 +51,16 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07") public class User implements org.apache.thrift.TBase<User, User._Fields>, java.io.Serializable, Cloneable, Comparable<User> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("User"); - private static final org.apache.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField GROUP_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("groupList", org.apache.thrift.protocol.TType.LIST, (short)2); + private static final org.apache.thrift.protocol.TField AIRAVATA_INTERNAL_USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("airavataInternalUserId", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField FIRST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("firstName", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField LAST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastName", org.apache.thrift.protocol.TType.STRING, (short)5); + private static final org.apache.thrift.protocol.TField EMAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("email", org.apache.thrift.protocol.TType.STRING, (short)6); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -64,13 +68,21 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i schemes.put(TupleScheme.class, new UserTupleSchemeFactory()); } - private String userName; // required - private List<Group> groupList; // optional + private String airavataInternalUserId; // required + private String userName; // optional + private String gatewayId; // required + private String firstName; // optional + private String lastName; // optional + private String email; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - USER_NAME((short)1, "userName"), - GROUP_LIST((short)2, "groupList"); + AIRAVATA_INTERNAL_USER_ID((short)1, "airavataInternalUserId"), + USER_NAME((short)2, "userName"), + GATEWAY_ID((short)3, "gatewayId"), + FIRST_NAME((short)4, "firstName"), + LAST_NAME((short)5, "lastName"), + EMAIL((short)6, "email"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -85,10 +97,18 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // USER_NAME + case 1: // AIRAVATA_INTERNAL_USER_ID + return AIRAVATA_INTERNAL_USER_ID; + case 2: // USER_NAME return USER_NAME; - case 2: // GROUP_LIST - return GROUP_LIST; + case 3: // GATEWAY_ID + return GATEWAY_ID; + case 4: // FIRST_NAME + return FIRST_NAME; + case 5: // LAST_NAME + return LAST_NAME; + case 6: // EMAIL + return EMAIL; default: return null; } @@ -129,42 +149,61 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i } // isset id assignments - private static final _Fields optionals[] = {_Fields.GROUP_LIST}; + private static final _Fields optionals[] = {_Fields.USER_NAME,_Fields.FIRST_NAME,_Fields.LAST_NAME,_Fields.EMAIL}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.AIRAVATA_INTERNAL_USER_ID, new org.apache.thrift.meta_data.FieldMetaData("airavataInternalUserId", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.FIRST_NAME, new org.apache.thrift.meta_data.FieldMetaData("firstName", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.LAST_NAME, new org.apache.thrift.meta_data.FieldMetaData("lastName", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.EMAIL, new org.apache.thrift.meta_data.FieldMetaData("email", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.GROUP_LIST, new org.apache.thrift.meta_data.FieldMetaData("groupList", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Group.class)))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(User.class, metaDataMap); } public User() { + this.airavataInternalUserId = "DO_NOT_SET_AT_CLIENTS"; + } public User( - String userName) + String airavataInternalUserId, + String gatewayId) { this(); - this.userName = userName; + this.airavataInternalUserId = airavataInternalUserId; + this.gatewayId = gatewayId; } /** * Performs a deep copy on <i>other</i>. */ public User(User other) { + if (other.isSetAiravataInternalUserId()) { + this.airavataInternalUserId = other.airavataInternalUserId; + } if (other.isSetUserName()) { this.userName = other.userName; } - if (other.isSetGroupList()) { - List<Group> __this__groupList = new ArrayList<Group>(other.groupList.size()); - for (Group other_element : other.groupList) { - __this__groupList.add(new Group(other_element)); - } - this.groupList = __this__groupList; + if (other.isSetGatewayId()) { + this.gatewayId = other.gatewayId; + } + if (other.isSetFirstName()) { + this.firstName = other.firstName; + } + if (other.isSetLastName()) { + this.lastName = other.lastName; + } + if (other.isSetEmail()) { + this.email = other.email; } } @@ -174,8 +213,36 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i @Override public void clear() { + this.airavataInternalUserId = "DO_NOT_SET_AT_CLIENTS"; + this.userName = null; - this.groupList = null; + this.gatewayId = null; + this.firstName = null; + this.lastName = null; + this.email = null; + } + + public String getAiravataInternalUserId() { + return this.airavataInternalUserId; + } + + public void setAiravataInternalUserId(String airavataInternalUserId) { + this.airavataInternalUserId = airavataInternalUserId; + } + + public void unsetAiravataInternalUserId() { + this.airavataInternalUserId = null; + } + + /** Returns true if field airavataInternalUserId is set (has been assigned a value) and false otherwise */ + public boolean isSetAiravataInternalUserId() { + return this.airavataInternalUserId != null; + } + + public void setAiravataInternalUserIdIsSet(boolean value) { + if (!value) { + this.airavataInternalUserId = null; + } } public String getUserName() { @@ -201,46 +268,108 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i } } - public int getGroupListSize() { - return (this.groupList == null) ? 0 : this.groupList.size(); + public String getGatewayId() { + return this.gatewayId; } - public java.util.Iterator<Group> getGroupListIterator() { - return (this.groupList == null) ? null : this.groupList.iterator(); + public void setGatewayId(String gatewayId) { + this.gatewayId = gatewayId; } - public void addToGroupList(Group elem) { - if (this.groupList == null) { - this.groupList = new ArrayList<Group>(); + public void unsetGatewayId() { + this.gatewayId = null; + } + + /** Returns true if field gatewayId is set (has been assigned a value) and false otherwise */ + public boolean isSetGatewayId() { + return this.gatewayId != null; + } + + public void setGatewayIdIsSet(boolean value) { + if (!value) { + this.gatewayId = null; } - this.groupList.add(elem); } - public List<Group> getGroupList() { - return this.groupList; + public String getFirstName() { + return this.firstName; } - public void setGroupList(List<Group> groupList) { - this.groupList = groupList; + public void setFirstName(String firstName) { + this.firstName = firstName; } - public void unsetGroupList() { - this.groupList = null; + public void unsetFirstName() { + this.firstName = null; } - /** Returns true if field groupList is set (has been assigned a value) and false otherwise */ - public boolean isSetGroupList() { - return this.groupList != null; + /** Returns true if field firstName is set (has been assigned a value) and false otherwise */ + public boolean isSetFirstName() { + return this.firstName != null; } - public void setGroupListIsSet(boolean value) { + public void setFirstNameIsSet(boolean value) { if (!value) { - this.groupList = null; + this.firstName = null; + } + } + + public String getLastName() { + return this.lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public void unsetLastName() { + this.lastName = null; + } + + /** Returns true if field lastName is set (has been assigned a value) and false otherwise */ + public boolean isSetLastName() { + return this.lastName != null; + } + + public void setLastNameIsSet(boolean value) { + if (!value) { + this.lastName = null; + } + } + + public String getEmail() { + return this.email; + } + + public void setEmail(String email) { + this.email = email; + } + + public void unsetEmail() { + this.email = null; + } + + /** Returns true if field email is set (has been assigned a value) and false otherwise */ + public boolean isSetEmail() { + return this.email != null; + } + + public void setEmailIsSet(boolean value) { + if (!value) { + this.email = null; } } public void setFieldValue(_Fields field, Object value) { switch (field) { + case AIRAVATA_INTERNAL_USER_ID: + if (value == null) { + unsetAiravataInternalUserId(); + } else { + setAiravataInternalUserId((String)value); + } + break; + case USER_NAME: if (value == null) { unsetUserName(); @@ -249,11 +378,35 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i } break; - case GROUP_LIST: + case GATEWAY_ID: if (value == null) { - unsetGroupList(); + unsetGatewayId(); } else { - setGroupList((List<Group>)value); + setGatewayId((String)value); + } + break; + + case FIRST_NAME: + if (value == null) { + unsetFirstName(); + } else { + setFirstName((String)value); + } + break; + + case LAST_NAME: + if (value == null) { + unsetLastName(); + } else { + setLastName((String)value); + } + break; + + case EMAIL: + if (value == null) { + unsetEmail(); + } else { + setEmail((String)value); } break; @@ -262,11 +415,23 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i public Object getFieldValue(_Fields field) { switch (field) { + case AIRAVATA_INTERNAL_USER_ID: + return getAiravataInternalUserId(); + case USER_NAME: return getUserName(); - case GROUP_LIST: - return getGroupList(); + case GATEWAY_ID: + return getGatewayId(); + + case FIRST_NAME: + return getFirstName(); + + case LAST_NAME: + return getLastName(); + + case EMAIL: + return getEmail(); } throw new IllegalStateException(); @@ -279,10 +444,18 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i } switch (field) { + case AIRAVATA_INTERNAL_USER_ID: + return isSetAiravataInternalUserId(); case USER_NAME: return isSetUserName(); - case GROUP_LIST: - return isSetGroupList(); + case GATEWAY_ID: + return isSetGatewayId(); + case FIRST_NAME: + return isSetFirstName(); + case LAST_NAME: + return isSetLastName(); + case EMAIL: + return isSetEmail(); } throw new IllegalStateException(); } @@ -300,6 +473,15 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i if (that == null) return false; + boolean this_present_airavataInternalUserId = true && this.isSetAiravataInternalUserId(); + boolean that_present_airavataInternalUserId = true && that.isSetAiravataInternalUserId(); + if (this_present_airavataInternalUserId || that_present_airavataInternalUserId) { + if (!(this_present_airavataInternalUserId && that_present_airavataInternalUserId)) + return false; + if (!this.airavataInternalUserId.equals(that.airavataInternalUserId)) + return false; + } + boolean this_present_userName = true && this.isSetUserName(); boolean that_present_userName = true && that.isSetUserName(); if (this_present_userName || that_present_userName) { @@ -309,12 +491,39 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i return false; } - boolean this_present_groupList = true && this.isSetGroupList(); - boolean that_present_groupList = true && that.isSetGroupList(); - if (this_present_groupList || that_present_groupList) { - if (!(this_present_groupList && that_present_groupList)) + boolean this_present_gatewayId = true && this.isSetGatewayId(); + boolean that_present_gatewayId = true && that.isSetGatewayId(); + if (this_present_gatewayId || that_present_gatewayId) { + if (!(this_present_gatewayId && that_present_gatewayId)) + return false; + if (!this.gatewayId.equals(that.gatewayId)) + return false; + } + + boolean this_present_firstName = true && this.isSetFirstName(); + boolean that_present_firstName = true && that.isSetFirstName(); + if (this_present_firstName || that_present_firstName) { + if (!(this_present_firstName && that_present_firstName)) + return false; + if (!this.firstName.equals(that.firstName)) + return false; + } + + boolean this_present_lastName = true && this.isSetLastName(); + boolean that_present_lastName = true && that.isSetLastName(); + if (this_present_lastName || that_present_lastName) { + if (!(this_present_lastName && that_present_lastName)) + return false; + if (!this.lastName.equals(that.lastName)) + return false; + } + + boolean this_present_email = true && this.isSetEmail(); + boolean that_present_email = true && that.isSetEmail(); + if (this_present_email || that_present_email) { + if (!(this_present_email && that_present_email)) return false; - if (!this.groupList.equals(that.groupList)) + if (!this.email.equals(that.email)) return false; } @@ -325,15 +534,35 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i public int hashCode() { List<Object> list = new ArrayList<Object>(); + boolean present_airavataInternalUserId = true && (isSetAiravataInternalUserId()); + list.add(present_airavataInternalUserId); + if (present_airavataInternalUserId) + list.add(airavataInternalUserId); + boolean present_userName = true && (isSetUserName()); list.add(present_userName); if (present_userName) list.add(userName); - boolean present_groupList = true && (isSetGroupList()); - list.add(present_groupList); - if (present_groupList) - list.add(groupList); + boolean present_gatewayId = true && (isSetGatewayId()); + list.add(present_gatewayId); + if (present_gatewayId) + list.add(gatewayId); + + boolean present_firstName = true && (isSetFirstName()); + list.add(present_firstName); + if (present_firstName) + list.add(firstName); + + boolean present_lastName = true && (isSetLastName()); + list.add(present_lastName); + if (present_lastName) + list.add(lastName); + + boolean present_email = true && (isSetEmail()); + list.add(present_email); + if (present_email) + list.add(email); return list.hashCode(); } @@ -346,6 +575,16 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i int lastComparison = 0; + lastComparison = Boolean.valueOf(isSetAiravataInternalUserId()).compareTo(other.isSetAiravataInternalUserId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetAiravataInternalUserId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.airavataInternalUserId, other.airavataInternalUserId); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetUserName()).compareTo(other.isSetUserName()); if (lastComparison != 0) { return lastComparison; @@ -356,12 +595,42 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i return lastComparison; } } - lastComparison = Boolean.valueOf(isSetGroupList()).compareTo(other.isSetGroupList()); + lastComparison = Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetGatewayId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayId, other.gatewayId); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetFirstName()).compareTo(other.isSetFirstName()); if (lastComparison != 0) { return lastComparison; } - if (isSetGroupList()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.groupList, other.groupList); + if (isSetFirstName()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.firstName, other.firstName); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetLastName()).compareTo(other.isSetLastName()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetLastName()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastName, other.lastName); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetEmail()).compareTo(other.isSetEmail()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetEmail()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.email, other.email); if (lastComparison != 0) { return lastComparison; } @@ -386,20 +655,58 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i StringBuilder sb = new StringBuilder("User("); boolean first = true; - sb.append("userName:"); - if (this.userName == null) { + sb.append("airavataInternalUserId:"); + if (this.airavataInternalUserId == null) { + sb.append("null"); + } else { + sb.append(this.airavataInternalUserId); + } + first = false; + if (isSetUserName()) { + if (!first) sb.append(", "); + sb.append("userName:"); + if (this.userName == null) { + sb.append("null"); + } else { + sb.append(this.userName); + } + first = false; + } + if (!first) sb.append(", "); + sb.append("gatewayId:"); + if (this.gatewayId == null) { sb.append("null"); } else { - sb.append(this.userName); + sb.append(this.gatewayId); } first = false; - if (isSetGroupList()) { + if (isSetFirstName()) { + if (!first) sb.append(", "); + sb.append("firstName:"); + if (this.firstName == null) { + sb.append("null"); + } else { + sb.append(this.firstName); + } + first = false; + } + if (isSetLastName()) { + if (!first) sb.append(", "); + sb.append("lastName:"); + if (this.lastName == null) { + sb.append("null"); + } else { + sb.append(this.lastName); + } + first = false; + } + if (isSetEmail()) { if (!first) sb.append(", "); - sb.append("groupList:"); - if (this.groupList == null) { + sb.append("email:"); + if (this.email == null) { sb.append("null"); } else { - sb.append(this.groupList); + sb.append(this.email); } first = false; } @@ -409,8 +716,12 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i public void validate() throws org.apache.thrift.TException { // check for required fields - if (!isSetUserName()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'userName' is unset! Struct:" + toString()); + if (!isSetAiravataInternalUserId()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'airavataInternalUserId' is unset! Struct:" + toString()); + } + + if (!isSetGatewayId()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' is unset! Struct:" + toString()); } // check for sub-struct validity @@ -450,7 +761,15 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i break; } switch (schemeField.id) { - case 1: // USER_NAME + case 1: // AIRAVATA_INTERNAL_USER_ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.airavataInternalUserId = iprot.readString(); + struct.setAiravataInternalUserIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 2: // USER_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.userName = iprot.readString(); struct.setUserNameIsSet(true); @@ -458,21 +777,34 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // GROUP_LIST - if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { - { - org.apache.thrift.protocol.TList _list16 = iprot.readListBegin(); - struct.groupList = new ArrayList<Group>(_list16.size); - Group _elem17; - for (int _i18 = 0; _i18 < _list16.size; ++_i18) - { - _elem17 = new Group(); - _elem17.read(iprot); - struct.groupList.add(_elem17); - } - iprot.readListEnd(); - } - struct.setGroupListIsSet(true); + case 3: // GATEWAY_ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.gatewayId = iprot.readString(); + struct.setGatewayIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // FIRST_NAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.firstName = iprot.readString(); + struct.setFirstNameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 5: // LAST_NAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.lastName = iprot.readString(); + struct.setLastNameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 6: // EMAIL + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.email = iprot.readString(); + struct.setEmailIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -490,22 +822,41 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + if (struct.airavataInternalUserId != null) { + oprot.writeFieldBegin(AIRAVATA_INTERNAL_USER_ID_FIELD_DESC); + oprot.writeString(struct.airavataInternalUserId); + oprot.writeFieldEnd(); + } if (struct.userName != null) { - oprot.writeFieldBegin(USER_NAME_FIELD_DESC); - oprot.writeString(struct.userName); + if (struct.isSetUserName()) { + oprot.writeFieldBegin(USER_NAME_FIELD_DESC); + oprot.writeString(struct.userName); + oprot.writeFieldEnd(); + } + } + if (struct.gatewayId != null) { + oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC); + oprot.writeString(struct.gatewayId); oprot.writeFieldEnd(); } - if (struct.groupList != null) { - if (struct.isSetGroupList()) { - oprot.writeFieldBegin(GROUP_LIST_FIELD_DESC); - { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.groupList.size())); - for (Group _iter19 : struct.groupList) - { - _iter19.write(oprot); - } - oprot.writeListEnd(); - } + if (struct.firstName != null) { + if (struct.isSetFirstName()) { + oprot.writeFieldBegin(FIRST_NAME_FIELD_DESC); + oprot.writeString(struct.firstName); + oprot.writeFieldEnd(); + } + } + if (struct.lastName != null) { + if (struct.isSetLastName()) { + oprot.writeFieldBegin(LAST_NAME_FIELD_DESC); + oprot.writeString(struct.lastName); + oprot.writeFieldEnd(); + } + } + if (struct.email != null) { + if (struct.isSetEmail()) { + oprot.writeFieldBegin(EMAIL_FIELD_DESC); + oprot.writeString(struct.email); oprot.writeFieldEnd(); } } @@ -526,42 +877,59 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i @Override public void write(org.apache.thrift.protocol.TProtocol prot, User struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; - oprot.writeString(struct.userName); + oprot.writeString(struct.airavataInternalUserId); + oprot.writeString(struct.gatewayId); BitSet optionals = new BitSet(); - if (struct.isSetGroupList()) { + if (struct.isSetUserName()) { optionals.set(0); } - oprot.writeBitSet(optionals, 1); - if (struct.isSetGroupList()) { - { - oprot.writeI32(struct.groupList.size()); - for (Group _iter20 : struct.groupList) - { - _iter20.write(oprot); - } - } + if (struct.isSetFirstName()) { + optionals.set(1); + } + if (struct.isSetLastName()) { + optionals.set(2); + } + if (struct.isSetEmail()) { + optionals.set(3); + } + oprot.writeBitSet(optionals, 4); + if (struct.isSetUserName()) { + oprot.writeString(struct.userName); + } + if (struct.isSetFirstName()) { + oprot.writeString(struct.firstName); + } + if (struct.isSetLastName()) { + oprot.writeString(struct.lastName); + } + if (struct.isSetEmail()) { + oprot.writeString(struct.email); } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, User struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - struct.userName = iprot.readString(); - struct.setUserNameIsSet(true); - BitSet incoming = iprot.readBitSet(1); + struct.airavataInternalUserId = iprot.readString(); + struct.setAiravataInternalUserIdIsSet(true); + struct.gatewayId = iprot.readString(); + struct.setGatewayIdIsSet(true); + BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { - { - org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.groupList = new ArrayList<Group>(_list21.size); - Group _elem22; - for (int _i23 = 0; _i23 < _list21.size; ++_i23) - { - _elem22 = new Group(); - _elem22.read(iprot); - struct.groupList.add(_elem22); - } - } - struct.setGroupListIsSet(true); + struct.userName = iprot.readString(); + struct.setUserNameIsSet(true); + } + if (incoming.get(1)) { + struct.firstName = iprot.readString(); + struct.setFirstNameIsSet(true); + } + if (incoming.get(2)) { + struct.lastName = iprot.readString(); + struct.setLastNameIsSet(true); + } + if (incoming.get(3)) { + struct.email = iprot.readString(); + struct.setEmailIsSet(true); } } } http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/modules/configuration/server/src/main/resources/airavata-default-xacml-policy.xml ---------------------------------------------------------------------- diff --git a/modules/configuration/server/src/main/resources/airavata-default-xacml-policy.xml b/modules/configuration/server/src/main/resources/airavata-default-xacml-policy.xml index 8fe92a7..426f5fe 100644 --- a/modules/configuration/server/src/main/resources/airavata-default-xacml-policy.xml +++ b/modules/configuration/server/src/main/resources/airavata-default-xacml-policy.xml @@ -90,6 +90,10 @@ /airavata/getWorkflow| /airavata/getWorkflowTemplateId| /airavata/isWorkflowExistWithName| +/airavata/getAllUsersInGateway| +/airavata/shareResourceWithUsers| +/airavata/revokeSharingOfResourceFromUsers| +/airavata/getAllAccessibleUsers| /airavata/registerDataProduct| /airavata/getDataProduct| /airavata/registerReplicaLocation| @@ -128,13 +132,11 @@ /airavata/getUserProjects| /airavata/searchsearchProjects| /airavata/searchExperiments| -/airavata/getExperimentStatistics| /airavata/getExperimentsInProject| /airavata/getUserExperiments| /airavata/createExperiment| /airavata/deleteExperiment| /airavata/getExperiment| -/airavata/getDetailedExperimentTree| /airavata/updateExperiment| /airavata/updateExperimentConfiguration| /airavata/updateResourceScheduleing| @@ -159,6 +161,9 @@ /airavata/getWorkflowTemplateId| /airavata/isWorkflowExistWithName| /airavata/getAllUsersInGateway| +/airavata/shareResourceWithUsers| +/airavata/revokeSharingOfResourceFromUsers| +/airavata/getAllAccessibleUsers| /airavata/registerDataProduct| /airavata/getDataProduct| /airavata/registerReplicaLocation| http://git-wip-us.apache.org/repos/asf/airavata/blob/edfbbfe0/modules/group-manager/src/main/java/org/apache/airavata/grouper/GroupManagerCPI.java ---------------------------------------------------------------------- diff --git a/modules/group-manager/src/main/java/org/apache/airavata/grouper/GroupManagerCPI.java b/modules/group-manager/src/main/java/org/apache/airavata/grouper/GroupManagerCPI.java index 3e0eb53..70ef6a2 100644 --- a/modules/group-manager/src/main/java/org/apache/airavata/grouper/GroupManagerCPI.java +++ b/modules/group-manager/src/main/java/org/apache/airavata/grouper/GroupManagerCPI.java @@ -1,4 +1,24 @@ package org.apache.airavata.grouper; +import org.apache.airavata.grouper.permission.PermissionAction; +import org.apache.airavata.grouper.resource.Resource; +import org.apache.airavata.grouper.resource.ResourceType; + +import java.util.List; +import java.util.Set; + public interface GroupManagerCPI { + void createResource(Resource projectResource); + + boolean isResourceRegistered(String resourceId, org.apache.airavata.grouper.resource.ResourceType resourceType); + + void grantPermission(String userId, SubjectType subjectType, String resourceId, ResourceType resourceType, + PermissionAction permissionAction); + + void revokePermission(String userId, SubjectType subjectType, String resourceId, ResourceType resourceType, + PermissionAction action); + + Set<String> getAllAccessibleUsers(String resourceId, ResourceType resourceType, PermissionAction permissionType); + + List<String> getAccessibleResourcesForUser(String userId, ResourceType resourceType, PermissionAction permissionAction); }
