http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/Experiment.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/Experiment.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/Experiment.java index 60d6b32..d96b31e 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/Experiment.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/Experiment.java @@ -23,31 +23,14 @@ */ package org.apache.airavata.model.workspace.experiment; +import org.apache.thrift.EncodingUtils; +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.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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; + +import java.util.*; /** * A structure holding the experiment metadata and its child models. @@ -68,8 +51,8 @@ import org.slf4j.LoggerFactory; @SuppressWarnings("all") public class Experiment implements org.apache.thrift.TBase<Experiment, Experiment._Fields>, java.io.Serializable, Cloneable, Comparable<Experiment> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Experiment"); - 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 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 CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("creationTime", org.apache.thrift.protocol.TType.I64, (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 NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)5); @@ -96,8 +79,8 @@ import org.slf4j.LoggerFactory; schemes.put(TupleScheme.class, new ExperimentTupleSchemeFactory()); } - private String experimentID; // required - private String projectID; // required + private String experimentId; // required + private String projectId; // required private long creationTime; // optional private String userName; // required private String name; // required @@ -120,8 +103,8 @@ import org.slf4j.LoggerFactory; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { - EXPERIMENT_ID((short)1, "experimentID"), - PROJECT_ID((short)2, "projectID"), + EXPERIMENT_ID((short)1, "experimentId"), + PROJECT_ID((short)2, "projectId"), CREATION_TIME((short)3, "creationTime"), USER_NAME((short)4, "userName"), NAME((short)5, "name"), @@ -244,9 +227,9 @@ import org.slf4j.LoggerFactory; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.EXPERIMENT_ID, new org.apache.thrift.meta_data.FieldMetaData("experimentID", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.EXPERIMENT_ID, new org.apache.thrift.meta_data.FieldMetaData("experimentId", org.apache.thrift.TFieldRequirementType.REQUIRED, 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, + 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.CREATION_TIME, new org.apache.thrift.meta_data.FieldMetaData("creationTime", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); @@ -297,21 +280,21 @@ import org.slf4j.LoggerFactory; } public Experiment() { - this.experimentID = "DO_NOT_SET_AT_CLIENTS"; + this.experimentId = "DO_NOT_SET_AT_CLIENTS"; - this.projectID = "DEFAULT"; + this.projectId = "DEFAULT"; } public Experiment( - String experimentID, - String projectID, + String experimentId, + String projectId, String userName, String name) { this(); - this.experimentID = experimentID; - this.projectID = projectID; + this.experimentId = experimentId; + this.projectId = projectId; this.userName = userName; this.name = name; } @@ -321,11 +304,11 @@ import org.slf4j.LoggerFactory; */ public Experiment(Experiment other) { __isset_bitfield = other.__isset_bitfield; - if (other.isSetExperimentID()) { - this.experimentID = other.experimentID; + if (other.isSetExperimentId()) { + this.experimentId = other.experimentId; } - if (other.isSetProjectID()) { - this.projectID = other.projectID; + if (other.isSetProjectId()) { + this.projectId = other.projectId; } this.creationTime = other.creationTime; if (other.isSetUserName()) { @@ -409,9 +392,9 @@ import org.slf4j.LoggerFactory; @Override public void clear() { - this.experimentID = "DO_NOT_SET_AT_CLIENTS"; + this.experimentId = "DO_NOT_SET_AT_CLIENTS"; - this.projectID = "DEFAULT"; + this.projectId = "DEFAULT"; setCreationTimeIsSet(false); this.creationTime = 0; @@ -436,49 +419,49 @@ import org.slf4j.LoggerFactory; this.errors = null; } - public String getExperimentID() { - return this.experimentID; + public String getExperimentId() { + return this.experimentId; } - public void setExperimentID(String experimentID) { - this.experimentID = experimentID; + public void setExperimentId(String experimentId) { + this.experimentId = experimentId; } - public void unsetExperimentID() { - this.experimentID = null; + public void unsetExperimentId() { + this.experimentId = null; } - /** Returns true if field experimentID is set (has been assigned a value) and false otherwise */ - public boolean isSetExperimentID() { - return this.experimentID != null; + /** Returns true if field experimentId is set (has been assigned a value) and false otherwise */ + public boolean isSetExperimentId() { + return this.experimentId != null; } - public void setExperimentIDIsSet(boolean value) { + public void setExperimentIdIsSet(boolean value) { if (!value) { - this.experimentID = null; + this.experimentId = null; } } - public String getProjectID() { - return this.projectID; + public String getProjectId() { + return this.projectId; } - public void setProjectID(String projectID) { - this.projectID = projectID; + public void setProjectId(String projectId) { + this.projectId = projectId; } - public void unsetProjectID() { - this.projectID = null; + public void unsetProjectId() { + this.projectId = null; } - /** Returns true if field projectID is set (has been assigned a value) and false otherwise */ - public boolean isSetProjectID() { - return this.projectID != null; + /** Returns true if field projectId is set (has been assigned a value) and false otherwise */ + public boolean isSetProjectId() { + return this.projectId != null; } - public void setProjectIDIsSet(boolean value) { + public void setProjectIdIsSet(boolean value) { if (!value) { - this.projectID = null; + this.projectId = null; } } @@ -1011,17 +994,17 @@ import org.slf4j.LoggerFactory; switch (field) { case EXPERIMENT_ID: if (value == null) { - unsetExperimentID(); + unsetExperimentId(); } else { - setExperimentID((String)value); + setExperimentId((String)value); } break; case PROJECT_ID: if (value == null) { - unsetProjectID(); + unsetProjectId(); } else { - setProjectID((String)value); + setProjectId((String)value); } break; @@ -1183,10 +1166,10 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case EXPERIMENT_ID: - return getExperimentID(); + return getExperimentId(); case PROJECT_ID: - return getProjectID(); + return getProjectId(); case CREATION_TIME: return Long.valueOf(getCreationTime()); @@ -1257,9 +1240,9 @@ import org.slf4j.LoggerFactory; switch (field) { case EXPERIMENT_ID: - return isSetExperimentID(); + return isSetExperimentId(); case PROJECT_ID: - return isSetProjectID(); + return isSetProjectId(); case CREATION_TIME: return isSetCreationTime(); case USER_NAME: @@ -1315,21 +1298,21 @@ import org.slf4j.LoggerFactory; if (that == null) return false; - boolean this_present_experimentID = true && this.isSetExperimentID(); - boolean that_present_experimentID = true && that.isSetExperimentID(); - if (this_present_experimentID || that_present_experimentID) { - if (!(this_present_experimentID && that_present_experimentID)) + boolean this_present_experimentId = true && this.isSetExperimentId(); + boolean that_present_experimentId = true && that.isSetExperimentId(); + if (this_present_experimentId || that_present_experimentId) { + if (!(this_present_experimentId && that_present_experimentId)) return false; - if (!this.experimentID.equals(that.experimentID)) + if (!this.experimentId.equals(that.experimentId)) return false; } - boolean this_present_projectID = true && this.isSetProjectID(); - boolean that_present_projectID = true && that.isSetProjectID(); - if (this_present_projectID || that_present_projectID) { - if (!(this_present_projectID && that_present_projectID)) + boolean this_present_projectId = true && this.isSetProjectId(); + boolean that_present_projectId = true && that.isSetProjectId(); + if (this_present_projectId || that_present_projectId) { + if (!(this_present_projectId && that_present_projectId)) return false; - if (!this.projectID.equals(that.projectID)) + if (!this.projectId.equals(that.projectId)) return false; } @@ -1520,22 +1503,22 @@ import org.slf4j.LoggerFactory; int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetExperimentID()).compareTo(other.isSetExperimentID()); + lastComparison = Boolean.valueOf(isSetExperimentId()).compareTo(other.isSetExperimentId()); if (lastComparison != 0) { return lastComparison; } - if (isSetExperimentID()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.experimentID, other.experimentID); + if (isSetExperimentId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.experimentId, other.experimentId); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetProjectID()).compareTo(other.isSetProjectID()); + lastComparison = Boolean.valueOf(isSetProjectId()).compareTo(other.isSetProjectId()); if (lastComparison != 0) { return lastComparison; } - if (isSetProjectID()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.projectID, other.projectID); + if (isSetProjectId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.projectId, other.projectId); if (lastComparison != 0) { return lastComparison; } @@ -1750,19 +1733,19 @@ import org.slf4j.LoggerFactory; StringBuilder sb = new StringBuilder("Experiment("); boolean first = true; - sb.append("experimentID:"); - if (this.experimentID == null) { + sb.append("experimentId:"); + if (this.experimentId == null) { sb.append("null"); } else { - sb.append(this.experimentID); + sb.append(this.experimentId); } first = false; if (!first) sb.append(", "); - sb.append("projectID:"); - if (this.projectID == null) { + sb.append("projectId:"); + if (this.projectId == null) { sb.append("null"); } else { - sb.append(this.projectID); + sb.append(this.projectId); } first = false; if (isSetCreationTime()) { @@ -1949,12 +1932,12 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields - if (!isSetExperimentID()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'experimentID' is unset! Struct:" + toString()); + if (!isSetExperimentId()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'experimentId' is unset! Struct:" + toString()); } - if (!isSetProjectID()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'projectID' is unset! Struct:" + toString()); + if (!isSetProjectId()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'projectId' is unset! Struct:" + toString()); } if (!isSetUserName()) { @@ -2012,16 +1995,16 @@ import org.slf4j.LoggerFactory; switch (schemeField.id) { case 1: // EXPERIMENT_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.experimentID = iprot.readString(); - struct.setExperimentIDIsSet(true); + struct.experimentId = iprot.readString(); + struct.setExperimentIdIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 2: // PROJECT_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.projectID = iprot.readString(); - struct.setProjectIDIsSet(true); + struct.projectId = iprot.readString(); + struct.setProjectIdIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -2258,14 +2241,14 @@ import org.slf4j.LoggerFactory; struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.experimentID != null) { + if (struct.experimentId != null) { oprot.writeFieldBegin(EXPERIMENT_ID_FIELD_DESC); - oprot.writeString(struct.experimentID); + oprot.writeString(struct.experimentId); oprot.writeFieldEnd(); } - if (struct.projectID != null) { + if (struct.projectId != null) { oprot.writeFieldBegin(PROJECT_ID_FIELD_DESC); - oprot.writeString(struct.projectID); + oprot.writeString(struct.projectId); oprot.writeFieldEnd(); } if (struct.isSetCreationTime()) { @@ -2452,8 +2435,8 @@ import org.slf4j.LoggerFactory; @Override public void write(org.apache.thrift.protocol.TProtocol prot, Experiment struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; - oprot.writeString(struct.experimentID); - oprot.writeString(struct.projectID); + oprot.writeString(struct.experimentId); + oprot.writeString(struct.projectId); oprot.writeString(struct.userName); oprot.writeString(struct.name); BitSet optionals = new BitSet(); @@ -2601,10 +2584,10 @@ import org.slf4j.LoggerFactory; @Override public void read(org.apache.thrift.protocol.TProtocol prot, Experiment 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.experimentId = iprot.readString(); + struct.setExperimentIdIsSet(true); + struct.projectId = iprot.readString(); + struct.setProjectIdIsSet(true); struct.userName = iprot.readString(); struct.setUserNameIsSet(true); struct.name = iprot.readString();
http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentSummary.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentSummary.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentSummary.java index c30e4ea..d28bbeb 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentSummary.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentSummary.java @@ -52,8 +52,8 @@ import org.slf4j.LoggerFactory; @SuppressWarnings("all") public class ExperimentSummary implements org.apache.thrift.TBase<ExperimentSummary, ExperimentSummary._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentSummary> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentSummary"); - 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 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 CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("creationTime", org.apache.thrift.protocol.TType.I64, (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 NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)5); @@ -68,8 +68,8 @@ import org.slf4j.LoggerFactory; schemes.put(TupleScheme.class, new ExperimentSummaryTupleSchemeFactory()); } - private String experimentID; // required - private String projectID; // required + private String experimentId; // required + private String projectId; // required private long creationTime; // optional private String userName; // required private String name; // required @@ -80,8 +80,8 @@ import org.slf4j.LoggerFactory; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { - EXPERIMENT_ID((short)1, "experimentID"), - PROJECT_ID((short)2, "projectID"), + EXPERIMENT_ID((short)1, "experimentId"), + PROJECT_ID((short)2, "projectId"), CREATION_TIME((short)3, "creationTime"), USER_NAME((short)4, "userName"), NAME((short)5, "name"), @@ -167,9 +167,9 @@ import org.slf4j.LoggerFactory; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.EXPERIMENT_ID, new org.apache.thrift.meta_data.FieldMetaData("experimentID", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.EXPERIMENT_ID, new org.apache.thrift.meta_data.FieldMetaData("experimentId", org.apache.thrift.TFieldRequirementType.REQUIRED, 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, + 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.CREATION_TIME, new org.apache.thrift.meta_data.FieldMetaData("creationTime", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); @@ -194,14 +194,14 @@ import org.slf4j.LoggerFactory; } public ExperimentSummary( - String experimentID, - String projectID, + String experimentId, + String projectId, String userName, String name) { this(); - this.experimentID = experimentID; - this.projectID = projectID; + this.experimentId = experimentId; + this.projectId = projectId; this.userName = userName; this.name = name; } @@ -211,11 +211,11 @@ import org.slf4j.LoggerFactory; */ public ExperimentSummary(ExperimentSummary other) { __isset_bitfield = other.__isset_bitfield; - if (other.isSetExperimentID()) { - this.experimentID = other.experimentID; + if (other.isSetExperimentId()) { + this.experimentId = other.experimentId; } - if (other.isSetProjectID()) { - this.projectID = other.projectID; + if (other.isSetProjectId()) { + this.projectId = other.projectId; } this.creationTime = other.creationTime; if (other.isSetUserName()) { @@ -248,8 +248,8 @@ import org.slf4j.LoggerFactory; @Override public void clear() { - this.experimentID = null; - this.projectID = null; + this.experimentId = null; + this.projectId = null; setCreationTimeIsSet(false); this.creationTime = 0; this.userName = null; @@ -260,49 +260,49 @@ import org.slf4j.LoggerFactory; this.errors = null; } - public String getExperimentID() { - return this.experimentID; + public String getExperimentId() { + return this.experimentId; } - public void setExperimentID(String experimentID) { - this.experimentID = experimentID; + public void setExperimentId(String experimentId) { + this.experimentId = experimentId; } - public void unsetExperimentID() { - this.experimentID = null; + public void unsetExperimentId() { + this.experimentId = null; } - /** Returns true if field experimentID is set (has been assigned a value) and false otherwise */ - public boolean isSetExperimentID() { - return this.experimentID != null; + /** Returns true if field experimentId is set (has been assigned a value) and false otherwise */ + public boolean isSetExperimentId() { + return this.experimentId != null; } - public void setExperimentIDIsSet(boolean value) { + public void setExperimentIdIsSet(boolean value) { if (!value) { - this.experimentID = null; + this.experimentId = null; } } - public String getProjectID() { - return this.projectID; + public String getProjectId() { + return this.projectId; } - public void setProjectID(String projectID) { - this.projectID = projectID; + public void setProjectId(String projectId) { + this.projectId = projectId; } - public void unsetProjectID() { - this.projectID = null; + public void unsetProjectId() { + this.projectId = null; } - /** Returns true if field projectID is set (has been assigned a value) and false otherwise */ - public boolean isSetProjectID() { - return this.projectID != null; + /** Returns true if field projectId is set (has been assigned a value) and false otherwise */ + public boolean isSetProjectId() { + return this.projectId != null; } - public void setProjectIDIsSet(boolean value) { + public void setProjectIdIsSet(boolean value) { if (!value) { - this.projectID = null; + this.projectId = null; } } @@ -485,17 +485,17 @@ import org.slf4j.LoggerFactory; switch (field) { case EXPERIMENT_ID: if (value == null) { - unsetExperimentID(); + unsetExperimentId(); } else { - setExperimentID((String)value); + setExperimentId((String)value); } break; case PROJECT_ID: if (value == null) { - unsetProjectID(); + unsetProjectId(); } else { - setProjectID((String)value); + setProjectId((String)value); } break; @@ -561,10 +561,10 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case EXPERIMENT_ID: - return getExperimentID(); + return getExperimentId(); case PROJECT_ID: - return getProjectID(); + return getProjectId(); case CREATION_TIME: return Long.valueOf(getCreationTime()); @@ -599,9 +599,9 @@ import org.slf4j.LoggerFactory; switch (field) { case EXPERIMENT_ID: - return isSetExperimentID(); + return isSetExperimentId(); case PROJECT_ID: - return isSetProjectID(); + return isSetProjectId(); case CREATION_TIME: return isSetCreationTime(); case USER_NAME: @@ -633,21 +633,21 @@ import org.slf4j.LoggerFactory; if (that == null) return false; - boolean this_present_experimentID = true && this.isSetExperimentID(); - boolean that_present_experimentID = true && that.isSetExperimentID(); - if (this_present_experimentID || that_present_experimentID) { - if (!(this_present_experimentID && that_present_experimentID)) + boolean this_present_experimentId = true && this.isSetExperimentId(); + boolean that_present_experimentId = true && that.isSetExperimentId(); + if (this_present_experimentId || that_present_experimentId) { + if (!(this_present_experimentId && that_present_experimentId)) return false; - if (!this.experimentID.equals(that.experimentID)) + if (!this.experimentId.equals(that.experimentId)) return false; } - boolean this_present_projectID = true && this.isSetProjectID(); - boolean that_present_projectID = true && that.isSetProjectID(); - if (this_present_projectID || that_present_projectID) { - if (!(this_present_projectID && that_present_projectID)) + boolean this_present_projectId = true && this.isSetProjectId(); + boolean that_present_projectId = true && that.isSetProjectId(); + if (this_present_projectId || that_present_projectId) { + if (!(this_present_projectId && that_present_projectId)) return false; - if (!this.projectID.equals(that.projectID)) + if (!this.projectId.equals(that.projectId)) return false; } @@ -730,22 +730,22 @@ import org.slf4j.LoggerFactory; int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetExperimentID()).compareTo(other.isSetExperimentID()); + lastComparison = Boolean.valueOf(isSetExperimentId()).compareTo(other.isSetExperimentId()); if (lastComparison != 0) { return lastComparison; } - if (isSetExperimentID()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.experimentID, other.experimentID); + if (isSetExperimentId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.experimentId, other.experimentId); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetProjectID()).compareTo(other.isSetProjectID()); + lastComparison = Boolean.valueOf(isSetProjectId()).compareTo(other.isSetProjectId()); if (lastComparison != 0) { return lastComparison; } - if (isSetProjectID()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.projectID, other.projectID); + if (isSetProjectId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.projectId, other.projectId); if (lastComparison != 0) { return lastComparison; } @@ -840,19 +840,19 @@ import org.slf4j.LoggerFactory; StringBuilder sb = new StringBuilder("ExperimentSummary("); boolean first = true; - sb.append("experimentID:"); - if (this.experimentID == null) { + sb.append("experimentId:"); + if (this.experimentId == null) { sb.append("null"); } else { - sb.append(this.experimentID); + sb.append(this.experimentId); } first = false; if (!first) sb.append(", "); - sb.append("projectID:"); - if (this.projectID == null) { + sb.append("projectId:"); + if (this.projectId == null) { sb.append("null"); } else { - sb.append(this.projectID); + sb.append(this.projectId); } first = false; if (isSetCreationTime()) { @@ -923,12 +923,12 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields - if (!isSetExperimentID()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'experimentID' is unset! Struct:" + toString()); + if (!isSetExperimentId()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'experimentId' is unset! Struct:" + toString()); } - if (!isSetProjectID()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'projectID' is unset! Struct:" + toString()); + if (!isSetProjectId()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'projectId' is unset! Struct:" + toString()); } if (!isSetUserName()) { @@ -983,16 +983,16 @@ import org.slf4j.LoggerFactory; switch (schemeField.id) { case 1: // EXPERIMENT_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.experimentID = iprot.readString(); - struct.setExperimentIDIsSet(true); + struct.experimentId = iprot.readString(); + struct.setExperimentIdIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 2: // PROJECT_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.projectID = iprot.readString(); - struct.setProjectIDIsSet(true); + struct.projectId = iprot.readString(); + struct.setProjectIdIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1078,14 +1078,14 @@ import org.slf4j.LoggerFactory; struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.experimentID != null) { + if (struct.experimentId != null) { oprot.writeFieldBegin(EXPERIMENT_ID_FIELD_DESC); - oprot.writeString(struct.experimentID); + oprot.writeString(struct.experimentId); oprot.writeFieldEnd(); } - if (struct.projectID != null) { + if (struct.projectId != null) { oprot.writeFieldBegin(PROJECT_ID_FIELD_DESC); - oprot.writeString(struct.projectID); + oprot.writeString(struct.projectId); oprot.writeFieldEnd(); } if (struct.isSetCreationTime()) { @@ -1155,8 +1155,8 @@ import org.slf4j.LoggerFactory; @Override public void write(org.apache.thrift.protocol.TProtocol prot, ExperimentSummary struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; - oprot.writeString(struct.experimentID); - oprot.writeString(struct.projectID); + oprot.writeString(struct.experimentId); + oprot.writeString(struct.projectId); oprot.writeString(struct.userName); oprot.writeString(struct.name); BitSet optionals = new BitSet(); @@ -1202,10 +1202,10 @@ import org.slf4j.LoggerFactory; @Override public void read(org.apache.thrift.protocol.TProtocol prot, ExperimentSummary 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.experimentId = iprot.readString(); + struct.setExperimentIdIsSet(true); + struct.projectId = iprot.readString(); + struct.setProjectIdIsSet(true); struct.userName = iprot.readString(); struct.setUserNameIsSet(true); struct.name = iprot.readString(); http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobDetails.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobDetails.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobDetails.java index 10c70fe..f9dc3bb 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobDetails.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobDetails.java @@ -23,36 +23,19 @@ */ package org.apache.airavata.model.workspace.experiment; +import org.apache.thrift.EncodingUtils; +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.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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; + +import java.util.*; @SuppressWarnings("all") public class JobDetails implements org.apache.thrift.TBase<JobDetails, JobDetails._Fields>, java.io.Serializable, Cloneable, Comparable<JobDetails> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobDetails"); - private static final org.apache.thrift.protocol.TField JOB_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("jobID", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField JOB_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("jobId", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField JOB_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("jobDescription", org.apache.thrift.protocol.TType.STRING, (short)2); 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)3); private static final org.apache.thrift.protocol.TField JOB_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("jobStatus", org.apache.thrift.protocol.TType.STRUCT, (short)4); @@ -68,7 +51,7 @@ import org.slf4j.LoggerFactory; schemes.put(TupleScheme.class, new JobDetailsTupleSchemeFactory()); } - private String jobID; // required + private String jobId; // required private String jobDescription; // required private long creationTime; // optional private JobStatus jobStatus; // optional @@ -80,7 +63,7 @@ import org.slf4j.LoggerFactory; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { - JOB_ID((short)1, "jobID"), + JOB_ID((short)1, "jobId"), JOB_DESCRIPTION((short)2, "jobDescription"), CREATION_TIME((short)3, "creationTime"), JOB_STATUS((short)4, "jobStatus"), @@ -167,7 +150,7 @@ import org.slf4j.LoggerFactory; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.JOB_ID, new org.apache.thrift.meta_data.FieldMetaData("jobID", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.JOB_ID, new org.apache.thrift.meta_data.FieldMetaData("jobId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.JOB_DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("jobDescription", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); @@ -191,16 +174,16 @@ import org.slf4j.LoggerFactory; } public JobDetails() { - this.jobID = "DO_NOT_SET_AT_CLIENTS"; + this.jobId = "DO_NOT_SET_AT_CLIENTS"; } public JobDetails( - String jobID, + String jobId, String jobDescription) { this(); - this.jobID = jobID; + this.jobId = jobId; this.jobDescription = jobDescription; } @@ -209,8 +192,8 @@ import org.slf4j.LoggerFactory; */ public JobDetails(JobDetails other) { __isset_bitfield = other.__isset_bitfield; - if (other.isSetJobID()) { - this.jobID = other.jobID; + if (other.isSetJobId()) { + this.jobId = other.jobId; } if (other.isSetJobDescription()) { this.jobDescription = other.jobDescription; @@ -246,7 +229,7 @@ import org.slf4j.LoggerFactory; @Override public void clear() { - this.jobID = "DO_NOT_SET_AT_CLIENTS"; + this.jobId = "DO_NOT_SET_AT_CLIENTS"; this.jobDescription = null; setCreationTimeIsSet(false); @@ -259,26 +242,26 @@ import org.slf4j.LoggerFactory; this.workingDir = null; } - public String getJobID() { - return this.jobID; + public String getJobId() { + return this.jobId; } - public void setJobID(String jobID) { - this.jobID = jobID; + public void setJobId(String jobId) { + this.jobId = jobId; } - public void unsetJobID() { - this.jobID = null; + public void unsetJobId() { + this.jobId = null; } - /** Returns true if field jobID is set (has been assigned a value) and false otherwise */ - public boolean isSetJobID() { - return this.jobID != null; + /** Returns true if field jobId is set (has been assigned a value) and false otherwise */ + public boolean isSetJobId() { + return this.jobId != null; } - public void setJobIDIsSet(boolean value) { + public void setJobIdIsSet(boolean value) { if (!value) { - this.jobID = null; + this.jobId = null; } } @@ -484,9 +467,9 @@ import org.slf4j.LoggerFactory; switch (field) { case JOB_ID: if (value == null) { - unsetJobID(); + unsetJobId(); } else { - setJobID((String)value); + setJobId((String)value); } break; @@ -560,7 +543,7 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case JOB_ID: - return getJobID(); + return getJobId(); case JOB_DESCRIPTION: return getJobDescription(); @@ -598,7 +581,7 @@ import org.slf4j.LoggerFactory; switch (field) { case JOB_ID: - return isSetJobID(); + return isSetJobId(); case JOB_DESCRIPTION: return isSetJobDescription(); case CREATION_TIME: @@ -632,12 +615,12 @@ import org.slf4j.LoggerFactory; if (that == null) return false; - boolean this_present_jobID = true && this.isSetJobID(); - boolean that_present_jobID = true && that.isSetJobID(); - if (this_present_jobID || that_present_jobID) { - if (!(this_present_jobID && that_present_jobID)) + boolean this_present_jobId = true && this.isSetJobId(); + boolean that_present_jobId = true && that.isSetJobId(); + if (this_present_jobId || that_present_jobId) { + if (!(this_present_jobId && that_present_jobId)) return false; - if (!this.jobID.equals(that.jobID)) + if (!this.jobId.equals(that.jobId)) return false; } @@ -729,12 +712,12 @@ import org.slf4j.LoggerFactory; int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetJobID()).compareTo(other.isSetJobID()); + lastComparison = Boolean.valueOf(isSetJobId()).compareTo(other.isSetJobId()); if (lastComparison != 0) { return lastComparison; } - if (isSetJobID()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jobID, other.jobID); + if (isSetJobId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jobId, other.jobId); if (lastComparison != 0) { return lastComparison; } @@ -839,11 +822,11 @@ import org.slf4j.LoggerFactory; StringBuilder sb = new StringBuilder("JobDetails("); boolean first = true; - sb.append("jobID:"); - if (this.jobID == null) { + sb.append("jobId:"); + if (this.jobId == null) { sb.append("null"); } else { - sb.append(this.jobID); + sb.append(this.jobId); } first = false; if (!first) sb.append(", "); @@ -926,8 +909,8 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields - if (!isSetJobID()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'jobID' is unset! Struct:" + toString()); + if (!isSetJobId()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'jobId' is unset! Struct:" + toString()); } if (!isSetJobDescription()) { @@ -981,8 +964,8 @@ import org.slf4j.LoggerFactory; switch (schemeField.id) { case 1: // JOB_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.jobID = iprot.readString(); - struct.setJobIDIsSet(true); + struct.jobId = iprot.readString(); + struct.setJobIdIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1077,9 +1060,9 @@ import org.slf4j.LoggerFactory; struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.jobID != null) { + if (struct.jobId != null) { oprot.writeFieldBegin(JOB_ID_FIELD_DESC); - oprot.writeString(struct.jobID); + oprot.writeString(struct.jobId); oprot.writeFieldEnd(); } if (struct.jobDescription != null) { @@ -1158,7 +1141,7 @@ import org.slf4j.LoggerFactory; @Override public void write(org.apache.thrift.protocol.TProtocol prot, JobDetails struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; - oprot.writeString(struct.jobID); + oprot.writeString(struct.jobId); oprot.writeString(struct.jobDescription); BitSet optionals = new BitSet(); if (struct.isSetCreationTime()) { @@ -1215,8 +1198,8 @@ import org.slf4j.LoggerFactory; @Override public void read(org.apache.thrift.protocol.TProtocol prot, JobDetails struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - struct.jobID = iprot.readString(); - struct.setJobIDIsSet(true); + struct.jobId = iprot.readString(); + struct.setJobIdIsSet(true); struct.jobDescription = iprot.readString(); struct.setJobDescriptionIsSet(true); BitSet incoming = iprot.readBitSet(7); http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskDetails.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskDetails.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskDetails.java index 7488f06..47618d0 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskDetails.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskDetails.java @@ -23,31 +23,14 @@ */ package org.apache.airavata.model.workspace.experiment; +import org.apache.thrift.EncodingUtils; +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.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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; + +import java.util.*; /** * A structure holding the actual execution context decided based on user provided configuration data or system inferred @@ -58,7 +41,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings("all") public class TaskDetails implements org.apache.thrift.TBase<TaskDetails, TaskDetails._Fields>, java.io.Serializable, Cloneable, Comparable<TaskDetails> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskDetails"); - private static final org.apache.thrift.protocol.TField TASK_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("taskID", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField TASK_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("taskId", org.apache.thrift.protocol.TType.STRING, (short)1); 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)2); private static final org.apache.thrift.protocol.TField APPLICATION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationId", org.apache.thrift.protocol.TType.STRING, (short)3); private static final org.apache.thrift.protocol.TField APPLICATION_VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationVersion", org.apache.thrift.protocol.TType.STRING, (short)4); @@ -81,7 +64,7 @@ import org.slf4j.LoggerFactory; schemes.put(TupleScheme.class, new TaskDetailsTupleSchemeFactory()); } - private String taskID; // required + private String taskId; // required private long creationTime; // optional private String applicationId; // optional private String applicationVersion; // optional @@ -100,7 +83,7 @@ import org.slf4j.LoggerFactory; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { - TASK_ID((short)1, "taskID"), + TASK_ID((short)1, "taskId"), CREATION_TIME((short)2, "creationTime"), APPLICATION_ID((short)3, "applicationId"), APPLICATION_VERSION((short)4, "applicationVersion"), @@ -209,7 +192,7 @@ import org.slf4j.LoggerFactory; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.TASK_ID, new org.apache.thrift.meta_data.FieldMetaData("taskID", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.TASK_ID, new org.apache.thrift.meta_data.FieldMetaData("taskId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.CREATION_TIME, new org.apache.thrift.meta_data.FieldMetaData("creationTime", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); @@ -252,15 +235,15 @@ import org.slf4j.LoggerFactory; } public TaskDetails() { - this.taskID = "DO_NOT_SET_AT_CLIENTS"; + this.taskId = "DO_NOT_SET_AT_CLIENTS"; } public TaskDetails( - String taskID) + String taskId) { this(); - this.taskID = taskID; + this.taskId = taskId; } /** @@ -268,8 +251,8 @@ import org.slf4j.LoggerFactory; */ public TaskDetails(TaskDetails other) { __isset_bitfield = other.__isset_bitfield; - if (other.isSetTaskID()) { - this.taskID = other.taskID; + if (other.isSetTaskId()) { + this.taskId = other.taskId; } this.creationTime = other.creationTime; if (other.isSetApplicationId()) { @@ -341,7 +324,7 @@ import org.slf4j.LoggerFactory; @Override public void clear() { - this.taskID = "DO_NOT_SET_AT_CLIENTS"; + this.taskId = "DO_NOT_SET_AT_CLIENTS"; setCreationTimeIsSet(false); this.creationTime = 0; @@ -362,26 +345,26 @@ import org.slf4j.LoggerFactory; this.emailAddresses = null; } - public String getTaskID() { - return this.taskID; + public String getTaskId() { + return this.taskId; } - public void setTaskID(String taskID) { - this.taskID = taskID; + public void setTaskId(String taskId) { + this.taskId = taskId; } - public void unsetTaskID() { - this.taskID = null; + public void unsetTaskId() { + this.taskId = null; } - /** Returns true if field taskID is set (has been assigned a value) and false otherwise */ - public boolean isSetTaskID() { - return this.taskID != null; + /** Returns true if field taskId is set (has been assigned a value) and false otherwise */ + public boolean isSetTaskId() { + return this.taskId != null; } - public void setTaskIDIsSet(boolean value) { + public void setTaskIdIsSet(boolean value) { if (!value) { - this.taskID = null; + this.taskId = null; } } @@ -822,9 +805,9 @@ import org.slf4j.LoggerFactory; switch (field) { case TASK_ID: if (value == null) { - unsetTaskID(); + unsetTaskId(); } else { - setTaskID((String)value); + setTaskId((String)value); } break; @@ -954,7 +937,7 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case TASK_ID: - return getTaskID(); + return getTaskId(); case CREATION_TIME: return Long.valueOf(getCreationTime()); @@ -1013,7 +996,7 @@ import org.slf4j.LoggerFactory; switch (field) { case TASK_ID: - return isSetTaskID(); + return isSetTaskId(); case CREATION_TIME: return isSetCreationTime(); case APPLICATION_ID: @@ -1061,12 +1044,12 @@ import org.slf4j.LoggerFactory; if (that == null) return false; - boolean this_present_taskID = true && this.isSetTaskID(); - boolean that_present_taskID = true && that.isSetTaskID(); - if (this_present_taskID || that_present_taskID) { - if (!(this_present_taskID && that_present_taskID)) + boolean this_present_taskId = true && this.isSetTaskId(); + boolean that_present_taskId = true && that.isSetTaskId(); + if (this_present_taskId || that_present_taskId) { + if (!(this_present_taskId && that_present_taskId)) return false; - if (!this.taskID.equals(that.taskID)) + if (!this.taskId.equals(that.taskId)) return false; } @@ -1221,12 +1204,12 @@ import org.slf4j.LoggerFactory; int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetTaskID()).compareTo(other.isSetTaskID()); + lastComparison = Boolean.valueOf(isSetTaskId()).compareTo(other.isSetTaskId()); if (lastComparison != 0) { return lastComparison; } - if (isSetTaskID()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskID, other.taskID); + if (isSetTaskId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskId, other.taskId); if (lastComparison != 0) { return lastComparison; } @@ -1401,11 +1384,11 @@ import org.slf4j.LoggerFactory; StringBuilder sb = new StringBuilder("TaskDetails("); boolean first = true; - sb.append("taskID:"); - if (this.taskID == null) { + sb.append("taskId:"); + if (this.taskId == null) { sb.append("null"); } else { - sb.append(this.taskID); + sb.append(this.taskId); } first = false; if (isSetCreationTime()) { @@ -1556,8 +1539,8 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields - if (!isSetTaskID()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'taskID' is unset! Struct:" + toString()); + if (!isSetTaskId()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'taskId' is unset! Struct:" + toString()); } // check for sub-struct validity @@ -1613,8 +1596,8 @@ import org.slf4j.LoggerFactory; switch (schemeField.id) { case 1: // TASK_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.taskID = iprot.readString(); - struct.setTaskIDIsSet(true); + struct.taskId = iprot.readString(); + struct.setTaskIdIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1821,9 +1804,9 @@ import org.slf4j.LoggerFactory; struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.taskID != null) { + if (struct.taskId != null) { oprot.writeFieldBegin(TASK_ID_FIELD_DESC); - oprot.writeString(struct.taskID); + oprot.writeString(struct.taskId); oprot.writeFieldEnd(); } if (struct.isSetCreationTime()) { @@ -1986,7 +1969,7 @@ import org.slf4j.LoggerFactory; @Override public void write(org.apache.thrift.protocol.TProtocol prot, TaskDetails struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; - oprot.writeString(struct.taskID); + oprot.writeString(struct.taskId); BitSet optionals = new BitSet(); if (struct.isSetCreationTime()) { optionals.set(0); @@ -2120,8 +2103,8 @@ import org.slf4j.LoggerFactory; @Override public void read(org.apache.thrift.protocol.TProtocol prot, TaskDetails struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - struct.taskID = iprot.readString(); - struct.setTaskIDIsSet(true); + struct.taskId = iprot.readString(); + struct.setTaskIdIsSet(true); BitSet incoming = iprot.readBitSet(15); if (incoming.get(0)) { struct.creationTime = iprot.readI64(); http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/UserConfigurationData.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/UserConfigurationData.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/UserConfigurationData.java index c9531ea..fdc80f5 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/UserConfigurationData.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/UserConfigurationData.java @@ -65,7 +65,7 @@ import org.slf4j.LoggerFactory; private static final org.apache.thrift.protocol.TField ADVANCE_OUTPUT_DATA_HANDLING_FIELD_DESC = new org.apache.thrift.protocol.TField("advanceOutputDataHandling", org.apache.thrift.protocol.TType.STRUCT, (short)6); private static final org.apache.thrift.protocol.TField QOS_PARAMS_FIELD_DESC = new org.apache.thrift.protocol.TField("qosParams", org.apache.thrift.protocol.TType.STRUCT, (short)7); private static final org.apache.thrift.protocol.TField THROTTLE_RESOURCES_FIELD_DESC = new org.apache.thrift.protocol.TField("throttleResources", org.apache.thrift.protocol.TType.BOOL, (short)8); - private static final org.apache.thrift.protocol.TField USER_DN_FIELD_DESC = new org.apache.thrift.protocol.TField("userDN", org.apache.thrift.protocol.TType.STRING, (short)9); + private static final org.apache.thrift.protocol.TField USER_DN_FIELD_DESC = new org.apache.thrift.protocol.TField("userDn", org.apache.thrift.protocol.TType.STRING, (short)9); private static final org.apache.thrift.protocol.TField GENERATE_CERT_FIELD_DESC = new org.apache.thrift.protocol.TField("generateCert", org.apache.thrift.protocol.TType.BOOL, (short)10); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); @@ -82,7 +82,7 @@ import org.slf4j.LoggerFactory; private AdvancedOutputDataHandling advanceOutputDataHandling; // optional private QualityOfServiceParams qosParams; // optional private boolean throttleResources; // optional - private String userDN; // optional + private String userDn; // optional private boolean generateCert; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @@ -95,7 +95,7 @@ import org.slf4j.LoggerFactory; ADVANCE_OUTPUT_DATA_HANDLING((short)6, "advanceOutputDataHandling"), QOS_PARAMS((short)7, "qosParams"), THROTTLE_RESOURCES((short)8, "throttleResources"), - USER_DN((short)9, "userDN"), + USER_DN((short)9, "userDn"), GENERATE_CERT((short)10, "generateCert"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -197,7 +197,7 @@ import org.slf4j.LoggerFactory; new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, QualityOfServiceParams.class))); tmpMap.put(_Fields.THROTTLE_RESOURCES, new org.apache.thrift.meta_data.FieldMetaData("throttleResources", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); - tmpMap.put(_Fields.USER_DN, new org.apache.thrift.meta_data.FieldMetaData("userDN", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.USER_DN, new org.apache.thrift.meta_data.FieldMetaData("userDn", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.GENERATE_CERT, new org.apache.thrift.meta_data.FieldMetaData("generateCert", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); @@ -250,8 +250,8 @@ import org.slf4j.LoggerFactory; this.qosParams = new QualityOfServiceParams(other.qosParams); } this.throttleResources = other.throttleResources; - if (other.isSetUserDN()) { - this.userDN = other.userDN; + if (other.isSetUserDn()) { + this.userDn = other.userDn; } this.generateCert = other.generateCert; } @@ -274,7 +274,7 @@ import org.slf4j.LoggerFactory; this.qosParams = null; this.throttleResources = false; - this.userDN = null; + this.userDn = null; this.generateCert = false; } @@ -459,26 +459,26 @@ import org.slf4j.LoggerFactory; __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __THROTTLERESOURCES_ISSET_ID, value); } - public String getUserDN() { - return this.userDN; + public String getUserDn() { + return this.userDn; } - public void setUserDN(String userDN) { - this.userDN = userDN; + public void setUserDn(String userDn) { + this.userDn = userDn; } - public void unsetUserDN() { - this.userDN = null; + public void unsetUserDn() { + this.userDn = null; } - /** Returns true if field userDN is set (has been assigned a value) and false otherwise */ - public boolean isSetUserDN() { - return this.userDN != null; + /** Returns true if field userDn is set (has been assigned a value) and false otherwise */ + public boolean isSetUserDn() { + return this.userDn != null; } - public void setUserDNIsSet(boolean value) { + public void setUserDnIsSet(boolean value) { if (!value) { - this.userDN = null; + this.userDn = null; } } @@ -572,9 +572,9 @@ import org.slf4j.LoggerFactory; case USER_DN: if (value == null) { - unsetUserDN(); + unsetUserDn(); } else { - setUserDN((String)value); + setUserDn((String)value); } break; @@ -616,7 +616,7 @@ import org.slf4j.LoggerFactory; return Boolean.valueOf(isThrottleResources()); case USER_DN: - return getUserDN(); + return getUserDn(); case GENERATE_CERT: return Boolean.valueOf(isGenerateCert()); @@ -649,7 +649,7 @@ import org.slf4j.LoggerFactory; case THROTTLE_RESOURCES: return isSetThrottleResources(); case USER_DN: - return isSetUserDN(); + return isSetUserDn(); case GENERATE_CERT: return isSetGenerateCert(); } @@ -741,12 +741,12 @@ import org.slf4j.LoggerFactory; return false; } - boolean this_present_userDN = true && this.isSetUserDN(); - boolean that_present_userDN = true && that.isSetUserDN(); - if (this_present_userDN || that_present_userDN) { - if (!(this_present_userDN && that_present_userDN)) + boolean this_present_userDn = true && this.isSetUserDn(); + boolean that_present_userDn = true && that.isSetUserDn(); + if (this_present_userDn || that_present_userDn) { + if (!(this_present_userDn && that_present_userDn)) return false; - if (!this.userDN.equals(that.userDN)) + if (!this.userDn.equals(that.userDn)) return false; } @@ -855,12 +855,12 @@ import org.slf4j.LoggerFactory; return lastComparison; } } - lastComparison = Boolean.valueOf(isSetUserDN()).compareTo(other.isSetUserDN()); + lastComparison = Boolean.valueOf(isSetUserDn()).compareTo(other.isSetUserDn()); if (lastComparison != 0) { return lastComparison; } - if (isSetUserDN()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userDN, other.userDN); + if (isSetUserDn()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userDn, other.userDn); if (lastComparison != 0) { return lastComparison; } @@ -954,13 +954,13 @@ import org.slf4j.LoggerFactory; sb.append(this.throttleResources); first = false; } - if (isSetUserDN()) { + if (isSetUserDn()) { if (!first) sb.append(", "); - sb.append("userDN:"); - if (this.userDN == null) { + sb.append("userDn:"); + if (this.userDn == null) { sb.append("null"); } else { - sb.append(this.userDN); + sb.append(this.userDn); } first = false; } @@ -1105,8 +1105,8 @@ import org.slf4j.LoggerFactory; break; case 9: // USER_DN if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.userDN = iprot.readString(); - struct.setUserDNIsSet(true); + struct.userDn = iprot.readString(); + struct.setUserDnIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1176,10 +1176,10 @@ import org.slf4j.LoggerFactory; oprot.writeBool(struct.throttleResources); oprot.writeFieldEnd(); } - if (struct.userDN != null) { - if (struct.isSetUserDN()) { + if (struct.userDn != null) { + if (struct.isSetUserDn()) { oprot.writeFieldBegin(USER_DN_FIELD_DESC); - oprot.writeString(struct.userDN); + oprot.writeString(struct.userDn); oprot.writeFieldEnd(); } } @@ -1226,7 +1226,7 @@ import org.slf4j.LoggerFactory; if (struct.isSetThrottleResources()) { optionals.set(5); } - if (struct.isSetUserDN()) { + if (struct.isSetUserDn()) { optionals.set(6); } if (struct.isSetGenerateCert()) { @@ -1251,8 +1251,8 @@ import org.slf4j.LoggerFactory; if (struct.isSetThrottleResources()) { oprot.writeBool(struct.throttleResources); } - if (struct.isSetUserDN()) { - oprot.writeString(struct.userDN); + if (struct.isSetUserDn()) { + oprot.writeString(struct.userDn); } if (struct.isSetGenerateCert()) { oprot.writeBool(struct.generateCert); @@ -1296,8 +1296,8 @@ import org.slf4j.LoggerFactory; struct.setThrottleResourcesIsSet(true); } if (incoming.get(6)) { - struct.userDN = iprot.readString(); - struct.setUserDNIsSet(true); + struct.userDn = iprot.readString(); + struct.setUserDnIsSet(true); } if (incoming.get(7)) { struct.generateCert = iprot.readBool(); http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ExperimentModelUtil.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ExperimentModelUtil.java b/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ExperimentModelUtil.java index 341cfa6..6ac1e7f 100644 --- a/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ExperimentModelUtil.java +++ b/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ExperimentModelUtil.java @@ -55,7 +55,7 @@ public class ExperimentModelUtil { String applicationId, List<InputDataObjectType> experimentInputList) { Experiment experiment = new Experiment(); - experiment.setProjectID(projectID); + experiment.setProjectId(projectID); experiment.setUserName(userName); experiment.setName(experimentName); experiment.setDescription(expDescription); @@ -77,7 +77,7 @@ public class ExperimentModelUtil { ComputationalResourceScheduling cmRS = new ComputationalResourceScheduling(); cmRS.setResourceHostId(resourceHostId); - cmRS.setTotalCPUCount(cpuCount); + cmRS.setTotalCpuCount(cpuCount); cmRS.setNodeCount(nodeCount); cmRS.setNumberOfThreads(numberOfThreads); cmRS.setQueueName(queueName); http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/airavata-api/thrift-interface-descriptions/experimentModel.thrift ---------------------------------------------------------------------- diff --git a/airavata-api/thrift-interface-descriptions/experimentModel.thrift b/airavata-api/thrift-interface-descriptions/experimentModel.thrift index 51aaca7..15382ab 100644 --- a/airavata-api/thrift-interface-descriptions/experimentModel.thrift +++ b/airavata-api/thrift-interface-descriptions/experimentModel.thrift @@ -191,7 +191,7 @@ enum CorrectiveAction { */ struct ComputationalResourceScheduling { 1: optional string resourceHostId, - 2: optional i32 totalCPUCount, + 2: optional i32 totalCpuCount, 3: optional i32 nodeCount, 4: optional i32 numberOfThreads, 5: optional string queueName, @@ -247,12 +247,12 @@ struct UserConfigurationData { 6: optional AdvancedOutputDataHandling advanceOutputDataHandling, 7: optional QualityOfServiceParams qosParams, 8: optional bool throttleResources = 0, - 9: optional string userDN, + 9: optional string userDn, 10: optional bool generateCert = 0 } struct ErrorDetails { - 1: required string errorID = DEFAULT_ID, + 1: required string errorId = DEFAULT_ID, 2: optional i64 creationTime, 3: optional string actualErrorMessage, 4: optional string userFriendlyMessage, @@ -264,7 +264,7 @@ struct ErrorDetails { } struct JobDetails { - 1: required string jobID = DEFAULT_ID, + 1: required string jobId = DEFAULT_ID, 2: required string jobDescription, 3: optional i64 creationTime, 4: optional JobStatus jobStatus, @@ -276,7 +276,7 @@ struct JobDetails { } struct DataTransferDetails { - 1: required string transferID = DEFAULT_ID, + 1: required string transferId = DEFAULT_ID, 2: optional i64 creationTime, 3: required string transferDescription, 4: optional TransferStatus transferStatus, @@ -289,7 +289,7 @@ struct DataTransferDetails { * */ struct TaskDetails { - 1: required string taskID = DEFAULT_ID, + 1: required string taskId = DEFAULT_ID, 2: optional i64 creationTime, 3: optional string applicationId, 4: optional string applicationVersion, @@ -367,8 +367,8 @@ struct ValidationResults { */ struct Experiment { - 1: required string experimentID = DEFAULT_ID, - 2: required string projectID = DEFAULT_PROJECT_NAME, + 1: required string experimentId = DEFAULT_ID, + 2: required string projectId = DEFAULT_PROJECT_NAME, 3: optional i64 creationTime, 4: required string userName, 5: required string name, @@ -391,8 +391,8 @@ struct Experiment { } struct ExperimentSummary { - 1: required string experimentID, - 2: required string projectID, + 1: required string experimentId, + 2: required string projectId, 3: optional i64 creationTime, 4: required string userName, 5: required string name, http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/airavata-api/thrift-interface-descriptions/workspaceModel.thrift ---------------------------------------------------------------------- diff --git a/airavata-api/thrift-interface-descriptions/workspaceModel.thrift b/airavata-api/thrift-interface-descriptions/workspaceModel.thrift index 803cea8..16aea3c 100644 --- a/airavata-api/thrift-interface-descriptions/workspaceModel.thrift +++ b/airavata-api/thrift-interface-descriptions/workspaceModel.thrift @@ -41,7 +41,7 @@ struct Group { } struct Project { - 1: required string projectID = experimentModel.DEFAULT_PROJECT_NAME, + 1: required string projectId = experimentModel.DEFAULT_PROJECT_NAME, 2: required string owner, 3: required string name, 4: optional string description http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java ---------------------------------------------------------------------- diff --git a/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java b/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java index 213b834..e1188b6 100644 --- a/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java +++ b/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java @@ -1311,10 +1311,10 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on <i>other</i>. */ public submitJob_args(submitJob_args other) { - if (other.isSetExperimentId()) { + if (other.issetExperimentId()) { this.experimentId = other.experimentId; } - if (other.isSetTaskId()) { + if (other.issetTaskId()) { this.taskId = other.taskId; } if (other.isSetGatewayId()) { @@ -1351,7 +1351,7 @@ import org.slf4j.LoggerFactory; } /** Returns true if field experimentId is set (has been assigned a value) and false otherwise */ - public boolean isSetExperimentId() { + public boolean issetExperimentId() { return this.experimentId != null; } @@ -1375,7 +1375,7 @@ import org.slf4j.LoggerFactory; } /** Returns true if field taskId is set (has been assigned a value) and false otherwise */ - public boolean isSetTaskId() { + public boolean issetTaskId() { return this.taskId != null; } @@ -1496,9 +1496,9 @@ import org.slf4j.LoggerFactory; switch (field) { case EXPERIMENT_ID: - return isSetExperimentId(); + return issetExperimentId(); case TASK_ID: - return isSetTaskId(); + return issetTaskId(); case GATEWAY_ID: return isSetGatewayId(); case TOKEN_ID: @@ -1520,8 +1520,8 @@ import org.slf4j.LoggerFactory; if (that == null) return false; - boolean this_present_experimentId = true && this.isSetExperimentId(); - boolean that_present_experimentId = true && that.isSetExperimentId(); + boolean this_present_experimentId = true && this.issetExperimentId(); + boolean that_present_experimentId = true && that.issetExperimentId(); if (this_present_experimentId || that_present_experimentId) { if (!(this_present_experimentId && that_present_experimentId)) return false; @@ -1529,8 +1529,8 @@ import org.slf4j.LoggerFactory; return false; } - boolean this_present_taskId = true && this.isSetTaskId(); - boolean that_present_taskId = true && that.isSetTaskId(); + boolean this_present_taskId = true && this.issetTaskId(); + boolean that_present_taskId = true && that.issetTaskId(); if (this_present_taskId || that_present_taskId) { if (!(this_present_taskId && that_present_taskId)) return false; @@ -1572,21 +1572,21 @@ import org.slf4j.LoggerFactory; int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetExperimentId()).compareTo(other.isSetExperimentId()); + lastComparison = Boolean.valueOf(issetExperimentId()).compareTo(other.issetExperimentId()); if (lastComparison != 0) { return lastComparison; } - if (isSetExperimentId()) { + if (issetExperimentId()) { lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.experimentId, other.experimentId); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTaskId()).compareTo(other.isSetTaskId()); + lastComparison = Boolean.valueOf(issetTaskId()).compareTo(other.issetTaskId()); if (lastComparison != 0) { return lastComparison; } - if (isSetTaskId()) { + if (issetTaskId()) { lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskId, other.taskId); if (lastComparison != 0) { return lastComparison; @@ -2300,10 +2300,10 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on <i>other</i>. */ public cancelJob_args(cancelJob_args other) { - if (other.isSetExperimentId()) { + if (other.issetExperimentId()) { this.experimentId = other.experimentId; } - if (other.isSetTaskId()) { + if (other.issetTaskId()) { this.taskId = other.taskId; } if (other.isSetGatewayId()) { @@ -2340,7 +2340,7 @@ import org.slf4j.LoggerFactory; } /** Returns true if field experimentId is set (has been assigned a value) and false otherwise */ - public boolean isSetExperimentId() { + public boolean issetExperimentId() { return this.experimentId != null; } @@ -2364,7 +2364,7 @@ import org.slf4j.LoggerFactory; } /** Returns true if field taskId is set (has been assigned a value) and false otherwise */ - public boolean isSetTaskId() { + public boolean issetTaskId() { return this.taskId != null; } @@ -2485,9 +2485,9 @@ import org.slf4j.LoggerFactory; switch (field) { case EXPERIMENT_ID: - return isSetExperimentId(); + return issetExperimentId(); case TASK_ID: - return isSetTaskId(); + return issetTaskId(); case GATEWAY_ID: return isSetGatewayId(); case TOKEN_ID: @@ -2509,8 +2509,8 @@ import org.slf4j.LoggerFactory; if (that == null) return false; - boolean this_present_experimentId = true && this.isSetExperimentId(); - boolean that_present_experimentId = true && that.isSetExperimentId(); + boolean this_present_experimentId = true && this.issetExperimentId(); + boolean that_present_experimentId = true && that.issetExperimentId(); if (this_present_experimentId || that_present_experimentId) { if (!(this_present_experimentId && that_present_experimentId)) return false; @@ -2518,8 +2518,8 @@ import org.slf4j.LoggerFactory; return false; } - boolean this_present_taskId = true && this.isSetTaskId(); - boolean that_present_taskId = true && that.isSetTaskId(); + boolean this_present_taskId = true && this.issetTaskId(); + boolean that_present_taskId = true && that.issetTaskId(); if (this_present_taskId || that_present_taskId) { if (!(this_present_taskId && that_present_taskId)) return false; @@ -2561,21 +2561,21 @@ import org.slf4j.LoggerFactory; int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetExperimentId()).compareTo(other.isSetExperimentId()); + lastComparison = Boolean.valueOf(issetExperimentId()).compareTo(other.issetExperimentId()); if (lastComparison != 0) { return lastComparison; } - if (isSetExperimentId()) { + if (issetExperimentId()) { lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.experimentId, other.experimentId); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTaskId()).compareTo(other.isSetTaskId()); + lastComparison = Boolean.valueOf(issetTaskId()).compareTo(other.issetTaskId()); if (lastComparison != 0) { return lastComparison; } - if (isSetTaskId()) { + if (issetTaskId()) { lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskId, other.taskId); if (lastComparison != 0) { return lastComparison; http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/airavata-gfac-stubs/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java ---------------------------------------------------------------------- diff --git a/modules/gfac/airavata-gfac-stubs/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java b/modules/gfac/airavata-gfac-stubs/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java index eb8ddf7..37c5e53 100644 --- a/modules/gfac/airavata-gfac-stubs/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java +++ b/modules/gfac/airavata-gfac-stubs/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java @@ -1287,10 +1287,10 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on <i>other</i>. */ public submitJob_args(submitJob_args other) { - if (other.isSetExperimentId()) { + if (other.issetExperimentId()) { this.experimentId = other.experimentId; } - if (other.isSetTaskId()) { + if (other.issetTaskId()) { this.taskId = other.taskId; } if (other.isSetGatewayId()) { @@ -1323,7 +1323,7 @@ import org.slf4j.LoggerFactory; } /** Returns true if field experimentId is set (has been assigned a value) and false otherwise */ - public boolean isSetExperimentId() { + public boolean issetExperimentId() { return this.experimentId != null; } @@ -1347,7 +1347,7 @@ import org.slf4j.LoggerFactory; } /** Returns true if field taskId is set (has been assigned a value) and false otherwise */ - public boolean isSetTaskId() { + public boolean issetTaskId() { return this.taskId != null; } @@ -1433,9 +1433,9 @@ import org.slf4j.LoggerFactory; switch (field) { case EXPERIMENT_ID: - return isSetExperimentId(); + return issetExperimentId(); case TASK_ID: - return isSetTaskId(); + return issetTaskId(); case GATEWAY_ID: return isSetGatewayId(); } @@ -1455,8 +1455,8 @@ import org.slf4j.LoggerFactory; if (that == null) return false; - boolean this_present_experimentId = true && this.isSetExperimentId(); - boolean that_present_experimentId = true && that.isSetExperimentId(); + boolean this_present_experimentId = true && this.issetExperimentId(); + boolean that_present_experimentId = true && that.issetExperimentId(); if (this_present_experimentId || that_present_experimentId) { if (!(this_present_experimentId && that_present_experimentId)) return false; @@ -1464,8 +1464,8 @@ import org.slf4j.LoggerFactory; return false; } - boolean this_present_taskId = true && this.isSetTaskId(); - boolean that_present_taskId = true && that.isSetTaskId(); + boolean this_present_taskId = true && this.issetTaskId(); + boolean that_present_taskId = true && that.issetTaskId(); if (this_present_taskId || that_present_taskId) { if (!(this_present_taskId && that_present_taskId)) return false; @@ -1498,21 +1498,21 @@ import org.slf4j.LoggerFactory; int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetExperimentId()).compareTo(other.isSetExperimentId()); + lastComparison = Boolean.valueOf(issetExperimentId()).compareTo(other.issetExperimentId()); if (lastComparison != 0) { return lastComparison; } - if (isSetExperimentId()) { + if (issetExperimentId()) { lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.experimentId, other.experimentId); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTaskId()).compareTo(other.isSetTaskId()); + lastComparison = Boolean.valueOf(issetTaskId()).compareTo(other.issetTaskId()); if (lastComparison != 0) { return lastComparison; } - if (isSetTaskId()) { + if (issetTaskId()) { lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskId, other.taskId); if (lastComparison != 0) { return lastComparison; @@ -2171,10 +2171,10 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on <i>other</i>. */ public cancelJob_args(cancelJob_args other) { - if (other.isSetExperimentId()) { + if (other.issetExperimentId()) { this.experimentId = other.experimentId; } - if (other.isSetTaskId()) { + if (other.issetTaskId()) { this.taskId = other.taskId; } } @@ -2203,7 +2203,7 @@ import org.slf4j.LoggerFactory; } /** Returns true if field experimentId is set (has been assigned a value) and false otherwise */ - public boolean isSetExperimentId() { + public boolean issetExperimentId() { return this.experimentId != null; } @@ -2227,7 +2227,7 @@ import org.slf4j.LoggerFactory; } /** Returns true if field taskId is set (has been assigned a value) and false otherwise */ - public boolean isSetTaskId() { + public boolean issetTaskId() { return this.taskId != null; } @@ -2278,9 +2278,9 @@ import org.slf4j.LoggerFactory; switch (field) { case EXPERIMENT_ID: - return isSetExperimentId(); + return issetExperimentId(); case TASK_ID: - return isSetTaskId(); + return issetTaskId(); } throw new IllegalStateException(); } @@ -2298,8 +2298,8 @@ import org.slf4j.LoggerFactory; if (that == null) return false; - boolean this_present_experimentId = true && this.isSetExperimentId(); - boolean that_present_experimentId = true && that.isSetExperimentId(); + boolean this_present_experimentId = true && this.issetExperimentId(); + boolean that_present_experimentId = true && that.issetExperimentId(); if (this_present_experimentId || that_present_experimentId) { if (!(this_present_experimentId && that_present_experimentId)) return false; @@ -2307,8 +2307,8 @@ import org.slf4j.LoggerFactory; return false; } - boolean this_present_taskId = true && this.isSetTaskId(); - boolean that_present_taskId = true && that.isSetTaskId(); + boolean this_present_taskId = true && this.issetTaskId(); + boolean that_present_taskId = true && that.issetTaskId(); if (this_present_taskId || that_present_taskId) { if (!(this_present_taskId && that_present_taskId)) return false; @@ -2332,21 +2332,21 @@ import org.slf4j.LoggerFactory; int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetExperimentId()).compareTo(other.isSetExperimentId()); + lastComparison = Boolean.valueOf(issetExperimentId()).compareTo(other.issetExperimentId()); if (lastComparison != 0) { return lastComparison; } - if (isSetExperimentId()) { + if (issetExperimentId()) { lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.experimentId, other.experimentId); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTaskId()).compareTo(other.isSetTaskId()); + lastComparison = Boolean.valueOf(issetTaskId()).compareTo(other.issetTaskId()); if (lastComparison != 0) { return lastComparison; } - if (isSetTaskId()) { + if (issetTaskId()) { lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskId, other.taskId); if (lastComparison != 0) { return lastComparison;
