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 2014/05/27 19:41:33 UTC
git commit: fixing AIRAVATA-1281
Repository: airavata
Updated Branches:
refs/heads/master 36a0b8c20 -> 5153d0c82
fixing AIRAVATA-1281
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5153d0c8
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5153d0c8
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5153d0c8
Branch: refs/heads/master
Commit: 5153d0c82fb4954d6098fd85f26c6fd018e9a656
Parents: 36a0b8c
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Tue May 27 13:41:28 2014 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Tue May 27 13:41:28 2014 -0400
----------------------------------------------------------------------
.../resources/lib/experimentModel_types.cpp | 24 +++-
.../main/resources/lib/experimentModel_types.h | 19 ++-
.../Model/Workspace/Experiment/Types.php | 28 +++-
.../workspace/experiment/ExperimentSummary.java | 129 +++++++++++++++++--
.../experimentModel.thrift | 5 +-
.../jpa/utils/ThriftDataModelConversion.java | 1 +
6 files changed, 177 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/5153d0c8/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.cpp
index 8e3dcfb..24434a9 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.cpp
@@ -3071,8 +3071,8 @@ void swap(Experiment &a, Experiment &b) {
swap(a.__isset, b.__isset);
}
-const char* ExperimentSummary::ascii_fingerprint = "3DCA5B62241F7A586E1E31A64AE87E0A";
-const uint8_t ExperimentSummary::binary_fingerprint[16] = {0x3D,0xCA,0x5B,0x62,0x24,0x1F,0x7A,0x58,0x6E,0x1E,0x31,0xA6,0x4A,0xE8,0x7E,0x0A};
+const char* ExperimentSummary::ascii_fingerprint = "44FD485ABF32F5EB94D6F393F51241B6";
+const uint8_t ExperimentSummary::binary_fingerprint[16] = {0x44,0xFD,0x48,0x5A,0xBF,0x32,0xF5,0xEB,0x94,0xD6,0xF3,0x93,0xF5,0x12,0x41,0xB6};
uint32_t ExperimentSummary::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -3147,6 +3147,14 @@ uint32_t ExperimentSummary::read(::apache::thrift::protocol::TProtocol* iprot) {
}
break;
case 7:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->applicationId);
+ this->__isset.applicationId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 8:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->experimentStatus.read(iprot);
this->__isset.experimentStatus = true;
@@ -3154,7 +3162,7 @@ uint32_t ExperimentSummary::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 8:
+ case 9:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->errors.clear();
@@ -3224,13 +3232,18 @@ uint32_t ExperimentSummary::write(::apache::thrift::protocol::TProtocol* oprot)
xfer += oprot->writeString(this->description);
xfer += oprot->writeFieldEnd();
}
+ if (this->__isset.applicationId) {
+ xfer += oprot->writeFieldBegin("applicationId", ::apache::thrift::protocol::T_STRING, 7);
+ xfer += oprot->writeString(this->applicationId);
+ xfer += oprot->writeFieldEnd();
+ }
if (this->__isset.experimentStatus) {
- xfer += oprot->writeFieldBegin("experimentStatus", ::apache::thrift::protocol::T_STRUCT, 7);
+ xfer += oprot->writeFieldBegin("experimentStatus", ::apache::thrift::protocol::T_STRUCT, 8);
xfer += this->experimentStatus.write(oprot);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.errors) {
- xfer += oprot->writeFieldBegin("errors", ::apache::thrift::protocol::T_LIST, 8);
+ xfer += oprot->writeFieldBegin("errors", ::apache::thrift::protocol::T_LIST, 9);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->errors.size()));
std::vector<ErrorDetails> ::const_iterator _iter116;
@@ -3255,6 +3268,7 @@ void swap(ExperimentSummary &a, ExperimentSummary &b) {
swap(a.userName, b.userName);
swap(a.name, b.name);
swap(a.description, b.description);
+ swap(a.applicationId, b.applicationId);
swap(a.experimentStatus, b.experimentStatus);
swap(a.errors, b.errors);
swap(a.__isset, b.__isset);
http://git-wip-us.apache.org/repos/asf/airavata/blob/5153d0c8/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h
index 18b8691..8ce11db 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h
@@ -1912,9 +1912,10 @@ class Experiment {
void swap(Experiment &a, Experiment &b);
typedef struct _ExperimentSummary__isset {
- _ExperimentSummary__isset() : creationTime(false), description(false), experimentStatus(false), errors(false) {}
+ _ExperimentSummary__isset() : creationTime(false), description(false), applicationId(false), experimentStatus(false), errors(false) {}
bool creationTime;
bool description;
+ bool applicationId;
bool experimentStatus;
bool errors;
} _ExperimentSummary__isset;
@@ -1922,10 +1923,10 @@ typedef struct _ExperimentSummary__isset {
class ExperimentSummary {
public:
- static const char* ascii_fingerprint; // = "3DCA5B62241F7A586E1E31A64AE87E0A";
- static const uint8_t binary_fingerprint[16]; // = {0x3D,0xCA,0x5B,0x62,0x24,0x1F,0x7A,0x58,0x6E,0x1E,0x31,0xA6,0x4A,0xE8,0x7E,0x0A};
+ static const char* ascii_fingerprint; // = "44FD485ABF32F5EB94D6F393F51241B6";
+ static const uint8_t binary_fingerprint[16]; // = {0x44,0xFD,0x48,0x5A,0xBF,0x32,0xF5,0xEB,0x94,0xD6,0xF3,0x93,0xF5,0x12,0x41,0xB6};
- ExperimentSummary() : experimentID(), projectID(), creationTime(0), userName(), name(), description() {
+ ExperimentSummary() : experimentID(), projectID(), creationTime(0), userName(), name(), description(), applicationId() {
}
virtual ~ExperimentSummary() throw() {}
@@ -1936,6 +1937,7 @@ class ExperimentSummary {
std::string userName;
std::string name;
std::string description;
+ std::string applicationId;
ExperimentStatus experimentStatus;
std::vector<ErrorDetails> errors;
@@ -1967,6 +1969,11 @@ class ExperimentSummary {
__isset.description = true;
}
+ void __set_applicationId(const std::string& val) {
+ applicationId = val;
+ __isset.applicationId = true;
+ }
+
void __set_experimentStatus(const ExperimentStatus& val) {
experimentStatus = val;
__isset.experimentStatus = true;
@@ -1995,6 +2002,10 @@ class ExperimentSummary {
return false;
else if (__isset.description && !(description == rhs.description))
return false;
+ if (__isset.applicationId != rhs.__isset.applicationId)
+ return false;
+ else if (__isset.applicationId && !(applicationId == rhs.applicationId))
+ return false;
if (__isset.experimentStatus != rhs.__isset.experimentStatus)
return false;
else if (__isset.experimentStatus && !(experimentStatus == rhs.experimentStatus))
http://git-wip-us.apache.org/repos/asf/airavata/blob/5153d0c8/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Experiment/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Experiment/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Experiment/Types.php
index 267939c..8554e04 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Experiment/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Experiment/Types.php
@@ -3907,6 +3907,7 @@ class ExperimentSummary {
public $userName = null;
public $name = null;
public $description = null;
+ public $applicationId = null;
public $experimentStatus = null;
public $errors = null;
@@ -3938,11 +3939,15 @@ class ExperimentSummary {
'type' => TType::STRING,
),
7 => array(
+ 'var' => 'applicationId',
+ 'type' => TType::STRING,
+ ),
+ 8 => array(
'var' => 'experimentStatus',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Workspace\Experiment\ExperimentStatus',
),
- 8 => array(
+ 9 => array(
'var' => 'errors',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -3972,6 +3977,9 @@ class ExperimentSummary {
if (isset($vals['description'])) {
$this->description = $vals['description'];
}
+ if (isset($vals['applicationId'])) {
+ $this->applicationId = $vals['applicationId'];
+ }
if (isset($vals['experimentStatus'])) {
$this->experimentStatus = $vals['experimentStatus'];
}
@@ -4043,6 +4051,13 @@ class ExperimentSummary {
}
break;
case 7:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->applicationId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 8:
if ($ftype == TType::STRUCT) {
$this->experimentStatus = new \Airavata\Model\Workspace\Experiment\ExperimentStatus();
$xfer += $this->experimentStatus->read($input);
@@ -4050,7 +4065,7 @@ class ExperimentSummary {
$xfer += $input->skip($ftype);
}
break;
- case 8:
+ case 9:
if ($ftype == TType::LST) {
$this->errors = array();
$_size119 = 0;
@@ -4111,11 +4126,16 @@ class ExperimentSummary {
$xfer += $output->writeString($this->description);
$xfer += $output->writeFieldEnd();
}
+ if ($this->applicationId !== null) {
+ $xfer += $output->writeFieldBegin('applicationId', TType::STRING, 7);
+ $xfer += $output->writeString($this->applicationId);
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->experimentStatus !== null) {
if (!is_object($this->experimentStatus)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('experimentStatus', TType::STRUCT, 7);
+ $xfer += $output->writeFieldBegin('experimentStatus', TType::STRUCT, 8);
$xfer += $this->experimentStatus->write($output);
$xfer += $output->writeFieldEnd();
}
@@ -4123,7 +4143,7 @@ class ExperimentSummary {
if (!is_array($this->errors)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('errors', TType::LST, 8);
+ $xfer += $output->writeFieldBegin('errors', TType::LST, 9);
{
$output->writeListBegin(TType::STRUCT, count($this->errors));
{
http://git-wip-us.apache.org/repos/asf/airavata/blob/5153d0c8/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 653044f..e45b32a 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
@@ -57,8 +57,9 @@ import org.slf4j.LoggerFactory;
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);
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)6);
- 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)7);
- 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)8);
+ 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)7);
+ 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)8);
+ 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)9);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -72,6 +73,7 @@ import org.slf4j.LoggerFactory;
private String userName; // required
private String name; // required
private String description; // optional
+ private String applicationId; // optional
private ExperimentStatus experimentStatus; // optional
private List<ErrorDetails> errors; // optional
@@ -83,8 +85,9 @@ import org.slf4j.LoggerFactory;
USER_NAME((short)4, "userName"),
NAME((short)5, "name"),
DESCRIPTION((short)6, "description"),
- EXPERIMENT_STATUS((short)7, "experimentStatus"),
- ERRORS((short)8, "errors");
+ APPLICATION_ID((short)7, "applicationId"),
+ EXPERIMENT_STATUS((short)8, "experimentStatus"),
+ ERRORS((short)9, "errors");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -111,9 +114,11 @@ import org.slf4j.LoggerFactory;
return NAME;
case 6: // DESCRIPTION
return DESCRIPTION;
- case 7: // EXPERIMENT_STATUS
+ case 7: // APPLICATION_ID
+ return APPLICATION_ID;
+ case 8: // EXPERIMENT_STATUS
return EXPERIMENT_STATUS;
- case 8: // ERRORS
+ case 9: // ERRORS
return ERRORS;
default:
return null;
@@ -157,7 +162,7 @@ import org.slf4j.LoggerFactory;
// isset id assignments
private static final int __CREATIONTIME_ISSET_ID = 0;
private byte __isset_bitfield = 0;
- private _Fields optionals[] = {_Fields.CREATION_TIME,_Fields.DESCRIPTION,_Fields.EXPERIMENT_STATUS,_Fields.ERRORS};
+ private _Fields optionals[] = {_Fields.CREATION_TIME,_Fields.DESCRIPTION,_Fields.APPLICATION_ID,_Fields.EXPERIMENT_STATUS,_Fields.ERRORS};
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);
@@ -173,6 +178,8 @@ import org.slf4j.LoggerFactory;
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("description", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.APPLICATION_ID, new org.apache.thrift.meta_data.FieldMetaData("applicationId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.EXPERIMENT_STATUS, new org.apache.thrift.meta_data.FieldMetaData("experimentStatus", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ExperimentStatus.class)));
tmpMap.put(_Fields.ERRORS, new org.apache.thrift.meta_data.FieldMetaData("errors", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -219,6 +226,9 @@ import org.slf4j.LoggerFactory;
if (other.isSetDescription()) {
this.description = other.description;
}
+ if (other.isSetApplicationId()) {
+ this.applicationId = other.applicationId;
+ }
if (other.isSetExperimentStatus()) {
this.experimentStatus = new ExperimentStatus(other.experimentStatus);
}
@@ -244,6 +254,7 @@ import org.slf4j.LoggerFactory;
this.userName = null;
this.name = null;
this.description = null;
+ this.applicationId = null;
this.experimentStatus = null;
this.errors = null;
}
@@ -385,6 +396,29 @@ import org.slf4j.LoggerFactory;
}
}
+ public String getApplicationId() {
+ return this.applicationId;
+ }
+
+ public void setApplicationId(String applicationId) {
+ this.applicationId = applicationId;
+ }
+
+ public void unsetApplicationId() {
+ this.applicationId = null;
+ }
+
+ /** Returns true if field applicationId is set (has been assigned a value) and false otherwise */
+ public boolean isSetApplicationId() {
+ return this.applicationId != null;
+ }
+
+ public void setApplicationIdIsSet(boolean value) {
+ if (!value) {
+ this.applicationId = null;
+ }
+ }
+
public ExperimentStatus getExperimentStatus() {
return this.experimentStatus;
}
@@ -496,6 +530,14 @@ import org.slf4j.LoggerFactory;
}
break;
+ case APPLICATION_ID:
+ if (value == null) {
+ unsetApplicationId();
+ } else {
+ setApplicationId((String)value);
+ }
+ break;
+
case EXPERIMENT_STATUS:
if (value == null) {
unsetExperimentStatus();
@@ -535,6 +577,9 @@ import org.slf4j.LoggerFactory;
case DESCRIPTION:
return getDescription();
+ case APPLICATION_ID:
+ return getApplicationId();
+
case EXPERIMENT_STATUS:
return getExperimentStatus();
@@ -564,6 +609,8 @@ import org.slf4j.LoggerFactory;
return isSetName();
case DESCRIPTION:
return isSetDescription();
+ case APPLICATION_ID:
+ return isSetApplicationId();
case EXPERIMENT_STATUS:
return isSetExperimentStatus();
case ERRORS:
@@ -639,6 +686,15 @@ import org.slf4j.LoggerFactory;
return false;
}
+ boolean this_present_applicationId = true && this.isSetApplicationId();
+ boolean that_present_applicationId = true && that.isSetApplicationId();
+ if (this_present_applicationId || that_present_applicationId) {
+ if (!(this_present_applicationId && that_present_applicationId))
+ return false;
+ if (!this.applicationId.equals(that.applicationId))
+ return false;
+ }
+
boolean this_present_experimentStatus = true && this.isSetExperimentStatus();
boolean that_present_experimentStatus = true && that.isSetExperimentStatus();
if (this_present_experimentStatus || that_present_experimentStatus) {
@@ -733,6 +789,16 @@ import org.slf4j.LoggerFactory;
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetApplicationId()).compareTo(other.isSetApplicationId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetApplicationId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.applicationId, other.applicationId);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
lastComparison = Boolean.valueOf(isSetExperimentStatus()).compareTo(other.isSetExperimentStatus());
if (lastComparison != 0) {
return lastComparison;
@@ -820,6 +886,16 @@ import org.slf4j.LoggerFactory;
}
first = false;
}
+ if (isSetApplicationId()) {
+ if (!first) sb.append(", ");
+ sb.append("applicationId:");
+ if (this.applicationId == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.applicationId);
+ }
+ first = false;
+ }
if (isSetExperimentStatus()) {
if (!first) sb.append(", ");
sb.append("experimentStatus:");
@@ -952,7 +1028,15 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 7: // EXPERIMENT_STATUS
+ case 7: // APPLICATION_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.applicationId = iprot.readString();
+ struct.setApplicationIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 8: // EXPERIMENT_STATUS
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
struct.experimentStatus = new ExperimentStatus();
struct.experimentStatus.read(iprot);
@@ -961,7 +1045,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 8: // ERRORS
+ case 9: // ERRORS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list136 = iprot.readListBegin();
@@ -1025,6 +1109,13 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldEnd();
}
}
+ if (struct.applicationId != null) {
+ if (struct.isSetApplicationId()) {
+ oprot.writeFieldBegin(APPLICATION_ID_FIELD_DESC);
+ oprot.writeString(struct.applicationId);
+ oprot.writeFieldEnd();
+ }
+ }
if (struct.experimentStatus != null) {
if (struct.isSetExperimentStatus()) {
oprot.writeFieldBegin(EXPERIMENT_STATUS_FIELD_DESC);
@@ -1074,19 +1165,25 @@ import org.slf4j.LoggerFactory;
if (struct.isSetDescription()) {
optionals.set(1);
}
- if (struct.isSetExperimentStatus()) {
+ if (struct.isSetApplicationId()) {
optionals.set(2);
}
- if (struct.isSetErrors()) {
+ if (struct.isSetExperimentStatus()) {
optionals.set(3);
}
- oprot.writeBitSet(optionals, 4);
+ if (struct.isSetErrors()) {
+ optionals.set(4);
+ }
+ oprot.writeBitSet(optionals, 5);
if (struct.isSetCreationTime()) {
oprot.writeI64(struct.creationTime);
}
if (struct.isSetDescription()) {
oprot.writeString(struct.description);
}
+ if (struct.isSetApplicationId()) {
+ oprot.writeString(struct.applicationId);
+ }
if (struct.isSetExperimentStatus()) {
struct.experimentStatus.write(oprot);
}
@@ -1112,7 +1209,7 @@ import org.slf4j.LoggerFactory;
struct.setUserNameIsSet(true);
struct.name = iprot.readString();
struct.setNameIsSet(true);
- BitSet incoming = iprot.readBitSet(4);
+ BitSet incoming = iprot.readBitSet(5);
if (incoming.get(0)) {
struct.creationTime = iprot.readI64();
struct.setCreationTimeIsSet(true);
@@ -1122,11 +1219,15 @@ import org.slf4j.LoggerFactory;
struct.setDescriptionIsSet(true);
}
if (incoming.get(2)) {
+ struct.applicationId = iprot.readString();
+ struct.setApplicationIdIsSet(true);
+ }
+ if (incoming.get(3)) {
struct.experimentStatus = new ExperimentStatus();
struct.experimentStatus.read(iprot);
struct.setExperimentStatusIsSet(true);
}
- if (incoming.get(3)) {
+ if (incoming.get(4)) {
{
org.apache.thrift.protocol.TList _list141 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.errors = new ArrayList<ErrorDetails>(_list141.size);
http://git-wip-us.apache.org/repos/asf/airavata/blob/5153d0c8/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 ea92107..88a4db2 100644
--- a/airavata-api/thrift-interface-descriptions/experimentModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/experimentModel.thrift
@@ -389,6 +389,7 @@ struct ExperimentSummary {
4: required string userName,
5: required string name,
6: optional string description,
- 7: optional ExperimentStatus experimentStatus,
- 8: optional list<ErrorDetails> errors
+ 7: optional string applicationId,
+ 8: optional ExperimentStatus experimentStatus,
+ 9: optional list<ErrorDetails> errors
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5153d0c8/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
index bae3287..7c4ad7b 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
@@ -116,6 +116,7 @@ public class ThriftDataModelConversion {
experimentSummary.setUserName(experimentResource.getExecutionUser());
experimentSummary.setName(experimentResource.getExpName());
experimentSummary.setDescription(experimentResource.getDescription());
+ experimentSummary.setApplicationId(experimentResource.getApplicationId());
StatusResource experimentStatus = experimentResource.getExperimentStatus();
if (experimentStatus != null){
experimentSummary.setExperimentStatus(getExperimentStatus(experimentStatus));