You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2017/07/20 17:43:17 UTC
[6/6] airavata git commit: updating group management api methods in
API server handler
updating group management api methods in API server handler
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a8ca4fcb
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a8ca4fcb
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a8ca4fcb
Branch: refs/heads/master
Commit: a8ca4fcbdc2aa15bec94eb94518f2541887607d0
Parents: 983225c
Author: scnakandala <su...@gmail.com>
Authored: Thu Jul 20 13:42:59 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Jul 20 13:43:00 2017 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 54 ++-
.../java/org/apache/airavata/api/Airavata.java | 370 ++++---------------
.../airavata/api/airavata_apiConstants.java | 28 +-
.../main/resources/lib/airavata/Airavata.cpp | 104 ++----
.../src/main/resources/lib/airavata/Airavata.h | 82 ++--
.../lib/airavata/Airavata_server.skeleton.cpp | 6 +-
.../resources/lib/Airavata/API/Airavata.php | 80 +---
.../Model/AppCatalog/ComputeResource/Types.php | 2 +-
.../lib/Airavata/Model/Application/Io/Types.php | 6 +-
.../lib/apache/airavata/api/Airavata-remote | 18 +-
.../lib/apache/airavata/api/Airavata.py | 70 +---
.../apache/airavata/model/ComponentState.java | 28 +-
.../apache/airavata/model/ComponentStatus.java | 28 +-
.../org/apache/airavata/model/EdgeModel.java | 28 +-
.../org/apache/airavata/model/NodeModel.java | 28 +-
.../org/apache/airavata/model/PortModel.java | 28 +-
.../apache/airavata/model/WorkflowModel.java | 28 +-
.../apache/airavata/model/WorkflowState.java | 28 +-
.../apache/airavata/model/WorkflowStatus.java | 28 +-
.../ApplicationDeploymentDescription.java | 28 +-
.../appdeployment/ApplicationModule.java | 28 +-
.../appcatalog/appdeployment/CommandObject.java | 28 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 28 +-
.../ApplicationInterfaceDescription.java | 28 +-
.../appcatalog/computeresource/BatchQueue.java | 28 +-
.../computeresource/CloudJobSubmission.java | 28 +-
.../ComputeResourceDescription.java | 28 +-
.../appcatalog/computeresource/DMType.java | 28 +-
.../appcatalog/computeresource/FileSystems.java | 28 +-
.../computeresource/GlobusJobSubmission.java | 28 +-
.../computeresource/JobManagerCommand.java | 28 +-
.../computeresource/JobSubmissionInterface.java | 28 +-
.../computeresource/JobSubmissionProtocol.java | 28 +-
.../computeresource/LOCALSubmission.java | 28 +-
.../appcatalog/computeresource/MonitorMode.java | 28 +-
.../computeresource/ProviderName.java | 28 +-
.../computeresource/ResourceJobManager.java | 28 +-
.../computeresource/ResourceJobManagerType.java | 32 +-
.../computeresource/SSHJobSubmission.java | 28 +-
.../computeresource/UnicoreJobSubmission.java | 28 +-
.../ComputeResourcePreference.java | 28 +-
.../gatewayprofile/GatewayResourceProfile.java | 28 +-
.../gatewayprofile/StoragePreference.java | 28 +-
.../StorageResourceDescription.java | 28 +-
.../UserComputeResourcePreference.java | 28 +-
.../UserResourceProfile.java | 28 +-
.../UserStoragePreference.java | 28 +-
.../airavata/model/application/io/DataType.java | 28 +-
.../application/io/InputDataObjectType.java | 91 +++--
.../application/io/OutputDataObjectType.java | 28 +-
.../airavata/model/commons/ErrorModel.java | 28 +-
.../model/commons/ValidationResults.java | 28 +-
.../airavata/model/commons/ValidatorResult.java | 28 +-
.../commons/airavata_commonsConstants.java | 28 +-
.../credential/store/CertificateCredential.java | 28 +-
.../model/credential/store/CommunityUser.java | 28 +-
.../credential/store/CredentialOwnerType.java | 28 +-
.../credential/store/CredentialSummary.java | 28 +-
.../credential/store/PasswordCredential.java | 28 +-
.../model/credential/store/SSHCredential.java | 28 +-
.../model/credential/store/SummaryType.java | 28 +-
.../credential_store_data_modelsConstants.java | 28 +-
.../airavata/model/data/movement/DMType.java | 28 +-
.../data/movement/DataMovementInterface.java | 28 +-
.../data/movement/DataMovementProtocol.java | 28 +-
.../data/movement/GridFTPDataMovement.java | 28 +-
.../model/data/movement/LOCALDataMovement.java | 28 +-
.../model/data/movement/SCPDataMovement.java | 28 +-
.../model/data/movement/SecurityProtocol.java | 28 +-
.../data/movement/UnicoreDataMovement.java | 28 +-
.../model/data/replica/DataProductModel.java | 28 +-
.../model/data/replica/DataProductType.java | 28 +-
.../data/replica/DataReplicaLocationModel.java | 28 +-
.../data/replica/ReplicaLocationCategory.java | 28 +-
.../data/replica/ReplicaPersistentType.java | 28 +-
.../model/error/AiravataClientException.java | 28 +-
.../airavata/model/error/AiravataErrorType.java | 28 +-
.../model/error/AiravataSystemException.java | 28 +-
.../model/error/AuthenticationException.java | 28 +-
.../model/error/AuthorizationException.java | 28 +-
.../error/ExperimentNotFoundException.java | 28 +-
.../model/error/InvalidRequestException.java | 28 +-
.../model/error/LaunchValidationException.java | 28 +-
.../model/error/ProjectNotFoundException.java | 28 +-
.../airavata/model/error/TimedOutException.java | 28 +-
.../airavata/model/error/ValidationResults.java | 28 +-
.../airavata/model/error/ValidatorResult.java | 28 +-
.../model/experiment/ExperimentModel.java | 28 +-
.../experiment/ExperimentSearchFields.java | 28 +-
.../model/experiment/ExperimentStatistics.java | 28 +-
.../experiment/ExperimentSummaryModel.java | 28 +-
.../model/experiment/ExperimentType.java | 28 +-
.../model/experiment/ProjectSearchFields.java | 28 +-
.../experiment/UserConfigurationDataModel.java | 28 +-
.../apache/airavata/model/group/GroupModel.java | 28 +-
.../model/group/ResourcePermissionType.java | 28 +-
.../airavata/model/group/ResourceType.java | 28 +-
.../org/apache/airavata/model/job/JobModel.java | 28 +-
.../event/ExperimentStatusChangeEvent.java | 28 +-
.../messaging/event/ExperimentSubmitEvent.java | 28 +-
.../model/messaging/event/JobIdentifier.java | 28 +-
.../messaging/event/JobStatusChangeEvent.java | 28 +-
.../event/JobStatusChangeRequestEvent.java | 28 +-
.../airavata/model/messaging/event/Message.java | 28 +-
.../model/messaging/event/MessageLevel.java | 28 +-
.../model/messaging/event/MessageType.java | 28 +-
.../messaging/event/ProcessIdentifier.java | 28 +-
.../event/ProcessStatusChangeEvent.java | 28 +-
.../event/ProcessStatusChangeRequestEvent.java | 28 +-
.../messaging/event/ProcessSubmitEvent.java | 28 +-
.../messaging/event/ProcessTerminateEvent.java | 28 +-
.../model/messaging/event/TaskIdentifier.java | 28 +-
.../messaging/event/TaskOutputChangeEvent.java | 28 +-
.../messaging/event/TaskStatusChangeEvent.java | 28 +-
.../event/TaskStatusChangeRequestEvent.java | 28 +-
.../parallelism/ApplicationParallelismType.java | 28 +-
.../airavata/model/process/ProcessModel.java | 28 +-
.../ComputationalResourceSchedulingModel.java | 28 +-
.../airavata/model/security/AuthzToken.java | 28 +-
.../airavata/model/status/ExperimentState.java | 28 +-
.../airavata/model/status/ExperimentStatus.java | 28 +-
.../apache/airavata/model/status/JobState.java | 28 +-
.../apache/airavata/model/status/JobStatus.java | 28 +-
.../airavata/model/status/ProcessState.java | 28 +-
.../airavata/model/status/ProcessStatus.java | 28 +-
.../airavata/model/status/QueueStatusModel.java | 28 +-
.../apache/airavata/model/status/TaskState.java | 28 +-
.../airavata/model/status/TaskStatus.java | 28 +-
.../airavata/model/task/DataStageType.java | 28 +-
.../model/task/DataStagingTaskModel.java | 28 +-
.../model/task/EnvironmentSetupTaskModel.java | 28 +-
.../model/task/JobSubmissionTaskModel.java | 28 +-
.../airavata/model/task/MonitorTaskModel.java | 28 +-
.../apache/airavata/model/task/TaskModel.java | 28 +-
.../apache/airavata/model/task/TaskTypes.java | 28 +-
.../airavata/model/user/NSFDemographics.java | 28 +-
.../org/apache/airavata/model/user/Status.java | 28 +-
.../airavata/model/user/USCitizenship.java | 28 +-
.../apache/airavata/model/user/UserProfile.java | 28 +-
.../apache/airavata/model/user/disability.java | 28 +-
.../apache/airavata/model/user/ethnicity.java | 28 +-
.../org/apache/airavata/model/user/race.java | 28 +-
.../model/user/user_profile_modelConstants.java | 28 +-
.../airavata/model/workspace/Gateway.java | 28 +-
.../model/workspace/GatewayApprovalStatus.java | 28 +-
.../apache/airavata/model/workspace/Group.java | 28 +-
.../airavata/model/workspace/Notification.java | 28 +-
.../model/workspace/NotificationPriority.java | 28 +-
.../airavata/model/workspace/Project.java | 28 +-
.../apache/airavata/model/workspace/User.java | 28 +-
.../airavata-apis/airavata_api.thrift | 6 +-
151 files changed, 2105 insertions(+), 2680 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/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 906259c..2281b20 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
@@ -4691,9 +4691,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);
@@ -4708,7 +4720,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);
@@ -4720,10 +4744,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);
@@ -4738,7 +4766,19 @@ 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);
@@ -4750,7 +4790,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/a8ca4fcb/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 f6ac55b..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
@@ -1,22 +1,20 @@
/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
+
/**
* Autogenerated by Thrift Compiler (0.9.3)
*
@@ -3013,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;
}
@@ -3359,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;
}
@@ -9419,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();
@@ -9433,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");
@@ -9491,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);
}
@@ -9565,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);
}
@@ -15796,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!");
}
@@ -15841,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);
}
@@ -15852,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 {
@@ -15867,7 +15861,6 @@ public class Airavata {
args.setAuthzToken(authzToken);
args.setGroupId(groupId);
args.setOwnerId(ownerId);
- args.setGatewayId(gatewayId);
args.write(prot);
prot.writeMessageEnd();
}
@@ -15917,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);
}
@@ -15927,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 {
@@ -15940,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();
}
@@ -21144,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) {
@@ -21205,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;
@@ -21266,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) {
@@ -33347,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");
}
@@ -33356,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;
@@ -33415,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);
}
}
@@ -33562,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);
}
}
@@ -33706,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);
}
}
@@ -255512,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);
@@ -255524,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
@@ -255601,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,
@@ -255624,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,
@@ -255632,7 +255618,6 @@ public class Airavata {
{
this();
this.success = success;
- setSuccessIsSet(true);
this.ire = ire;
this.ace = ace;
this.ase = ase;
@@ -255643,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);
}
@@ -255665,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() {
@@ -255798,7 +255784,7 @@ public class Airavata {
if (value == null) {
unsetSuccess();
} else {
- setSuccess((Boolean)value);
+ setSuccess((String)value);
}
break;
@@ -255840,7 +255826,7 @@ public class Airavata {
public Object getFieldValue(_Fields field) {
switch (field) {
case SUCCESS:
- return isSuccess();
+ return getSuccess();
case IRE:
return getIre();
@@ -255892,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;
}
@@ -255944,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);
@@ -256051,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:");
@@ -256104,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);
@@ -256131,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);
@@ -256189,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) {
@@ -256249,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);
@@ -256270,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)) {
@@ -257558,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 {
@@ -257569,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>();
@@ -257597,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;
}
@@ -257648,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);
}
@@ -257660,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;
}
/**
@@ -257683,9 +257662,6 @@ public class Airavata {
if (other.isSetOwnerId()) {
this.ownerId = other.ownerId;
}
- if (other.isSetGatewayId()) {
- this.gatewayId = other.gatewayId;
- }
}
public deleteGroup_args deepCopy() {
@@ -257697,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() {
@@ -257772,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:
@@ -257822,14 +257773,6 @@ public class Airavata {
}
break;
- case GATEWAY_ID:
- if (value == null) {
- unsetGatewayId();
- } else {
- setGatewayId((String)value);
- }
- break;
-
}
}
@@ -257844,9 +257787,6 @@ public class Airavata {
case OWNER_ID:
return getOwnerId();
- case GATEWAY_ID:
- return getGatewayId();
-
}
throw new IllegalStateException();
}
@@ -257864,8 +257804,6 @@ public class Airavata {
return isSetGroupId();
case OWNER_ID:
return isSetOwnerId();
- case GATEWAY_ID:
- return isSetGatewayId();
}
throw new IllegalStateException();
}
@@ -257910,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;
}
@@ -257941,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();
}
@@ -257987,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;
}
@@ -258040,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();
}
@@ -258063,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();
@@ -258131,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);
}
@@ -258169,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();
}
@@ -258194,7 +258084,6 @@ public class Airavata {
struct.authzToken.write(oprot);
oprot.writeString(struct.groupId);
oprot.writeString(struct.ownerId);
- oprot.writeString(struct.gatewayId);
}
@Override
@@ -258207,8 +258096,6 @@ public class Airavata {
struct.setGroupIdIsSet(true);
struct.ownerId = iprot.readString();
struct.setOwnerIdIsSet(true);
- struct.gatewayId = iprot.readString();
- struct.setGatewayIdIsSet(true);
}
}
@@ -260262,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 {
@@ -260272,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>();
@@ -260297,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;
}
@@ -260346,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);
}
@@ -260357,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;
}
/**
@@ -260376,9 +260254,6 @@ public class Airavata {
if (other.isSetUserName()) {
this.userName = other.userName;
}
- if (other.isSetGatewayId()) {
- this.gatewayId = other.gatewayId;
- }
}
public getAllGroupsUserBelongs_args deepCopy() {
@@ -260389,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() {
@@ -260440,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:
@@ -260482,14 +260332,6 @@ public class Airavata {
}
break;
- case GATEWAY_ID:
- if (value == null) {
- unsetGatewayId();
- } else {
- setGatewayId((String)value);
- }
- break;
-
}
}
@@ -260501,9 +260343,6 @@ public class Airavata {
case USER_NAME:
return getUserName();
- case GATEWAY_ID:
- return getGatewayId();
-
}
throw new IllegalStateException();
}
@@ -260519,8 +260358,6 @@ public class Airavata {
return isSetAuthzToken();
case USER_NAME:
return isSetUserName();
- case GATEWAY_ID:
- return isSetGatewayId();
}
throw new IllegalStateException();
}
@@ -260556,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;
}
@@ -260582,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();
}
@@ -260618,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;
}
@@ -260663,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();
}
@@ -260683,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();
@@ -260743,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);
}
@@ -260776,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();
}
@@ -260800,7 +260589,6 @@ public class Airavata {
TTupleProtocol oprot = (TTupleProtocol) prot;
struct.authzToken.write(oprot);
oprot.writeString(struct.userName);
- oprot.writeString(struct.gatewayId);
}
@Override
@@ -260811,8 +260599,6 @@ public class Airavata {
struct.setAuthzTokenIsSet(true);
struct.userName = iprot.readString();
struct.setUserNameIsSet(true);
- struct.gatewayId = iprot.readString();
- struct.setGatewayIdIsSet(true);
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/airavata_apiConstants.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/airavata_apiConstants.java b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/airavata_apiConstants.java
index ae8145d..f8e87d8 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/airavata_apiConstants.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/airavata_apiConstants.java
@@ -1,22 +1,20 @@
/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
+
/**
* Autogenerated by Thrift Compiler (0.9.3)
*
http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
index de65cd0..357fa1e 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
@@ -51463,8 +51463,8 @@ uint32_t Airavata_createGroup_result::read(::apache::thrift::protocol::TProtocol
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool(this->success);
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->success);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -51521,8 +51521,8 @@ uint32_t Airavata_createGroup_result::write(::apache::thrift::protocol::TProtoco
xfer += oprot->writeStructBegin("Airavata_createGroup_result");
if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
- xfer += oprot->writeBool(this->success);
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRING, 0);
+ xfer += oprot->writeString(this->success);
xfer += oprot->writeFieldEnd();
} else if (this->__isset.ire) {
xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -51573,8 +51573,8 @@ uint32_t Airavata_createGroup_presult::read(::apache::thrift::protocol::TProtoco
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool((*(this->success)));
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString((*(this->success)));
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -51933,7 +51933,6 @@ uint32_t Airavata_deleteGroup_args::read(::apache::thrift::protocol::TProtocol*
bool isset_authzToken = false;
bool isset_groupId = false;
bool isset_ownerId = false;
- bool isset_gatewayId = false;
while (true)
{
@@ -51967,14 +51966,6 @@ uint32_t Airavata_deleteGroup_args::read(::apache::thrift::protocol::TProtocol*
xfer += iprot->skip(ftype);
}
break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->gatewayId);
- isset_gatewayId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
default:
xfer += iprot->skip(ftype);
break;
@@ -51990,8 +51981,6 @@ uint32_t Airavata_deleteGroup_args::read(::apache::thrift::protocol::TProtocol*
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_ownerId)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_gatewayId)
- throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
@@ -52012,10 +52001,6 @@ uint32_t Airavata_deleteGroup_args::write(::apache::thrift::protocol::TProtocol*
xfer += oprot->writeString(this->ownerId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 4);
- xfer += oprot->writeString(this->gatewayId);
- xfer += oprot->writeFieldEnd();
-
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -52043,10 +52028,6 @@ uint32_t Airavata_deleteGroup_pargs::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeString((*(this->ownerId)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 4);
- xfer += oprot->writeString((*(this->gatewayId)));
- xfer += oprot->writeFieldEnd();
-
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -52548,7 +52529,6 @@ uint32_t Airavata_getAllGroupsUserBelongs_args::read(::apache::thrift::protocol:
bool isset_authzToken = false;
bool isset_userName = false;
- bool isset_gatewayId = false;
while (true)
{
@@ -52574,14 +52554,6 @@ uint32_t Airavata_getAllGroupsUserBelongs_args::read(::apache::thrift::protocol:
xfer += iprot->skip(ftype);
}
break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->gatewayId);
- isset_gatewayId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
default:
xfer += iprot->skip(ftype);
break;
@@ -52595,8 +52567,6 @@ uint32_t Airavata_getAllGroupsUserBelongs_args::read(::apache::thrift::protocol:
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_userName)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_gatewayId)
- throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
@@ -52613,10 +52583,6 @@ uint32_t Airavata_getAllGroupsUserBelongs_args::write(::apache::thrift::protocol
xfer += oprot->writeString(this->userName);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 3);
- xfer += oprot->writeString(this->gatewayId);
- xfer += oprot->writeFieldEnd();
-
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -52640,10 +52606,6 @@ uint32_t Airavata_getAllGroupsUserBelongs_pargs::write(::apache::thrift::protoco
xfer += oprot->writeString((*(this->userName)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 3);
- xfer += oprot->writeString((*(this->gatewayId)));
- xfer += oprot->writeFieldEnd();
-
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -64625,10 +64587,10 @@ void AiravataClient::recv_getAllAccessibleUsers(std::vector<std::string> & _retu
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAllAccessibleUsers failed: unknown result");
}
-bool AiravataClient::createGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel)
+void AiravataClient::createGroup(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel)
{
send_createGroup(authzToken, groupModel);
- return recv_createGroup();
+ recv_createGroup(_return);
}
void AiravataClient::send_createGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel)
@@ -64646,7 +64608,7 @@ void AiravataClient::send_createGroup(const ::apache::airavata::model::security
oprot_->getTransport()->flush();
}
-bool AiravataClient::recv_createGroup()
+void AiravataClient::recv_createGroup(std::string& _return)
{
int32_t rseqid = 0;
@@ -64671,7 +64633,6 @@ bool AiravataClient::recv_createGroup()
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- bool _return;
Airavata_createGroup_presult result;
result.success = &_return;
result.read(iprot_);
@@ -64679,7 +64640,8 @@ bool AiravataClient::recv_createGroup()
iprot_->getTransport()->readEnd();
if (result.__isset.success) {
- return _return;
+ // _return pointer has now been filled
+ return;
}
if (result.__isset.ire) {
throw result.ire;
@@ -64767,13 +64729,13 @@ bool AiravataClient::recv_updateGroup()
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "updateGroup failed: unknown result");
}
-bool AiravataClient::deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId, const std::string& gatewayId)
+bool AiravataClient::deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId)
{
- send_deleteGroup(authzToken, groupId, ownerId, gatewayId);
+ send_deleteGroup(authzToken, groupId, ownerId);
return recv_deleteGroup();
}
-void AiravataClient::send_deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId, const std::string& gatewayId)
+void AiravataClient::send_deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId)
{
int32_t cseqid = 0;
oprot_->writeMessageBegin("deleteGroup", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -64782,7 +64744,6 @@ void AiravataClient::send_deleteGroup(const ::apache::airavata::model::security
args.authzToken = &authzToken;
args.groupId = &groupId;
args.ownerId = &ownerId;
- args.gatewayId = &gatewayId;
args.write(oprot_);
oprot_->writeMessageEnd();
@@ -64911,13 +64872,13 @@ void AiravataClient::recv_getGroup( ::apache::airavata::model::group::GroupModel
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getGroup failed: unknown result");
}
-void AiravataClient::getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId)
+void AiravataClient::getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName)
{
- send_getAllGroupsUserBelongs(authzToken, userName, gatewayId);
+ send_getAllGroupsUserBelongs(authzToken, userName);
recv_getAllGroupsUserBelongs(_return);
}
-void AiravataClient::send_getAllGroupsUserBelongs(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId)
+void AiravataClient::send_getAllGroupsUserBelongs(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName)
{
int32_t cseqid = 0;
oprot_->writeMessageBegin("getAllGroupsUserBelongs", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -64925,7 +64886,6 @@ void AiravataClient::send_getAllGroupsUserBelongs(const ::apache::airavata::mod
Airavata_getAllGroupsUserBelongs_pargs args;
args.authzToken = &authzToken;
args.userName = &userName;
- args.gatewayId = &gatewayId;
args.write(oprot_);
oprot_->writeMessageEnd();
@@ -75856,7 +75816,7 @@ void AiravataProcessor::process_createGroup(int32_t seqid, ::apache::thrift::pro
Airavata_createGroup_result result;
try {
- result.success = iface_->createGroup(args.authzToken, args.groupModel);
+ iface_->createGroup(result.success, args.authzToken, args.groupModel);
result.__isset.success = true;
} catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
result.ire = ire;
@@ -75988,7 +75948,7 @@ void AiravataProcessor::process_deleteGroup(int32_t seqid, ::apache::thrift::pro
Airavata_deleteGroup_result 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.__isset.success = true;
} catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
result.ire = ire;
@@ -76120,7 +76080,7 @@ void AiravataProcessor::process_getAllGroupsUserBelongs(int32_t seqid, ::apache:
Airavata_getAllGroupsUserBelongs_result result;
try {
- iface_->getAllGroupsUserBelongs(result.success, args.authzToken, args.userName, args.gatewayId);
+ iface_->getAllGroupsUserBelongs(result.success, args.authzToken, args.userName);
result.__isset.success = true;
} catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
result.ire = ire;
@@ -92843,10 +92803,10 @@ void AiravataConcurrentClient::recv_getAllAccessibleUsers(std::vector<std::strin
} // end while(true)
}
-bool AiravataConcurrentClient::createGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel)
+void AiravataConcurrentClient::createGroup(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel)
{
int32_t seqid = send_createGroup(authzToken, groupModel);
- return recv_createGroup(seqid);
+ recv_createGroup(_return, seqid);
}
int32_t AiravataConcurrentClient::send_createGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel)
@@ -92868,7 +92828,7 @@ int32_t AiravataConcurrentClient::send_createGroup(const ::apache::airavata::mo
return cseqid;
}
-bool AiravataConcurrentClient::recv_createGroup(const int32_t seqid)
+void AiravataConcurrentClient::recv_createGroup(std::string& _return, const int32_t seqid)
{
int32_t rseqid = 0;
@@ -92906,7 +92866,6 @@ bool AiravataConcurrentClient::recv_createGroup(const int32_t seqid)
using ::apache::thrift::protocol::TProtocolException;
throw TProtocolException(TProtocolException::INVALID_DATA);
}
- bool _return;
Airavata_createGroup_presult result;
result.success = &_return;
result.read(iprot_);
@@ -92914,8 +92873,9 @@ bool AiravataConcurrentClient::recv_createGroup(const int32_t seqid)
iprot_->getTransport()->readEnd();
if (result.__isset.success) {
+ // _return pointer has now been filled
sentry.commit();
- return _return;
+ return;
}
if (result.__isset.ire) {
sentry.commit();
@@ -93045,13 +93005,13 @@ bool AiravataConcurrentClient::recv_updateGroup(const int32_t seqid)
} // end while(true)
}
-bool AiravataConcurrentClient::deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId, const std::string& gatewayId)
+bool AiravataConcurrentClient::deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId)
{
- int32_t seqid = send_deleteGroup(authzToken, groupId, ownerId, gatewayId);
+ int32_t seqid = send_deleteGroup(authzToken, groupId, ownerId);
return recv_deleteGroup(seqid);
}
-int32_t AiravataConcurrentClient::send_deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId, const std::string& gatewayId)
+int32_t AiravataConcurrentClient::send_deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId)
{
int32_t cseqid = this->sync_.generateSeqId();
::apache::thrift::async::TConcurrentSendSentry sentry(&this->sync_);
@@ -93061,7 +93021,6 @@ int32_t AiravataConcurrentClient::send_deleteGroup(const ::apache::airavata::mo
args.authzToken = &authzToken;
args.groupId = &groupId;
args.ownerId = &ownerId;
- args.gatewayId = &gatewayId;
args.write(oprot_);
oprot_->writeMessageEnd();
@@ -93249,13 +93208,13 @@ void AiravataConcurrentClient::recv_getGroup( ::apache::airavata::model::group::
} // end while(true)
}
-void AiravataConcurrentClient::getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId)
+void AiravataConcurrentClient::getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName)
{
- int32_t seqid = send_getAllGroupsUserBelongs(authzToken, userName, gatewayId);
+ int32_t seqid = send_getAllGroupsUserBelongs(authzToken, userName);
recv_getAllGroupsUserBelongs(_return, seqid);
}
-int32_t AiravataConcurrentClient::send_getAllGroupsUserBelongs(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId)
+int32_t AiravataConcurrentClient::send_getAllGroupsUserBelongs(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName)
{
int32_t cseqid = this->sync_.generateSeqId();
::apache::thrift::async::TConcurrentSendSentry sentry(&this->sync_);
@@ -93264,7 +93223,6 @@ int32_t AiravataConcurrentClient::send_getAllGroupsUserBelongs(const ::apache::
Airavata_getAllGroupsUserBelongs_pargs args;
args.authzToken = &authzToken;
args.userName = &userName;
- args.gatewayId = &gatewayId;
args.write(oprot_);
oprot_->writeMessageEnd();