You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/08/03 16:02:02 UTC
[46/50] [abbrv] airavata git commit: updating some of the group
management API methods in AiravataServerHandler
updating some of the group management API methods in AiravataServerHandler
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e7e77716
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e7e77716
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e7e77716
Branch: refs/heads/master
Commit: e7e77716260ad745c8b82c08f4bb490feb6c0b2f
Parents: f386e38
Author: scnakandala <su...@gmail.com>
Authored: Fri Jul 21 15:35:29 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Fri Jul 21 15:35:29 2017 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 60 +-
.../java/org/apache/airavata/api/Airavata.java | 342 +-
.../main/resources/lib/airavata/Airavata.cpp | 17882 +++++++----------
.../src/main/resources/lib/airavata/Airavata.h | 1088 +-
.../lib/airavata/Airavata_server.skeleton.cpp | 36 +-
.../lib/airavata/tenant_profile_model_types.cpp | 510 +-
.../lib/airavata/tenant_profile_model_types.h | 203 +-
.../lib/airavata/workspace_model_types.cpp | 106 +-
.../lib/airavata/workspace_model_types.h | 15 +-
.../resources/lib/Airavata/API/Airavata.php | 80 +-
.../lib/Airavata/Model/Tenant/Types.php | 410 +-
.../lib/apache/airavata/api/Airavata-remote | 58 +-
.../lib/apache/airavata/api/Airavata.py | 8126 +++-----
.../lib/apache/airavata/model/tenant/ttypes.py | 320 +-
.../apache/airavata/model/workspace/ttypes.py | 130 +-
.../apache/airavata/model/tenant/Tenant.java | 758 +-
.../model/workspace/GatewayApprovalStatus.java | 4 +
.../airavata-apis/airavata_api.thrift | 6 +-
18 files changed, 11739 insertions(+), 18395 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index 86e47b0..4ae91ea 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -69,16 +69,12 @@ import org.apache.airavata.model.status.ExperimentState;
import org.apache.airavata.model.status.ExperimentStatus;
import org.apache.airavata.model.status.JobStatus;
import org.apache.airavata.model.status.QueueStatusModel;
-import org.apache.airavata.model.user.UserProfile;
import org.apache.airavata.model.workspace.Gateway;
import org.apache.airavata.model.workspace.Notification;
import org.apache.airavata.model.workspace.Project;
import org.apache.airavata.registry.api.RegistryService;
import org.apache.airavata.registry.api.client.RegistryServiceClientFactory;
import org.apache.airavata.registry.api.exception.RegistryServiceException;
-import org.apache.airavata.service.profile.client.ProfileServiceClientFactory;
-import org.apache.airavata.service.profile.user.cpi.UserProfileService;
-import org.apache.airavata.service.profile.user.cpi.exception.UserProfileServiceException;
import org.apache.airavata.service.security.interceptor.SecurityCheck;
import org.apache.airavata.sharing.registry.client.SharingRegistryServiceClientFactory;
import org.apache.airavata.sharing.registry.models.*;
@@ -88,7 +84,6 @@ import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.text.MessageFormat;
import java.util.*;
public class AiravataServerHandler implements Airavata.Iface {
@@ -4700,9 +4695,21 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
@SecurityCheck
- public boolean createGroup(AuthzToken authzToken, GroupModel groupModel) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
+ public String createGroup(AuthzToken authzToken, GroupModel groupModel) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
try {
- throw new UnsupportedOperationException("Method not supported yet");
+ //TODO Validations for authorization
+ SharingRegistryService.Client sharingClient = sharingClientPool.getResource();
+
+ UserGroup sharingUserGroup = new UserGroup();
+ sharingUserGroup.setGroupId(UUID.randomUUID().toString());
+ sharingUserGroup.setName(groupModel.getName());
+ sharingUserGroup.setDescription(groupModel.getDescription());
+ sharingUserGroup.setGroupType(GroupType.USER_LEVEL_GROUP);
+ sharingUserGroup.setDomainId(authzToken.getClaimsMap().get(Constants.GATEWAY_ID));
+
+ String groupId = sharingClient.createGroup(sharingUserGroup);
+ sharingClient.addUsersToGroup(authzToken.getClaimsMap().get(Constants.GATEWAY_ID), groupModel.getMembers(), groupId);
+ return groupId;
} catch (Exception e) {
String msg = "Error Creating Group" ;
logger.error(msg, e);
@@ -4717,7 +4724,19 @@ public class AiravataServerHandler implements Airavata.Iface {
public boolean updateGroup(AuthzToken authzToken, GroupModel groupModel) throws InvalidRequestException,
AiravataClientException, AiravataSystemException, AuthorizationException, TException {
try {
- throw new UnsupportedOperationException("Method not supported yet");
+ //TODO Validations for authorization
+ SharingRegistryService.Client sharingClient = sharingClientPool.getResource();
+
+ UserGroup sharingUserGroup = new UserGroup();
+ sharingUserGroup.setGroupId(groupModel.getId());
+ sharingUserGroup.setName(groupModel.getName());
+ sharingUserGroup.setDescription(groupModel.getDescription());
+ sharingUserGroup.setGroupType(GroupType.USER_LEVEL_GROUP);
+ sharingUserGroup.setDomainId(authzToken.getClaimsMap().get(Constants.GATEWAY_ID));
+
+ //adding and removal of users should be handle separately
+ sharingClient.updateGroup(sharingUserGroup);
+ return true;
} catch (Exception e) {
String msg = "Error Updating Group" ;
logger.error(msg, e);
@@ -4729,10 +4748,14 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
@SecurityCheck
- public boolean deleteGroup(AuthzToken authzToken, String groupId, String ownerId, String gatewayId) throws
+ public boolean deleteGroup(AuthzToken authzToken, String groupId, String ownerId) throws
InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
try {
- throw new UnsupportedOperationException("Method not supported yet");
+ //TODO Validations for authorization
+ SharingRegistryService.Client sharingClient = sharingClientPool.getResource();
+
+ sharingClient.deleteGroup(authzToken.getClaimsMap().get(Constants.GATEWAY_ID), groupId);
+ return true;
} catch (Exception e) {
String msg = "Error Deleting Group. Group ID: " + groupId ;
logger.error(msg, e);
@@ -4747,7 +4770,20 @@ public class AiravataServerHandler implements Airavata.Iface {
public GroupModel getGroup(AuthzToken authzToken, String groupId) throws InvalidRequestException,
AiravataClientException, AiravataSystemException, AuthorizationException, TException {
try {
- throw new UnsupportedOperationException("Method not supported yet");
+ SharingRegistryService.Client sharingClient = sharingClientPool.getResource();
+ UserGroup userGroup = sharingClient.getGroup(authzToken.getClaimsMap().get(Constants.GATEWAY_ID), groupId);
+
+ GroupModel groupModel = new GroupModel();
+ groupModel.setId(userGroup.getGroupId());
+ groupModel.setName(userGroup.getName());
+ groupModel.setDescription(userGroup.getDescription());
+ groupModel.setOwnerId(userGroup.getOwnerId());
+
+ sharingClient.getGroupMembersOfTypeUser(authzToken.getClaimsMap().get(Constants.GATEWAY_ID), groupId, 0, -1).stream().forEach(user->
+ groupModel.addToMembers(user.getUserId())
+ );
+
+ return groupModel;
} catch (Exception e) {
String msg = "Error Retreiving Group. Group ID: " + groupId ;
logger.error(msg, e);
@@ -4759,7 +4795,7 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
@SecurityCheck
- public List<GroupModel> getAllGroupsUserBelongs(AuthzToken authzToken, String userName, String gatewayId)
+ public List<GroupModel> getAllGroupsUserBelongs(AuthzToken authzToken, String userName)
throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
try {
throw new UnsupportedOperationException("Method not supported yet");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
index 8f62c2d..6ef1610 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
@@ -3011,15 +3011,15 @@ public class Airavata {
public List<String> getAllAccessibleUsers(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.group.ResourceType resourceType, org.apache.airavata.model.group.ResourcePermissionType permissionType) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
- public boolean createGroup(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.group.GroupModel groupModel) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+ public String createGroup(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.group.GroupModel groupModel) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
public boolean updateGroup(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.group.GroupModel groupModel) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
- public boolean deleteGroup(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, String ownerId, String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+ public boolean deleteGroup(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, String ownerId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
public org.apache.airavata.model.group.GroupModel getGroup(org.apache.airavata.model.security.AuthzToken authzToken, String groupId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
- public List<org.apache.airavata.model.group.GroupModel> getAllGroupsUserBelongs(org.apache.airavata.model.security.AuthzToken authzToken, String userName, String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+ public List<org.apache.airavata.model.group.GroupModel> getAllGroupsUserBelongs(org.apache.airavata.model.security.AuthzToken authzToken, String userName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
}
@@ -3357,11 +3357,11 @@ public class Airavata {
public void updateGroup(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.group.GroupModel groupModel, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void deleteGroup(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, String ownerId, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void deleteGroup(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, String ownerId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void getGroup(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getAllGroupsUserBelongs(org.apache.airavata.model.security.AuthzToken authzToken, String userName, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void getAllGroupsUserBelongs(org.apache.airavata.model.security.AuthzToken authzToken, String userName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
}
@@ -9417,7 +9417,7 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAllAccessibleUsers failed: unknown result");
}
- public boolean createGroup(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.group.GroupModel groupModel) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public String createGroup(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.group.GroupModel groupModel) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
send_createGroup(authzToken, groupModel);
return recv_createGroup();
@@ -9431,7 +9431,7 @@ public class Airavata {
sendBase("createGroup", args);
}
- public boolean recv_createGroup() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public String recv_createGroup() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
createGroup_result result = new createGroup_result();
receiveBase(result, "createGroup");
@@ -9489,19 +9489,18 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateGroup failed: unknown result");
}
- public boolean deleteGroup(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, String ownerId, String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public boolean deleteGroup(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, String ownerId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
- send_deleteGroup(authzToken, groupId, ownerId, gatewayId);
+ send_deleteGroup(authzToken, groupId, ownerId);
return recv_deleteGroup();
}
- public void send_deleteGroup(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, String ownerId, String gatewayId) throws org.apache.thrift.TException
+ public void send_deleteGroup(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, String ownerId) throws org.apache.thrift.TException
{
deleteGroup_args args = new deleteGroup_args();
args.setAuthzToken(authzToken);
args.setGroupId(groupId);
args.setOwnerId(ownerId);
- args.setGatewayId(gatewayId);
sendBase("deleteGroup", args);
}
@@ -9563,18 +9562,17 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getGroup failed: unknown result");
}
- public List<org.apache.airavata.model.group.GroupModel> getAllGroupsUserBelongs(org.apache.airavata.model.security.AuthzToken authzToken, String userName, String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public List<org.apache.airavata.model.group.GroupModel> getAllGroupsUserBelongs(org.apache.airavata.model.security.AuthzToken authzToken, String userName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
- send_getAllGroupsUserBelongs(authzToken, userName, gatewayId);
+ send_getAllGroupsUserBelongs(authzToken, userName);
return recv_getAllGroupsUserBelongs();
}
- public void send_getAllGroupsUserBelongs(org.apache.airavata.model.security.AuthzToken authzToken, String userName, String gatewayId) throws org.apache.thrift.TException
+ public void send_getAllGroupsUserBelongs(org.apache.airavata.model.security.AuthzToken authzToken, String userName) throws org.apache.thrift.TException
{
getAllGroupsUserBelongs_args args = new getAllGroupsUserBelongs_args();
args.setAuthzToken(authzToken);
args.setUserName(userName);
- args.setGatewayId(gatewayId);
sendBase("getAllGroupsUserBelongs", args);
}
@@ -15794,7 +15792,7 @@ public class Airavata {
prot.writeMessageEnd();
}
- public boolean getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException {
+ public String getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException {
if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
throw new IllegalStateException("Method call not finished!");
}
@@ -15839,9 +15837,9 @@ public class Airavata {
}
}
- public void deleteGroup(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, String ownerId, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void deleteGroup(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, String ownerId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- deleteGroup_call method_call = new deleteGroup_call(authzToken, groupId, ownerId, gatewayId, resultHandler, this, ___protocolFactory, ___transport);
+ deleteGroup_call method_call = new deleteGroup_call(authzToken, groupId, ownerId, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
@@ -15850,13 +15848,11 @@ public class Airavata {
private org.apache.airavata.model.security.AuthzToken authzToken;
private String groupId;
private String ownerId;
- private String gatewayId;
- public deleteGroup_call(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, String ownerId, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public deleteGroup_call(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, String ownerId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.authzToken = authzToken;
this.groupId = groupId;
this.ownerId = ownerId;
- this.gatewayId = gatewayId;
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
@@ -15865,7 +15861,6 @@ public class Airavata {
args.setAuthzToken(authzToken);
args.setGroupId(groupId);
args.setOwnerId(ownerId);
- args.setGatewayId(gatewayId);
args.write(prot);
prot.writeMessageEnd();
}
@@ -15915,9 +15910,9 @@ public class Airavata {
}
}
- public void getAllGroupsUserBelongs(org.apache.airavata.model.security.AuthzToken authzToken, String userName, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void getAllGroupsUserBelongs(org.apache.airavata.model.security.AuthzToken authzToken, String userName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- getAllGroupsUserBelongs_call method_call = new getAllGroupsUserBelongs_call(authzToken, userName, gatewayId, resultHandler, this, ___protocolFactory, ___transport);
+ getAllGroupsUserBelongs_call method_call = new getAllGroupsUserBelongs_call(authzToken, userName, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
@@ -15925,12 +15920,10 @@ public class Airavata {
public static class getAllGroupsUserBelongs_call extends org.apache.thrift.async.TAsyncMethodCall {
private org.apache.airavata.model.security.AuthzToken authzToken;
private String userName;
- private String gatewayId;
- public getAllGroupsUserBelongs_call(org.apache.airavata.model.security.AuthzToken authzToken, String userName, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public getAllGroupsUserBelongs_call(org.apache.airavata.model.security.AuthzToken authzToken, String userName, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.authzToken = authzToken;
this.userName = userName;
- this.gatewayId = gatewayId;
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
@@ -15938,7 +15931,6 @@ public class Airavata {
getAllGroupsUserBelongs_args args = new getAllGroupsUserBelongs_args();
args.setAuthzToken(authzToken);
args.setUserName(userName);
- args.setGatewayId(gatewayId);
args.write(prot);
prot.writeMessageEnd();
}
@@ -21142,7 +21134,6 @@ public class Airavata {
createGroup_result result = new createGroup_result();
try {
result.success = iface.createGroup(args.authzToken, args.groupModel);
- result.setSuccessIsSet(true);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
} catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -21203,7 +21194,7 @@ public class Airavata {
public deleteGroup_result getResult(I iface, deleteGroup_args args) throws org.apache.thrift.TException {
deleteGroup_result result = new deleteGroup_result();
try {
- result.success = iface.deleteGroup(args.authzToken, args.groupId, args.ownerId, args.gatewayId);
+ result.success = iface.deleteGroup(args.authzToken, args.groupId, args.ownerId);
result.setSuccessIsSet(true);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
@@ -21264,7 +21255,7 @@ public class Airavata {
public getAllGroupsUserBelongs_result getResult(I iface, getAllGroupsUserBelongs_args args) throws org.apache.thrift.TException {
getAllGroupsUserBelongs_result result = new getAllGroupsUserBelongs_result();
try {
- result.success = iface.getAllGroupsUserBelongs(args.authzToken, args.userName, args.gatewayId);
+ result.success = iface.getAllGroupsUserBelongs(args.authzToken, args.userName);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
} catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -33345,7 +33336,7 @@ public class Airavata {
}
}
- public static class createGroup<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, createGroup_args, Boolean> {
+ public static class createGroup<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, createGroup_args, String> {
public createGroup() {
super("createGroup");
}
@@ -33354,13 +33345,12 @@ public class Airavata {
return new createGroup_args();
}
- public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<Boolean>() {
- public void onComplete(Boolean o) {
+ return new AsyncMethodCallback<String>() {
+ public void onComplete(String o) {
createGroup_result result = new createGroup_result();
result.success = o;
- result.setSuccessIsSet(true);
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
return;
@@ -33413,7 +33403,7 @@ public class Airavata {
return false;
}
- public void start(I iface, createGroup_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+ public void start(I iface, createGroup_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
iface.createGroup(args.authzToken, args.groupModel,resultHandler);
}
}
@@ -33560,7 +33550,7 @@ public class Airavata {
}
public void start(I iface, deleteGroup_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
- iface.deleteGroup(args.authzToken, args.groupId, args.ownerId, args.gatewayId,resultHandler);
+ iface.deleteGroup(args.authzToken, args.groupId, args.ownerId,resultHandler);
}
}
@@ -33704,7 +33694,7 @@ public class Airavata {
}
public void start(I iface, getAllGroupsUserBelongs_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.group.GroupModel>> resultHandler) throws TException {
- iface.getAllGroupsUserBelongs(args.authzToken, args.userName, args.gatewayId,resultHandler);
+ iface.getAllGroupsUserBelongs(args.authzToken, args.userName,resultHandler);
}
}
@@ -255510,7 +255500,7 @@ public class Airavata {
public static class createGroup_result implements org.apache.thrift.TBase<createGroup_result, createGroup_result._Fields>, java.io.Serializable, Cloneable, Comparable<createGroup_result> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("createGroup_result");
- private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
+ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0);
private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1);
private static final org.apache.thrift.protocol.TField ACE_FIELD_DESC = new org.apache.thrift.protocol.TField("ace", org.apache.thrift.protocol.TType.STRUCT, (short)2);
private static final org.apache.thrift.protocol.TField ASE_FIELD_DESC = new org.apache.thrift.protocol.TField("ase", org.apache.thrift.protocol.TType.STRUCT, (short)3);
@@ -255522,7 +255512,7 @@ public class Airavata {
schemes.put(TupleScheme.class, new createGroup_resultTupleSchemeFactory());
}
- public boolean success; // required
+ public String success; // required
public org.apache.airavata.model.error.InvalidRequestException ire; // required
public org.apache.airavata.model.error.AiravataClientException ace; // required
public org.apache.airavata.model.error.AiravataSystemException ase; // required
@@ -255599,13 +255589,11 @@ public class Airavata {
}
// isset id assignments
- private static final int __SUCCESS_ISSET_ID = 0;
- private byte __isset_bitfield = 0;
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.IRE, new org.apache.thrift.meta_data.FieldMetaData("ire", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
tmpMap.put(_Fields.ACE, new org.apache.thrift.meta_data.FieldMetaData("ace", org.apache.thrift.TFieldRequirementType.DEFAULT,
@@ -255622,7 +255610,7 @@ public class Airavata {
}
public createGroup_result(
- boolean success,
+ String success,
org.apache.airavata.model.error.InvalidRequestException ire,
org.apache.airavata.model.error.AiravataClientException ace,
org.apache.airavata.model.error.AiravataSystemException ase,
@@ -255630,7 +255618,6 @@ public class Airavata {
{
this();
this.success = success;
- setSuccessIsSet(true);
this.ire = ire;
this.ace = ace;
this.ase = ase;
@@ -255641,8 +255628,9 @@ public class Airavata {
* Performs a deep copy on <i>other</i>.
*/
public createGroup_result(createGroup_result other) {
- __isset_bitfield = other.__isset_bitfield;
- this.success = other.success;
+ if (other.isSetSuccess()) {
+ this.success = other.success;
+ }
if (other.isSetIre()) {
this.ire = new org.apache.airavata.model.error.InvalidRequestException(other.ire);
}
@@ -255663,35 +255651,35 @@ public class Airavata {
@Override
public void clear() {
- setSuccessIsSet(false);
- this.success = false;
+ this.success = null;
this.ire = null;
this.ace = null;
this.ase = null;
this.ae = null;
}
- public boolean isSuccess() {
+ public String getSuccess() {
return this.success;
}
- public createGroup_result setSuccess(boolean success) {
+ public createGroup_result setSuccess(String success) {
this.success = success;
- setSuccessIsSet(true);
return this;
}
public void unsetSuccess() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+ this.success = null;
}
/** Returns true if field success is set (has been assigned a value) and false otherwise */
public boolean isSetSuccess() {
- return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+ return this.success != null;
}
public void setSuccessIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
+ if (!value) {
+ this.success = null;
+ }
}
public org.apache.airavata.model.error.InvalidRequestException getIre() {
@@ -255796,7 +255784,7 @@ public class Airavata {
if (value == null) {
unsetSuccess();
} else {
- setSuccess((Boolean)value);
+ setSuccess((String)value);
}
break;
@@ -255838,7 +255826,7 @@ public class Airavata {
public Object getFieldValue(_Fields field) {
switch (field) {
case SUCCESS:
- return isSuccess();
+ return getSuccess();
case IRE:
return getIre();
@@ -255890,12 +255878,12 @@ public class Airavata {
if (that == null)
return false;
- boolean this_present_success = true;
- boolean that_present_success = true;
+ boolean this_present_success = true && this.isSetSuccess();
+ boolean that_present_success = true && that.isSetSuccess();
if (this_present_success || that_present_success) {
if (!(this_present_success && that_present_success))
return false;
- if (this.success != that.success)
+ if (!this.success.equals(that.success))
return false;
}
@@ -255942,7 +255930,7 @@ public class Airavata {
public int hashCode() {
List<Object> list = new ArrayList<Object>();
- boolean present_success = true;
+ boolean present_success = true && (isSetSuccess());
list.add(present_success);
if (present_success)
list.add(success);
@@ -256049,7 +256037,11 @@ public class Airavata {
boolean first = true;
sb.append("success:");
- sb.append(this.success);
+ if (this.success == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.success);
+ }
first = false;
if (!first) sb.append(", ");
sb.append("ire:");
@@ -256102,8 +256094,6 @@ public class Airavata {
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bitfield = 0;
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
@@ -256129,8 +256119,8 @@ public class Airavata {
}
switch (schemeField.id) {
case 0: // SUCCESS
- if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
- struct.success = iprot.readBool();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.success = iprot.readString();
struct.setSuccessIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -256187,9 +256177,9 @@ public class Airavata {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
- if (struct.isSetSuccess()) {
+ if (struct.success != null) {
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
- oprot.writeBool(struct.success);
+ oprot.writeString(struct.success);
oprot.writeFieldEnd();
}
if (struct.ire != null) {
@@ -256247,7 +256237,7 @@ public class Airavata {
}
oprot.writeBitSet(optionals, 5);
if (struct.isSetSuccess()) {
- oprot.writeBool(struct.success);
+ oprot.writeString(struct.success);
}
if (struct.isSetIre()) {
struct.ire.write(oprot);
@@ -256268,7 +256258,7 @@ public class Airavata {
TTupleProtocol iprot = (TTupleProtocol) prot;
BitSet incoming = iprot.readBitSet(5);
if (incoming.get(0)) {
- struct.success = iprot.readBool();
+ struct.success = iprot.readString();
struct.setSuccessIsSet(true);
}
if (incoming.get(1)) {
@@ -257556,7 +257546,6 @@ public class Airavata {
private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
private static final org.apache.thrift.protocol.TField GROUP_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("groupId", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final org.apache.thrift.protocol.TField OWNER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("ownerId", org.apache.thrift.protocol.TType.STRING, (short)3);
- private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)4);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -257567,14 +257556,12 @@ public class Airavata {
public org.apache.airavata.model.security.AuthzToken authzToken; // required
public String groupId; // required
public String ownerId; // required
- public String gatewayId; // 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 {
AUTHZ_TOKEN((short)1, "authzToken"),
GROUP_ID((short)2, "groupId"),
- OWNER_ID((short)3, "ownerId"),
- GATEWAY_ID((short)4, "gatewayId");
+ OWNER_ID((short)3, "ownerId");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -257595,8 +257582,6 @@ public class Airavata {
return GROUP_ID;
case 3: // OWNER_ID
return OWNER_ID;
- case 4: // GATEWAY_ID
- return GATEWAY_ID;
default:
return null;
}
@@ -257646,8 +257631,6 @@ public class Airavata {
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.OWNER_ID, new org.apache.thrift.meta_data.FieldMetaData("ownerId", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteGroup_args.class, metaDataMap);
}
@@ -257658,14 +257641,12 @@ public class Airavata {
public deleteGroup_args(
org.apache.airavata.model.security.AuthzToken authzToken,
String groupId,
- String ownerId,
- String gatewayId)
+ String ownerId)
{
this();
this.authzToken = authzToken;
this.groupId = groupId;
this.ownerId = ownerId;
- this.gatewayId = gatewayId;
}
/**
@@ -257681,9 +257662,6 @@ public class Airavata {
if (other.isSetOwnerId()) {
this.ownerId = other.ownerId;
}
- if (other.isSetGatewayId()) {
- this.gatewayId = other.gatewayId;
- }
}
public deleteGroup_args deepCopy() {
@@ -257695,7 +257673,6 @@ public class Airavata {
this.authzToken = null;
this.groupId = null;
this.ownerId = null;
- this.gatewayId = null;
}
public org.apache.airavata.model.security.AuthzToken getAuthzToken() {
@@ -257770,30 +257747,6 @@ public class Airavata {
}
}
- public String getGatewayId() {
- return this.gatewayId;
- }
-
- public deleteGroup_args setGatewayId(String gatewayId) {
- this.gatewayId = gatewayId;
- return this;
- }
-
- public void unsetGatewayId() {
- this.gatewayId = null;
- }
-
- /** Returns true if field gatewayId is set (has been assigned a value) and false otherwise */
- public boolean isSetGatewayId() {
- return this.gatewayId != null;
- }
-
- public void setGatewayIdIsSet(boolean value) {
- if (!value) {
- this.gatewayId = null;
- }
- }
-
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case AUTHZ_TOKEN:
@@ -257820,14 +257773,6 @@ public class Airavata {
}
break;
- case GATEWAY_ID:
- if (value == null) {
- unsetGatewayId();
- } else {
- setGatewayId((String)value);
- }
- break;
-
}
}
@@ -257842,9 +257787,6 @@ public class Airavata {
case OWNER_ID:
return getOwnerId();
- case GATEWAY_ID:
- return getGatewayId();
-
}
throw new IllegalStateException();
}
@@ -257862,8 +257804,6 @@ public class Airavata {
return isSetGroupId();
case OWNER_ID:
return isSetOwnerId();
- case GATEWAY_ID:
- return isSetGatewayId();
}
throw new IllegalStateException();
}
@@ -257908,15 +257848,6 @@ public class Airavata {
return false;
}
- boolean this_present_gatewayId = true && this.isSetGatewayId();
- boolean that_present_gatewayId = true && that.isSetGatewayId();
- if (this_present_gatewayId || that_present_gatewayId) {
- if (!(this_present_gatewayId && that_present_gatewayId))
- return false;
- if (!this.gatewayId.equals(that.gatewayId))
- return false;
- }
-
return true;
}
@@ -257939,11 +257870,6 @@ public class Airavata {
if (present_ownerId)
list.add(ownerId);
- boolean present_gatewayId = true && (isSetGatewayId());
- list.add(present_gatewayId);
- if (present_gatewayId)
- list.add(gatewayId);
-
return list.hashCode();
}
@@ -257985,16 +257911,6 @@ public class Airavata {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetGatewayId()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayId, other.gatewayId);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
return 0;
}
@@ -258038,14 +257954,6 @@ public class Airavata {
sb.append(this.ownerId);
}
first = false;
- if (!first) sb.append(", ");
- sb.append("gatewayId:");
- if (this.gatewayId == null) {
- sb.append("null");
- } else {
- sb.append(this.gatewayId);
- }
- first = false;
sb.append(")");
return sb.toString();
}
@@ -258061,9 +257969,6 @@ public class Airavata {
if (ownerId == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'ownerId' was not present! Struct: " + toString());
}
- if (gatewayId == null) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' was not present! Struct: " + toString());
- }
// check for sub-struct validity
if (authzToken != null) {
authzToken.validate();
@@ -258129,14 +258034,6 @@ public class Airavata {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 4: // GATEWAY_ID
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.gatewayId = iprot.readString();
- struct.setGatewayIdIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -258167,11 +258064,6 @@ public class Airavata {
oprot.writeString(struct.ownerId);
oprot.writeFieldEnd();
}
- if (struct.gatewayId != null) {
- oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC);
- oprot.writeString(struct.gatewayId);
- oprot.writeFieldEnd();
- }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -258192,7 +258084,6 @@ public class Airavata {
struct.authzToken.write(oprot);
oprot.writeString(struct.groupId);
oprot.writeString(struct.ownerId);
- oprot.writeString(struct.gatewayId);
}
@Override
@@ -258205,8 +258096,6 @@ public class Airavata {
struct.setGroupIdIsSet(true);
struct.ownerId = iprot.readString();
struct.setOwnerIdIsSet(true);
- struct.gatewayId = iprot.readString();
- struct.setGatewayIdIsSet(true);
}
}
@@ -260260,7 +260149,6 @@ public class Airavata {
private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
private static final org.apache.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)2);
- private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)3);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -260270,13 +260158,11 @@ public class Airavata {
public org.apache.airavata.model.security.AuthzToken authzToken; // required
public String userName; // required
- public String gatewayId; // 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 {
AUTHZ_TOKEN((short)1, "authzToken"),
- USER_NAME((short)2, "userName"),
- GATEWAY_ID((short)3, "gatewayId");
+ USER_NAME((short)2, "userName");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -260295,8 +260181,6 @@ public class Airavata {
return AUTHZ_TOKEN;
case 2: // USER_NAME
return USER_NAME;
- case 3: // GATEWAY_ID
- return GATEWAY_ID;
default:
return null;
}
@@ -260344,8 +260228,6 @@ public class Airavata {
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class)));
tmpMap.put(_Fields.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAllGroupsUserBelongs_args.class, metaDataMap);
}
@@ -260355,13 +260237,11 @@ public class Airavata {
public getAllGroupsUserBelongs_args(
org.apache.airavata.model.security.AuthzToken authzToken,
- String userName,
- String gatewayId)
+ String userName)
{
this();
this.authzToken = authzToken;
this.userName = userName;
- this.gatewayId = gatewayId;
}
/**
@@ -260374,9 +260254,6 @@ public class Airavata {
if (other.isSetUserName()) {
this.userName = other.userName;
}
- if (other.isSetGatewayId()) {
- this.gatewayId = other.gatewayId;
- }
}
public getAllGroupsUserBelongs_args deepCopy() {
@@ -260387,7 +260264,6 @@ public class Airavata {
public void clear() {
this.authzToken = null;
this.userName = null;
- this.gatewayId = null;
}
public org.apache.airavata.model.security.AuthzToken getAuthzToken() {
@@ -260438,30 +260314,6 @@ public class Airavata {
}
}
- public String getGatewayId() {
- return this.gatewayId;
- }
-
- public getAllGroupsUserBelongs_args setGatewayId(String gatewayId) {
- this.gatewayId = gatewayId;
- return this;
- }
-
- public void unsetGatewayId() {
- this.gatewayId = null;
- }
-
- /** Returns true if field gatewayId is set (has been assigned a value) and false otherwise */
- public boolean isSetGatewayId() {
- return this.gatewayId != null;
- }
-
- public void setGatewayIdIsSet(boolean value) {
- if (!value) {
- this.gatewayId = null;
- }
- }
-
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case AUTHZ_TOKEN:
@@ -260480,14 +260332,6 @@ public class Airavata {
}
break;
- case GATEWAY_ID:
- if (value == null) {
- unsetGatewayId();
- } else {
- setGatewayId((String)value);
- }
- break;
-
}
}
@@ -260499,9 +260343,6 @@ public class Airavata {
case USER_NAME:
return getUserName();
- case GATEWAY_ID:
- return getGatewayId();
-
}
throw new IllegalStateException();
}
@@ -260517,8 +260358,6 @@ public class Airavata {
return isSetAuthzToken();
case USER_NAME:
return isSetUserName();
- case GATEWAY_ID:
- return isSetGatewayId();
}
throw new IllegalStateException();
}
@@ -260554,15 +260393,6 @@ public class Airavata {
return false;
}
- boolean this_present_gatewayId = true && this.isSetGatewayId();
- boolean that_present_gatewayId = true && that.isSetGatewayId();
- if (this_present_gatewayId || that_present_gatewayId) {
- if (!(this_present_gatewayId && that_present_gatewayId))
- return false;
- if (!this.gatewayId.equals(that.gatewayId))
- return false;
- }
-
return true;
}
@@ -260580,11 +260410,6 @@ public class Airavata {
if (present_userName)
list.add(userName);
- boolean present_gatewayId = true && (isSetGatewayId());
- list.add(present_gatewayId);
- if (present_gatewayId)
- list.add(gatewayId);
-
return list.hashCode();
}
@@ -260616,16 +260441,6 @@ public class Airavata {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetGatewayId()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayId, other.gatewayId);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
return 0;
}
@@ -260661,14 +260476,6 @@ public class Airavata {
sb.append(this.userName);
}
first = false;
- if (!first) sb.append(", ");
- sb.append("gatewayId:");
- if (this.gatewayId == null) {
- sb.append("null");
- } else {
- sb.append(this.gatewayId);
- }
- first = false;
sb.append(")");
return sb.toString();
}
@@ -260681,9 +260488,6 @@ public class Airavata {
if (userName == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'userName' was not present! Struct: " + toString());
}
- if (gatewayId == null) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' was not present! Struct: " + toString());
- }
// check for sub-struct validity
if (authzToken != null) {
authzToken.validate();
@@ -260741,14 +260545,6 @@ public class Airavata {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 3: // GATEWAY_ID
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.gatewayId = iprot.readString();
- struct.setGatewayIdIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -260774,11 +260570,6 @@ public class Airavata {
oprot.writeString(struct.userName);
oprot.writeFieldEnd();
}
- if (struct.gatewayId != null) {
- oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC);
- oprot.writeString(struct.gatewayId);
- oprot.writeFieldEnd();
- }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -260798,7 +260589,6 @@ public class Airavata {
TTupleProtocol oprot = (TTupleProtocol) prot;
struct.authzToken.write(oprot);
oprot.writeString(struct.userName);
- oprot.writeString(struct.gatewayId);
}
@Override
@@ -260809,8 +260599,6 @@ public class Airavata {
struct.setAuthzTokenIsSet(true);
struct.userName = iprot.readString();
struct.setUserNameIsSet(true);
- struct.gatewayId = iprot.readString();
- struct.setGatewayIdIsSet(true);
}
}