You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/06/23 18:04:54 UTC
[03/11] airavata git commit: messaging data models
http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
index 4b91522..b8ea2df 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.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.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
public class LaunchValidationException extends TException implements org.apache.thrift.TBase<LaunchValidationException, LaunchValidationException._Fields>, java.io.Serializable, Cloneable, Comparable<LaunchValidationException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LaunchValidationException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
index 764fa83..2af31b8 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
* 2: optional string key
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
public class ProjectNotFoundException extends TException implements org.apache.thrift.TBase<ProjectNotFoundException, ProjectNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<ProjectNotFoundException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProjectNotFoundException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
index 2843773..c23bbb6 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
/**
* This exception is thrown when RPC timeout gets exceeded.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
public class TimedOutException extends TException implements org.apache.thrift.TBase<TimedOutException, TimedOutException._Fields>, java.io.Serializable, Cloneable, Comparable<TimedOutException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TimedOutException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
index 7bd9f2e..f2013f1 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/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.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/aec8f411/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
index 7b3018f..bec8af3 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.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.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/aec8f411/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
index 332482b..abb63b6 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
@@ -1,4 +1,21 @@
/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
* Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
@@ -6,17 +23,32 @@
*/
package org.apache.airavata.model.experiment;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
import javax.annotation.Generated;
-import java.util.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
@@ -35,27 +67,26 @@ import java.util.*;
* experimentDescription:
* The verbose description of the experiment. This is an optional parameter.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-22")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel, ExperimentModel._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentModel");
private static final org.apache.thrift.protocol.TField EXPERIMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentId", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.thrift.protocol.TField PROJECT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("projectId", 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 EXPERIMENT_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentType", org.apache.thrift.protocol.TType.I32, (short)4);
- 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)5);
- private static final org.apache.thrift.protocol.TField EXPERIMENT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentName", org.apache.thrift.protocol.TType.STRING, (short)6);
- 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)7);
- 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)8);
- private static final org.apache.thrift.protocol.TField EXECUTION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("executionId", org.apache.thrift.protocol.TType.STRING, (short)9);
- private static final org.apache.thrift.protocol.TField GATEWAY_EXECUTION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayExecutionId", org.apache.thrift.protocol.TType.STRING, (short)10);
- private static final org.apache.thrift.protocol.TField ENABLE_EMAIL_NOTIFICATION_FIELD_DESC = new org.apache.thrift.protocol.TField("enableEmailNotification", org.apache.thrift.protocol.TType.BOOL, (short)11);
- private static final org.apache.thrift.protocol.TField EMAIL_ADDRESSES_FIELD_DESC = new org.apache.thrift.protocol.TField("emailAddresses", org.apache.thrift.protocol.TType.LIST, (short)12);
- private static final org.apache.thrift.protocol.TField USER_CONFIGURATION_DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("userConfigurationData", org.apache.thrift.protocol.TType.STRUCT, (short)13);
- private static final org.apache.thrift.protocol.TField EXPERIMENT_INPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentInputs", org.apache.thrift.protocol.TType.LIST, (short)14);
- private static final org.apache.thrift.protocol.TField EXPERIMENT_OUTPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentOutputs", org.apache.thrift.protocol.TType.LIST, (short)15);
- private static final org.apache.thrift.protocol.TField EXPERIMENT_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentStatus", org.apache.thrift.protocol.TType.STRUCT, (short)16);
- private static final org.apache.thrift.protocol.TField ERRORS_FIELD_DESC = new org.apache.thrift.protocol.TField("errors", org.apache.thrift.protocol.TType.LIST, (short)17);
+ private static final org.apache.thrift.protocol.TField EXPERIMENT_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentType", org.apache.thrift.protocol.TType.I32, (short)3);
+ 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)4);
+ private static final org.apache.thrift.protocol.TField EXPERIMENT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentName", 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 DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", org.apache.thrift.protocol.TType.STRING, (short)7);
+ private static final org.apache.thrift.protocol.TField EXECUTION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("executionId", org.apache.thrift.protocol.TType.STRING, (short)8);
+ private static final org.apache.thrift.protocol.TField GATEWAY_EXECUTION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayExecutionId", org.apache.thrift.protocol.TType.STRING, (short)9);
+ private static final org.apache.thrift.protocol.TField ENABLE_EMAIL_NOTIFICATION_FIELD_DESC = new org.apache.thrift.protocol.TField("enableEmailNotification", org.apache.thrift.protocol.TType.BOOL, (short)10);
+ private static final org.apache.thrift.protocol.TField EMAIL_ADDRESSES_FIELD_DESC = new org.apache.thrift.protocol.TField("emailAddresses", org.apache.thrift.protocol.TType.LIST, (short)11);
+ private static final org.apache.thrift.protocol.TField USER_CONFIGURATION_DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("userConfigurationData", org.apache.thrift.protocol.TType.STRUCT, (short)12);
+ private static final org.apache.thrift.protocol.TField EXPERIMENT_INPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentInputs", org.apache.thrift.protocol.TType.LIST, (short)13);
+ private static final org.apache.thrift.protocol.TField EXPERIMENT_OUTPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentOutputs", org.apache.thrift.protocol.TType.LIST, (short)14);
+ private static final org.apache.thrift.protocol.TField EXPERIMENT_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentStatus", org.apache.thrift.protocol.TType.STRUCT, (short)15);
+ private static final org.apache.thrift.protocol.TField ERRORS_FIELD_DESC = new org.apache.thrift.protocol.TField("errors", org.apache.thrift.protocol.TType.LIST, (short)16);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -63,51 +94,45 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
schemes.put(TupleScheme.class, new ExperimentModelTupleSchemeFactory());
}
- public String experimentId; // required
- public String projectId; // required
- public String gatewayId; // required
- /**
- *
- * @see org.apache.airavata.model.experiment.ExperimentType
- */
- public ExperimentType experimentType; // required
- public String userName; // required
- public String experimentName; // required
- public long creationTime; // optional
- public String description; // optional
- public String executionId; // optional
- public String gatewayExecutionId; // optional
- public boolean enableEmailNotification; // optional
- public List<String> emailAddresses; // optional
- public UserConfigurationDataModel userConfigurationData; // optional
- public List<org.apache.airavata.model.application.io.InputDataObjectType> experimentInputs; // optional
- public List<org.apache.airavata.model.application.io.OutputDataObjectType> experimentOutputs; // optional
- public org.apache.airavata.model.status.ExperimentStatus experimentStatus; // optional
- public List<org.apache.airavata.model.commons.ErrorModel> errors; // optional
+ private String experimentId; // required
+ private String projectId; // required
+ private ExperimentType experimentType; // required
+ private String userName; // required
+ private String experimentName; // required
+ private long creationTime; // optional
+ private String description; // optional
+ private String executionId; // optional
+ private String gatewayExecutionId; // optional
+ private boolean enableEmailNotification; // optional
+ private List<String> emailAddresses; // optional
+ private UserConfigurationDataModel userConfigurationData; // optional
+ private List<org.apache.airavata.model.application.io.InputDataObjectType> experimentInputs; // optional
+ private List<org.apache.airavata.model.application.io.OutputDataObjectType> experimentOutputs; // optional
+ private org.apache.airavata.model.status.ExperimentStatus experimentStatus; // optional
+ private List<org.apache.airavata.model.commons.ErrorModel> errors; // 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 {
EXPERIMENT_ID((short)1, "experimentId"),
PROJECT_ID((short)2, "projectId"),
- GATEWAY_ID((short)3, "gatewayId"),
/**
*
- * @see org.apache.airavata.model.experiment.ExperimentType
+ * @see ExperimentType
*/
- EXPERIMENT_TYPE((short)4, "experimentType"),
- USER_NAME((short)5, "userName"),
- EXPERIMENT_NAME((short)6, "experimentName"),
- CREATION_TIME((short)7, "creationTime"),
- DESCRIPTION((short)8, "description"),
- EXECUTION_ID((short)9, "executionId"),
- GATEWAY_EXECUTION_ID((short)10, "gatewayExecutionId"),
- ENABLE_EMAIL_NOTIFICATION((short)11, "enableEmailNotification"),
- EMAIL_ADDRESSES((short)12, "emailAddresses"),
- USER_CONFIGURATION_DATA((short)13, "userConfigurationData"),
- EXPERIMENT_INPUTS((short)14, "experimentInputs"),
- EXPERIMENT_OUTPUTS((short)15, "experimentOutputs"),
- EXPERIMENT_STATUS((short)16, "experimentStatus"),
- ERRORS((short)17, "errors");
+ EXPERIMENT_TYPE((short)3, "experimentType"),
+ USER_NAME((short)4, "userName"),
+ EXPERIMENT_NAME((short)5, "experimentName"),
+ CREATION_TIME((short)6, "creationTime"),
+ DESCRIPTION((short)7, "description"),
+ EXECUTION_ID((short)8, "executionId"),
+ GATEWAY_EXECUTION_ID((short)9, "gatewayExecutionId"),
+ ENABLE_EMAIL_NOTIFICATION((short)10, "enableEmailNotification"),
+ EMAIL_ADDRESSES((short)11, "emailAddresses"),
+ USER_CONFIGURATION_DATA((short)12, "userConfigurationData"),
+ EXPERIMENT_INPUTS((short)13, "experimentInputs"),
+ EXPERIMENT_OUTPUTS((short)14, "experimentOutputs"),
+ EXPERIMENT_STATUS((short)15, "experimentStatus"),
+ ERRORS((short)16, "errors");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -126,35 +151,33 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return EXPERIMENT_ID;
case 2: // PROJECT_ID
return PROJECT_ID;
- case 3: // GATEWAY_ID
- return GATEWAY_ID;
- case 4: // EXPERIMENT_TYPE
+ case 3: // EXPERIMENT_TYPE
return EXPERIMENT_TYPE;
- case 5: // USER_NAME
+ case 4: // USER_NAME
return USER_NAME;
- case 6: // EXPERIMENT_NAME
+ case 5: // EXPERIMENT_NAME
return EXPERIMENT_NAME;
- case 7: // CREATION_TIME
+ case 6: // CREATION_TIME
return CREATION_TIME;
- case 8: // DESCRIPTION
+ case 7: // DESCRIPTION
return DESCRIPTION;
- case 9: // EXECUTION_ID
+ case 8: // EXECUTION_ID
return EXECUTION_ID;
- case 10: // GATEWAY_EXECUTION_ID
+ case 9: // GATEWAY_EXECUTION_ID
return GATEWAY_EXECUTION_ID;
- case 11: // ENABLE_EMAIL_NOTIFICATION
+ case 10: // ENABLE_EMAIL_NOTIFICATION
return ENABLE_EMAIL_NOTIFICATION;
- case 12: // EMAIL_ADDRESSES
+ case 11: // EMAIL_ADDRESSES
return EMAIL_ADDRESSES;
- case 13: // USER_CONFIGURATION_DATA
+ case 12: // USER_CONFIGURATION_DATA
return USER_CONFIGURATION_DATA;
- case 14: // EXPERIMENT_INPUTS
+ case 13: // EXPERIMENT_INPUTS
return EXPERIMENT_INPUTS;
- case 15: // EXPERIMENT_OUTPUTS
+ case 14: // EXPERIMENT_OUTPUTS
return EXPERIMENT_OUTPUTS;
- case 16: // EXPERIMENT_STATUS
+ case 15: // EXPERIMENT_STATUS
return EXPERIMENT_STATUS;
- case 17: // ERRORS
+ case 16: // ERRORS
return ERRORS;
default:
return null;
@@ -207,8 +230,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.PROJECT_ID, new org.apache.thrift.meta_data.FieldMetaData("projectId", 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.EXPERIMENT_TYPE, new org.apache.thrift.meta_data.FieldMetaData("experimentType", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ExperimentType.class)));
tmpMap.put(_Fields.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.REQUIRED,
@@ -246,18 +267,13 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
public ExperimentModel() {
- this.experimentId = "DO_NOT_SET_AT_CLIENTS";
-
- this.projectId = "DEFAULT_PROJECT";
-
- this.experimentType = ExperimentType.SINGLE_APPLICATION;
+ this.experimentType = org.apache.airavata.model.experiment.ExperimentType.SINGLE_APPLICATION;
}
public ExperimentModel(
String experimentId,
String projectId,
- String gatewayId,
ExperimentType experimentType,
String userName,
String experimentName)
@@ -265,7 +281,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
this();
this.experimentId = experimentId;
this.projectId = projectId;
- this.gatewayId = gatewayId;
this.experimentType = experimentType;
this.userName = userName;
this.experimentName = experimentName;
@@ -282,9 +297,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
if (other.isSetProjectId()) {
this.projectId = other.projectId;
}
- if (other.isSetGatewayId()) {
- this.gatewayId = other.gatewayId;
- }
if (other.isSetExperimentType()) {
this.experimentType = other.experimentType;
}
@@ -344,12 +356,9 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
@Override
public void clear() {
- this.experimentId = "DO_NOT_SET_AT_CLIENTS";
-
- this.projectId = "DEFAULT_PROJECT";
-
- this.gatewayId = null;
- this.experimentType = ExperimentType.SINGLE_APPLICATION;
+ this.experimentId = null;
+ this.projectId = null;
+ this.experimentType = org.apache.airavata.model.experiment.ExperimentType.SINGLE_APPLICATION;
this.userName = null;
this.experimentName = null;
@@ -372,9 +381,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.experimentId;
}
- public ExperimentModel setExperimentId(String experimentId) {
+ public void setExperimentId(String experimentId) {
this.experimentId = experimentId;
- return this;
}
public void unsetExperimentId() {
@@ -396,9 +404,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.projectId;
}
- public ExperimentModel setProjectId(String projectId) {
+ public void setProjectId(String projectId) {
this.projectId = projectId;
- return this;
}
public void unsetProjectId() {
@@ -416,33 +423,9 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
}
- public String getGatewayId() {
- return this.gatewayId;
- }
-
- public ExperimentModel setGatewayId(String gatewayId) {
- this.gatewayId = gatewayId;
- return this;
- }
-
- public void unsetGatewayId() {
- this.gatewayId = null;
- }
-
- /** Returns true if field gatewayId is set (has been assigned a value) and false otherwise */
- public boolean isSetGatewayId() {
- return this.gatewayId != null;
- }
-
- public void setGatewayIdIsSet(boolean value) {
- if (!value) {
- this.gatewayId = null;
- }
- }
-
/**
*
- * @see org.apache.airavata.model.experiment.ExperimentType
+ * @see ExperimentType
*/
public ExperimentType getExperimentType() {
return this.experimentType;
@@ -450,11 +433,10 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
/**
*
- * @see org.apache.airavata.model.experiment.ExperimentType
+ * @see ExperimentType
*/
- public ExperimentModel setExperimentType(ExperimentType experimentType) {
+ public void setExperimentType(ExperimentType experimentType) {
this.experimentType = experimentType;
- return this;
}
public void unsetExperimentType() {
@@ -476,9 +458,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.userName;
}
- public ExperimentModel setUserName(String userName) {
+ public void setUserName(String userName) {
this.userName = userName;
- return this;
}
public void unsetUserName() {
@@ -500,9 +481,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.experimentName;
}
- public ExperimentModel setExperimentName(String experimentName) {
+ public void setExperimentName(String experimentName) {
this.experimentName = experimentName;
- return this;
}
public void unsetExperimentName() {
@@ -524,10 +504,9 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.creationTime;
}
- public ExperimentModel setCreationTime(long creationTime) {
+ public void setCreationTime(long creationTime) {
this.creationTime = creationTime;
setCreationTimeIsSet(true);
- return this;
}
public void unsetCreationTime() {
@@ -547,9 +526,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.description;
}
- public ExperimentModel setDescription(String description) {
+ public void setDescription(String description) {
this.description = description;
- return this;
}
public void unsetDescription() {
@@ -571,9 +549,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.executionId;
}
- public ExperimentModel setExecutionId(String executionId) {
+ public void setExecutionId(String executionId) {
this.executionId = executionId;
- return this;
}
public void unsetExecutionId() {
@@ -595,9 +572,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.gatewayExecutionId;
}
- public ExperimentModel setGatewayExecutionId(String gatewayExecutionId) {
+ public void setGatewayExecutionId(String gatewayExecutionId) {
this.gatewayExecutionId = gatewayExecutionId;
- return this;
}
public void unsetGatewayExecutionId() {
@@ -619,10 +595,9 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.enableEmailNotification;
}
- public ExperimentModel setEnableEmailNotification(boolean enableEmailNotification) {
+ public void setEnableEmailNotification(boolean enableEmailNotification) {
this.enableEmailNotification = enableEmailNotification;
setEnableEmailNotificationIsSet(true);
- return this;
}
public void unsetEnableEmailNotification() {
@@ -657,9 +632,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.emailAddresses;
}
- public ExperimentModel setEmailAddresses(List<String> emailAddresses) {
+ public void setEmailAddresses(List<String> emailAddresses) {
this.emailAddresses = emailAddresses;
- return this;
}
public void unsetEmailAddresses() {
@@ -681,9 +655,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.userConfigurationData;
}
- public ExperimentModel setUserConfigurationData(UserConfigurationDataModel userConfigurationData) {
+ public void setUserConfigurationData(UserConfigurationDataModel userConfigurationData) {
this.userConfigurationData = userConfigurationData;
- return this;
}
public void unsetUserConfigurationData() {
@@ -720,9 +693,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.experimentInputs;
}
- public ExperimentModel setExperimentInputs(List<org.apache.airavata.model.application.io.InputDataObjectType> experimentInputs) {
+ public void setExperimentInputs(List<org.apache.airavata.model.application.io.InputDataObjectType> experimentInputs) {
this.experimentInputs = experimentInputs;
- return this;
}
public void unsetExperimentInputs() {
@@ -759,9 +731,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.experimentOutputs;
}
- public ExperimentModel setExperimentOutputs(List<org.apache.airavata.model.application.io.OutputDataObjectType> experimentOutputs) {
+ public void setExperimentOutputs(List<org.apache.airavata.model.application.io.OutputDataObjectType> experimentOutputs) {
this.experimentOutputs = experimentOutputs;
- return this;
}
public void unsetExperimentOutputs() {
@@ -783,9 +754,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.experimentStatus;
}
- public ExperimentModel setExperimentStatus(org.apache.airavata.model.status.ExperimentStatus experimentStatus) {
+ public void setExperimentStatus(org.apache.airavata.model.status.ExperimentStatus experimentStatus) {
this.experimentStatus = experimentStatus;
- return this;
}
public void unsetExperimentStatus() {
@@ -822,9 +792,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.errors;
}
- public ExperimentModel setErrors(List<org.apache.airavata.model.commons.ErrorModel> errors) {
+ public void setErrors(List<org.apache.airavata.model.commons.ErrorModel> errors) {
this.errors = errors;
- return this;
}
public void unsetErrors() {
@@ -860,14 +829,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
break;
- case GATEWAY_ID:
- if (value == null) {
- unsetGatewayId();
- } else {
- setGatewayId((String)value);
- }
- break;
-
case EXPERIMENT_TYPE:
if (value == null) {
unsetExperimentType();
@@ -991,9 +952,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
case PROJECT_ID:
return getProjectId();
- case GATEWAY_ID:
- return getGatewayId();
-
case EXPERIMENT_TYPE:
return getExperimentType();
@@ -1051,8 +1009,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return isSetExperimentId();
case PROJECT_ID:
return isSetProjectId();
- case GATEWAY_ID:
- return isSetGatewayId();
case EXPERIMENT_TYPE:
return isSetExperimentType();
case USER_NAME:
@@ -1116,15 +1072,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
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_experimentType = true && this.isSetExperimentType();
boolean that_present_experimentType = true && that.isSetExperimentType();
if (this_present_experimentType || that_present_experimentType) {
@@ -1268,11 +1215,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
if (present_projectId)
list.add(projectId);
- boolean present_gatewayId = true && (isSetGatewayId());
- list.add(present_gatewayId);
- if (present_gatewayId)
- list.add(gatewayId);
-
boolean present_experimentType = true && (isSetExperimentType());
list.add(present_experimentType);
if (present_experimentType)
@@ -1374,16 +1316,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
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(isSetExperimentType()).compareTo(other.isSetExperimentType());
if (lastComparison != 0) {
return lastComparison;
@@ -1531,11 +1463,11 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return _Fields.findByThriftId(fieldId);
}
- public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
- public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@@ -1560,14 +1492,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
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("experimentType:");
if (this.experimentType == null) {
sb.append("null");
@@ -1697,26 +1621,28 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return sb.toString();
}
- public void validate() throws TException {
+ public void validate() throws org.apache.thrift.TException {
// check for required fields
- if (experimentId == null) {
- throw new TProtocolException("Required field 'experimentId' was not present! Struct: " + toString());
- }
- if (projectId == null) {
- throw new TProtocolException("Required field 'projectId' was not present! Struct: " + toString());
+ if (!isSetExperimentId()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'experimentId' is unset! Struct:" + toString());
}
- if (gatewayId == null) {
- throw new TProtocolException("Required field 'gatewayId' was not present! Struct: " + toString());
+
+ if (!isSetProjectId()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'projectId' is unset! Struct:" + toString());
}
- if (experimentType == null) {
- throw new TProtocolException("Required field 'experimentType' was not present! Struct: " + toString());
+
+ if (!isSetExperimentType()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'experimentType' is unset! Struct:" + toString());
}
- if (userName == null) {
- throw new TProtocolException("Required field 'userName' was not present! Struct: " + toString());
+
+ if (!isSetUserName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'userName' is unset! Struct:" + toString());
}
- if (experimentName == null) {
- throw new TProtocolException("Required field 'experimentName' was not present! Struct: " + toString());
+
+ if (!isSetExperimentName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'experimentName' is unset! Struct:" + toString());
}
+
// check for sub-struct validity
if (userConfigurationData != null) {
userConfigurationData.validate();
@@ -1729,7 +1655,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
try {
write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
- } catch (TException te) {
+ } catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
}
}
@@ -1739,7 +1665,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
// it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
__isset_bitfield = 0;
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
- } catch (TException te) {
+ } catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
}
}
@@ -1752,7 +1678,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
private static class ExperimentModelStandardScheme extends StandardScheme<ExperimentModel> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, ExperimentModel struct) throws TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, ExperimentModel struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -1778,23 +1704,15 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 3: // GATEWAY_ID
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.gatewayId = iprot.readString();
- struct.setGatewayIdIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 4: // EXPERIMENT_TYPE
+ case 3: // EXPERIMENT_TYPE
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.experimentType = ExperimentType.findByValue(iprot.readI32());
+ struct.experimentType = org.apache.airavata.model.experiment.ExperimentType.findByValue(iprot.readI32());
struct.setExperimentTypeIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 5: // USER_NAME
+ case 4: // USER_NAME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.userName = iprot.readString();
struct.setUserNameIsSet(true);
@@ -1802,7 +1720,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 6: // EXPERIMENT_NAME
+ case 5: // EXPERIMENT_NAME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.experimentName = iprot.readString();
struct.setExperimentNameIsSet(true);
@@ -1810,7 +1728,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 7: // CREATION_TIME
+ case 6: // CREATION_TIME
if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
struct.creationTime = iprot.readI64();
struct.setCreationTimeIsSet(true);
@@ -1818,7 +1736,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 8: // DESCRIPTION
+ case 7: // DESCRIPTION
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.description = iprot.readString();
struct.setDescriptionIsSet(true);
@@ -1826,7 +1744,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 9: // EXECUTION_ID
+ case 8: // EXECUTION_ID
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.executionId = iprot.readString();
struct.setExecutionIdIsSet(true);
@@ -1834,7 +1752,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 10: // GATEWAY_EXECUTION_ID
+ case 9: // GATEWAY_EXECUTION_ID
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.gatewayExecutionId = iprot.readString();
struct.setGatewayExecutionIdIsSet(true);
@@ -1842,7 +1760,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 11: // ENABLE_EMAIL_NOTIFICATION
+ case 10: // ENABLE_EMAIL_NOTIFICATION
if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
struct.enableEmailNotification = iprot.readBool();
struct.setEnableEmailNotificationIsSet(true);
@@ -1850,7 +1768,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 12: // EMAIL_ADDRESSES
+ case 11: // EMAIL_ADDRESSES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
@@ -1868,7 +1786,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 13: // USER_CONFIGURATION_DATA
+ case 12: // USER_CONFIGURATION_DATA
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
struct.userConfigurationData = new UserConfigurationDataModel();
struct.userConfigurationData.read(iprot);
@@ -1877,7 +1795,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 14: // EXPERIMENT_INPUTS
+ case 13: // EXPERIMENT_INPUTS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list3 = iprot.readListBegin();
@@ -1896,7 +1814,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 15: // EXPERIMENT_OUTPUTS
+ case 14: // EXPERIMENT_OUTPUTS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list6 = iprot.readListBegin();
@@ -1915,7 +1833,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 16: // EXPERIMENT_STATUS
+ case 15: // EXPERIMENT_STATUS
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
struct.experimentStatus = new org.apache.airavata.model.status.ExperimentStatus();
struct.experimentStatus.read(iprot);
@@ -1924,7 +1842,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 17: // ERRORS
+ case 16: // ERRORS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list9 = iprot.readListBegin();
@@ -1949,12 +1867,10 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, ExperimentModel struct) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, ExperimentModel struct) throws org.apache.thrift.TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -1968,11 +1884,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
oprot.writeString(struct.projectId);
oprot.writeFieldEnd();
}
- if (struct.gatewayId != null) {
- oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC);
- oprot.writeString(struct.gatewayId);
- oprot.writeFieldEnd();
- }
if (struct.experimentType != null) {
oprot.writeFieldBegin(EXPERIMENT_TYPE_FIELD_DESC);
oprot.writeI32(struct.experimentType.getValue());
@@ -2104,11 +2015,10 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
private static class ExperimentModelTupleScheme extends TupleScheme<ExperimentModel> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, ExperimentModel struct) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, ExperimentModel struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeString(struct.experimentId);
oprot.writeString(struct.projectId);
- oprot.writeString(struct.gatewayId);
oprot.writeI32(struct.experimentType.getValue());
oprot.writeString(struct.userName);
oprot.writeString(struct.experimentName);
@@ -2207,15 +2117,13 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, ExperimentModel struct) throws TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, ExperimentModel struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.experimentId = iprot.readString();
struct.setExperimentIdIsSet(true);
struct.projectId = iprot.readString();
struct.setProjectIdIsSet(true);
- struct.gatewayId = iprot.readString();
- struct.setGatewayIdIsSet(true);
- struct.experimentType = ExperimentType.findByValue(iprot.readI32());
+ struct.experimentType = org.apache.airavata.model.experiment.ExperimentType.findByValue(iprot.readI32());
struct.setExperimentTypeIsSet(true);
struct.userName = iprot.readString();
struct.setUserNameIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/aec8f411/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
index cd64683..ed91100 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.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.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentStatistics, ExperimentStatistics._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatistics> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatistics");