You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by is...@apache.org on 2022/11/29 15:47:26 UTC
[airavata] branch develop updated: Update thrift stubs to include job commands
This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/develop by this push:
new 9efb93b9a5 Update thrift stubs to include job commands
new 6f99b9bcdc Merge pull request #348 from isururanawaka/metaschedular
9efb93b9a5 is described below
commit 9efb93b9a5a496e2ead480f077bb3243c66b707a
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Tue Nov 29 10:45:51 2022 -0500
Update thrift stubs to include job commands
---
.../airavata/model/status/ProcessStatus.java | 113 ++++++++++++++++++++-
.../engine/rescheduler/ProcessScannerImpl.java | 37 ++++++-
.../expcatalog/ProcessStatusRepository.java | 6 ++
.../registry/core/utils/QueryConstants.java | 5 +-
.../api/service/handler/RegistryServerHandler.java | 34 +++----
.../airavata/sharing/registry/models/Domain.java | 32 +++---
.../registry/models/DuplicateEntryException.java | 12 +--
.../airavata/sharing/registry/models/Entity.java | 70 +++++--------
.../sharing/registry/models/EntityType.java | 32 +++---
.../sharing/registry/models/GroupAdmin.java | 17 ++--
.../sharing/registry/models/GroupMembership.java | 36 +++----
.../sharing/registry/models/PermissionType.java | 32 +++---
.../sharing/registry/models/SearchCriteria.java | 25 ++---
.../airavata/sharing/registry/models/Sharing.java | 46 +++------
.../registry/models/SharingRegistryException.java | 12 +--
.../airavata/sharing/registry/models/User.java | 50 ++++-----
.../sharing/registry/models/UserGroup.java | 60 ++++-------
.../experiment-catalog-models/status_models.thrift | 3 +-
.../compute_resource_model.thrift | 5 +-
19 files changed, 323 insertions(+), 304 deletions(-)
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
index dc426055f4..3ae893cc5a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
@@ -32,6 +32,7 @@ public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, Pro
private static final org.apache.thrift.protocol.TField TIME_OF_STATE_CHANGE_FIELD_DESC = new org.apache.thrift.protocol.TField("timeOfStateChange", org.apache.thrift.protocol.TType.I64, (short)2);
private static final org.apache.thrift.protocol.TField REASON_FIELD_DESC = new org.apache.thrift.protocol.TField("reason", org.apache.thrift.protocol.TType.STRING, (short)3);
private static final org.apache.thrift.protocol.TField STATUS_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("statusId", org.apache.thrift.protocol.TType.STRING, (short)4);
+ private static final org.apache.thrift.protocol.TField PROCESS_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("processId", org.apache.thrift.protocol.TType.STRING, (short)5);
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ProcessStatusStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ProcessStatusTupleSchemeFactory();
@@ -40,6 +41,7 @@ public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, Pro
private long timeOfStateChange; // optional
private java.lang.String reason; // optional
private java.lang.String statusId; // optional
+ private java.lang.String processId; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -50,7 +52,8 @@ public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, Pro
STATE((short)1, "state"),
TIME_OF_STATE_CHANGE((short)2, "timeOfStateChange"),
REASON((short)3, "reason"),
- STATUS_ID((short)4, "statusId");
+ STATUS_ID((short)4, "statusId"),
+ PROCESS_ID((short)5, "processId");
private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -73,6 +76,8 @@ public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, Pro
return REASON;
case 4: // STATUS_ID
return STATUS_ID;
+ case 5: // PROCESS_ID
+ return PROCESS_ID;
default:
return null;
}
@@ -115,7 +120,7 @@ public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, Pro
// isset id assignments
private static final int __TIMEOFSTATECHANGE_ISSET_ID = 0;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.TIME_OF_STATE_CHANGE,_Fields.REASON,_Fields.STATUS_ID};
+ private static final _Fields optionals[] = {_Fields.TIME_OF_STATE_CHANGE,_Fields.REASON,_Fields.STATUS_ID,_Fields.PROCESS_ID};
public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -127,6 +132,8 @@ public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, Pro
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.STATUS_ID, new org.apache.thrift.meta_data.FieldMetaData("statusId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.PROCESS_ID, new org.apache.thrift.meta_data.FieldMetaData("processId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ProcessStatus.class, metaDataMap);
}
@@ -156,6 +163,9 @@ public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, Pro
if (other.isSetStatusId()) {
this.statusId = other.statusId;
}
+ if (other.isSetProcessId()) {
+ this.processId = other.processId;
+ }
}
public ProcessStatus deepCopy() {
@@ -169,6 +179,7 @@ public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, Pro
this.timeOfStateChange = 0;
this.reason = null;
this.statusId = null;
+ this.processId = null;
}
/**
@@ -270,6 +281,29 @@ public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, Pro
}
}
+ public java.lang.String getProcessId() {
+ return this.processId;
+ }
+
+ public void setProcessId(java.lang.String processId) {
+ this.processId = processId;
+ }
+
+ public void unsetProcessId() {
+ this.processId = null;
+ }
+
+ /** Returns true if field processId is set (has been assigned a value) and false otherwise */
+ public boolean isSetProcessId() {
+ return this.processId != null;
+ }
+
+ public void setProcessIdIsSet(boolean value) {
+ if (!value) {
+ this.processId = null;
+ }
+ }
+
public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case STATE:
@@ -304,6 +338,14 @@ public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, Pro
}
break;
+ case PROCESS_ID:
+ if (value == null) {
+ unsetProcessId();
+ } else {
+ setProcessId((java.lang.String)value);
+ }
+ break;
+
}
}
@@ -321,6 +363,9 @@ public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, Pro
case STATUS_ID:
return getStatusId();
+ case PROCESS_ID:
+ return getProcessId();
+
}
throw new java.lang.IllegalStateException();
}
@@ -340,6 +385,8 @@ public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, Pro
return isSetReason();
case STATUS_ID:
return isSetStatusId();
+ case PROCESS_ID:
+ return isSetProcessId();
}
throw new java.lang.IllegalStateException();
}
@@ -395,6 +442,15 @@ public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, Pro
return false;
}
+ boolean this_present_processId = true && this.isSetProcessId();
+ boolean that_present_processId = true && that.isSetProcessId();
+ if (this_present_processId || that_present_processId) {
+ if (!(this_present_processId && that_present_processId))
+ return false;
+ if (!this.processId.equals(that.processId))
+ return false;
+ }
+
return true;
}
@@ -418,6 +474,10 @@ public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, Pro
if (isSetStatusId())
hashCode = hashCode * 8191 + statusId.hashCode();
+ hashCode = hashCode * 8191 + ((isSetProcessId()) ? 131071 : 524287);
+ if (isSetProcessId())
+ hashCode = hashCode * 8191 + processId.hashCode();
+
return hashCode;
}
@@ -469,6 +529,16 @@ public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, Pro
return lastComparison;
}
}
+ lastComparison = java.lang.Boolean.valueOf(isSetProcessId()).compareTo(other.isSetProcessId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetProcessId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.processId, other.processId);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -522,6 +592,16 @@ public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, Pro
}
first = false;
}
+ if (isSetProcessId()) {
+ if (!first) sb.append(", ");
+ sb.append("processId:");
+ if (this.processId == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.processId);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -603,6 +683,14 @@ public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, Pro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 5: // PROCESS_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.processId = iprot.readString();
+ struct.setProcessIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -640,6 +728,13 @@ public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, Pro
oprot.writeFieldEnd();
}
}
+ if (struct.processId != null) {
+ if (struct.isSetProcessId()) {
+ oprot.writeFieldBegin(PROCESS_ID_FIELD_DESC);
+ oprot.writeString(struct.processId);
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -668,7 +763,10 @@ public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, Pro
if (struct.isSetStatusId()) {
optionals.set(2);
}
- oprot.writeBitSet(optionals, 3);
+ if (struct.isSetProcessId()) {
+ optionals.set(3);
+ }
+ oprot.writeBitSet(optionals, 4);
if (struct.isSetTimeOfStateChange()) {
oprot.writeI64(struct.timeOfStateChange);
}
@@ -678,6 +776,9 @@ public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, Pro
if (struct.isSetStatusId()) {
oprot.writeString(struct.statusId);
}
+ if (struct.isSetProcessId()) {
+ oprot.writeString(struct.processId);
+ }
}
@Override
@@ -685,7 +786,7 @@ public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, Pro
org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
struct.state = org.apache.airavata.model.status.ProcessState.findByValue(iprot.readI32());
struct.setStateIsSet(true);
- java.util.BitSet incoming = iprot.readBitSet(3);
+ java.util.BitSet incoming = iprot.readBitSet(4);
if (incoming.get(0)) {
struct.timeOfStateChange = iprot.readI64();
struct.setTimeOfStateChangeIsSet(true);
@@ -698,6 +799,10 @@ public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, Pro
struct.statusId = iprot.readString();
struct.setStatusIdIsSet(true);
}
+ if (incoming.get(3)) {
+ struct.processId = iprot.readString();
+ struct.setProcessIdIsSet(true);
+ }
}
}
diff --git a/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ProcessScannerImpl.java b/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ProcessScannerImpl.java
index f06c445317..6a010dee87 100644
--- a/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ProcessScannerImpl.java
+++ b/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ProcessScannerImpl.java
@@ -11,6 +11,7 @@ import org.apache.airavata.registry.api.RegistryService;
import org.apache.airavata.registry.api.RegistryService.Client;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
+import org.quartz.impl.JobExecutionContextImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -19,11 +20,11 @@ import java.util.List;
public class ProcessScannerImpl implements ProcessScanner {
private static final Logger LOGGER = LoggerFactory.getLogger(ProcessScannerImpl.class);
- protected ThriftClientPool<RegistryService.Client> registryClientPool;
+ protected static ThriftClientPool<RegistryService.Client> registryClientPool = Utils.getRegistryServiceClientPool();
- public ProcessScannerImpl() {
- this.registryClientPool = Utils.getRegistryServiceClientPool();
- }
+// public ProcessScannerImpl() {
+// this.registryClientPool = Utils.getRegistryServiceClientPool();
+// }
@Override
public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
@@ -45,7 +46,7 @@ public class ProcessScannerImpl implements ProcessScanner {
List<ProcessModel> reQueuedProcessModels = client.getProcessListInState(ReQueuedState);
for (ProcessModel processModel : reQueuedProcessModels) {
- reScheduler.reschedule(processModel, state);
+ reScheduler.reschedule(processModel, ReQueuedState);
}
} catch (Exception ex) {
@@ -63,4 +64,30 @@ public class ProcessScannerImpl implements ProcessScanner {
}
+
+
+
+
+ public static void main(String[] args) {
+ try {
+ RegistryService.Client client = registryClientPool.getResource();
+ ProcessState state = ProcessState.QUEUED;
+ List<ProcessModel> processModelList = client.getProcessListInState(state);
+
+ String reSchedulerPolicyClass = ServerSettings.getReSchedulerPolicyClass();
+ ReScheduler reScheduler = (ReScheduler) Class.forName(reSchedulerPolicyClass).newInstance();
+
+ for (ProcessModel processModel : processModelList) {
+ reScheduler.reschedule(processModel, state);
+ }
+ ProcessState ReQueuedState = ProcessState.REQUEUED;
+ List<ProcessModel> reQueuedProcessModels = client.getProcessListInState(ReQueuedState);
+
+ for (ProcessModel processModel : reQueuedProcessModels) {
+ reScheduler.reschedule(processModel, state);
+ }
+ }catch (Exception exception){
+ exception.printStackTrace();
+ }
+ }
}
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessStatusRepository.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessStatusRepository.java
index 7c6f7ab806..cc2ce54dbe 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessStatusRepository.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessStatusRepository.java
@@ -122,5 +122,11 @@ public class ProcessStatusRepository extends ExpCatAbstractRepository<ProcessSta
}
+ public List<ProcessStatus> getProcessStatusList(ProcessState processState, int limit, int offset) throws RegistryException {
+ Map<String, Object> queryMap = new HashMap<>();
+ queryMap.put(DBConstants.ProcessStatus.STATE,processState.name());
+ return select(QueryConstants.FIND_PROCESS_WITH_STATUS,limit,offset,queryMap);
+ }
+
}
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/utils/QueryConstants.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/utils/QueryConstants.java
index b62ce25b99..d81c74c22b 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/utils/QueryConstants.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/utils/QueryConstants.java
@@ -184,9 +184,8 @@ public interface QueryConstants {
+ DBConstants.QueueStatus.HOST_NAME + " AND Q.queueName LIKE :" + DBConstants.QueueStatus.QUEUE_NAME + " AND " +
" WHERE q.createdTime =(SELECT MAX(CREATED_TIME) FROM" + QueueStatusModel.class.getSimpleName();
- String FIND_PROCESS_WITH_STATUS = "SELECT P FROM " + ProcessStatusEntity.class.getSimpleName() + " P " + " JOIN ( select " +
- " PROCESS_ID, max(TIME_OF_STATE_CHANGE) as timestamp from PROCESS_STATUS GROUP BY PROCESS_ID) as p2 on P.PROCESS_ID=p2.PROCESS_ID AND " +
- "P.TIME_OF_STATE_CHANGE=p2.timestamp where P.state LIKE :" + DBConstants.ProcessStatus.STATE;
+ String FIND_PROCESS_WITH_STATUS = "SELECT P FROM " + ProcessStatusEntity.class.getSimpleName() + " P " +
+ " where P.state LIKE :" + DBConstants.ProcessStatus.STATE;
String GET_ALL_PROCESSES = "SELECT P FROM " + ProcessEntity.class.getSimpleName() +" P ";
diff --git a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
index 4d12edb1ae..88e27b0b22 100644
--- a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
+++ b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
@@ -980,24 +980,22 @@ public class RegistryServerHandler implements RegistryService.Iface {
@Override
public List<ProcessModel> getProcessListInState(ProcessState processState) throws RegistryServiceException, TException {
try {
- int count = 100;
- int offset = 0;
- int receivedCount = 0;
- List<ProcessModel> finalProcessList = new ArrayList<>();
- while (receivedCount <= count) {
- List<ProcessModel> processModels = processRepository.getAllProcesses(offset, count);
- offset = offset + processModels.size();
- receivedCount += processModels.size();
- for (ProcessModel processModel : processModels) {
- ProcessStatus processStatus = processStatusRepository.getProcessStatus(processModel.getProcessId());
- if (processStatus.getState().name().equals(processState.name())) {
- finalProcessList.add(processModel);
- }
- }
- if (processModels.size() < count) {
- break;
- }
- }
+
+ List<ProcessModel> finalProcessList = new ArrayList<>();
+ int offset =0;
+ int limit = 100;
+ int count =0;
+ while(count==limit) {
+ List<ProcessStatus> processStatusList = processStatusRepository.getProcessStatusList(processState,offset,limit);
+ offset += processStatusList.size();
+ count = processStatusList.size();
+ for (ProcessStatus processStatus : processStatusList) {
+ ProcessStatus latestStatus = processStatusRepository.getProcessStatus(processStatus.getProcessId());
+ if (latestStatus.getState().name().equals(processState.name())) {
+ finalProcessList.add(processRepository.getProcess(latestStatus.getProcessId()));
+ }
+ }
+ }
return finalProcessList;
} catch (Exception e) {
AiravataSystemException exception = new AiravataSystemException();
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Domain.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Domain.java
index 2e30aa1c2a..3800279732 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Domain.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Domain.java
@@ -50,12 +50,12 @@ public class Domain implements org.apache.thrift.TBase<Domain, Domain._Fields>,
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new DomainStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new DomainTupleSchemeFactory();
- public java.lang.String domainId; // optional
- public java.lang.String name; // optional
- public java.lang.String description; // optional
- public long createdTime; // optional
- public long updatedTime; // optional
- public java.lang.String initialUserGroupId; // optional
+ private java.lang.String domainId; // optional
+ private java.lang.String name; // optional
+ private java.lang.String description; // optional
+ private long createdTime; // optional
+ private long updatedTime; // optional
+ private java.lang.String initialUserGroupId; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -201,9 +201,8 @@ public class Domain implements org.apache.thrift.TBase<Domain, Domain._Fields>,
return this.domainId;
}
- public Domain setDomainId(java.lang.String domainId) {
+ public void setDomainId(java.lang.String domainId) {
this.domainId = domainId;
- return this;
}
public void unsetDomainId() {
@@ -225,9 +224,8 @@ public class Domain implements org.apache.thrift.TBase<Domain, Domain._Fields>,
return this.name;
}
- public Domain setName(java.lang.String name) {
+ public void setName(java.lang.String name) {
this.name = name;
- return this;
}
public void unsetName() {
@@ -249,9 +247,8 @@ public class Domain implements org.apache.thrift.TBase<Domain, Domain._Fields>,
return this.description;
}
- public Domain setDescription(java.lang.String description) {
+ public void setDescription(java.lang.String description) {
this.description = description;
- return this;
}
public void unsetDescription() {
@@ -273,10 +270,9 @@ public class Domain implements org.apache.thrift.TBase<Domain, Domain._Fields>,
return this.createdTime;
}
- public Domain setCreatedTime(long createdTime) {
+ public void setCreatedTime(long createdTime) {
this.createdTime = createdTime;
setCreatedTimeIsSet(true);
- return this;
}
public void unsetCreatedTime() {
@@ -296,10 +292,9 @@ public class Domain implements org.apache.thrift.TBase<Domain, Domain._Fields>,
return this.updatedTime;
}
- public Domain setUpdatedTime(long updatedTime) {
+ public void setUpdatedTime(long updatedTime) {
this.updatedTime = updatedTime;
setUpdatedTimeIsSet(true);
- return this;
}
public void unsetUpdatedTime() {
@@ -319,9 +314,8 @@ public class Domain implements org.apache.thrift.TBase<Domain, Domain._Fields>,
return this.initialUserGroupId;
}
- public Domain setInitialUserGroupId(java.lang.String initialUserGroupId) {
+ public void setInitialUserGroupId(java.lang.String initialUserGroupId) {
this.initialUserGroupId = initialUserGroupId;
- return this;
}
public void unsetInitialUserGroupId() {
@@ -780,8 +774,6 @@ public class Domain implements org.apache.thrift.TBase<Domain, Domain._Fields>,
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/DuplicateEntryException.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/DuplicateEntryException.java
index cd37d6dce7..e8ef5177df 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/DuplicateEntryException.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/DuplicateEntryException.java
@@ -40,7 +40,7 @@ public class DuplicateEntryException extends org.apache.thrift.TException implem
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new DuplicateEntryExceptionStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new DuplicateEntryExceptionTupleSchemeFactory();
- public java.lang.String message; // required
+ private java.lang.String message; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -142,9 +142,8 @@ public class DuplicateEntryException extends org.apache.thrift.TException implem
return this.message;
}
- public DuplicateEntryException setMessage(java.lang.String message) {
+ public void setMessage(java.lang.String message) {
this.message = message;
- return this;
}
public void unsetMessage() {
@@ -286,9 +285,10 @@ public class DuplicateEntryException extends org.apache.thrift.TException implem
public void validate() throws org.apache.thrift.TException {
// check for required fields
- if (message == null) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'message' was not present! Struct: " + toString());
+ if (!isSetMessage()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'message' is unset! Struct:" + toString());
}
+
// check for sub-struct validity
}
@@ -340,8 +340,6 @@ public class DuplicateEntryException extends org.apache.thrift.TException implem
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
index 6f7564bf99..5f9bab5620 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
@@ -62,19 +62,19 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new EntityStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new EntityTupleSchemeFactory();
- public java.lang.String entityId; // optional
- public java.lang.String domainId; // optional
- public java.lang.String entityTypeId; // optional
- public java.lang.String ownerId; // optional
- public java.lang.String parentEntityId; // optional
- public java.lang.String name; // optional
- public java.lang.String description; // optional
- public java.nio.ByteBuffer binaryData; // optional
- public java.lang.String fullText; // optional
- public long sharedCount; // optional
- public long originalEntityCreationTime; // optional
- public long createdTime; // optional
- public long updatedTime; // optional
+ private java.lang.String entityId; // optional
+ private java.lang.String domainId; // optional
+ private java.lang.String entityTypeId; // optional
+ private java.lang.String ownerId; // optional
+ private java.lang.String parentEntityId; // optional
+ private java.lang.String name; // optional
+ private java.lang.String description; // optional
+ private java.nio.ByteBuffer binaryData; // optional
+ private java.lang.String fullText; // optional
+ private long sharedCount; // optional
+ private long originalEntityCreationTime; // optional
+ private long createdTime; // optional
+ private long updatedTime; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -282,9 +282,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return this.entityId;
}
- public Entity setEntityId(java.lang.String entityId) {
+ public void setEntityId(java.lang.String entityId) {
this.entityId = entityId;
- return this;
}
public void unsetEntityId() {
@@ -306,9 +305,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return this.domainId;
}
- public Entity setDomainId(java.lang.String domainId) {
+ public void setDomainId(java.lang.String domainId) {
this.domainId = domainId;
- return this;
}
public void unsetDomainId() {
@@ -330,9 +328,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return this.entityTypeId;
}
- public Entity setEntityTypeId(java.lang.String entityTypeId) {
+ public void setEntityTypeId(java.lang.String entityTypeId) {
this.entityTypeId = entityTypeId;
- return this;
}
public void unsetEntityTypeId() {
@@ -354,9 +351,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return this.ownerId;
}
- public Entity setOwnerId(java.lang.String ownerId) {
+ public void setOwnerId(java.lang.String ownerId) {
this.ownerId = ownerId;
- return this;
}
public void unsetOwnerId() {
@@ -378,9 +374,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return this.parentEntityId;
}
- public Entity setParentEntityId(java.lang.String parentEntityId) {
+ public void setParentEntityId(java.lang.String parentEntityId) {
this.parentEntityId = parentEntityId;
- return this;
}
public void unsetParentEntityId() {
@@ -402,9 +397,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return this.name;
}
- public Entity setName(java.lang.String name) {
+ public void setName(java.lang.String name) {
this.name = name;
- return this;
}
public void unsetName() {
@@ -426,9 +420,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return this.description;
}
- public Entity setDescription(java.lang.String description) {
+ public void setDescription(java.lang.String description) {
this.description = description;
- return this;
}
public void unsetDescription() {
@@ -455,14 +448,12 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return org.apache.thrift.TBaseHelper.copyBinary(binaryData);
}
- public Entity setBinaryData(byte[] binaryData) {
+ public void setBinaryData(byte[] binaryData) {
this.binaryData = binaryData == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(binaryData.clone());
- return this;
}
- public Entity setBinaryData(java.nio.ByteBuffer binaryData) {
+ public void setBinaryData(java.nio.ByteBuffer binaryData) {
this.binaryData = org.apache.thrift.TBaseHelper.copyBinary(binaryData);
- return this;
}
public void unsetBinaryData() {
@@ -484,9 +475,8 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return this.fullText;
}
- public Entity setFullText(java.lang.String fullText) {
+ public void setFullText(java.lang.String fullText) {
this.fullText = fullText;
- return this;
}
public void unsetFullText() {
@@ -508,10 +498,9 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return this.sharedCount;
}
- public Entity setSharedCount(long sharedCount) {
+ public void setSharedCount(long sharedCount) {
this.sharedCount = sharedCount;
setSharedCountIsSet(true);
- return this;
}
public void unsetSharedCount() {
@@ -531,10 +520,9 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return this.originalEntityCreationTime;
}
- public Entity setOriginalEntityCreationTime(long originalEntityCreationTime) {
+ public void setOriginalEntityCreationTime(long originalEntityCreationTime) {
this.originalEntityCreationTime = originalEntityCreationTime;
setOriginalEntityCreationTimeIsSet(true);
- return this;
}
public void unsetOriginalEntityCreationTime() {
@@ -554,10 +542,9 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return this.createdTime;
}
- public Entity setCreatedTime(long createdTime) {
+ public void setCreatedTime(long createdTime) {
this.createdTime = createdTime;
setCreatedTimeIsSet(true);
- return this;
}
public void unsetCreatedTime() {
@@ -577,10 +564,9 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
return this.updatedTime;
}
- public Entity setUpdatedTime(long updatedTime) {
+ public void setUpdatedTime(long updatedTime) {
this.updatedTime = updatedTime;
setUpdatedTimeIsSet(true);
- return this;
}
public void unsetUpdatedTime() {
@@ -1411,8 +1397,6 @@ public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>,
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntityType.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntityType.java
index 17977da346..1536760f99 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntityType.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntityType.java
@@ -48,12 +48,12 @@ public class EntityType implements org.apache.thrift.TBase<EntityType, EntityTyp
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new EntityTypeStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new EntityTypeTupleSchemeFactory();
- public java.lang.String entityTypeId; // optional
- public java.lang.String domainId; // optional
- public java.lang.String name; // optional
- public java.lang.String description; // optional
- public long createdTime; // optional
- public long updatedTime; // optional
+ private java.lang.String entityTypeId; // optional
+ private java.lang.String domainId; // optional
+ private java.lang.String name; // optional
+ private java.lang.String description; // optional
+ private long createdTime; // optional
+ private long updatedTime; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -196,9 +196,8 @@ public class EntityType implements org.apache.thrift.TBase<EntityType, EntityTyp
return this.entityTypeId;
}
- public EntityType setEntityTypeId(java.lang.String entityTypeId) {
+ public void setEntityTypeId(java.lang.String entityTypeId) {
this.entityTypeId = entityTypeId;
- return this;
}
public void unsetEntityTypeId() {
@@ -220,9 +219,8 @@ public class EntityType implements org.apache.thrift.TBase<EntityType, EntityTyp
return this.domainId;
}
- public EntityType setDomainId(java.lang.String domainId) {
+ public void setDomainId(java.lang.String domainId) {
this.domainId = domainId;
- return this;
}
public void unsetDomainId() {
@@ -244,9 +242,8 @@ public class EntityType implements org.apache.thrift.TBase<EntityType, EntityTyp
return this.name;
}
- public EntityType setName(java.lang.String name) {
+ public void setName(java.lang.String name) {
this.name = name;
- return this;
}
public void unsetName() {
@@ -268,9 +265,8 @@ public class EntityType implements org.apache.thrift.TBase<EntityType, EntityTyp
return this.description;
}
- public EntityType setDescription(java.lang.String description) {
+ public void setDescription(java.lang.String description) {
this.description = description;
- return this;
}
public void unsetDescription() {
@@ -292,10 +288,9 @@ public class EntityType implements org.apache.thrift.TBase<EntityType, EntityTyp
return this.createdTime;
}
- public EntityType setCreatedTime(long createdTime) {
+ public void setCreatedTime(long createdTime) {
this.createdTime = createdTime;
setCreatedTimeIsSet(true);
- return this;
}
public void unsetCreatedTime() {
@@ -315,10 +310,9 @@ public class EntityType implements org.apache.thrift.TBase<EntityType, EntityTyp
return this.updatedTime;
}
- public EntityType setUpdatedTime(long updatedTime) {
+ public void setUpdatedTime(long updatedTime) {
this.updatedTime = updatedTime;
setUpdatedTimeIsSet(true);
- return this;
}
public void unsetUpdatedTime() {
@@ -775,8 +769,6 @@ public class EntityType implements org.apache.thrift.TBase<EntityType, EntityTyp
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupAdmin.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupAdmin.java
index 9520b16850..d9707198bf 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupAdmin.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupAdmin.java
@@ -35,9 +35,9 @@ public class GroupAdmin implements org.apache.thrift.TBase<GroupAdmin, GroupAdmi
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new GroupAdminStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new GroupAdminTupleSchemeFactory();
- public java.lang.String groupId; // optional
- public java.lang.String domainId; // optional
- public java.lang.String adminId; // optional
+ private java.lang.String groupId; // optional
+ private java.lang.String domainId; // optional
+ private java.lang.String adminId; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -151,9 +151,8 @@ public class GroupAdmin implements org.apache.thrift.TBase<GroupAdmin, GroupAdmi
return this.groupId;
}
- public GroupAdmin setGroupId(java.lang.String groupId) {
+ public void setGroupId(java.lang.String groupId) {
this.groupId = groupId;
- return this;
}
public void unsetGroupId() {
@@ -175,9 +174,8 @@ public class GroupAdmin implements org.apache.thrift.TBase<GroupAdmin, GroupAdmi
return this.domainId;
}
- public GroupAdmin setDomainId(java.lang.String domainId) {
+ public void setDomainId(java.lang.String domainId) {
this.domainId = domainId;
- return this;
}
public void unsetDomainId() {
@@ -199,9 +197,8 @@ public class GroupAdmin implements org.apache.thrift.TBase<GroupAdmin, GroupAdmi
return this.adminId;
}
- public GroupAdmin setAdminId(java.lang.String adminId) {
+ public void setAdminId(java.lang.String adminId) {
this.adminId = adminId;
- return this;
}
public void unsetAdminId() {
@@ -504,8 +501,6 @@ public class GroupAdmin implements org.apache.thrift.TBase<GroupAdmin, GroupAdmi
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupMembership.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupMembership.java
index 138174b375..2f37788d52 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupMembership.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupMembership.java
@@ -42,16 +42,12 @@ public class GroupMembership implements org.apache.thrift.TBase<GroupMembership,
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new GroupMembershipStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new GroupMembershipTupleSchemeFactory();
- public java.lang.String parentId; // optional
- public java.lang.String childId; // optional
- public java.lang.String domainId; // optional
- /**
- *
- * @see GroupChildType
- */
- public GroupChildType childType; // optional
- public long createdTime; // optional
- public long updatedTime; // optional
+ private java.lang.String parentId; // optional
+ private java.lang.String childId; // optional
+ private java.lang.String domainId; // optional
+ private GroupChildType childType; // optional
+ private long createdTime; // optional
+ private long updatedTime; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -198,9 +194,8 @@ public class GroupMembership implements org.apache.thrift.TBase<GroupMembership,
return this.parentId;
}
- public GroupMembership setParentId(java.lang.String parentId) {
+ public void setParentId(java.lang.String parentId) {
this.parentId = parentId;
- return this;
}
public void unsetParentId() {
@@ -222,9 +217,8 @@ public class GroupMembership implements org.apache.thrift.TBase<GroupMembership,
return this.childId;
}
- public GroupMembership setChildId(java.lang.String childId) {
+ public void setChildId(java.lang.String childId) {
this.childId = childId;
- return this;
}
public void unsetChildId() {
@@ -246,9 +240,8 @@ public class GroupMembership implements org.apache.thrift.TBase<GroupMembership,
return this.domainId;
}
- public GroupMembership setDomainId(java.lang.String domainId) {
+ public void setDomainId(java.lang.String domainId) {
this.domainId = domainId;
- return this;
}
public void unsetDomainId() {
@@ -278,9 +271,8 @@ public class GroupMembership implements org.apache.thrift.TBase<GroupMembership,
*
* @see GroupChildType
*/
- public GroupMembership setChildType(GroupChildType childType) {
+ public void setChildType(GroupChildType childType) {
this.childType = childType;
- return this;
}
public void unsetChildType() {
@@ -302,10 +294,9 @@ public class GroupMembership implements org.apache.thrift.TBase<GroupMembership,
return this.createdTime;
}
- public GroupMembership setCreatedTime(long createdTime) {
+ public void setCreatedTime(long createdTime) {
this.createdTime = createdTime;
setCreatedTimeIsSet(true);
- return this;
}
public void unsetCreatedTime() {
@@ -325,10 +316,9 @@ public class GroupMembership implements org.apache.thrift.TBase<GroupMembership,
return this.updatedTime;
}
- public GroupMembership setUpdatedTime(long updatedTime) {
+ public void setUpdatedTime(long updatedTime) {
this.updatedTime = updatedTime;
setUpdatedTimeIsSet(true);
- return this;
}
public void unsetUpdatedTime() {
@@ -785,8 +775,6 @@ public class GroupMembership implements org.apache.thrift.TBase<GroupMembership,
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/PermissionType.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/PermissionType.java
index 915686b630..96df5d3c59 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/PermissionType.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/PermissionType.java
@@ -48,12 +48,12 @@ public class PermissionType implements org.apache.thrift.TBase<PermissionType, P
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new PermissionTypeStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new PermissionTypeTupleSchemeFactory();
- public java.lang.String permissionTypeId; // optional
- public java.lang.String domainId; // optional
- public java.lang.String name; // optional
- public java.lang.String description; // optional
- public long createdTime; // optional
- public long updatedTime; // optional
+ private java.lang.String permissionTypeId; // optional
+ private java.lang.String domainId; // optional
+ private java.lang.String name; // optional
+ private java.lang.String description; // optional
+ private long createdTime; // optional
+ private long updatedTime; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -196,9 +196,8 @@ public class PermissionType implements org.apache.thrift.TBase<PermissionType, P
return this.permissionTypeId;
}
- public PermissionType setPermissionTypeId(java.lang.String permissionTypeId) {
+ public void setPermissionTypeId(java.lang.String permissionTypeId) {
this.permissionTypeId = permissionTypeId;
- return this;
}
public void unsetPermissionTypeId() {
@@ -220,9 +219,8 @@ public class PermissionType implements org.apache.thrift.TBase<PermissionType, P
return this.domainId;
}
- public PermissionType setDomainId(java.lang.String domainId) {
+ public void setDomainId(java.lang.String domainId) {
this.domainId = domainId;
- return this;
}
public void unsetDomainId() {
@@ -244,9 +242,8 @@ public class PermissionType implements org.apache.thrift.TBase<PermissionType, P
return this.name;
}
- public PermissionType setName(java.lang.String name) {
+ public void setName(java.lang.String name) {
this.name = name;
- return this;
}
public void unsetName() {
@@ -268,9 +265,8 @@ public class PermissionType implements org.apache.thrift.TBase<PermissionType, P
return this.description;
}
- public PermissionType setDescription(java.lang.String description) {
+ public void setDescription(java.lang.String description) {
this.description = description;
- return this;
}
public void unsetDescription() {
@@ -292,10 +288,9 @@ public class PermissionType implements org.apache.thrift.TBase<PermissionType, P
return this.createdTime;
}
- public PermissionType setCreatedTime(long createdTime) {
+ public void setCreatedTime(long createdTime) {
this.createdTime = createdTime;
setCreatedTimeIsSet(true);
- return this;
}
public void unsetCreatedTime() {
@@ -315,10 +310,9 @@ public class PermissionType implements org.apache.thrift.TBase<PermissionType, P
return this.updatedTime;
}
- public PermissionType setUpdatedTime(long updatedTime) {
+ public void setUpdatedTime(long updatedTime) {
this.updatedTime = updatedTime;
setUpdatedTimeIsSet(true);
- return this;
}
public void unsetUpdatedTime() {
@@ -775,8 +769,6 @@ public class PermissionType implements org.apache.thrift.TBase<PermissionType, P
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCriteria.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCriteria.java
index 0a605a9161..8afaf8e15b 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCriteria.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCriteria.java
@@ -42,17 +42,9 @@ public class SearchCriteria implements org.apache.thrift.TBase<SearchCriteria, S
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SearchCriteriaStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SearchCriteriaTupleSchemeFactory();
- /**
- *
- * @see EntitySearchField
- */
- public EntitySearchField searchField; // optional
- public java.lang.String value; // optional
- /**
- *
- * @see SearchCondition
- */
- public SearchCondition searchCondition; // optional
+ private EntitySearchField searchField; // optional
+ private java.lang.String value; // optional
+ private SearchCondition searchCondition; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -182,9 +174,8 @@ public class SearchCriteria implements org.apache.thrift.TBase<SearchCriteria, S
*
* @see EntitySearchField
*/
- public SearchCriteria setSearchField(EntitySearchField searchField) {
+ public void setSearchField(EntitySearchField searchField) {
this.searchField = searchField;
- return this;
}
public void unsetSearchField() {
@@ -206,9 +197,8 @@ public class SearchCriteria implements org.apache.thrift.TBase<SearchCriteria, S
return this.value;
}
- public SearchCriteria setValue(java.lang.String value) {
+ public void setValue(java.lang.String value) {
this.value = value;
- return this;
}
public void unsetValue() {
@@ -238,9 +228,8 @@ public class SearchCriteria implements org.apache.thrift.TBase<SearchCriteria, S
*
* @see SearchCondition
*/
- public SearchCriteria setSearchCondition(SearchCondition searchCondition) {
+ public void setSearchCondition(SearchCondition searchCondition) {
this.searchCondition = searchCondition;
- return this;
}
public void unsetSearchCondition() {
@@ -543,8 +532,6 @@ public class SearchCriteria implements org.apache.thrift.TBase<SearchCriteria, S
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Sharing.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Sharing.java
index 38b131cc95..e5c956ccd8 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Sharing.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Sharing.java
@@ -44,18 +44,14 @@ public class Sharing implements org.apache.thrift.TBase<Sharing, Sharing._Fields
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SharingStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SharingTupleSchemeFactory();
- public java.lang.String permissionTypeId; // optional
- public java.lang.String entityId; // optional
- public java.lang.String groupId; // optional
- /**
- *
- * @see SharingType
- */
- public SharingType sharingType; // optional
- public java.lang.String domainId; // optional
- public java.lang.String inheritedParentId; // optional
- public long createdTime; // optional
- public long updatedTime; // optional
+ private java.lang.String permissionTypeId; // optional
+ private java.lang.String entityId; // optional
+ private java.lang.String groupId; // optional
+ private SharingType sharingType; // optional
+ private java.lang.String domainId; // optional
+ private java.lang.String inheritedParentId; // optional
+ private long createdTime; // optional
+ private long updatedTime; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -220,9 +216,8 @@ public class Sharing implements org.apache.thrift.TBase<Sharing, Sharing._Fields
return this.permissionTypeId;
}
- public Sharing setPermissionTypeId(java.lang.String permissionTypeId) {
+ public void setPermissionTypeId(java.lang.String permissionTypeId) {
this.permissionTypeId = permissionTypeId;
- return this;
}
public void unsetPermissionTypeId() {
@@ -244,9 +239,8 @@ public class Sharing implements org.apache.thrift.TBase<Sharing, Sharing._Fields
return this.entityId;
}
- public Sharing setEntityId(java.lang.String entityId) {
+ public void setEntityId(java.lang.String entityId) {
this.entityId = entityId;
- return this;
}
public void unsetEntityId() {
@@ -268,9 +262,8 @@ public class Sharing implements org.apache.thrift.TBase<Sharing, Sharing._Fields
return this.groupId;
}
- public Sharing setGroupId(java.lang.String groupId) {
+ public void setGroupId(java.lang.String groupId) {
this.groupId = groupId;
- return this;
}
public void unsetGroupId() {
@@ -300,9 +293,8 @@ public class Sharing implements org.apache.thrift.TBase<Sharing, Sharing._Fields
*
* @see SharingType
*/
- public Sharing setSharingType(SharingType sharingType) {
+ public void setSharingType(SharingType sharingType) {
this.sharingType = sharingType;
- return this;
}
public void unsetSharingType() {
@@ -324,9 +316,8 @@ public class Sharing implements org.apache.thrift.TBase<Sharing, Sharing._Fields
return this.domainId;
}
- public Sharing setDomainId(java.lang.String domainId) {
+ public void setDomainId(java.lang.String domainId) {
this.domainId = domainId;
- return this;
}
public void unsetDomainId() {
@@ -348,9 +339,8 @@ public class Sharing implements org.apache.thrift.TBase<Sharing, Sharing._Fields
return this.inheritedParentId;
}
- public Sharing setInheritedParentId(java.lang.String inheritedParentId) {
+ public void setInheritedParentId(java.lang.String inheritedParentId) {
this.inheritedParentId = inheritedParentId;
- return this;
}
public void unsetInheritedParentId() {
@@ -372,10 +362,9 @@ public class Sharing implements org.apache.thrift.TBase<Sharing, Sharing._Fields
return this.createdTime;
}
- public Sharing setCreatedTime(long createdTime) {
+ public void setCreatedTime(long createdTime) {
this.createdTime = createdTime;
setCreatedTimeIsSet(true);
- return this;
}
public void unsetCreatedTime() {
@@ -395,10 +384,9 @@ public class Sharing implements org.apache.thrift.TBase<Sharing, Sharing._Fields
return this.updatedTime;
}
- public Sharing setUpdatedTime(long updatedTime) {
+ public void setUpdatedTime(long updatedTime) {
this.updatedTime = updatedTime;
setUpdatedTimeIsSet(true);
- return this;
}
public void unsetUpdatedTime() {
@@ -963,8 +951,6 @@ public class Sharing implements org.apache.thrift.TBase<Sharing, Sharing._Fields
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SharingRegistryException.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SharingRegistryException.java
index 6bffd6b2ca..4bad273709 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SharingRegistryException.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SharingRegistryException.java
@@ -37,7 +37,7 @@ public class SharingRegistryException extends org.apache.thrift.TException imple
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SharingRegistryExceptionStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SharingRegistryExceptionTupleSchemeFactory();
- public java.lang.String message; // required
+ private java.lang.String message; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -139,9 +139,8 @@ public class SharingRegistryException extends org.apache.thrift.TException imple
return this.message;
}
- public SharingRegistryException setMessage(java.lang.String message) {
+ public void setMessage(java.lang.String message) {
this.message = message;
- return this;
}
public void unsetMessage() {
@@ -283,9 +282,10 @@ public class SharingRegistryException extends org.apache.thrift.TException imple
public void validate() throws org.apache.thrift.TException {
// check for required fields
- if (message == null) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'message' was not present! Struct: " + toString());
+ if (!isSetMessage()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'message' is unset! Struct:" + toString());
}
+
// check for sub-struct validity
}
@@ -337,8 +337,6 @@ public class SharingRegistryException extends org.apache.thrift.TException imple
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/User.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/User.java
index c6641b6c2a..2ad188bd69 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/User.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/User.java
@@ -55,15 +55,15 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new UserStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new UserTupleSchemeFactory();
- public java.lang.String userId; // optional
- public java.lang.String domainId; // optional
- public java.lang.String userName; // optional
- public java.lang.String firstName; // optional
- public java.lang.String lastName; // optional
- public java.lang.String email; // optional
- public java.nio.ByteBuffer icon; // optional
- public long createdTime; // optional
- public long updatedTime; // optional
+ private java.lang.String userId; // optional
+ private java.lang.String domainId; // optional
+ private java.lang.String userName; // optional
+ private java.lang.String firstName; // optional
+ private java.lang.String lastName; // optional
+ private java.lang.String email; // optional
+ private java.nio.ByteBuffer icon; // optional
+ private long createdTime; // optional
+ private long updatedTime; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -233,9 +233,8 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
return this.userId;
}
- public User setUserId(java.lang.String userId) {
+ public void setUserId(java.lang.String userId) {
this.userId = userId;
- return this;
}
public void unsetUserId() {
@@ -257,9 +256,8 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
return this.domainId;
}
- public User setDomainId(java.lang.String domainId) {
+ public void setDomainId(java.lang.String domainId) {
this.domainId = domainId;
- return this;
}
public void unsetDomainId() {
@@ -281,9 +279,8 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
return this.userName;
}
- public User setUserName(java.lang.String userName) {
+ public void setUserName(java.lang.String userName) {
this.userName = userName;
- return this;
}
public void unsetUserName() {
@@ -305,9 +302,8 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
return this.firstName;
}
- public User setFirstName(java.lang.String firstName) {
+ public void setFirstName(java.lang.String firstName) {
this.firstName = firstName;
- return this;
}
public void unsetFirstName() {
@@ -329,9 +325,8 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
return this.lastName;
}
- public User setLastName(java.lang.String lastName) {
+ public void setLastName(java.lang.String lastName) {
this.lastName = lastName;
- return this;
}
public void unsetLastName() {
@@ -353,9 +348,8 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
return this.email;
}
- public User setEmail(java.lang.String email) {
+ public void setEmail(java.lang.String email) {
this.email = email;
- return this;
}
public void unsetEmail() {
@@ -382,14 +376,12 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
return org.apache.thrift.TBaseHelper.copyBinary(icon);
}
- public User setIcon(byte[] icon) {
+ public void setIcon(byte[] icon) {
this.icon = icon == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(icon.clone());
- return this;
}
- public User setIcon(java.nio.ByteBuffer icon) {
+ public void setIcon(java.nio.ByteBuffer icon) {
this.icon = org.apache.thrift.TBaseHelper.copyBinary(icon);
- return this;
}
public void unsetIcon() {
@@ -411,10 +403,9 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
return this.createdTime;
}
- public User setCreatedTime(long createdTime) {
+ public void setCreatedTime(long createdTime) {
this.createdTime = createdTime;
setCreatedTimeIsSet(true);
- return this;
}
public void unsetCreatedTime() {
@@ -434,10 +425,9 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
return this.updatedTime;
}
- public User setUpdatedTime(long updatedTime) {
+ public void setUpdatedTime(long updatedTime) {
this.updatedTime = updatedTime;
setUpdatedTimeIsSet(true);
- return this;
}
public void unsetUpdatedTime() {
@@ -1060,8 +1050,6 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/UserGroup.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/UserGroup.java
index 95e375b77d..46414053c2 100644
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/UserGroup.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/UserGroup.java
@@ -56,24 +56,16 @@ public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._
private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new UserGroupStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new UserGroupTupleSchemeFactory();
- public java.lang.String groupId; // optional
- public java.lang.String domainId; // optional
- public java.lang.String name; // optional
- public java.lang.String description; // optional
- public java.lang.String ownerId; // optional
- /**
- *
- * @see GroupType
- */
- public GroupType groupType; // optional
- /**
- *
- * @see GroupCardinality
- */
- public GroupCardinality groupCardinality; // optional
- public long createdTime; // optional
- public long updatedTime; // optional
- public java.util.List<GroupAdmin> groupAdmins; // optional
+ private java.lang.String groupId; // optional
+ private java.lang.String domainId; // optional
+ private java.lang.String name; // optional
+ private java.lang.String description; // optional
+ private java.lang.String ownerId; // optional
+ private GroupType groupType; // optional
+ private GroupCardinality groupCardinality; // optional
+ private long createdTime; // optional
+ private long updatedTime; // optional
+ private java.util.List<GroupAdmin> groupAdmins; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -265,9 +257,8 @@ public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._
return this.groupId;
}
- public UserGroup setGroupId(java.lang.String groupId) {
+ public void setGroupId(java.lang.String groupId) {
this.groupId = groupId;
- return this;
}
public void unsetGroupId() {
@@ -289,9 +280,8 @@ public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._
return this.domainId;
}
- public UserGroup setDomainId(java.lang.String domainId) {
+ public void setDomainId(java.lang.String domainId) {
this.domainId = domainId;
- return this;
}
public void unsetDomainId() {
@@ -313,9 +303,8 @@ public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._
return this.name;
}
- public UserGroup setName(java.lang.String name) {
+ public void setName(java.lang.String name) {
this.name = name;
- return this;
}
public void unsetName() {
@@ -337,9 +326,8 @@ public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._
return this.description;
}
- public UserGroup setDescription(java.lang.String description) {
+ public void setDescription(java.lang.String description) {
this.description = description;
- return this;
}
public void unsetDescription() {
@@ -361,9 +349,8 @@ public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._
return this.ownerId;
}
- public UserGroup setOwnerId(java.lang.String ownerId) {
+ public void setOwnerId(java.lang.String ownerId) {
this.ownerId = ownerId;
- return this;
}
public void unsetOwnerId() {
@@ -393,9 +380,8 @@ public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._
*
* @see GroupType
*/
- public UserGroup setGroupType(GroupType groupType) {
+ public void setGroupType(GroupType groupType) {
this.groupType = groupType;
- return this;
}
public void unsetGroupType() {
@@ -425,9 +411,8 @@ public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._
*
* @see GroupCardinality
*/
- public UserGroup setGroupCardinality(GroupCardinality groupCardinality) {
+ public void setGroupCardinality(GroupCardinality groupCardinality) {
this.groupCardinality = groupCardinality;
- return this;
}
public void unsetGroupCardinality() {
@@ -449,10 +434,9 @@ public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._
return this.createdTime;
}
- public UserGroup setCreatedTime(long createdTime) {
+ public void setCreatedTime(long createdTime) {
this.createdTime = createdTime;
setCreatedTimeIsSet(true);
- return this;
}
public void unsetCreatedTime() {
@@ -472,10 +456,9 @@ public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._
return this.updatedTime;
}
- public UserGroup setUpdatedTime(long updatedTime) {
+ public void setUpdatedTime(long updatedTime) {
this.updatedTime = updatedTime;
setUpdatedTimeIsSet(true);
- return this;
}
public void unsetUpdatedTime() {
@@ -510,9 +493,8 @@ public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._
return this.groupAdmins;
}
- public UserGroup setGroupAdmins(java.util.List<GroupAdmin> groupAdmins) {
+ public void setGroupAdmins(java.util.List<GroupAdmin> groupAdmins) {
this.groupAdmins = groupAdmins;
- return this;
}
public void unsetGroupAdmins() {
@@ -1198,8 +1180,6 @@ public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
diff --git a/thrift-interface-descriptions/data-models/experiment-catalog-models/status_models.thrift b/thrift-interface-descriptions/data-models/experiment-catalog-models/status_models.thrift
index 61189c1479..dda158e317 100644
--- a/thrift-interface-descriptions/data-models/experiment-catalog-models/status_models.thrift
+++ b/thrift-interface-descriptions/data-models/experiment-catalog-models/status_models.thrift
@@ -99,7 +99,8 @@ struct ProcessStatus {
1: required ProcessState state,
2: optional i64 timeOfStateChange,
3: optional string reason,
- 4: optional string statusId
+ 4: optional string statusId,
+ 5: optional string processId
}
struct TaskStatus {
diff --git a/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift b/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift
index 1d64c0081a..06744a9003 100644
--- a/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift
+++ b/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift
@@ -90,7 +90,10 @@ enum JobManagerCommand {
CHECK_JOB,
SHOW_QUEUE,
SHOW_RESERVATION,
- SHOW_START
+ SHOW_START,
+ SHOW_CLUSTER_INFO,
+ SHOW_NO_OF_RUNNING_JOBS,
+ SHOW_NO_OF_PENDING_JOBS
}