You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ya...@apache.org on 2025/12/15 15:41:46 UTC
(airavata) branch service-layer-improvements updated: push latest fixes
This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch service-layer-improvements
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/service-layer-improvements by this push:
new aa27af0269 push latest fixes
aa27af0269 is described below
commit aa27af0269577c2037012051f72bedd332125e83
Author: yasithdev <ya...@icloud.com>
AuthorDate: Mon Dec 15 09:41:38 2025 -0600
push latest fixes
---
.../service/handlers/AgentManagementHandler.java | 256 +-
.../service/services/AiravataFileService.java | 6 +-
.../service/services/AiravataService.java | 48 +-
.../thriftapi/handler/AiravataServiceHandler.java | 5362 +++++++++++---------
.../handler/CredentialServiceHandler.java | 13 +-
.../handler/GroupManagerServiceHandler.java | 45 +-
.../thriftapi/handler/IamAdminServiceHandler.java | 49 +-
.../handler/OrchestratorServiceHandler.java | 19 +-
.../handler/SharingRegistryServerHandler.java | 3 +-
.../handler/TenantProfileServiceHandler.java | 26 +-
.../handler/UserProfileServiceHandler.java | 23 +-
.../thriftapi/mapper/ExperimentModelMapper.java | 1 -
.../thriftapi/mapper/ProcessModelMapper.java | 1 -
.../thriftapi/server/AiravataServiceServer.java | 13 +-
.../server/OrchestratorServiceServer.java | 2 +-
.../thriftapi/server/ProfileServiceServer.java | 10 +-
.../thriftapi/server/RegistryServiceServer.java | 2 +-
.../thriftapi/server/SharingRegistryServer.java | 2 +-
.../client/TestAiravataServiceClientFactory.java | 2 +-
19 files changed, 3331 insertions(+), 2552 deletions(-)
diff --git a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentManagementHandler.java b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentManagementHandler.java
index cb9ec5e015..0361a8b100 100644
--- a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentManagementHandler.java
+++ b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentManagementHandler.java
@@ -46,7 +46,6 @@ import org.apache.airavata.common.model.ProcessModel;
import org.apache.airavata.common.model.ProcessState;
import org.apache.airavata.common.model.ProcessStatus;
import org.apache.airavata.common.model.UserConfigurationDataModel;
-import org.apache.airavata.security.model.AuthzToken;
import org.apache.airavata.thriftapi.service.Airavata;
import org.apache.commons.lang3.StringUtils;
import org.apache.thrift.TException;
@@ -76,14 +75,15 @@ public class AgentManagementHandler {
this.clusterApplicationConfig = clusterApplicationConfig;
}
- private org.apache.airavata.thriftapi.security.model.AuthzToken convertAuthzToken(org.apache.airavata.security.model.AuthzToken domainToken) {
- org.apache.airavata.thriftapi.security.model.AuthzToken thriftToken = new org.apache.airavata.thriftapi.security.model.AuthzToken();
+ private org.apache.airavata.thriftapi.security.model.AuthzToken convertAuthzToken(
+ org.apache.airavata.security.model.AuthzToken domainToken) {
+ org.apache.airavata.thriftapi.security.model.AuthzToken thriftToken =
+ new org.apache.airavata.thriftapi.security.model.AuthzToken();
thriftToken.setAccessToken(domainToken.getAccessToken());
thriftToken.setClaimsMap(domainToken.getClaimsMap());
return thriftToken;
}
-
private ExperimentModel convertExperimentModel(org.apache.airavata.thriftapi.model.ExperimentModel thriftModel) {
if (thriftModel == null) return null;
ExperimentModel domainModel = new ExperimentModel();
@@ -93,46 +93,83 @@ public class AgentManagementHandler {
domainModel.setUserName(thriftModel.getUserName());
domainModel.setGatewayId(thriftModel.getGatewayId());
domainModel.setExecutionId(thriftModel.getExecutionId());
- domainModel.setExperimentType(ExperimentType.valueOf(thriftModel.getExperimentType().name()));
+ domainModel.setExperimentType(
+ ExperimentType.valueOf(thriftModel.getExperimentType().name()));
if (thriftModel.getUserConfigurationData() != null) {
UserConfigurationDataModel userConfig = new UserConfigurationDataModel();
- userConfig.setGroupResourceProfileId(thriftModel.getUserConfigurationData().getGroupResourceProfileId());
- userConfig.setExperimentDataDir(thriftModel.getUserConfigurationData().getExperimentDataDir());
- userConfig.setInputStorageResourceId(thriftModel.getUserConfigurationData().getInputStorageResourceId());
- userConfig.setOutputStorageResourceId(thriftModel.getUserConfigurationData().getOutputStorageResourceId());
+ userConfig.setGroupResourceProfileId(
+ thriftModel.getUserConfigurationData().getGroupResourceProfileId());
+ userConfig.setExperimentDataDir(
+ thriftModel.getUserConfigurationData().getExperimentDataDir());
+ userConfig.setInputStorageResourceId(
+ thriftModel.getUserConfigurationData().getInputStorageResourceId());
+ userConfig.setOutputStorageResourceId(
+ thriftModel.getUserConfigurationData().getOutputStorageResourceId());
if (thriftModel.getUserConfigurationData().getComputationalResourceScheduling() != null) {
ComputationalResourceSchedulingModel scheduling = new ComputationalResourceSchedulingModel();
- scheduling.setQueueName(thriftModel.getUserConfigurationData().getComputationalResourceScheduling().getQueueName());
- scheduling.setNodeCount(thriftModel.getUserConfigurationData().getComputationalResourceScheduling().getNodeCount());
- scheduling.setTotalCPUCount(thriftModel.getUserConfigurationData().getComputationalResourceScheduling().getTotalCPUCount());
- scheduling.setWallTimeLimit(thriftModel.getUserConfigurationData().getComputationalResourceScheduling().getWallTimeLimit());
- scheduling.setTotalPhysicalMemory(thriftModel.getUserConfigurationData().getComputationalResourceScheduling().getTotalPhysicalMemory());
- scheduling.setResourceHostId(thriftModel.getUserConfigurationData().getComputationalResourceScheduling().getResourceHostId());
- scheduling.setOverrideScratchLocation(thriftModel.getUserConfigurationData().getComputationalResourceScheduling().getOverrideScratchLocation());
- scheduling.setOverrideAllocationProjectNumber(thriftModel.getUserConfigurationData().getComputationalResourceScheduling().getOverrideAllocationProjectNumber());
- scheduling.setOverrideLoginUserName(thriftModel.getUserConfigurationData().getComputationalResourceScheduling().getOverrideLoginUserName());
+ scheduling.setQueueName(thriftModel
+ .getUserConfigurationData()
+ .getComputationalResourceScheduling()
+ .getQueueName());
+ scheduling.setNodeCount(thriftModel
+ .getUserConfigurationData()
+ .getComputationalResourceScheduling()
+ .getNodeCount());
+ scheduling.setTotalCPUCount(thriftModel
+ .getUserConfigurationData()
+ .getComputationalResourceScheduling()
+ .getTotalCPUCount());
+ scheduling.setWallTimeLimit(thriftModel
+ .getUserConfigurationData()
+ .getComputationalResourceScheduling()
+ .getWallTimeLimit());
+ scheduling.setTotalPhysicalMemory(thriftModel
+ .getUserConfigurationData()
+ .getComputationalResourceScheduling()
+ .getTotalPhysicalMemory());
+ scheduling.setResourceHostId(thriftModel
+ .getUserConfigurationData()
+ .getComputationalResourceScheduling()
+ .getResourceHostId());
+ scheduling.setOverrideScratchLocation(thriftModel
+ .getUserConfigurationData()
+ .getComputationalResourceScheduling()
+ .getOverrideScratchLocation());
+ scheduling.setOverrideAllocationProjectNumber(thriftModel
+ .getUserConfigurationData()
+ .getComputationalResourceScheduling()
+ .getOverrideAllocationProjectNumber());
+ scheduling.setOverrideLoginUserName(thriftModel
+ .getUserConfigurationData()
+ .getComputationalResourceScheduling()
+ .getOverrideLoginUserName());
userConfig.setComputationalResourceScheduling(scheduling);
}
domainModel.setUserConfigurationData(userConfig);
}
if (thriftModel.getExperimentInputs() != null) {
domainModel.setExperimentInputs(thriftModel.getExperimentInputs().stream()
- .map(this::convertInputDataObjectType).collect(Collectors.toList()));
+ .map(this::convertInputDataObjectType)
+ .collect(Collectors.toList()));
}
if (thriftModel.getExperimentOutputs() != null) {
domainModel.setExperimentOutputs(thriftModel.getExperimentOutputs().stream()
- .map(this::convertOutputDataObjectType).collect(Collectors.toList()));
+ .map(this::convertOutputDataObjectType)
+ .collect(Collectors.toList()));
}
if (thriftModel.getProcesses() != null) {
domainModel.setProcesses(thriftModel.getProcesses().stream()
- .map(this::convertProcessModel).collect(Collectors.toList()));
+ .map(this::convertProcessModel)
+ .collect(Collectors.toList()));
}
return domainModel;
}
- private org.apache.airavata.thriftapi.model.ExperimentModel convertExperimentModelToThrift(ExperimentModel domainModel) {
+ private org.apache.airavata.thriftapi.model.ExperimentModel convertExperimentModelToThrift(
+ ExperimentModel domainModel) {
if (domainModel == null) return null;
- org.apache.airavata.thriftapi.model.ExperimentModel thriftModel = new org.apache.airavata.thriftapi.model.ExperimentModel();
+ org.apache.airavata.thriftapi.model.ExperimentModel thriftModel =
+ new org.apache.airavata.thriftapi.model.ExperimentModel();
thriftModel.setExperimentId(domainModel.getExperimentId());
thriftModel.setExperimentName(domainModel.getExperimentName());
thriftModel.setProjectId(domainModel.getProjectId());
@@ -140,53 +177,92 @@ public class AgentManagementHandler {
thriftModel.setGatewayId(domainModel.getGatewayId());
thriftModel.setExecutionId(domainModel.getExecutionId());
if (domainModel.getExperimentType() != null) {
- thriftModel.setExperimentType(org.apache.airavata.thriftapi.model.ExperimentType.valueOf(domainModel.getExperimentType().name()));
+ thriftModel.setExperimentType(org.apache.airavata.thriftapi.model.ExperimentType.valueOf(
+ domainModel.getExperimentType().name()));
}
if (domainModel.getUserConfigurationData() != null) {
- org.apache.airavata.thriftapi.model.UserConfigurationDataModel userConfig = new org.apache.airavata.thriftapi.model.UserConfigurationDataModel();
- userConfig.setGroupResourceProfileId(domainModel.getUserConfigurationData().getGroupResourceProfileId());
- userConfig.setExperimentDataDir(domainModel.getUserConfigurationData().getExperimentDataDir());
- userConfig.setInputStorageResourceId(domainModel.getUserConfigurationData().getInputStorageResourceId());
- userConfig.setOutputStorageResourceId(domainModel.getUserConfigurationData().getOutputStorageResourceId());
+ org.apache.airavata.thriftapi.model.UserConfigurationDataModel userConfig =
+ new org.apache.airavata.thriftapi.model.UserConfigurationDataModel();
+ userConfig.setGroupResourceProfileId(
+ domainModel.getUserConfigurationData().getGroupResourceProfileId());
+ userConfig.setExperimentDataDir(
+ domainModel.getUserConfigurationData().getExperimentDataDir());
+ userConfig.setInputStorageResourceId(
+ domainModel.getUserConfigurationData().getInputStorageResourceId());
+ userConfig.setOutputStorageResourceId(
+ domainModel.getUserConfigurationData().getOutputStorageResourceId());
if (domainModel.getUserConfigurationData().getComputationalResourceScheduling() != null) {
- org.apache.airavata.thriftapi.model.ComputationalResourceSchedulingModel scheduling = new org.apache.airavata.thriftapi.model.ComputationalResourceSchedulingModel();
- scheduling.setQueueName(domainModel.getUserConfigurationData().getComputationalResourceScheduling().getQueueName());
- scheduling.setNodeCount(domainModel.getUserConfigurationData().getComputationalResourceScheduling().getNodeCount());
- scheduling.setTotalCPUCount(domainModel.getUserConfigurationData().getComputationalResourceScheduling().getTotalCPUCount());
- scheduling.setWallTimeLimit(domainModel.getUserConfigurationData().getComputationalResourceScheduling().getWallTimeLimit());
- scheduling.setTotalPhysicalMemory(domainModel.getUserConfigurationData().getComputationalResourceScheduling().getTotalPhysicalMemory());
- scheduling.setResourceHostId(domainModel.getUserConfigurationData().getComputationalResourceScheduling().getResourceHostId());
- scheduling.setOverrideScratchLocation(domainModel.getUserConfigurationData().getComputationalResourceScheduling().getOverrideScratchLocation());
- scheduling.setOverrideAllocationProjectNumber(domainModel.getUserConfigurationData().getComputationalResourceScheduling().getOverrideAllocationProjectNumber());
- scheduling.setOverrideLoginUserName(domainModel.getUserConfigurationData().getComputationalResourceScheduling().getOverrideLoginUserName());
+ org.apache.airavata.thriftapi.model.ComputationalResourceSchedulingModel scheduling =
+ new org.apache.airavata.thriftapi.model.ComputationalResourceSchedulingModel();
+ scheduling.setQueueName(domainModel
+ .getUserConfigurationData()
+ .getComputationalResourceScheduling()
+ .getQueueName());
+ scheduling.setNodeCount(domainModel
+ .getUserConfigurationData()
+ .getComputationalResourceScheduling()
+ .getNodeCount());
+ scheduling.setTotalCPUCount(domainModel
+ .getUserConfigurationData()
+ .getComputationalResourceScheduling()
+ .getTotalCPUCount());
+ scheduling.setWallTimeLimit(domainModel
+ .getUserConfigurationData()
+ .getComputationalResourceScheduling()
+ .getWallTimeLimit());
+ scheduling.setTotalPhysicalMemory(domainModel
+ .getUserConfigurationData()
+ .getComputationalResourceScheduling()
+ .getTotalPhysicalMemory());
+ scheduling.setResourceHostId(domainModel
+ .getUserConfigurationData()
+ .getComputationalResourceScheduling()
+ .getResourceHostId());
+ scheduling.setOverrideScratchLocation(domainModel
+ .getUserConfigurationData()
+ .getComputationalResourceScheduling()
+ .getOverrideScratchLocation());
+ scheduling.setOverrideAllocationProjectNumber(domainModel
+ .getUserConfigurationData()
+ .getComputationalResourceScheduling()
+ .getOverrideAllocationProjectNumber());
+ scheduling.setOverrideLoginUserName(domainModel
+ .getUserConfigurationData()
+ .getComputationalResourceScheduling()
+ .getOverrideLoginUserName());
userConfig.setComputationalResourceScheduling(scheduling);
}
thriftModel.setUserConfigurationData(userConfig);
}
if (domainModel.getExperimentInputs() != null) {
thriftModel.setExperimentInputs(domainModel.getExperimentInputs().stream()
- .map(this::convertInputDataObjectTypeToThrift).collect(Collectors.toList()));
+ .map(this::convertInputDataObjectTypeToThrift)
+ .collect(Collectors.toList()));
}
if (domainModel.getExperimentOutputs() != null) {
thriftModel.setExperimentOutputs(domainModel.getExperimentOutputs().stream()
- .map(this::convertOutputDataObjectTypeToThrift).collect(Collectors.toList()));
+ .map(this::convertOutputDataObjectTypeToThrift)
+ .collect(Collectors.toList()));
}
return thriftModel;
}
- private GroupResourceProfile convertGroupResourceProfile(org.apache.airavata.thriftapi.model.GroupResourceProfile thriftModel) {
+ private GroupResourceProfile convertGroupResourceProfile(
+ org.apache.airavata.thriftapi.model.GroupResourceProfile thriftModel) {
if (thriftModel == null) return null;
GroupResourceProfile domainModel = new GroupResourceProfile();
domainModel.setGroupResourceProfileId(thriftModel.getGroupResourceProfileId());
domainModel.setGroupResourceProfileName(thriftModel.getGroupResourceProfileName());
if (thriftModel.getComputePreferences() != null) {
domainModel.setComputePreferences(thriftModel.getComputePreferences().stream()
- .map(this::convertGroupComputeResourcePreference).collect(Collectors.toList()));
+ .map(this::convertGroupComputeResourcePreference)
+ .collect(Collectors.toList()));
}
return domainModel;
}
- private ExperimentStatistics convertExperimentStatistics(org.apache.airavata.thriftapi.model.ExperimentStatistics thriftModel) {
+ private ExperimentStatistics convertExperimentStatistics(
+ org.apache.airavata.thriftapi.model.ExperimentStatistics thriftModel) {
if (thriftModel == null) return null;
ExperimentStatistics domainModel = new ExperimentStatistics();
domainModel.setRunningExperimentCount(thriftModel.getRunningExperimentCount());
@@ -194,13 +270,15 @@ public class AgentManagementHandler {
return domainModel;
}
- private InputDataObjectType convertInputDataObjectType(org.apache.airavata.thriftapi.model.InputDataObjectType thriftModel) {
+ private InputDataObjectType convertInputDataObjectType(
+ org.apache.airavata.thriftapi.model.InputDataObjectType thriftModel) {
if (thriftModel == null) return null;
InputDataObjectType domainModel = new InputDataObjectType();
domainModel.setName(thriftModel.getName());
domainModel.setValue(thriftModel.getValue());
if (thriftModel.getType() != null) {
- domainModel.setType(org.apache.airavata.common.model.DataType.valueOf(thriftModel.getType().name()));
+ domainModel.setType(org.apache.airavata.common.model.DataType.valueOf(
+ thriftModel.getType().name()));
}
domainModel.setApplicationArgument(thriftModel.getApplicationArgument());
if (thriftModel.isSetIsRequired()) {
@@ -213,13 +291,16 @@ public class AgentManagementHandler {
return domainModel;
}
- private org.apache.airavata.thriftapi.model.InputDataObjectType convertInputDataObjectTypeToThrift(InputDataObjectType domainModel) {
+ private org.apache.airavata.thriftapi.model.InputDataObjectType convertInputDataObjectTypeToThrift(
+ InputDataObjectType domainModel) {
if (domainModel == null) return null;
- org.apache.airavata.thriftapi.model.InputDataObjectType thriftModel = new org.apache.airavata.thriftapi.model.InputDataObjectType();
+ org.apache.airavata.thriftapi.model.InputDataObjectType thriftModel =
+ new org.apache.airavata.thriftapi.model.InputDataObjectType();
thriftModel.setName(domainModel.getName());
thriftModel.setValue(domainModel.getValue());
if (domainModel.getType() != null) {
- thriftModel.setType(org.apache.airavata.thriftapi.model.DataType.valueOf(domainModel.getType().name()));
+ thriftModel.setType(org.apache.airavata.thriftapi.model.DataType.valueOf(
+ domainModel.getType().name()));
}
thriftModel.setApplicationArgument(domainModel.getApplicationArgument());
// Note: isRequired and requiredToAddedToCommandLine may need to be set differently
@@ -230,24 +311,30 @@ public class AgentManagementHandler {
return thriftModel;
}
- private org.apache.airavata.common.model.OutputDataObjectType convertOutputDataObjectType(org.apache.airavata.thriftapi.model.OutputDataObjectType thriftModel) {
+ private org.apache.airavata.common.model.OutputDataObjectType convertOutputDataObjectType(
+ org.apache.airavata.thriftapi.model.OutputDataObjectType thriftModel) {
if (thriftModel == null) return null;
- org.apache.airavata.common.model.OutputDataObjectType domainModel = new org.apache.airavata.common.model.OutputDataObjectType();
+ org.apache.airavata.common.model.OutputDataObjectType domainModel =
+ new org.apache.airavata.common.model.OutputDataObjectType();
domainModel.setName(thriftModel.getName());
domainModel.setValue(thriftModel.getValue());
if (thriftModel.getType() != null) {
- domainModel.setType(org.apache.airavata.common.model.DataType.valueOf(thriftModel.getType().name()));
+ domainModel.setType(org.apache.airavata.common.model.DataType.valueOf(
+ thriftModel.getType().name()));
}
return domainModel;
}
- private org.apache.airavata.thriftapi.model.OutputDataObjectType convertOutputDataObjectTypeToThrift(org.apache.airavata.common.model.OutputDataObjectType domainModel) {
+ private org.apache.airavata.thriftapi.model.OutputDataObjectType convertOutputDataObjectTypeToThrift(
+ org.apache.airavata.common.model.OutputDataObjectType domainModel) {
if (domainModel == null) return null;
- org.apache.airavata.thriftapi.model.OutputDataObjectType thriftModel = new org.apache.airavata.thriftapi.model.OutputDataObjectType();
+ org.apache.airavata.thriftapi.model.OutputDataObjectType thriftModel =
+ new org.apache.airavata.thriftapi.model.OutputDataObjectType();
thriftModel.setName(domainModel.getName());
thriftModel.setValue(domainModel.getValue());
if (domainModel.getType() != null) {
- thriftModel.setType(org.apache.airavata.thriftapi.model.DataType.valueOf(domainModel.getType().name()));
+ thriftModel.setType(org.apache.airavata.thriftapi.model.DataType.valueOf(
+ domainModel.getType().name()));
}
return thriftModel;
}
@@ -266,12 +353,14 @@ public class AgentManagementHandler {
return domainModel;
}
- private GroupComputeResourcePreference convertGroupComputeResourcePreference(org.apache.airavata.thriftapi.model.GroupComputeResourcePreference thriftModel) {
+ private GroupComputeResourcePreference convertGroupComputeResourcePreference(
+ org.apache.airavata.thriftapi.model.GroupComputeResourcePreference thriftModel) {
if (thriftModel == null) return null;
GroupComputeResourcePreference domainModel = new GroupComputeResourcePreference();
domainModel.setComputeResourceId(thriftModel.getComputeResourceId());
domainModel.setGroupResourceProfileId(thriftModel.getGroupResourceProfileId());
- domainModel.setResourceType(ComputeResourceType.valueOf(thriftModel.getResourceType().name()));
+ domainModel.setResourceType(
+ ComputeResourceType.valueOf(thriftModel.getResourceType().name()));
domainModel.setScratchLocation(thriftModel.getScratchLocation());
domainModel.setLoginUserName(thriftModel.getLoginUserName());
return domainModel;
@@ -280,10 +369,13 @@ public class AgentManagementHandler {
public AgentTerminateResponse terminateExperiment(String experimentId) {
try {
Airavata.Client airavata = airavataService.airavata();
- org.apache.airavata.thriftapi.model.ExperimentModel thriftExperiment = airavata.getExperiment(convertAuthzToken(UserContext.authzToken()), experimentId);
+ org.apache.airavata.thriftapi.model.ExperimentModel thriftExperiment =
+ airavata.getExperiment(convertAuthzToken(UserContext.authzToken()), experimentId);
ExperimentModel experiment = convertExperimentModel(thriftExperiment);
airavata.terminateExperiment(
- convertAuthzToken(UserContext.authzToken()), experiment.getExperimentId(), experiment.getGatewayId());
+ convertAuthzToken(UserContext.authzToken()),
+ experiment.getExperimentId(),
+ experiment.getGatewayId());
return new AgentTerminateResponse(experimentId, true);
} catch (Exception e) {
LOGGER.error("Error terminating experiment {}", experimentId, e);
@@ -294,17 +386,20 @@ public class AgentManagementHandler {
public ExperimentModel getExperiment(String experimentId) {
try {
Airavata.Client airavata = airavataService.airavata();
- org.apache.airavata.thriftapi.model.ExperimentModel thriftExperiment = airavata.getExperiment(convertAuthzToken(UserContext.authzToken()), experimentId);
+ org.apache.airavata.thriftapi.model.ExperimentModel thriftExperiment =
+ airavata.getExperiment(convertAuthzToken(UserContext.authzToken()), experimentId);
ExperimentModel experiment = convertExperimentModel(thriftExperiment);
- org.apache.airavata.thriftapi.model.GroupResourceProfile thriftGroupResourceProfile = airavata.getGroupResourceProfile(
- convertAuthzToken(UserContext.authzToken()),
- experiment.getUserConfigurationData().getGroupResourceProfileId());
+ org.apache.airavata.thriftapi.model.GroupResourceProfile thriftGroupResourceProfile =
+ airavata.getGroupResourceProfile(
+ convertAuthzToken(UserContext.authzToken()),
+ experiment.getUserConfigurationData().getGroupResourceProfileId());
GroupResourceProfile groupResourceProfile = convertGroupResourceProfile(thriftGroupResourceProfile);
// Always get the Default allocation
if (!"Default".equalsIgnoreCase(groupResourceProfile.getGroupResourceProfileName())) {
List<org.apache.airavata.thriftapi.model.GroupResourceProfile> thriftGroupResourceList =
- airavata.getGroupResourceList(convertAuthzToken(UserContext.authzToken()), experiment.getGatewayId());
+ airavata.getGroupResourceList(
+ convertAuthzToken(UserContext.authzToken()), experiment.getGatewayId());
List<GroupResourceProfile> groupResourceList = thriftGroupResourceList.stream()
.map(this::convertGroupResourceProfile)
.collect(Collectors.toList());
@@ -380,11 +475,15 @@ public class AgentManagementHandler {
String experimentId = airavataService
.airavata()
- .createExperiment(convertAuthzToken(UserContext.authzToken()), experiment.getGatewayId(), convertExperimentModelToThrift(experiment));
+ .createExperiment(
+ convertAuthzToken(UserContext.authzToken()),
+ experiment.getGatewayId(),
+ convertExperimentModelToThrift(experiment));
LOGGER.info("Launching the application, Id: {}, Name: {}", experimentId, experiment.getExperimentName());
airavataService
.airavata()
- .launchExperiment(convertAuthzToken(UserContext.authzToken()), experimentId, experiment.getGatewayId());
+ .launchExperiment(
+ convertAuthzToken(UserContext.authzToken()), experimentId, experiment.getGatewayId());
return new AgentLaunchResponse(agentId, experimentId, envName);
} catch (Exception e) {
LOGGER.error("Error while creating the experiment with the name: {}", req.getExperimentName(), e);
@@ -396,7 +495,9 @@ public class AgentManagementHandler {
public void terminateApplication(String gatewayId, String experimentId) {
try {
LOGGER.info("Terminating the application with experiment Id: {}", experimentId);
- airavataService.airavata().terminateExperiment(convertAuthzToken(UserContext.authzToken()), experimentId, gatewayId);
+ airavataService
+ .airavata()
+ .terminateExperiment(convertAuthzToken(UserContext.authzToken()), experimentId, gatewayId);
} catch (Exception e) {
LOGGER.error("Error while terminating the application with the experiment Id: {}", experimentId);
throw new RuntimeException(
@@ -407,8 +508,9 @@ public class AgentManagementHandler {
public ProcessModel getEnvProcessModel(String expId) {
try {
LOGGER.info("Extracting the process model for experiment id: {}", expId);
- org.apache.airavata.thriftapi.model.ExperimentModel thriftExpModel =
- airavataService.airavata().getDetailedExperimentTree(convertAuthzToken(UserContext.authzToken()), expId);
+ org.apache.airavata.thriftapi.model.ExperimentModel thriftExpModel = airavataService
+ .airavata()
+ .getDetailedExperimentTree(convertAuthzToken(UserContext.authzToken()), expId);
ExperimentModel expModel = convertExperimentModel(thriftExpModel);
if (expModel.getProcesses() != null && !expModel.getProcesses().isEmpty()) {
return expModel.getProcesses().get(0);
@@ -431,7 +533,8 @@ public class AgentManagementHandler {
String projectName = req.getProjectName() != null ? req.getProjectName() : "Default Project";
String projectDir = projectName.replace(" ", "_");
String projectId = airavataService.getProjectId(airavataClient, projectName);
- org.apache.airavata.thriftapi.security.model.AuthzToken thriftAuthzToken = convertAuthzToken(UserContext.authzToken());
+ org.apache.airavata.thriftapi.security.model.AuthzToken thriftAuthzToken =
+ convertAuthzToken(UserContext.authzToken());
String userName = UserContext.username();
String gatewayId = UserContext.gatewayId();
String appInterfaceId = clusterApplicationConfig.getApplicationInterfaceId();
@@ -473,7 +576,8 @@ public class AgentManagementHandler {
experimentModel.setUserConfigurationData(userConfigurationDataModel);
- List<org.apache.airavata.thriftapi.model.InputDataObjectType> thriftApplicationInputs = airavataClient.getApplicationInputs(thriftAuthzToken, appInterfaceId);
+ List<org.apache.airavata.thriftapi.model.InputDataObjectType> thriftApplicationInputs =
+ airavataClient.getApplicationInputs(thriftAuthzToken, appInterfaceId);
List<InputDataObjectType> applicationInputs = thriftApplicationInputs.stream()
.map(this::convertInputDataObjectType)
.collect(Collectors.toList());
@@ -496,10 +600,12 @@ public class AgentManagementHandler {
.collect(Collectors.toList());
experimentModel.setExperimentInputs(experimentInputs);
- List<org.apache.airavata.thriftapi.model.OutputDataObjectType> thriftApplicationOutputs = airavataClient.getApplicationOutputs(thriftAuthzToken, appInterfaceId);
- List<org.apache.airavata.common.model.OutputDataObjectType> applicationOutputs = thriftApplicationOutputs.stream()
- .map(this::convertOutputDataObjectType)
- .collect(Collectors.toList());
+ List<org.apache.airavata.thriftapi.model.OutputDataObjectType> thriftApplicationOutputs =
+ airavataClient.getApplicationOutputs(thriftAuthzToken, appInterfaceId);
+ List<org.apache.airavata.common.model.OutputDataObjectType> applicationOutputs =
+ thriftApplicationOutputs.stream()
+ .map(this::convertOutputDataObjectType)
+ .collect(Collectors.toList());
experimentModel.setExperimentOutputs(applicationOutputs);
experimentModel.setExperimentType(ExperimentType.SINGLE_APPLICATION);
LOGGER.info("Generated the experiment: {}", experimentModel.getExperimentId());
diff --git a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataFileService.java b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataFileService.java
index f46417e10f..f2524546be 100644
--- a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataFileService.java
+++ b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataFileService.java
@@ -61,8 +61,10 @@ public class AiravataFileService {
this.airavataService = airavataService;
}
- private org.apache.airavata.thriftapi.security.model.AuthzToken convertAuthzToken(org.apache.airavata.security.model.AuthzToken domainToken) {
- org.apache.airavata.thriftapi.security.model.AuthzToken thriftToken = new org.apache.airavata.thriftapi.security.model.AuthzToken();
+ private org.apache.airavata.thriftapi.security.model.AuthzToken convertAuthzToken(
+ org.apache.airavata.security.model.AuthzToken domainToken) {
+ org.apache.airavata.thriftapi.security.model.AuthzToken thriftToken =
+ new org.apache.airavata.thriftapi.security.model.AuthzToken();
thriftToken.setAccessToken(domainToken.getAccessToken());
thriftToken.setClaimsMap(domainToken.getClaimsMap());
return thriftToken;
diff --git a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataService.java b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataService.java
index f7f9d1d1c9..13be7bee7d 100644
--- a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataService.java
+++ b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataService.java
@@ -31,7 +31,6 @@ import org.apache.airavata.common.exception.AiravataSystemException;
import org.apache.airavata.common.exception.AuthorizationException;
import org.apache.airavata.common.exception.InvalidRequestException;
import org.apache.airavata.common.model.ComputeResourceType;
-import org.apache.airavata.common.model.ExperimentSearchFields;
import org.apache.airavata.common.model.ExperimentSummaryModel;
import org.apache.airavata.common.model.GroupComputeResourcePreference;
import org.apache.airavata.common.model.GroupResourceProfile;
@@ -65,8 +64,10 @@ public class AiravataService {
this.properties = properties;
}
- private org.apache.airavata.thriftapi.security.model.AuthzToken convertAuthzToken(org.apache.airavata.security.model.AuthzToken domainToken) {
- org.apache.airavata.thriftapi.security.model.AuthzToken thriftToken = new org.apache.airavata.thriftapi.security.model.AuthzToken();
+ private org.apache.airavata.thriftapi.security.model.AuthzToken convertAuthzToken(
+ org.apache.airavata.security.model.AuthzToken domainToken) {
+ org.apache.airavata.thriftapi.security.model.AuthzToken thriftToken =
+ new org.apache.airavata.thriftapi.security.model.AuthzToken();
thriftToken.setAccessToken(domainToken.getAccessToken());
thriftToken.setClaimsMap(domainToken.getClaimsMap());
return thriftToken;
@@ -89,10 +90,13 @@ public class AiravataService {
List<Project> userProjects;
try {
List<org.apache.airavata.thriftapi.model.Project> thriftUserProjects = airavataClient.getUserProjects(
- convertAuthzToken(UserContext.authzToken()), UserContext.gatewayId(), UserContext.username(), limit, offset);
- userProjects = thriftUserProjects.stream()
- .map(this::convertProject)
- .collect(Collectors.toList());
+ convertAuthzToken(UserContext.authzToken()),
+ UserContext.gatewayId(),
+ UserContext.username(),
+ limit,
+ offset);
+ userProjects =
+ thriftUserProjects.stream().map(this::convertProject).collect(Collectors.toList());
} catch (InvalidRequestException e) {
String msg = String.format(
"Error getting user projects: projectName=%s, gatewayId=%s, username=%s, limit=%d, offset=%d. Reason: %s",
@@ -146,7 +150,9 @@ public class AiravataService {
Airavata.Client airavataClient, String group, String remoteCluster) {
List<GroupResourceProfile> groupResourceList;
try {
- List<org.apache.airavata.thriftapi.model.GroupResourceProfile> thriftGroupResourceList = airavataClient.getGroupResourceList(convertAuthzToken(UserContext.authzToken()), UserContext.gatewayId());
+ List<org.apache.airavata.thriftapi.model.GroupResourceProfile> thriftGroupResourceList =
+ airavataClient.getGroupResourceList(
+ convertAuthzToken(UserContext.authzToken()), UserContext.gatewayId());
groupResourceList = thriftGroupResourceList.stream()
.map(this::convertGroupResourceProfile)
.collect(Collectors.toList());
@@ -195,8 +201,9 @@ public class AiravataService {
public List<String> getUserExperimentIDs(Airavata.Client airavataClient) {
int limit = 100;
- Map<org.apache.airavata.thriftapi.model.ExperimentSearchFields, String> filters =
- Map.of(org.apache.airavata.thriftapi.model.ExperimentSearchFields.PROJECT_ID, getProjectId(airavataClient, "Default Project"));
+ Map<org.apache.airavata.thriftapi.model.ExperimentSearchFields, String> filters = Map.of(
+ org.apache.airavata.thriftapi.model.ExperimentSearchFields.PROJECT_ID,
+ getProjectId(airavataClient, "Default Project"));
return Stream.iterate(0, offset -> offset + limit)
.<List<org.apache.airavata.thriftapi.model.ExperimentSummaryModel>>map(offset -> {
@@ -267,29 +274,34 @@ public class AiravataService {
})
.takeWhile(list -> !list.isEmpty())
.flatMap(List::stream)
- .map(thriftSummary -> convertExperimentSummaryModel(thriftSummary).getExperimentId())
+ .map(thriftSummary ->
+ convertExperimentSummaryModel(thriftSummary).getExperimentId())
.collect(Collectors.toList());
}
- private GroupResourceProfile convertGroupResourceProfile(org.apache.airavata.thriftapi.model.GroupResourceProfile thriftModel) {
+ private GroupResourceProfile convertGroupResourceProfile(
+ org.apache.airavata.thriftapi.model.GroupResourceProfile thriftModel) {
if (thriftModel == null) return null;
GroupResourceProfile domainModel = new GroupResourceProfile();
domainModel.setGroupResourceProfileId(thriftModel.getGroupResourceProfileId());
domainModel.setGroupResourceProfileName(thriftModel.getGroupResourceProfileName());
if (thriftModel.getComputePreferences() != null) {
domainModel.setComputePreferences(thriftModel.getComputePreferences().stream()
- .map(this::convertGroupComputeResourcePreference).collect(Collectors.toList()));
+ .map(this::convertGroupComputeResourcePreference)
+ .collect(Collectors.toList()));
}
return domainModel;
}
- private GroupComputeResourcePreference convertGroupComputeResourcePreference(org.apache.airavata.thriftapi.model.GroupComputeResourcePreference thriftModel) {
+ private GroupComputeResourcePreference convertGroupComputeResourcePreference(
+ org.apache.airavata.thriftapi.model.GroupComputeResourcePreference thriftModel) {
if (thriftModel == null) return null;
GroupComputeResourcePreference domainModel = new GroupComputeResourcePreference();
domainModel.setComputeResourceId(thriftModel.getComputeResourceId());
domainModel.setGroupResourceProfileId(thriftModel.getGroupResourceProfileId());
if (thriftModel.getResourceType() != null) {
- domainModel.setResourceType(ComputeResourceType.valueOf(thriftModel.getResourceType().name()));
+ domainModel.setResourceType(
+ ComputeResourceType.valueOf(thriftModel.getResourceType().name()));
}
domainModel.setScratchLocation(thriftModel.getScratchLocation());
domainModel.setLoginUserName(thriftModel.getLoginUserName());
@@ -308,7 +320,8 @@ public class AiravataService {
return domainModel;
}
- private ExperimentSummaryModel convertExperimentSummaryModel(org.apache.airavata.thriftapi.model.ExperimentSummaryModel thriftModel) {
+ private ExperimentSummaryModel convertExperimentSummaryModel(
+ org.apache.airavata.thriftapi.model.ExperimentSummaryModel thriftModel) {
if (thriftModel == null) return null;
ExperimentSummaryModel domainModel = new ExperimentSummaryModel();
domainModel.setExperimentId(thriftModel.getExperimentId());
@@ -318,7 +331,8 @@ public class AiravataService {
domainModel.setUserName(thriftModel.getUserName());
domainModel.setName(thriftModel.getName());
if (thriftModel.getExperimentStatus() != null) {
- domainModel.setExperimentStatus(org.apache.airavata.common.model.ExperimentStatus.valueOf(thriftModel.getExperimentStatus().name()));
+ domainModel.setExperimentStatus(org.apache.airavata.common.model.ExperimentStatus.valueOf(
+ thriftModel.getExperimentStatus().name()));
}
return domainModel;
}
diff --git a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/AiravataServiceHandler.java b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/AiravataServiceHandler.java
index 0b61d04213..9098d17166 100644
--- a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/AiravataServiceHandler.java
+++ b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/AiravataServiceHandler.java
@@ -26,121 +26,123 @@ import java.util.stream.Collectors;
import org.apache.airavata.accountprovisioning.ConfigParam;
import org.apache.airavata.accountprovisioning.SSHAccountProvisionerFactory;
import org.apache.airavata.accountprovisioning.SSHAccountProvisionerProvider;
-import org.apache.airavata.common.exception.AiravataClientException;
-import org.apache.airavata.common.exception.AiravataErrorType;
import org.apache.airavata.common.exception.AiravataException;
-import org.apache.airavata.common.exception.AiravataSystemException;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.exception.AuthorizationException;
-import org.apache.airavata.common.exception.ExperimentNotFoundException;
-import org.apache.airavata.common.exception.InvalidRequestException;
-import org.apache.airavata.common.exception.ProjectNotFoundException;
-import org.apache.airavata.common.model.ApplicationDeploymentDescription;
-import org.apache.airavata.common.model.ApplicationInterfaceDescription;
-import org.apache.airavata.common.model.ApplicationModule;
-import org.apache.airavata.common.model.BatchQueueResourcePolicy;
-import org.apache.airavata.common.model.CloudJobSubmission;
-import org.apache.airavata.common.model.ComputationalResourceSchedulingModel;
-import org.apache.airavata.common.model.ComputeResourceDescription;
-import org.apache.airavata.common.model.ComputeResourcePolicy;
-import org.apache.airavata.common.model.ComputeResourcePreference;
-import org.apache.airavata.common.model.DMType;
-import org.apache.airavata.common.model.DataProductModel;
-import org.apache.airavata.common.model.DataReplicaLocationModel;
-import org.apache.airavata.common.model.ExperimentModel;
-import org.apache.airavata.common.model.ExperimentSearchFields;
-import org.apache.airavata.common.model.ExperimentStatistics;
-import org.apache.airavata.common.model.ExperimentStatus;
-import org.apache.airavata.common.model.ExperimentSummaryModel;
-import org.apache.airavata.common.model.Gateway;
-import org.apache.airavata.common.model.GatewayGroups;
-import org.apache.airavata.common.model.GatewayResourceProfile;
-import org.apache.airavata.common.model.GridFTPDataMovement;
-import org.apache.airavata.common.model.GroupComputeResourcePreference;
-import org.apache.airavata.common.model.GroupResourceProfile;
-import org.apache.airavata.common.model.InputDataObjectType;
-import org.apache.airavata.common.model.JobModel;
-import org.apache.airavata.common.model.JobStatus;
-import org.apache.airavata.common.model.LOCALDataMovement;
-import org.apache.airavata.common.model.LOCALSubmission;
-import org.apache.airavata.common.model.Notification;
-import org.apache.airavata.common.model.OutputDataObjectType;
-import org.apache.airavata.common.model.Parser;
-import org.apache.airavata.common.model.ParsingTemplate;
-import org.apache.airavata.common.model.ProcessStatus;
-import org.apache.airavata.common.model.Project;
-import org.apache.airavata.common.model.ProjectSearchFields;
-import org.apache.airavata.common.model.QueueStatusModel;
-import org.apache.airavata.common.model.ResourceJobManager;
-import org.apache.airavata.common.model.ResourcePermissionType;
-import org.apache.airavata.common.model.SCPDataMovement;
-import org.apache.airavata.common.model.SSHAccountProvisionerConfigParam;
-import org.apache.airavata.common.model.SSHAccountProvisionerConfigParamType;
-import org.apache.airavata.common.model.SSHJobSubmission;
-import org.apache.airavata.common.model.StorageDirectoryInfo;
-import org.apache.airavata.common.model.StoragePreference;
-import org.apache.airavata.common.model.StorageResourceDescription;
-import org.apache.airavata.common.model.StorageVolumeInfo;
-import org.apache.airavata.common.model.UnicoreDataMovement;
-import org.apache.airavata.common.model.UnicoreJobSubmission;
-import org.apache.airavata.common.model.UserComputeResourcePreference;
-import org.apache.airavata.common.model.UserConfigurationDataModel;
-import org.apache.airavata.common.model.UserResourceProfile;
-import org.apache.airavata.common.model.UserStoragePreference;
import org.apache.airavata.common.utils.Constants;
-import org.apache.airavata.credential.model.CredentialSummary;
-import org.apache.airavata.credential.model.SummaryType;
import org.apache.airavata.security.interceptor.SecurityCheck;
-import org.apache.airavata.security.model.AuthzToken;
+import org.apache.airavata.thriftapi.security.model.AuthzToken;
import org.apache.airavata.service.AiravataService;
-import org.apache.airavata.sharing.model.SharingRegistryException;
+import org.apache.airavata.thriftapi.credential.exception.CredentialStoreException;
+import org.apache.airavata.thriftapi.credential.model.CredentialSummary;
+import org.apache.airavata.thriftapi.credential.model.SummaryType;
+import org.apache.airavata.thriftapi.exception.AiravataClientException;
+import org.apache.airavata.thriftapi.exception.AiravataErrorType;
+import org.apache.airavata.thriftapi.exception.AiravataSystemException;
+import org.apache.airavata.thriftapi.exception.AuthorizationException;
+import org.apache.airavata.thriftapi.exception.ExperimentNotFoundException;
+import org.apache.airavata.thriftapi.exception.InvalidRequestException;
+import org.apache.airavata.thriftapi.exception.ProjectNotFoundException;
import org.apache.airavata.thriftapi.mapper.ApplicationDeploymentDescriptionMapper;
import org.apache.airavata.thriftapi.mapper.ApplicationInterfaceDescriptionMapper;
+import org.apache.airavata.thriftapi.mapper.ApplicationModuleMapper;
import org.apache.airavata.thriftapi.mapper.AuthzTokenMapper;
+import org.apache.airavata.thriftapi.mapper.BatchQueueResourcePolicyMapper;
+import org.apache.airavata.thriftapi.mapper.CloudJobSubmissionMapper;
+import org.apache.airavata.thriftapi.mapper.ComputationalResourceSchedulingModelMapper;
import org.apache.airavata.thriftapi.mapper.ComputeResourceDescriptionMapper;
+import org.apache.airavata.thriftapi.mapper.ComputeResourcePolicyMapper;
+import org.apache.airavata.thriftapi.mapper.ComputeResourcePreferenceMapper;
import org.apache.airavata.thriftapi.mapper.CredentialSummaryMapper;
import org.apache.airavata.thriftapi.mapper.DataProductModelMapper;
import org.apache.airavata.thriftapi.mapper.DataReplicaLocationModelMapper;
import org.apache.airavata.thriftapi.mapper.ExperimentModelMapper;
import org.apache.airavata.thriftapi.mapper.ExperimentStatisticsMapper;
import org.apache.airavata.thriftapi.mapper.ExperimentSummaryModelMapper;
+import org.apache.airavata.thriftapi.mapper.GatewayGroupsMapper;
import org.apache.airavata.thriftapi.mapper.GatewayMapper;
import org.apache.airavata.thriftapi.mapper.GatewayResourceProfileMapper;
+import org.apache.airavata.thriftapi.mapper.GridFTPDataMovementMapper;
+import org.apache.airavata.thriftapi.mapper.GroupComputeResourcePreferenceMapper;
+import org.apache.airavata.thriftapi.mapper.GroupResourceProfileMapper;
import org.apache.airavata.thriftapi.mapper.InputDataObjectTypeMapper;
import org.apache.airavata.thriftapi.mapper.JobModelMapper;
+import org.apache.airavata.thriftapi.mapper.LOCALDataMovementMapper;
+import org.apache.airavata.thriftapi.mapper.LOCALSubmissionMapper;
import org.apache.airavata.thriftapi.mapper.NotificationMapper;
import org.apache.airavata.thriftapi.mapper.OutputDataObjectTypeMapper;
+import org.apache.airavata.thriftapi.mapper.ParserMapper;
+import org.apache.airavata.thriftapi.mapper.ParsingTemplateMapper;
+import org.apache.airavata.thriftapi.mapper.ProcessStatusMapper;
import org.apache.airavata.thriftapi.mapper.ProjectMapper;
import org.apache.airavata.thriftapi.mapper.QueueStatusModelMapper;
+import org.apache.airavata.thriftapi.mapper.ResourceJobManagerMapper;
+import org.apache.airavata.thriftapi.mapper.SCPDataMovementMapper;
import org.apache.airavata.thriftapi.mapper.SSHAccountProvisionerDescriptionMapper;
-import org.apache.airavata.thriftapi.mapper.UserResourceProfileMapper;
+import org.apache.airavata.thriftapi.mapper.SSHJobSubmissionMapper;
import org.apache.airavata.thriftapi.mapper.StorageDirectoryInfoMapper;
+import org.apache.airavata.thriftapi.mapper.StoragePreferenceMapper;
+import org.apache.airavata.thriftapi.mapper.StorageResourceDescriptionMapper;
import org.apache.airavata.thriftapi.mapper.StorageVolumeInfoMapper;
-import org.apache.airavata.thriftapi.mapper.GroupResourceProfileMapper;
-import org.apache.airavata.thriftapi.mapper.UserConfigurationDataModelMapper;
-import org.apache.airavata.thriftapi.mapper.GridFTPDataMovementMapper;
-import org.apache.airavata.thriftapi.mapper.CloudJobSubmissionMapper;
-import org.apache.airavata.thriftapi.mapper.LOCALSubmissionMapper;
-import org.apache.airavata.thriftapi.mapper.ResourceJobManagerMapper;
-import org.apache.airavata.thriftapi.mapper.LOCALDataMovementMapper;
-import org.apache.airavata.thriftapi.mapper.SCPDataMovementMapper;
import org.apache.airavata.thriftapi.mapper.UnicoreDataMovementMapper;
import org.apache.airavata.thriftapi.mapper.UnicoreJobSubmissionMapper;
-import org.apache.airavata.thriftapi.mapper.SSHJobSubmissionMapper;
-import org.apache.airavata.thriftapi.mapper.StorageResourceDescriptionMapper;
-import org.apache.airavata.thriftapi.mapper.StoragePreferenceMapper;
-import org.apache.airavata.thriftapi.mapper.ComputeResourcePreferenceMapper;
import org.apache.airavata.thriftapi.mapper.UserComputeResourcePreferenceMapper;
+import org.apache.airavata.thriftapi.mapper.UserConfigurationDataModelMapper;
+import org.apache.airavata.thriftapi.mapper.UserResourceProfileMapper;
import org.apache.airavata.thriftapi.mapper.UserStoragePreferenceMapper;
-import org.apache.airavata.thriftapi.mapper.ApplicationModuleMapper;
-import org.apache.airavata.thriftapi.mapper.ParserMapper;
-import org.apache.airavata.thriftapi.mapper.ParsingTemplateMapper;
-import org.apache.airavata.thriftapi.mapper.ComputationalResourceSchedulingModelMapper;
-import org.apache.airavata.thriftapi.mapper.GroupComputeResourcePreferenceMapper;
-import org.apache.airavata.thriftapi.mapper.ComputeResourcePolicyMapper;
-import org.apache.airavata.thriftapi.mapper.BatchQueueResourcePolicyMapper;
-import org.apache.airavata.thriftapi.mapper.GatewayGroupsMapper;
-import org.apache.airavata.thriftapi.mapper.ProcessStatusMapper;
+import org.apache.airavata.thriftapi.model.ApplicationDeploymentDescription;
+import org.apache.airavata.thriftapi.model.ApplicationInterfaceDescription;
+import org.apache.airavata.thriftapi.model.BatchQueueResourcePolicy;
+import org.apache.airavata.thriftapi.model.ComputationalResourceSchedulingModel;
+import org.apache.airavata.thriftapi.model.ComputeResourceDescription;
+import org.apache.airavata.thriftapi.model.ComputeResourcePreference;
+import org.apache.airavata.thriftapi.model.DMType;
+import org.apache.airavata.thriftapi.model.DataProductModel;
+import org.apache.airavata.thriftapi.model.DataReplicaLocationModel;
+import org.apache.airavata.thriftapi.model.ExperimentModel;
+import org.apache.airavata.thriftapi.model.ExperimentSearchFields;
+import org.apache.airavata.thriftapi.model.ExperimentStatistics;
+import org.apache.airavata.thriftapi.model.ExperimentSummaryModel;
+import org.apache.airavata.thriftapi.model.Gateway;
+import org.apache.airavata.thriftapi.model.GatewayResourceProfile;
+import org.apache.airavata.thriftapi.model.GroupComputeResourcePreference;
+import org.apache.airavata.thriftapi.model.GroupResourceProfile;
+import org.apache.airavata.thriftapi.model.InputDataObjectType;
+import org.apache.airavata.thriftapi.model.LOCALDataMovement;
+import org.apache.airavata.thriftapi.model.Notification;
+import org.apache.airavata.thriftapi.model.OutputDataObjectType;
+import org.apache.airavata.thriftapi.model.Project;
+import org.apache.airavata.thriftapi.model.ProjectSearchFields;
+import org.apache.airavata.thriftapi.model.QueueStatusModel;
+import org.apache.airavata.thriftapi.model.ResourcePermissionType;
+import org.apache.airavata.thriftapi.model.SSHAccountProvisionerConfigParam;
+import org.apache.airavata.thriftapi.model.SSHAccountProvisionerConfigParamType;
+import org.apache.airavata.thriftapi.model.StorageDirectoryInfo;
+import org.apache.airavata.thriftapi.model.StorageVolumeInfo;
+import org.apache.airavata.thriftapi.model.UserConfigurationDataModel;
+import org.apache.airavata.thriftapi.model.UserResourceProfile;
+import org.apache.airavata.thriftapi.model.ExperimentStatus;
+import org.apache.airavata.thriftapi.model.ExperimentState;
+import org.apache.airavata.thriftapi.model.JobStatus;
+import org.apache.airavata.thriftapi.model.JobState;
+import org.apache.airavata.thriftapi.model.JobModel;
+import org.apache.airavata.thriftapi.model.ApplicationModule;
+import org.apache.airavata.thriftapi.model.StorageResourceDescription;
+import org.apache.airavata.thriftapi.model.LOCALSubmission;
+import org.apache.airavata.thriftapi.model.SSHJobSubmission;
+import org.apache.airavata.thriftapi.model.CloudJobSubmission;
+import org.apache.airavata.thriftapi.model.UnicoreJobSubmission;
+import org.apache.airavata.thriftapi.model.SCPDataMovement;
+import org.apache.airavata.thriftapi.model.UnicoreDataMovement;
+import org.apache.airavata.thriftapi.model.UserComputeResourcePreference;
+import org.apache.airavata.thriftapi.model.ParsingTemplate;
+import org.apache.airavata.thriftapi.model.Parser;
+import org.apache.airavata.thriftapi.model.GridFTPDataMovement;
+import org.apache.airavata.thriftapi.model.UserStoragePreference;
+import org.apache.airavata.thriftapi.model.StoragePreference;
+import org.apache.airavata.thriftapi.model.ResourceJobManager;
+import org.apache.airavata.thriftapi.model.ComputeResourcePolicy;
+import org.apache.airavata.thriftapi.model.GatewayGroups;
+import org.apache.airavata.thriftapi.model.ProcessStatus;
+import org.apache.airavata.thriftapi.model.SSHAccountProvisionerDescription;
import org.apache.airavata.thriftapi.service.airavata_apiConstants;
import org.apache.thrift.TException;
import org.springframework.stereotype.Component;
@@ -172,7 +174,8 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
private final StorageDirectoryInfoMapper storageDirectoryInfoMapper = StorageDirectoryInfoMapper.INSTANCE;
private final StorageVolumeInfoMapper storageVolumeInfoMapper = StorageVolumeInfoMapper.INSTANCE;
private final GroupResourceProfileMapper groupResourceProfileMapper = GroupResourceProfileMapper.INSTANCE;
- private final UserConfigurationDataModelMapper userConfigurationDataModelMapper = UserConfigurationDataModelMapper.INSTANCE;
+ private final UserConfigurationDataModelMapper userConfigurationDataModelMapper =
+ UserConfigurationDataModelMapper.INSTANCE;
private final GridFTPDataMovementMapper gridFTPDataMovementMapper = GridFTPDataMovementMapper.INSTANCE;
private final CloudJobSubmissionMapper cloudJobSubmissionMapper = CloudJobSubmissionMapper.INSTANCE;
private final LOCALSubmissionMapper localSubmissionMapper = LOCALSubmissionMapper.INSTANCE;
@@ -182,18 +185,24 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
private final UnicoreDataMovementMapper unicoreDataMovementMapper = UnicoreDataMovementMapper.INSTANCE;
private final UnicoreJobSubmissionMapper unicoreJobSubmissionMapper = UnicoreJobSubmissionMapper.INSTANCE;
private final SSHJobSubmissionMapper sshJobSubmissionMapper = SSHJobSubmissionMapper.INSTANCE;
- private final StorageResourceDescriptionMapper storageResourceDescriptionMapper = StorageResourceDescriptionMapper.INSTANCE;
+ private final StorageResourceDescriptionMapper storageResourceDescriptionMapper =
+ StorageResourceDescriptionMapper.INSTANCE;
private final StoragePreferenceMapper storagePreferenceMapper = StoragePreferenceMapper.INSTANCE;
- private final ComputeResourcePreferenceMapper computeResourcePreferenceMapper = ComputeResourcePreferenceMapper.INSTANCE;
- private final UserComputeResourcePreferenceMapper userComputeResourcePreferenceMapper = UserComputeResourcePreferenceMapper.INSTANCE;
+ private final ComputeResourcePreferenceMapper computeResourcePreferenceMapper =
+ ComputeResourcePreferenceMapper.INSTANCE;
+ private final UserComputeResourcePreferenceMapper userComputeResourcePreferenceMapper =
+ UserComputeResourcePreferenceMapper.INSTANCE;
private final UserStoragePreferenceMapper userStoragePreferenceMapper = UserStoragePreferenceMapper.INSTANCE;
private final ApplicationModuleMapper applicationModuleMapper = ApplicationModuleMapper.INSTANCE;
private final ParserMapper parserMapper = ParserMapper.INSTANCE;
private final ParsingTemplateMapper parsingTemplateMapper = ParsingTemplateMapper.INSTANCE;
- private final ComputationalResourceSchedulingModelMapper computationalResourceSchedulingModelMapper = ComputationalResourceSchedulingModelMapper.INSTANCE;
- private final GroupComputeResourcePreferenceMapper groupComputeResourcePreferenceMapper = GroupComputeResourcePreferenceMapper.INSTANCE;
+ private final ComputationalResourceSchedulingModelMapper computationalResourceSchedulingModelMapper =
+ ComputationalResourceSchedulingModelMapper.INSTANCE;
+ private final GroupComputeResourcePreferenceMapper groupComputeResourcePreferenceMapper =
+ GroupComputeResourcePreferenceMapper.INSTANCE;
private final ComputeResourcePolicyMapper computeResourcePolicyMapper = ComputeResourcePolicyMapper.INSTANCE;
- private final BatchQueueResourcePolicyMapper batchQueueResourcePolicyMapper = BatchQueueResourcePolicyMapper.INSTANCE;
+ private final BatchQueueResourcePolicyMapper batchQueueResourcePolicyMapper =
+ BatchQueueResourcePolicyMapper.INSTANCE;
private final GatewayGroupsMapper gatewayGroupsMapper = GatewayGroupsMapper.INSTANCE;
private final ProcessStatusMapper processStatusMapper = ProcessStatusMapper.INSTANCE;
@@ -205,8 +214,7 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
// Helper method to convert domain exceptions to thrift exceptions
private org.apache.airavata.thriftapi.exception.AiravataSystemException convertToThriftSystemException(
org.apache.airavata.common.exception.AiravataSystemException e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException thriftException =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ var thriftException = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
thriftException.setMessage(e.getMessage());
if (e.getAiravataErrorType() != null) {
thriftException.setAiravataErrorType(
@@ -218,8 +226,7 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
private org.apache.airavata.thriftapi.exception.InvalidRequestException convertToThriftInvalidRequestException(
org.apache.airavata.common.exception.InvalidRequestException e) {
- org.apache.airavata.thriftapi.exception.InvalidRequestException thriftException =
- new org.apache.airavata.thriftapi.exception.InvalidRequestException();
+ var thriftException = new org.apache.airavata.thriftapi.exception.InvalidRequestException();
thriftException.setMessage(e.getMessage());
thriftException.initCause(e);
return thriftException;
@@ -227,61 +234,73 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
private org.apache.airavata.thriftapi.exception.AiravataClientException convertToThriftAiravataClientException(
org.apache.airavata.common.exception.AiravataClientException e) {
- org.apache.airavata.thriftapi.exception.AiravataClientException thriftException =
- new org.apache.airavata.thriftapi.exception.AiravataClientException();
- thriftException.setMessage(e.getMessage());
+ var thriftException = new org.apache.airavata.thriftapi.exception.AiravataClientException();
+ thriftException.setAiravataErrorType(
+ org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(e.getAiravataErrorType().name()));
+ if (e.getMessage() != null) {
+ thriftException.setParameter(e.getMessage());
+ }
thriftException.initCause(e);
return thriftException;
}
private org.apache.airavata.thriftapi.exception.AuthorizationException convertToThriftAuthorizationException(
org.apache.airavata.common.exception.AuthorizationException e) {
- org.apache.airavata.thriftapi.exception.AuthorizationException thriftException =
- new org.apache.airavata.thriftapi.exception.AuthorizationException();
+ var thriftException = new org.apache.airavata.thriftapi.exception.AuthorizationException();
thriftException.setMessage(e.getMessage());
thriftException.initCause(e);
return thriftException;
}
- private org.apache.airavata.thriftapi.credential.exception.CredentialStoreException convertToThriftCredentialStoreException(
+ private CredentialStoreException convertToThriftCredentialStoreException(
org.apache.airavata.credential.exception.CredentialStoreException e) {
- org.apache.airavata.thriftapi.credential.exception.CredentialStoreException thriftException =
- new org.apache.airavata.thriftapi.credential.exception.CredentialStoreException();
+ var thriftException = new CredentialStoreException();
+ thriftException.setMessage(e.getMessage());
+ thriftException.initCause(e);
+ return thriftException;
+ }
+
+ private org.apache.airavata.thriftapi.exception.ExperimentNotFoundException convertToThriftExperimentNotFoundException(
+ org.apache.airavata.common.exception.ExperimentNotFoundException e) {
+ var thriftException = new org.apache.airavata.thriftapi.exception.ExperimentNotFoundException();
+ thriftException.setMessage(e.getMessage());
+ thriftException.initCause(e);
+ return thriftException;
+ }
+
+ private org.apache.airavata.thriftapi.exception.ProjectNotFoundException convertToThriftProjectNotFoundException(
+ org.apache.airavata.common.exception.ProjectNotFoundException e) {
+ var thriftException = new org.apache.airavata.thriftapi.exception.ProjectNotFoundException();
thriftException.setMessage(e.getMessage());
thriftException.initCause(e);
return thriftException;
}
- /**
- * Query Airavata to fetch the API version
- */
@Override
- public String getAPIVersion() throws org.apache.airavata.thriftapi.exception.AiravataSystemException, TException {
+ public String getAPIVersion() throws AiravataSystemException, TException {
return airavata_apiConstants.AIRAVATA_API_VERSION;
}
- /**
- * Verify if User Exists within Airavata.
- *
- * @param authzToken
- * @param gatewayId
- * @param userName
- * @return true/false
- */
@Override
@SecurityCheck
public boolean isUserExists(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayId, String userName)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String gatewayId,
+ String userName)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
// Convert thrift model to domain model
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return airavataService.isUserExists(gatewayId, userName);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
throw convertToThriftSystemException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ var exception = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ exception.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
exception.setMessage("Error checking if user exists: " + e.getMessage());
exception.initCause(e);
throw exception;
@@ -290,47 +309,36 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public String addGateway(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- org.apache.airavata.thriftapi.model.Gateway gateway)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public String addGateway(AuthzToken authzToken, Gateway gateway)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
// Convert thrift model to domain model
- Gateway domainGateway = gatewayMapper.toDomain(gateway);
+ var domainGateway = gatewayMapper.toDomain(gateway);
return airavataService.addGateway(domainGateway);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
- throw convertToThriftInvalidRequestException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ var exception = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ exception.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
exception.setMessage("Error adding gateway: " + e.getMessage());
exception.initCause(e);
throw exception;
}
}
- /**
- * Get all users in the gateway
- *
- * @param authzToken
- * @param gatewayId The gateway data model.
- * @return users
- * list of usernames of the users in the gateway
- */
@Override
@SecurityCheck
- public List<String> getAllUsersInGateway(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<String> getAllUsersInGateway(AuthzToken authzToken, String gatewayId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
return airavataService.getAllUsersInGateway(gatewayId);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
throw convertToThriftSystemException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ var exception = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ exception.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
exception.setMessage("Error getting all users in gateway: " + e.getMessage());
exception.initCause(e);
throw exception;
@@ -339,22 +347,24 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public boolean updateGateway(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- String gatewayId,
- org.apache.airavata.thriftapi.model.Gateway updatedGateway)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public boolean updateGateway(AuthzToken authzToken, String gatewayId, Gateway updatedGateway)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
// Convert thrift model to domain model
- Gateway domainGateway = gatewayMapper.toDomain(updatedGateway);
+ org.apache.airavata.common.model.Gateway domainGateway = gatewayMapper.toDomain(updatedGateway);
return airavataService.updateGateway(gatewayId, domainGateway);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
- throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
- throw convertToThriftInvalidRequestException(e);
+ AiravataSystemException thriftException = new AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(
+ AiravataErrorType.valueOf(e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ AiravataSystemException exception = new AiravataSystemException();
exception.setMessage("Error updating gateway: " + e.getMessage());
exception.initCause(e);
throw exception;
@@ -363,19 +373,24 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.Gateway getGateway(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public Gateway getGateway(
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String gatewayId)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
// Get domain model from service
- Gateway domainGateway = airavataService.getGateway(gatewayId);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.common.model.Gateway domainGateway = airavataService.getGateway(gatewayId);
// Convert domain model to thrift model
return gatewayMapper.toThrift(domainGateway);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
throw convertToThriftSystemException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ AiravataSystemException exception = new AiravataSystemException();
exception.setMessage("Error getting gateway: " + e.getMessage());
exception.initCause(e);
throw exception;
@@ -384,15 +399,16 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public boolean deleteGateway(org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public boolean deleteGateway(AuthzToken authzToken, String gatewayId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
return airavataService.deleteGateway(gatewayId);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
throw convertToThriftSystemException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException exception = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ exception.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
exception.setMessage("Error deleting gateway: " + e.getMessage());
exception.initCause(e);
throw exception;
@@ -401,19 +417,19 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.Gateway> getAllGateways(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<Gateway> getAllGateways(AuthzToken authzToken)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
// Get domain models from service
- List<Gateway> domainGateways = airavataService.getAllGateways();
+ List<org.apache.airavata.common.model.Gateway> domainGateways = airavataService.getAllGateways();
// Convert domain models to thrift models
return domainGateways.stream().map(gatewayMapper::toThrift).collect(Collectors.toList());
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
throw convertToThriftSystemException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException exception = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ exception.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
exception.setMessage("Error getting all gateways: " + e.getMessage());
exception.initCause(e);
throw exception;
@@ -422,112 +438,159 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public boolean isGatewayExist(org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public boolean isGatewayExist(AuthzToken authzToken, String gatewayId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
return airavataService.isGatewayExist(gatewayId);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
throw convertToThriftSystemException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException exception = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ exception.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
exception.setMessage("Error checking if gateway exists: " + e.getMessage());
exception.initCause(e);
throw exception;
}
}
- /**
- * * API methods to retrieve notifications
- * *
- *
- * @param authzToken
- * @param notification
- */
@Override
@SecurityCheck
- public String createNotification(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- org.apache.airavata.thriftapi.model.Notification notification)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public String createNotification(AuthzToken authzToken, Notification notification)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
// Convert thrift model to domain model
- Notification domainNotification = notificationMapper.toDomain(notification);
+ org.apache.airavata.common.model.Notification domainNotification =
+ notificationMapper.toDomain(notification);
return airavataService.createNotification(domainNotification);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error creating notification: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
- public boolean updateNotification(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- org.apache.airavata.thriftapi.model.Notification notification)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public boolean updateNotification(AuthzToken authzToken, Notification notification)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
// Convert thrift model to domain model
- Notification domainNotification = notificationMapper.toDomain(notification);
+ org.apache.airavata.common.model.Notification domainNotification =
+ notificationMapper.toDomain(notification);
return airavataService.updateNotification(domainNotification);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error updating notification: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
- public boolean deleteNotification(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayId, String notificationId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public boolean deleteNotification(AuthzToken authzToken, String gatewayId, String notificationId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
return airavataService.deleteNotification(gatewayId, notificationId);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error deleting notification: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
// No security check
@Override
- public org.apache.airavata.thriftapi.model.Notification getNotification(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayId, String notificationId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public Notification getNotification(AuthzToken authzToken, String gatewayId, String notificationId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
// Get domain model from service
- Notification domainNotification = airavataService.getNotification(gatewayId, notificationId);
+ org.apache.airavata.common.model.Notification domainNotification =
+ airavataService.getNotification(gatewayId, notificationId);
// Convert domain model to thrift model
return notificationMapper.toThrift(domainNotification);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting notification: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
// No security check
@Override
- public List<org.apache.airavata.thriftapi.model.Notification> getAllNotifications(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<Notification> getAllNotifications(AuthzToken authzToken, String gatewayId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
// Get domain models from service
- List<Notification> domainNotifications = airavataService.getAllNotifications(gatewayId);
+ List<org.apache.airavata.common.model.Notification> domainNotifications =
+ airavataService.getAllNotifications(gatewayId);
// Convert domain models to thrift models
- return domainNotifications.stream().map(notificationMapper::toThrift).collect(Collectors.toList());
+ return domainNotifications.stream()
+ .map(notificationMapper::toThrift)
+ .collect(Collectors.toList());
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting all notifications: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
- public String generateAndRegisterSSHKeys(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String description)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, TException {
+ public String generateAndRegisterSSHKeys(AuthzToken authzToken, String description)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
+ try {
// Convert thrift model to domain model
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
String gatewayId = domainAuthzToken.getClaimsMap().get(Constants.GATEWAY_ID);
String userName = domainAuthzToken.getClaimsMap().get(Constants.USER_NAME);
return airavataService.generateAndRegisterSSHKeys(gatewayId, userName, description);
+ } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error generating and registering SSH keys: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Register Username PWD Pair with Airavata Credential Store.
- *
- * @param authzToken
- * @param loginUserName
- * @param password
- * @param description
- * @return airavataCredStoreToken
- */
@Override
@SecurityCheck
public String registerPwdCredential(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- String loginUserName,
- String password,
- String description)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, TException {
+ AuthzToken authzToken, String loginUserName, String password, String description)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
try {
// Convert thrift model to domain model
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
String gatewayId = domainAuthzToken.getClaimsMap().get(Constants.GATEWAY_ID);
String userName = domainAuthzToken.getClaimsMap().get(Constants.USER_NAME);
return airavataService.registerPwdCredential(gatewayId, userName, loginUserName, password, description);
@@ -536,8 +599,8 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException exception = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ exception.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
exception.setMessage("Error registering password credential: " + e.getMessage());
exception.initCause(e);
throw exception;
@@ -547,21 +610,22 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
public org.apache.airavata.thriftapi.credential.model.CredentialSummary getCredentialSummary(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String tokenId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ AuthzToken authzToken, String tokenId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
// Convert thrift model to domain model
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
String gatewayId = domainAuthzToken.getClaimsMap().get(Constants.GATEWAY_ID);
- CredentialSummary domainSummary = airavataService.getCredentialSummary(tokenId, gatewayId);
+ org.apache.airavata.credential.model.CredentialSummary domainSummary = airavataService.getCredentialSummary(tokenId, gatewayId);
return credentialSummaryMapper.toThrift(domainSummary);
} catch (org.apache.airavata.credential.exception.CredentialStoreException e) {
throw convertToThriftCredentialStoreException(e);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
throw convertToThriftSystemException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException exception = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ exception.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
exception.setMessage("Error getting credential summary: " + e.getMessage());
exception.initCause(e);
throw exception;
@@ -571,23 +635,26 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
public List<org.apache.airavata.thriftapi.credential.model.CredentialSummary> getAllCredentialSummaries(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- org.apache.airavata.thriftapi.credential.model.SummaryType type)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- SummaryType domainType = SummaryType.valueOf(type.name());
+ AuthzToken authzToken, org.apache.airavata.thriftapi.credential.model.SummaryType type)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.credential.model.SummaryType domainType = org.apache.airavata.credential.model.SummaryType.valueOf(type.name());
String gatewayId = domainAuthzToken.getClaimsMap().get(Constants.GATEWAY_ID);
String userName = domainAuthzToken.getClaimsMap().get(Constants.USER_NAME);
try {
- List<CredentialSummary> domainSummaries = airavataService.getAllCredentialSummaries(domainAuthzToken, domainType, gatewayId, userName);
- return domainSummaries.stream().map(credentialSummaryMapper::toThrift).collect(Collectors.toList());
+ List<org.apache.airavata.credential.model.CredentialSummary> domainSummaries =
+ airavataService.getAllCredentialSummaries(domainAuthzToken, domainType, gatewayId, userName);
+ return domainSummaries.stream()
+ .map(credentialSummaryMapper::toThrift)
+ .collect(Collectors.toList());
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
throw convertToThriftSystemException(e);
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException exception = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ exception.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
exception.setMessage("Error getting all credential summaries: " + e.getMessage());
exception.initCause(e);
throw exception;
@@ -596,19 +663,18 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public boolean deleteSSHPubKey(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String airavataCredStoreToken)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public boolean deleteSSHPubKey(AuthzToken authzToken, String airavataCredStoreToken)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
// Convert thrift model to domain model
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
String gatewayId = domainAuthzToken.getClaimsMap().get(Constants.GATEWAY_ID);
return airavataService.deleteSSHCredential(airavataCredStoreToken, gatewayId);
} catch (org.apache.airavata.credential.exception.CredentialStoreException e) {
throw convertToThriftCredentialStoreException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ AiravataSystemException exception = new AiravataSystemException();
exception.setMessage("Error deleting SSH credential: " + e.getMessage());
exception.initCause(e);
throw exception;
@@ -617,38 +683,43 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public boolean deletePWDCredential(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String airavataCredStoreToken)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public boolean deletePWDCredential(AuthzToken authzToken, String airavataCredStoreToken)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
// Convert thrift model to domain model
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
String gatewayId = domainAuthzToken.getClaimsMap().get(Constants.GATEWAY_ID);
- return airavataService.deletePWDCredential(airavataCredStoreToken, gatewayId);
+ return airavataService.deletePWDCredential(domainAuthzToken, airavataCredStoreToken, gatewayId);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error deleting PWD credential: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Create a Project
- *
- * @param project
- */
@Override
@SecurityCheck
- public String createProject(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- String gatewayId,
- org.apache.airavata.thriftapi.model.Project project)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public String createProject(AuthzToken authzToken, String gatewayId, Project project)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
// Convert thrift model to domain model
- Project domainProject = projectMapper.toDomain(project);
+ org.apache.airavata.common.model.Project domainProject = projectMapper.toDomain(project);
return airavataService.createProject(gatewayId, domainProject);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
throw convertToThriftSystemException(e);
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException exception = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ exception.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
exception.setMessage("Error creating project: " + e.getMessage());
exception.initCause(e);
throw exception;
@@ -657,29 +728,35 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public void updateProject(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- String projectId,
- org.apache.airavata.thriftapi.model.Project updatedProject)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.ProjectNotFoundException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public void updateProject(AuthzToken authzToken, String projectId, Project updatedProject)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, ProjectNotFoundException,
+ AuthorizationException, TException {
try {
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
// Convert thrift model to domain model
- Project domainProject = projectMapper.toDomain(updatedProject);
+ org.apache.airavata.common.model.Project domainProject = projectMapper.toDomain(updatedProject);
airavataService.updateProject(domainAuthzToken, projectId, domainProject);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
- throw convertToThriftSystemException(e);
+ AiravataSystemException thriftException = new AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(
+ AiravataErrorType.valueOf(e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
- throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.ProjectNotFoundException e) {
- org.apache.airavata.thriftapi.exception.ProjectNotFoundException thriftException =
- new org.apache.airavata.thriftapi.exception.ProjectNotFoundException();
+ InvalidRequestException thriftException = new InvalidRequestException();
+ thriftException.setMessage(e.getMessage());
+ thriftException.initCause(e);
+ throw thriftException;
+ } catch (ProjectNotFoundException e) {
+ ProjectNotFoundException thriftException = new ProjectNotFoundException();
thriftException.setMessage(e.getMessage());
thriftException.initCause(e);
throw thriftException;
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ AiravataSystemException exception = new AiravataSystemException();
exception.setMessage("Error updating project: " + e.getMessage());
exception.initCause(e);
throw exception;
@@ -688,131 +765,115 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public boolean deleteProject(org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String projectId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.ProjectNotFoundException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public boolean deleteProject(AuthzToken authzToken, String projectId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, ProjectNotFoundException,
+ AuthorizationException, TException {
try {
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return airavataService.deleteProject(domainAuthzToken, projectId);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
throw convertToThriftSystemException(e);
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
} catch (org.apache.airavata.common.exception.ProjectNotFoundException e) {
- org.apache.airavata.thriftapi.exception.ProjectNotFoundException thriftException =
- new org.apache.airavata.thriftapi.exception.ProjectNotFoundException();
+ org.apache.airavata.thriftapi.exception.ProjectNotFoundException thriftException = new org.apache.airavata.thriftapi.exception.ProjectNotFoundException();
thriftException.setMessage(e.getMessage());
thriftException.initCause(e);
throw thriftException;
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ AiravataSystemException exception = new AiravataSystemException();
exception.setMessage("Error deleting project: " + e.getMessage());
exception.initCause(e);
throw exception;
}
}
- /**
- * Get a Project by ID
- *
- * @param projectId
- */
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.Project getProject(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String projectId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.ProjectNotFoundException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public Project getProject(AuthzToken authzToken, String projectId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, ProjectNotFoundException,
+ AuthorizationException, TException {
try {
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
// Get domain model from service
- Project domainProject = airavataService.getProject(domainAuthzToken, projectId);
+ org.apache.airavata.common.model.Project domainProject =
+ airavataService.getProject(domainAuthzToken, projectId);
// Convert domain model to thrift model
return projectMapper.toThrift(domainProject);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
- throw convertToThriftSystemException(e);
+ AiravataSystemException thriftException = new AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(
+ AiravataErrorType.valueOf(e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
- throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.ProjectNotFoundException e) {
- org.apache.airavata.thriftapi.exception.ProjectNotFoundException thriftException =
- new org.apache.airavata.thriftapi.exception.ProjectNotFoundException();
+ InvalidRequestException thriftException = new InvalidRequestException();
+ thriftException.setMessage(e.getMessage());
+ thriftException.initCause(e);
+ throw thriftException;
+ } catch (ProjectNotFoundException e) {
+ ProjectNotFoundException thriftException = new ProjectNotFoundException();
thriftException.setMessage(e.getMessage());
thriftException.initCause(e);
throw thriftException;
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ AiravataSystemException exception = new AiravataSystemException();
exception.setMessage("Error getting project: " + e.getMessage());
exception.initCause(e);
throw exception;
}
}
- /**
- * Get all Project by user with pagination. Results will be ordered based
- * on creation time DESC
- *
- * @param gatewayId
- * The identifier for the requested gateway.
- * @param userName
- * The identifier of the user
- * @param limit
- * The amount results to be fetched
- * @param offset
- * The starting point of the results to be fetched
- **/
- @Override
- @SecurityCheck
- public List<org.apache.airavata.thriftapi.model.Project> getUserProjects(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayId, String userName, int limit, int offset)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ @Override
+ @SecurityCheck
+ public List<Project> getUserProjects(
+ AuthzToken authzToken, String gatewayId, String userName, int limit, int offset)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
// Get domain models from service
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- List<Project> domainProjects = airavataService.getUserProjects(domainAuthzToken, gatewayId, userName, limit, offset);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ List<org.apache.airavata.common.model.Project> domainProjects =
+ airavataService.getUserProjects(domainAuthzToken, gatewayId, userName, limit, offset);
// Convert domain models to thrift models
return domainProjects.stream().map(projectMapper::toThrift).collect(Collectors.toList());
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting user projects: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- *
- * Search User Projects
- * Search and get all Projects for user by project description or/and project name with pagination.
- * Results will be ordered based on creation time DESC.
- *
- * @param gatewayId
- * The unique identifier of the gateway making the request.
- *
- * @param userName
- * The identifier of the user.
- *
- * @param filters
- * Map of multiple filter criteria. Currenlt search filters includes Project Name and Project Description
- *
- * @param limit
- * The amount results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- */
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.Project> searchProjects(
+ public List<Project> searchProjects(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
String gatewayId,
String userName,
- Map<org.apache.airavata.thriftapi.model.ProjectSearchFields, String> filters,
+ Map<ProjectSearchFields, String> filters,
int limit,
int offset)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
// Convert thrift models to domain models
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- Map<ProjectSearchFields, String> domainFilters = new java.util.HashMap<>();
- for (Map.Entry<org.apache.airavata.thriftapi.model.ProjectSearchFields, String> entry : filters.entrySet()) {
- domainFilters.put(ProjectSearchFields.valueOf(entry.getKey().name()), entry.getValue());
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ Map<org.apache.airavata.common.model.ProjectSearchFields, String> domainFilters = new java.util.HashMap<>();
+ for (Map.Entry<ProjectSearchFields, String> entry : filters.entrySet()) {
+ domainFilters.put(org.apache.airavata.common.model.ProjectSearchFields.valueOf(entry.getKey().name()), entry.getValue());
}
// Get domain models from service
- List<Project> domainProjects =
+ List<org.apache.airavata.common.model.Project> domainProjects =
airavataService.searchProjects(domainAuthzToken, gatewayId, userName, domainFilters, limit, offset);
// Convert domain models to thrift models
return domainProjects.stream().map(projectMapper::toThrift).collect(Collectors.toList());
@@ -825,62 +886,49 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
}
}
- /**
- * Search Experiments by using multiple filter criteria with pagination. Results will be sorted
- * based on creation time DESC
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param filters
- * map of multiple filter criteria.
- * @param limit
- * Amount of results to be fetched
- * @param offset
- * The starting point of the results to be fetched
- */
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.ExperimentSummaryModel> searchExperiments(
+ public List<ExperimentSummaryModel> searchExperiments(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
String gatewayId,
String userName,
- Map<org.apache.airavata.thriftapi.model.ExperimentSearchFields, String> filters,
+ Map<ExperimentSearchFields, String> filters,
int limit,
int offset)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
// Convert thrift models to domain models
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- Map<ExperimentSearchFields, String> domainFilters = new java.util.HashMap<>();
- for (Map.Entry<org.apache.airavata.thriftapi.model.ExperimentSearchFields, String> entry : filters.entrySet()) {
- domainFilters.put(ExperimentSearchFields.valueOf(entry.getKey().name()), entry.getValue());
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ Map<org.apache.airavata.common.model.ExperimentSearchFields, String> domainFilters = new java.util.HashMap<>();
+ for (Map.Entry<ExperimentSearchFields, String> entry : filters.entrySet()) {
+ domainFilters.put(org.apache.airavata.common.model.ExperimentSearchFields.valueOf(entry.getKey().name()), entry.getValue());
}
+ try {
// Get domain models from service
- List<ExperimentSummaryModel> domainSummaries =
- airavataService.searchExperiments(domainAuthzToken, gatewayId, userName, domainFilters, limit, offset);
+ List<org.apache.airavata.common.model.ExperimentSummaryModel> domainSummaries = airavataService.searchExperiments(
+ domainAuthzToken, gatewayId, userName, domainFilters, limit, offset);
// Convert domain models to thrift models
return domainSummaries.stream()
.map(experimentSummaryModelMapper::toThrift)
.collect(Collectors.toList());
- }
-
- /**
- * Get Experiment execution statisitics by sending the gateway id and the time period interested in.
- * This method will retrun an ExperimentStatistics object which contains the number of successfully
- * completed experiments, failed experiments etc.
- * @param gatewayId
- * @param fromTime
- * @param toTime
- * @return
- * @throws InvalidRequestException
- * @throws AiravataClientException
- * @throws org.apache.airavata.thriftapi.exception.AiravataSystemException, TException
- */
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error searching experiments: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
+ }
+
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.ExperimentStatistics getExperimentStatistics(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ public ExperimentStatistics getExperimentStatistics(
+ AuthzToken authzToken,
String gatewayId,
long fromTime,
long toTime,
@@ -889,10 +937,12 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
String resourceHostName,
int limit,
int offset)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
List<String> accessibleExpIds = null;
- ExperimentStatistics domainStats = airavataService.getExperimentStatistics(
+ org.apache.airavata.common.model.ExperimentStatistics domainStats = airavataService.getExperimentStatistics(
gatewayId,
fromTime,
toTime,
@@ -903,76 +953,89 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
limit,
offset);
return experimentStatisticsMapper.toThrift(domainStats);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException thriftException =
+ new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(
+ e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting experiment statistics: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Get Experiments within project with pagination. Results will be sorted
- * based on creation time DESC
- *
- * @param projectId
- * Identifier of the project
- * @param limit
- * Amount of results to be fetched
- * @param offset
- * The starting point of the results to be fetched
- */
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.ExperimentModel> getExperimentsInProject(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String projectId, int limit, int offset)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.ProjectNotFoundException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<ExperimentModel> getExperimentsInProject(AuthzToken authzToken, String projectId, int limit, int offset)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, ProjectNotFoundException,
+ AuthorizationException, TException {
try {
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
String gatewayId = domainAuthzToken.getClaimsMap().get(Constants.GATEWAY_ID);
// Get domain models from service
- List<ExperimentModel> domainExperiments =
+ List<org.apache.airavata.common.model.ExperimentModel> domainExperiments =
airavataService.getExperimentsInProject(gatewayId, projectId, limit, offset);
// Convert domain models to thrift models
- return domainExperiments.stream().map(experimentModelMapper::toThrift).collect(Collectors.toList());
+ return domainExperiments.stream()
+ .map(experimentModelMapper::toThrift)
+ .collect(Collectors.toList());
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
- throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.ProjectNotFoundException e) {
- org.apache.airavata.thriftapi.exception.ProjectNotFoundException thriftException =
- new org.apache.airavata.thriftapi.exception.ProjectNotFoundException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException thriftException =
+ new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(
+ e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
+ } catch (ProjectNotFoundException e) {
+ ProjectNotFoundException thriftException = new ProjectNotFoundException();
thriftException.setMessage(e.getMessage());
thriftException.initCause(e);
throw thriftException;
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ AiravataSystemException exception = new AiravataSystemException();
exception.setMessage("Error getting experiments in project: " + e.getMessage());
exception.initCause(e);
throw exception;
}
}
- /**
- * Get Experiments by user pagination. Results will be sorted
- * based on creation time DESC
- *
- * @param gatewayId
- * Identifier of the requesting gateway
- * @param userName
- * Username of the requested user
- * @param limit
- * Amount of results to be fetched
- * @param offset
- * The starting point of the results to be fetched
- */
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.ExperimentModel> getUserExperiments(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayId, String userName, int limit, int offset)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<ExperimentModel> getUserExperiments(
+ AuthzToken authzToken, String gatewayId, String userName, int limit, int offset)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
// Get domain models from service
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- List<ExperimentModel> domainExperiments =
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ List<org.apache.airavata.common.model.ExperimentModel> domainExperiments =
airavataService.getUserExperiments(gatewayId, userName, limit, offset);
// Convert domain models to thrift models
- return domainExperiments.stream().map(experimentModelMapper::toThrift).collect(Collectors.toList());
+ return domainExperiments.stream()
+ .map(experimentModelMapper::toThrift)
+ .collect(Collectors.toList());
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
- throw convertToThriftSystemException(e);
+ org.apache.airavata.thriftapi.exception.AiravataSystemException thriftException =
+ new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(
+ e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
} catch (Exception e) {
org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
new org.apache.airavata.thriftapi.exception.AiravataSystemException();
@@ -982,41 +1045,19 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
}
}
- /**
- * Create an experiment for the specified user belonging to the gateway. The gateway identity is not explicitly passed
- * but inferred from the authentication header. This experiment is just a persistent place holder. The client
- * has to subsequently configure and launch the created experiment. No action is taken on Airavata Server except
- * registering the experiment in a persistent store.
- *
- * @param experiment@return The server-side generated.airavata.registry.core.experiment.globally unique identifier.
- * @throws org.apache.airavata.common.exception.InvalidRequestException For any incorrect forming of the request itself.
- * @throws org.apache.airavata.common.exception.AiravataClientException The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
- * <p/>
- * UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
- * step, then Airavata Registry will not have a provenance area setup. The client has to follow
- * gateway registration steps and retry this request.
- * <p/>
- * AUTHENTICATION_FAILURE - How Authentication will be implemented is yet to be determined.
- * For now this is a place holder.
- * <p/>
- * INVALID_AUTHORIZATION - This will throw an authorization exception. When a more robust security hand-shake
- * is implemented, the authorization will be more substantial.
- * @throws org.apache.airavata.common.exception.AiravataSystemException This exception will be thrown for any Airavata Server side issues and if the problem cannot be corrected by the client
- * rather an Airavata Administrator will be notified to take corrective action.
- */
@Override
@SecurityCheck
- public String createExperiment(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- String gatewayId,
- org.apache.airavata.thriftapi.model.ExperimentModel experiment)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public String createExperiment(AuthzToken authzToken, String gatewayId, ExperimentModel experiment)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
// Convert thrift model to domain model
- ExperimentModel domainExperiment = experimentModelMapper.toDomain(experiment);
+ org.apache.airavata.common.model.ExperimentModel domainExperiment =
+ experimentModelMapper.toDomain(experiment);
return airavataService.createExperiment(gatewayId, domainExperiment);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException exception = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
+ new org.apache.airavata.thriftapi.exception.AiravataSystemException();
exception.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
exception.setMessage("Error creating experiment: " + e.getMessage());
exception.initCause(e);
@@ -1024,83 +1065,58 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
}
}
- /**
- * If the experiment is not already launched experiment can be deleted.
- * @param authzToken
- * @param experimentId
- * @return
- * @throws InvalidRequestException
- * @throws AiravataClientException
- * @throws org.apache.airavata.thriftapi.exception.AiravataSystemException, TException
- * @throws org.apache.airavata.thriftapi.exception.AuthorizationException, TException
- */
@Override
@SecurityCheck
- public boolean deleteExperiment(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String experimentId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public boolean deleteExperiment(AuthzToken authzToken, String experimentId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return airavataService.deleteExperimentWithAuth(domainAuthzToken, experimentId);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
throw convertToThriftSystemException(e);
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException exception = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ exception.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
exception.setMessage("Error deleting experiment: " + e.getMessage());
exception.initCause(e);
throw exception;
}
}
- /**
- * Fetch previously created experiment metadata.
- *
- * @param airavataExperimentId The identifier for the requested experiment. This is returned during the create experiment step.
- * @return experimentMetada
- * This method will return the previously stored experiment metadata.
- * @throws org.apache.airavata.common.exception.InvalidRequestException For any incorrect forming of the request itself.
- * @throws org.apache.airavata.common.exception.ExperimentNotFoundException If the specified experiment is not previously created, then an Experiment Not Found Exception is thrown.
- * @throws org.apache.airavata.common.exception.AiravataClientException The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
- * <p/>
- * UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
- * step, then Airavata Registry will not have a provenance area setup. The client has to follow
- * gateway registration steps and retry this request.
- * <p/>
- * AUTHENTICATION_FAILURE - How Authentication will be implemented is yet to be determined.
- * For now this is a place holder.
- * <p/>
- * INVALID_AUTHORIZATION - This will throw an authorization exception. When a more robust security hand-shake
- * is implemented, the authorization will be more substantial.
- * @throws org.apache.airavata.common.exception.AiravataSystemException This exception will be thrown for any Airavata Server side issues and if the problem cannot be corrected by the client
- * rather an Airavata Administrator will be notified to take corrective action.
- */
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.ExperimentModel getExperiment(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String airavataExperimentId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.ExperimentNotFoundException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public ExperimentModel getExperiment(AuthzToken authzToken, String airavataExperimentId)
+ throws InvalidRequestException, ExperimentNotFoundException, AiravataClientException,
+ AiravataSystemException, AuthorizationException, TException {
try {
// Get domain model from service
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- ExperimentModel domainExperiment = airavataService.getExperiment(domainAuthzToken, airavataExperimentId);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.common.model.ExperimentModel domainExperiment =
+ airavataService.getExperiment(domainAuthzToken, airavataExperimentId);
// Convert domain model to thrift model
return experimentModelMapper.toThrift(domainExperiment);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
- throw convertToThriftSystemException(e);
+ org.apache.airavata.thriftapi.exception.AiravataSystemException thriftException =
+ new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(
+ e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
} catch (org.apache.airavata.common.exception.ExperimentNotFoundException e) {
- org.apache.airavata.thriftapi.exception.ExperimentNotFoundException thriftException =
- new org.apache.airavata.thriftapi.exception.ExperimentNotFoundException();
+ org.apache.airavata.thriftapi.exception.ExperimentNotFoundException thriftException = new org.apache.airavata.thriftapi.exception.ExperimentNotFoundException();
thriftException.setMessage(e.getMessage());
thriftException.initCause(e);
throw thriftException;
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException exception = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
exception.setMessage("Error getting experiment: " + e.getMessage());
exception.initCause(e);
throw exception;
@@ -1109,123 +1125,99 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.ExperimentModel getExperimentByAdmin(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String airavataExperimentId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.ExperimentNotFoundException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public ExperimentModel getExperimentByAdmin(AuthzToken authzToken, String airavataExperimentId)
+ throws InvalidRequestException, ExperimentNotFoundException, AiravataClientException,
+ AiravataSystemException, AuthorizationException, TException {
try {
// Get domain model from service
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- ExperimentModel domainExperiment = airavataService.getExperimentByAdmin(domainAuthzToken, airavataExperimentId);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.common.model.ExperimentModel domainExperiment =
+ airavataService.getExperimentByAdmin(domainAuthzToken, airavataExperimentId);
// Convert domain model to thrift model
return experimentModelMapper.toThrift(domainExperiment);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
- throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException thriftException =
+ new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(
+ e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.ExperimentNotFoundException e) {
- org.apache.airavata.thriftapi.exception.ExperimentNotFoundException thriftException =
- new org.apache.airavata.thriftapi.exception.ExperimentNotFoundException();
+ } catch (ExperimentNotFoundException e) {
+ ExperimentNotFoundException thriftException = new ExperimentNotFoundException();
thriftException.setMessage(e.getMessage());
thriftException.initCause(e);
throw thriftException;
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ AiravataSystemException exception = new AiravataSystemException();
exception.setMessage("Error getting experiment by admin: " + e.getMessage());
exception.initCause(e);
throw exception;
}
}
- /**
- * Fetch the completed nested tree structue of previously created experiment metadata which includes processes ->
- * tasks -> jobs information.
- *
- * @param airavataExperimentId The identifier for the requested experiment. This is returned during the create experiment step.
- * @return experimentMetada
- * This method will return the previously stored experiment metadata.
- * @throws org.apache.airavata.common.exception.InvalidRequestException For any incorrect forming of the request itself.
- * @throws org.apache.airavata.common.exception.ExperimentNotFoundException If the specified experiment is not previously created, then an Experiment Not Found Exception is thrown.
- * @throws org.apache.airavata.common.exception.AiravataClientException The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
- * <p/>
- * UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
- * step, then Airavata Registry will not have a provenance area setup. The client has to follow
- * gateway registration steps and retry this request.
- * <p/>
- * AUTHENTICATION_FAILURE - How Authentication will be implemented is yet to be determined.
- * For now this is a place holder.
- * <p/>
- * INVALID_AUTHORIZATION - This will throw an authorization exception. When a more robust security hand-shake
- * is implemented, the authorization will be more substantial.
- * @throws org.apache.airavata.common.exception.AiravataSystemException This exception will be thrown for any Airavata Server side issues and if the problem cannot be corrected by the client
- * rather an Airavata Administrator will be notified to take corrective action.
- */
+
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.ExperimentModel getDetailedExperimentTree(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String airavataExperimentId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.ExperimentNotFoundException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public ExperimentModel getDetailedExperimentTree(AuthzToken authzToken, String airavataExperimentId)
+ throws InvalidRequestException, ExperimentNotFoundException, AiravataClientException,
+ AiravataSystemException, AuthorizationException, TException {
try {
// Get domain model from service
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- ExperimentModel domainExperiment = airavataService.getDetailedExperimentTree(domainAuthzToken, airavataExperimentId);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.common.model.ExperimentModel domainExperiment =
+ airavataService.getDetailedExperimentTree(airavataExperimentId);
// Convert domain model to thrift model
return experimentModelMapper.toThrift(domainExperiment);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
- throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException thriftException =
+ new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(
+ e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.ExperimentNotFoundException e) {
- org.apache.airavata.thriftapi.exception.ExperimentNotFoundException thriftException =
- new org.apache.airavata.thriftapi.exception.ExperimentNotFoundException();
+ } catch (ExperimentNotFoundException e) {
+ ExperimentNotFoundException thriftException = new ExperimentNotFoundException();
thriftException.setMessage(e.getMessage());
thriftException.initCause(e);
throw thriftException;
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ AiravataSystemException exception = new AiravataSystemException();
exception.setMessage("Error getting detailed experiment tree: " + e.getMessage());
exception.initCause(e);
throw exception;
}
}
- /**
- * Configure a previously created experiment with required inputs, scheduling and other quality of service
- * parameters. This method only updates the experiment object within the registry. The experiment has to be launched
- * to make it actionable by the server.
- *
- * @param airavataExperimentId The identifier for the requested experiment. This is returned during the create experiment step.
- * @param experiment
- * @return This method call does not have a return value.
- * @throws org.apache.airavata.common.exception.InvalidRequestException For any incorrect forming of the request itself.
- * @throws org.apache.airavata.common.exception.ExperimentNotFoundException If the specified experiment is not previously created, then an Experiment Not Found Exception is thrown.
- * @throws org.apache.airavata.common.exception.AiravataClientException The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
- * <p/>
- * UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
- * step, then Airavata Registry will not have a provenance area setup. The client has to follow
- * gateway registration steps and retry this request.
- * <p/>
- * AUTHENTICATION_FAILURE - How Authentication will be implemented is yet to be determined.
- * For now this is a place holder.
- * <p/>
- * INVALID_AUTHORIZATION - This will throw an authorization exception. When a more robust security hand-shake
- * is implemented, the authorization will be more substantial.
- * @throws org.apache.airavata.common.exception.AiravataSystemException This exception will be thrown for any Airavata Server side issues and if the problem cannot be corrected by the client
- * rather an Airavata Administrator will be notified to take corrective action.
- */
@Override
@SecurityCheck
public void updateExperiment(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
String airavataExperimentId,
- org.apache.airavata.thriftapi.model.ExperimentModel experiment)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.ExperimentNotFoundException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ ExperimentModel experiment)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.ExperimentNotFoundException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
// Convert thrift model to domain model
- ExperimentModel domainExperiment = experimentModelMapper.toDomain(experiment);
- airavataService.updateExperiment(authzToken, airavataExperimentId, domainExperiment);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.common.model.ExperimentModel domainExperiment =
+ experimentModelMapper.toDomain(experiment);
+ airavataService.updateExperiment(domainAuthzToken, airavataExperimentId, domainExperiment);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException exception = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
+ new org.apache.airavata.thriftapi.exception.AiravataSystemException();
exception.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
exception.setMessage("Error updating experiment: " + e.getMessage());
exception.initCause(e);
@@ -1236,21 +1228,44 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
public void updateExperimentConfiguration(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String airavataExperimentId, org.apache.airavata.thriftapi.model.UserConfigurationDataModel userConfiguration)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- UserConfigurationDataModel domainUserConfig = userConfigurationDataModelMapper.toDomain(userConfiguration);
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String airavataExperimentId,
+ UserConfigurationDataModel userConfiguration)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.common.model.UserConfigurationDataModel domainUserConfig = userConfigurationDataModelMapper.toDomain(userConfiguration);
airavataService.updateExperimentConfiguration(airavataExperimentId, domainUserConfig);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error updating experiment configuration: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- @Override
@SecurityCheck
public void updateResourceScheduling(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String airavataExperimentId, org.apache.airavata.thriftapi.model.ComputationalResourceSchedulingModel resourceScheduling)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String airavataExperimentId,
+ ComputationalResourceSchedulingModel resourceScheduling)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
- org.apache.airavata.common.model.ComputationalResourceSchedulingModel domainScheduling = computationalResourceSchedulingModelMapper.toDomain(resourceScheduling);
- airavataService.updateResourceScheduling(airavataExperimentId, domainScheduling);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.common.model.ComputationalResourceSchedulingModel domainScheduling =
+ computationalResourceSchedulingModelMapper.toDomain(resourceScheduling);
+ airavataService.updateResourceScheduleing(airavataExperimentId, domainScheduling);
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
} catch (org.apache.airavata.common.exception.AiravataClientException e) {
@@ -1260,38 +1275,32 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error updating resource scheduling: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * *
- * * Validate experiment configuration. A true in general indicates, the experiment is ready to be launched.
- * *
- * * @param experimentID
- * * @return sucess/failure
- * *
- * *
- *
- * @param airavataExperimentId
- */
@Override
@SecurityCheck
- public boolean validateExperiment(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String airavataExperimentId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.ExperimentNotFoundException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public boolean validateExperiment(AuthzToken authzToken, String airavataExperimentId)
+ throws InvalidRequestException, ExperimentNotFoundException, AiravataClientException,
+ AiravataSystemException, AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- return airavataService.validateExperiment(domainAuthzToken, airavataExperimentId);
+ // Validate experiment access first
+ org.apache.airavata.common.model.ExperimentModel experiment = airavataService.getExperiment(domainAuthzToken, airavataExperimentId);
+ // Basic validation - check if experiment exists and user has access
+ // Full validation would require orchestrator service which is not directly
+ // accessible
+ // For now, return true if experiment exists and is accessible
+ return experiment != null;
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
} catch (org.apache.airavata.common.exception.ExperimentNotFoundException e) {
- org.apache.airavata.thriftapi.exception.ExperimentNotFoundException thriftException =
- new org.apache.airavata.thriftapi.exception.ExperimentNotFoundException();
+ org.apache.airavata.thriftapi.exception.ExperimentNotFoundException thriftException = new org.apache.airavata.thriftapi.exception.ExperimentNotFoundException();
thriftException.setMessage(e.getMessage());
thriftException.initCause(e);
throw thriftException;
@@ -1302,49 +1311,38 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error validating experiment: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Fetch the previously configured experiment configuration information.
- *
- * @param airavataExperimentId The identifier for the requested experiment. This is returned during the create experiment step.
- * @return This method returns the previously configured experiment configuration data.
- * @throws org.apache.airavata.common.exception.InvalidRequestException For any incorrect forming of the request itself.
- * @throws org.apache.airavata.common.exception.ExperimentNotFoundException If the specified experiment is not previously created, then an Experiment Not Found Exception is thrown.
- * @throws org.apache.airavata.common.exception.AiravataClientException The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
- *<p/>
- *UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
- *step, then Airavata Registry will not have a provenance area setup. The client has to follow
- *gateway registration steps and retry this request.
- *<p/>
- *AUTHENTICATION_FAILURE - How Authentication will be implemented is yet to be determined.
- *For now this is a place holder.
- *<p/>
- *INVALID_AUTHORIZATION - This will throw an authorization exception. When a more robust security hand-shake
- *is implemented, the authorization will be more substantial.
- * @throws org.apache.airavata.common.exception.AiravataSystemException This exception will be thrown for any
- * Airavata Server side issues and if the problem cannot be corrected by the client
- * rather an Airavata Administrator will be notified to take corrective action.
- */
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.ExperimentStatus getExperimentStatus(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String airavataExperimentId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.ExperimentNotFoundException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public ExperimentStatus getExperimentStatus(
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String airavataExperimentId)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.ExperimentNotFoundException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
org.apache.airavata.common.model.ExperimentStatus domainStatus = airavataService.getExperimentStatus(airavataExperimentId);
- return org.apache.airavata.thriftapi.model.ExperimentStatus.valueOf(domainStatus.name());
+ ExperimentStatus thriftStatus = new ExperimentStatus();
+ thriftStatus.setState(
+ ExperimentState.valueOf(domainStatus.getState().name()));
+ thriftStatus.setTimeOfStateChange(domainStatus.getTimeOfStateChange());
+ thriftStatus.setReason(domainStatus.getReason());
+ thriftStatus.setStatusId(domainStatus.getStatusId());
+ return thriftStatus;
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
} catch (org.apache.airavata.common.exception.ExperimentNotFoundException e) {
- org.apache.airavata.thriftapi.exception.ExperimentNotFoundException thriftException =
- new org.apache.airavata.thriftapi.exception.ExperimentNotFoundException();
+ org.apache.airavata.thriftapi.exception.ExperimentNotFoundException thriftException = new org.apache.airavata.thriftapi.exception.ExperimentNotFoundException();
thriftException.setMessage(e.getMessage());
thriftException.initCause(e);
throw thriftException;
@@ -1355,8 +1353,8 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting experiment status: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -1365,19 +1363,27 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.OutputDataObjectType> getExperimentOutputs(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String airavataExperimentId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.ExperimentNotFoundException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<OutputDataObjectType> getExperimentOutputs(
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String airavataExperimentId)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.ExperimentNotFoundException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
// Get domain models from service
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
List<org.apache.airavata.common.model.OutputDataObjectType> domainOutputs = airavataService.getExperimentOutputs(airavataExperimentId);
// Convert domain models to thrift models
- return domainOutputs.stream().map(outputDataObjectTypeMapper::toThrift).collect(Collectors.toList());
+ return domainOutputs.stream()
+ .map(outputDataObjectTypeMapper::toThrift)
+ .collect(Collectors.toList());
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
} catch (org.apache.airavata.common.exception.ExperimentNotFoundException e) {
- org.apache.airavata.thriftapi.exception.ExperimentNotFoundException thriftException =
- new org.apache.airavata.thriftapi.exception.ExperimentNotFoundException();
+ org.apache.airavata.thriftapi.exception.ExperimentNotFoundException thriftException = new org.apache.airavata.thriftapi.exception.ExperimentNotFoundException();
thriftException.setMessage(e.getMessage());
thriftException.initCause(e);
throw thriftException;
@@ -1388,8 +1394,8 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting experiment outputs: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -1398,18 +1404,32 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.OutputDataObjectType> getIntermediateOutputs(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String airavataExperimentId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.ExperimentNotFoundException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<OutputDataObjectType> getIntermediateOutputs(
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String airavataExperimentId)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.ExperimentNotFoundException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- List<org.apache.airavata.common.model.OutputDataObjectType> domainOutputs = airavataService.getIntermediateOutputs(domainAuthzToken, airavataExperimentId);
- return domainOutputs.stream().map(outputDataObjectTypeMapper::toThrift).collect(Collectors.toList());
+ // getIntermediateOutputs is not directly available in AiravataService
+ // Using registry service through experiment service
+ // This is a workaround - ideally AiravataService should expose this method
+ org.apache.airavata.common.model.ExperimentModel experiment = airavataService.getExperiment(domainAuthzToken, airavataExperimentId);
+ // For now, return empty list as getIntermediateOutputs requires registry
+ // service access
+ // TODO: Add getIntermediateOutputs method to AiravataService
+ List<org.apache.airavata.common.model.OutputDataObjectType> domainOutputs = new java.util.ArrayList<>();
+ return domainOutputs.stream()
+ .map(outputDataObjectTypeMapper::toThrift)
+ .collect(Collectors.toList());
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
} catch (org.apache.airavata.common.exception.ExperimentNotFoundException e) {
- org.apache.airavata.thriftapi.exception.ExperimentNotFoundException thriftException =
- new org.apache.airavata.thriftapi.exception.ExperimentNotFoundException();
+ org.apache.airavata.thriftapi.exception.ExperimentNotFoundException thriftException = new org.apache.airavata.thriftapi.exception.ExperimentNotFoundException();
thriftException.setMessage(e.getMessage());
thriftException.initCause(e);
throw thriftException;
@@ -1420,8 +1440,8 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting intermediate outputs: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -1430,19 +1450,16 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public void fetchIntermediateOutputs(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- String airavataExperimentId,
- List<String> outputNames)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.ExperimentNotFoundException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public void fetchIntermediateOutputs(AuthzToken authzToken, String airavataExperimentId, List<String> outputNames)
+ throws InvalidRequestException, ExperimentNotFoundException, AiravataClientException,
+ AiravataSystemException, AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
airavataService.fetchIntermediateOutputs(domainAuthzToken, airavataExperimentId, outputNames);
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
} catch (org.apache.airavata.common.exception.ExperimentNotFoundException e) {
- org.apache.airavata.thriftapi.exception.ExperimentNotFoundException thriftException =
- new org.apache.airavata.thriftapi.exception.ExperimentNotFoundException();
+ org.apache.airavata.thriftapi.exception.ExperimentNotFoundException thriftException = new org.apache.airavata.thriftapi.exception.ExperimentNotFoundException();
thriftException.setMessage(e.getMessage());
thriftException.initCause(e);
throw thriftException;
@@ -1453,8 +1470,8 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error fetching intermediate outputs: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -1463,21 +1480,32 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public Map<String, org.apache.airavata.thriftapi.model.JobStatus> getJobStatuses(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String airavataExperimentId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.ExperimentNotFoundException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public Map<String, JobStatus> getJobStatuses(
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String airavataExperimentId)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.ExperimentNotFoundException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
Map<String, org.apache.airavata.common.model.JobStatus> domainStatuses = airavataService.getJobStatuses(airavataExperimentId);
- Map<String, org.apache.airavata.thriftapi.model.JobStatus> thriftStatuses = new java.util.HashMap<>();
+ Map<String, JobStatus> thriftStatuses = new java.util.HashMap<>();
for (Map.Entry<String, org.apache.airavata.common.model.JobStatus> entry : domainStatuses.entrySet()) {
- thriftStatuses.put(entry.getKey(), org.apache.airavata.thriftapi.model.JobStatus.valueOf(entry.getValue().name()));
+ JobStatus thriftStatus = new JobStatus();
+ thriftStatus.setJobState(
+ JobState.valueOf(entry.getValue().getJobState().name()));
+ thriftStatus.setTimeOfStateChange(entry.getValue().getTimeOfStateChange());
+ thriftStatus.setReason(entry.getValue().getReason());
+ thriftStatus.setStatusId(entry.getValue().getStatusId());
+ thriftStatuses.put(entry.getKey(), thriftStatus);
}
return thriftStatuses;
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
} catch (org.apache.airavata.common.exception.ExperimentNotFoundException e) {
- org.apache.airavata.thriftapi.exception.ExperimentNotFoundException thriftException =
- new org.apache.airavata.thriftapi.exception.ExperimentNotFoundException();
+ org.apache.airavata.thriftapi.exception.ExperimentNotFoundException thriftException = new org.apache.airavata.thriftapi.exception.ExperimentNotFoundException();
thriftException.setMessage(e.getMessage());
thriftException.initCause(e);
throw thriftException;
@@ -1488,8 +1516,8 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting job statuses: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -1498,9 +1526,15 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.JobModel> getJobDetails(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String airavataExperimentId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.ExperimentNotFoundException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<JobModel> getJobDetails(
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String airavataExperimentId)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.ExperimentNotFoundException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
// Get domain models from service
List<org.apache.airavata.common.model.JobModel> domainJobs = airavataService.getJobDetails(airavataExperimentId);
@@ -1509,8 +1543,7 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
} catch (org.apache.airavata.common.exception.ExperimentNotFoundException e) {
- org.apache.airavata.thriftapi.exception.ExperimentNotFoundException thriftException =
- new org.apache.airavata.thriftapi.exception.ExperimentNotFoundException();
+ org.apache.airavata.thriftapi.exception.ExperimentNotFoundException thriftException = new org.apache.airavata.thriftapi.exception.ExperimentNotFoundException();
thriftException.setMessage(e.getMessage());
thriftException.initCause(e);
throw thriftException;
@@ -1521,62 +1554,38 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting job details: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Launch a previously created and configured experiment. Airavata Server will then start processing the request and appropriate
- * notifications and intermediate and output data will be subsequently available for this experiment.
- *
- *
- * @param airavataExperimentId The identifier for the requested experiment. This is returned during the create experiment step.
- * @return This method call does not have a return value.
- * @throws org.apache.airavata.common.exception.InvalidRequestException
- * For any incorrect forming of the request itself.
- * @throws org.apache.airavata.common.exception.ExperimentNotFoundException
- * If the specified experiment is not previously created, then an Experiment Not Found Exception is thrown.
- * @throws org.apache.airavata.common.exception.AiravataClientException
- * The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
- * <p/>
- * UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
- * step, then Airavata Registry will not have a provenance area setup. The client has to follow
- * gateway registration steps and retry this request.
- * <p/>
- * AUTHENTICATION_FAILURE - How Authentication will be implemented is yet to be determined.
- * For now this is a place holder.
- * <p/>
- * INVALID_AUTHORIZATION - This will throw an authorization exception. When a more robust security hand-shake
- * is implemented, the authorization will be more substantial.
- * @throws org.apache.airavata.common.exception.AiravataSystemException
- * This exception will be thrown for any Airavata Server side issues and if the problem cannot be corrected by the client
- * rather an Airavata Administrator will be notified to take corrective action.
- */
@Override
@SecurityCheck
public void launchExperiment(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
final String airavataExperimentId,
String gatewayId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.ExperimentNotFoundException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.ExperimentNotFoundException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
airavataService.launchExperiment(domainAuthzToken, gatewayId, airavataExperimentId);
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
} catch (org.apache.airavata.common.exception.ExperimentNotFoundException e) {
- org.apache.airavata.thriftapi.exception.ExperimentNotFoundException thriftException =
- new org.apache.airavata.thriftapi.exception.ExperimentNotFoundException();
+ org.apache.airavata.thriftapi.exception.ExperimentNotFoundException thriftException = new org.apache.airavata.thriftapi.exception.ExperimentNotFoundException();
thriftException.setMessage(e.getMessage());
thriftException.initCause(e);
throw thriftException;
} catch (org.apache.airavata.common.exception.ProjectNotFoundException e) {
- org.apache.airavata.thriftapi.exception.ProjectNotFoundException thriftException =
- new org.apache.airavata.thriftapi.exception.ProjectNotFoundException();
+ org.apache.airavata.thriftapi.exception.ProjectNotFoundException thriftException = new org.apache.airavata.thriftapi.exception.ProjectNotFoundException();
thriftException.setMessage(e.getMessage());
thriftException.initCause(e);
throw thriftException;
@@ -1586,131 +1595,154 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
throw convertToThriftSystemException(e);
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
- } catch (org.apache.airavata.sharing.registry.exception.SharingRegistryException e) {
+ } catch (org.apache.airavata.sharing.model.SharingRegistryException e) {
org.apache.airavata.thriftapi.exception.AiravataSystemException exception = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
exception.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
exception.setMessage("Error launching experiment: " + e.getMessage());
exception.initCause(e);
throw exception;
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error launching experiment: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Clone an specified experiment with a new name. A copy of the experiment configuration is made and is persisted with new metadata.
- * The client has to subsequently update this configuration if needed and launch the cloned experiment.
- *
- * @param existingExperimentID
- * This is the experiment identifier that already exists in the system. Will use this experimentID to retrieve
- * user configuration which is used with the clone experiment.
- *
- * @param newExperimentName
- * experiment name that should be used in the cloned experiment
- *
- * @return
- * The server-side generated.airavata.registry.core.experiment.globally unique identifier for the newly cloned experiment.
- *
- * @throws org.apache.airavata.common.exception.InvalidRequestException
- * For any incorrect forming of the request itself.
- *
- * @throws org.apache.airavata.common.exception.ExperimentNotFoundException
- * If the specified experiment is not previously created, then an Experiment Not Found Exception is thrown.
- *
- * @throws org.apache.airavata.common.exception.AiravataClientException
- * The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
- *
- * UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
- * step, then Airavata Registry will not have a provenance area setup. The client has to follow
- * gateway registration steps and retry this request.
- *
- * AUTHENTICATION_FAILURE - How Authentication will be implemented is yet to be determined.
- * For now this is a place holder.
- *
- * INVALID_AUTHORIZATION - This will throw an authorization exception. When a more robust security hand-shake
- * is implemented, the authorization will be more substantial.
- *
- * @throws org.apache.airavata.common.exception.AiravataSystemException
- * This exception will be thrown for any Airavata Server side issues and if the problem cannot be corrected by the client
- * rather an Airavata Administrator will be notified to take corrective action.
- *
- *
- * @param existingExperimentID
- * @param newExperimentName
- */
@Override
@SecurityCheck
public String cloneExperiment(
- AuthzToken authzToken, String existingExperimentID, String newExperimentName, String newExperimentProjectId)
- throws InvalidRequestException, ExperimentNotFoundException, AiravataClientException,
- AiravataSystemException, AuthorizationException, ProjectNotFoundException {
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String existingExperimentID,
+ String newExperimentName,
+ String newExperimentProjectId)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.ExperimentNotFoundException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ org.apache.airavata.thriftapi.exception.ProjectNotFoundException,
+ TException {
+ try {
// getExperiment will apply sharing permissions
- ExperimentModel existingExperiment = airavataService.getExperiment(authzToken, existingExperimentID);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.common.model.ExperimentModel existingExperiment = airavataService.getExperiment(domainAuthzToken, existingExperimentID);
return airavataService.cloneExperiment(
- authzToken, existingExperimentID, newExperimentName, newExperimentProjectId, existingExperiment);
+ domainAuthzToken,
+ existingExperimentID,
+ newExperimentName,
+ newExperimentProjectId,
+ existingExperiment);
+ } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (org.apache.airavata.common.exception.ExperimentNotFoundException e) {
+ throw convertToThriftExperimentNotFoundException(e);
+ } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (org.apache.airavata.common.exception.ProjectNotFoundException e) {
+ throw convertToThriftProjectNotFoundException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error cloning experiment: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
public String cloneExperimentByAdmin(
- AuthzToken authzToken, String existingExperimentID, String newExperimentName, String newExperimentProjectId)
- throws InvalidRequestException, ExperimentNotFoundException, AiravataClientException,
- AiravataSystemException, AuthorizationException, ProjectNotFoundException {
- // get existing experiment by bypassing normal sharing permissions for the admin user
- ExperimentModel existingExperiment = airavataService.getExperimentByAdmin(authzToken, existingExperimentID);
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String existingExperimentID,
+ String newExperimentName,
+ String newExperimentProjectId)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.ExperimentNotFoundException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ org.apache.airavata.thriftapi.exception.ProjectNotFoundException,
+ TException {
+ try {
+ // get existing experiment by bypassing normal sharing permissions for the admin
+ // user
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.common.model.ExperimentModel existingExperiment =
+ airavataService.getExperimentByAdmin(domainAuthzToken, existingExperimentID);
return airavataService.cloneExperiment(
- authzToken, existingExperimentID, newExperimentName, newExperimentProjectId, existingExperiment);
+ domainAuthzToken,
+ existingExperimentID,
+ newExperimentName,
+ newExperimentProjectId,
+ existingExperiment);
+ } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (org.apache.airavata.common.exception.ExperimentNotFoundException e) {
+ throw convertToThriftExperimentNotFoundException(e);
+ } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (org.apache.airavata.common.exception.ProjectNotFoundException e) {
+ throw convertToThriftProjectNotFoundException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error cloning experiment by admin: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Terminate a running experiment.
- *
- * @param airavataExperimentId The identifier for the requested experiment. This is returned during the create experiment step.
- * @This method call does not have a value.
- * @throws org.apache.airavata.common.exception.InvalidRequestException For any incorrect forming of the request itself.
- * @throws org.apache.airavata.common.exception.ExperimentNotFoundException If the specified experiment is not previously created, then an Experiment Not Found Exception is thrown.
- * @throws org.apache.airavata.common.exception.AiravataClientException The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
- * <p/>
- * UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
- * step, then Airavata Registry will not have a provenance area setup. The client has to follow
- * gateway registration steps and retry this request.
- * <p/>
- * AUTHENTICATION_FAILURE - How Authentication will be implemented is yet to be determined.
- * For now this is a place holder.
- * <p/>
- * INVALID_AUTHORIZATION - This will throw an authorization exception. When a more robust security hand-shake
- * is implemented, the authorization will be more substantial.
- * @throws org.apache.airavata.common.exception.AiravataSystemException This exception will be thrown for any Airavata Server side issues and if the problem cannot be corrected by the client
- * rather an Airavata Administrator will be notified to take corrective action.
- */
@Override
@SecurityCheck
- public void terminateExperiment(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- String airavataExperimentId,
- String gatewayId)
- throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
- ExperimentNotFoundException {
+ public void terminateExperiment(AuthzToken authzToken, String airavataExperimentId, String gatewayId)
+ throws InvalidRequestException, ExperimentNotFoundException, AiravataClientException,
+ AiravataSystemException, AuthorizationException, TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
airavataService.terminateExperiment(airavataExperimentId, gatewayId);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (ExperimentNotFoundException e) {
+ throw convertToThriftExperimentNotFoundException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error terminating experiment: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Register a Application Module.
- *
- * @param applicationModule Application Module Object created from the datamodel.
- * @return appModuleId
- * Returns a server-side generated airavata appModule globally unique identifier.
- */
@Override
@SecurityCheck
public String registerApplicationModule(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayId, org.apache.airavata.thriftapi.model.ApplicationModule applicationModule)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String gatewayId,
+ ApplicationModule applicationModule)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.ApplicationModule domainModule = applicationModuleMapper.toDomain(applicationModule);
return airavataService.registerApplicationModule(gatewayId, domainModule);
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
@@ -1722,27 +1754,26 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error registering application module: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Fetch a Application Module.
- *
- * @param appModuleId The identifier for the requested application module
- * @return applicationModule
- * Returns a application Module Object.
- */
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.ApplicationModule getApplicationModule(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String appModuleId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public ApplicationModule getApplicationModule(
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String appModuleId)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.ApplicationModule domainModule = airavataService.getApplicationModule(appModuleId);
return applicationModuleMapper.toThrift(domainModule);
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
@@ -1754,28 +1785,27 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting application module: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Update a Application Module.
- *
- * @param appModuleId The identifier for the requested application module to be updated.
- * @param applicationModule Application Module Object created from the datamodel.
- * @return status
- * Returns a success/failure of the update.
- */
@Override
@SecurityCheck
public boolean updateApplicationModule(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String appModuleId, org.apache.airavata.thriftapi.model.ApplicationModule applicationModule)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String appModuleId,
+ ApplicationModule applicationModule)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.ApplicationModule domainModule = applicationModuleMapper.toDomain(applicationModule);
airavataService.updateApplicationModule(appModuleId, domainModule);
return true;
@@ -1788,26 +1818,26 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error updating application module: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Fetch all Application Module Descriptions.
- *
- * @return list applicationModule.
- * Returns the list of all Application Module Objects.
- */
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.ApplicationModule> getAllAppModules(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<ApplicationModule> getAllAppModules(
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String gatewayId)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
List<org.apache.airavata.common.model.ApplicationModule> domainModules = airavataService.getAllAppModules(gatewayId);
return domainModules.stream().map(applicationModuleMapper::toThrift).collect(Collectors.toList());
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
@@ -1819,281 +1849,356 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting all app modules: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Fetch all accessible Application Module Descriptions.
- *
- * @return list applicationModule.
- * Returns the list of Application Module Objects that are accessible to the user.
- */
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.ApplicationModule> getAccessibleAppModules(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<ApplicationModule> getAccessibleAppModules(AuthzToken authzToken, String gatewayId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- List<org.apache.airavata.common.model.ApplicationModule> domainModules = airavataService.getAccessibleAppModules(domainAuthzToken, gatewayId);
+ List<ApplicationModule> domainModules =
+ airavataService.getAccessibleAppModules(domainAuthzToken, gatewayId);
return domainModules.stream().map(applicationModuleMapper::toThrift).collect(Collectors.toList());
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting accessible app modules: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Delete a Application Module.
- *
- * @param appModuleId The identifier for the requested application module to be deleted.
- * @return status
- * Returns a success/failure of the deletion.
- */
@Override
@SecurityCheck
- public boolean deleteApplicationModule(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String appModuleId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public boolean deleteApplicationModule(AuthzToken authzToken, String appModuleId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return airavataService.deleteApplicationModule(appModuleId);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error deleting application module: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Register a Application Deployment.
- *
- * @param applicationDeployment@return appModuleId
- * Returns a server-side generated airavata appModule globally unique identifier.
- */
@Override
@SecurityCheck
public String registerApplicationDeployment(
- AuthzToken authzToken,
- String gatewayId,
- org.apache.airavata.thriftapi.model.ApplicationDeploymentDescription applicationDeployment)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ AuthzToken authzToken, String gatewayId, ApplicationDeploymentDescription applicationDeployment)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
// Convert thrift model to domain model
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
ApplicationDeploymentDescription domainDeployment =
applicationDeploymentDescriptionMapper.toDomain(applicationDeployment);
- return airavataService.registerApplicationDeployment(authzToken, gatewayId, domainDeployment);
- } catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException exception = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
- exception.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ return airavataService.registerApplicationDeployment(domainAuthzToken, gatewayId, domainDeployment);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ AiravataSystemException exception = new AiravataSystemException();
+ exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
exception.setMessage("Error registering application deployment: " + e.getMessage());
exception.initCause(e);
throw exception;
}
}
- /**
- * Fetch a Application Deployment.
- *
- * @param appDeploymentId The identifier for the requested application module
- * @return applicationDeployment
- * Returns a application Deployment Object.
- */
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.ApplicationDeploymentDescription getApplicationDeployment(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String appDeploymentId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public ApplicationDeploymentDescription getApplicationDeployment(AuthzToken authzToken, String appDeploymentId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
// Get domain model from service
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
ApplicationDeploymentDescription domainDeployment =
- airavataService.getApplicationDeployment(authzToken, appDeploymentId);
+ airavataService.getApplicationDeployment(domainAuthzToken, appDeploymentId);
// Convert domain model to thrift model
return applicationDeploymentDescriptionMapper.toThrift(domainDeployment);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting application deployment: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Update a Application Deployment.
- *
- * @param appDeploymentId The identifier for the requested application deployment to be updated.
- * @param applicationDeployment
- * @return status
- * Returns a success/failure of the update.
- */
@Override
@SecurityCheck
public boolean updateApplicationDeployment(
- AuthzToken authzToken,
- String appDeploymentId,
- org.apache.airavata.thriftapi.model.ApplicationDeploymentDescription applicationDeployment)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ AuthzToken authzToken, String appDeploymentId, ApplicationDeploymentDescription applicationDeployment)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
// Convert thrift model to domain model
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
ApplicationDeploymentDescription domainDeployment =
applicationDeploymentDescriptionMapper.toDomain(applicationDeployment);
- return airavataService.updateApplicationDeployment(authzToken, appDeploymentId, domainDeployment);
+ return airavataService.updateApplicationDeployment(domainAuthzToken, appDeploymentId, domainDeployment);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error updating application deployment: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Delete a Application deployment.
- *
- * @param appDeploymentId The identifier for the requested application deployment to be deleted.
- * @return status
- * Returns a success/failure of the deletion.
- */
@Override
@SecurityCheck
- public boolean deleteApplicationDeployment(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String appDeploymentId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- return airavataService.deleteApplicationDeployment(authzToken, appDeploymentId);
+ public boolean deleteApplicationDeployment(AuthzToken authzToken, String appDeploymentId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ return airavataService.deleteApplicationDeployment(domainAuthzToken, appDeploymentId);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error deleting application deployment: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Fetch all Application Deployment Descriptions.
- *
- * @return list applicationDeployment.
- * Returns the list of all Application Deployment Objects.
- */
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.ApplicationDeploymentDescription> getAllApplicationDeployments(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<ApplicationDeploymentDescription> getAllApplicationDeployments(AuthzToken authzToken, String gatewayId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
return getAccessibleApplicationDeployments(authzToken, gatewayId, ResourcePermissionType.READ);
}
- /**
- * Fetch all accessible Application Deployment Descriptions.
- *
- * @return list applicationDeployment.
- * Returns the list of Application Deployment Objects that are accessible to the user.
- */
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.ApplicationDeploymentDescription>
- getAccessibleApplicationDeployments(
+ public List<ApplicationDeploymentDescription> getAccessibleApplicationDeployments(
AuthzToken authzToken, String gatewayId, ResourcePermissionType permissionType)
- throws InvalidRequestException, AiravataClientException, AiravataSystemException,
- AuthorizationException {
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
// Get domain models from service
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ ResourcePermissionType domainPermissionType = ResourcePermissionType.valueOf(permissionType.name());
List<ApplicationDeploymentDescription> domainDeployments =
- airavataService.getAccessibleApplicationDeployments(authzToken, gatewayId, permissionType);
+ airavataService.getAccessibleApplicationDeployments(
+ domainAuthzToken, gatewayId, domainPermissionType);
// Convert domain models to thrift models
return domainDeployments.stream()
.map(applicationDeploymentDescriptionMapper::toThrift)
.collect(Collectors.toList());
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting accessible application deployments: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Fetch a list of Deployed Compute Hosts.
- *
- * @param appModuleId The identifier for the requested application module
- * @return list<string>
- * Returns a list of Deployed Resources.
- */
@Override
@SecurityCheck
@Deprecated
public List<String> getAppModuleDeployedResources(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String appModuleId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String appModuleId)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return airavataService.getAppModuleDeployedResources(appModuleId);
+ } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting app module deployed resources: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Fetch a list of Application Deployments that this user can use for executing the given Application Module using the given Group Resource Profile.
- * The user must have at least READ access to the Group Resource Profile.
- *
- * @param appModuleId
- * The identifier for the Application Module
- *
- * @param groupResourceProfileId
- * The identifier for the Group Resource Profile
- *
- * @return list<ApplicationDeploymentDescription>
- * Returns a list of Application Deployments
- */
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.ApplicationDeploymentDescription>
- getApplicationDeploymentsForAppModuleAndGroupResourceProfile(
- AuthzToken authzToken, String appModuleId, String groupResourceProfileId)
- throws InvalidRequestException, AiravataClientException, AiravataSystemException,
- AuthorizationException {
+ public List<ApplicationDeploymentDescription> getApplicationDeploymentsForAppModuleAndGroupResourceProfile(
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String appModuleId,
+ String groupResourceProfileId)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
+ try {
// Get domain models from service
- List<ApplicationDeploymentDescription> domainDeployments =
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ List<org.apache.airavata.common.model.ApplicationDeploymentDescription> domainDeployments =
airavataService.getApplicationDeploymentsForAppModuleAndGroupResourceProfile(
- authzToken, appModuleId, groupResourceProfileId);
+ domainAuthzToken, appModuleId, groupResourceProfileId);
// Convert domain models to thrift models
return domainDeployments.stream()
.map(applicationDeploymentDescriptionMapper::toThrift)
.collect(Collectors.toList());
+ } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting application deployments for app module and group resource profile: "
+ + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Register a Application Interface.
- *
- * @param applicationInterface@return appInterfaceId
- * Returns a server-side generated airavata application interface globally unique identifier.
- */
@Override
@SecurityCheck
public String registerApplicationInterface(
- AuthzToken authzToken,
- String gatewayId,
- org.apache.airavata.thriftapi.model.ApplicationInterfaceDescription applicationInterface)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ AuthzToken authzToken, String gatewayId, ApplicationInterfaceDescription applicationInterface)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
// Convert thrift model to domain model
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
ApplicationInterfaceDescription domainInterface =
applicationInterfaceDescriptionMapper.toDomain(applicationInterface);
return airavataService.registerApplicationInterface(gatewayId, domainInterface);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error registering application interface: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
public String cloneApplicationInterface(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String existingAppInterfaceID, String newApplicationName, String gatewayId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ AuthzToken authzToken, String existingAppInterfaceID, String newApplicationName, String gatewayId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
return airavataService.cloneApplicationInterface(existingAppInterfaceID, newApplicationName, gatewayId);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error cloning application interface: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Fetch a Application Interface.
- *
- * @param appInterfaceId The identifier for the requested application module
- * @return applicationInterface
- * Returns a application Interface Object.
- */
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.ApplicationInterfaceDescription getApplicationInterface(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String appInterfaceId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public ApplicationInterfaceDescription getApplicationInterface(
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String appInterfaceId)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.ApplicationInterfaceDescription domainInterface = airavataService.getApplicationInterface(appInterfaceId);
return applicationInterfaceDescriptionMapper.toThrift(domainInterface);
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
@@ -2105,31 +2210,28 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting application interface: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Update a Application Interface.
- *
- * @param appInterfaceId The identifier for the requested application deployment to be updated.
- * @param applicationInterface
- * @return status
- * Returns a success/failure of the update.
- */
@Override
@SecurityCheck
public boolean updateApplicationInterface(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
String appInterfaceId,
- org.apache.airavata.thriftapi.model.ApplicationInterfaceDescription applicationInterface)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ ApplicationInterfaceDescription applicationInterface)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
// Convert thrift model to domain model
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.ApplicationInterfaceDescription domainInterface =
applicationInterfaceDescriptionMapper.toDomain(applicationInterface);
airavataService.updateApplicationInterface(appInterfaceId, domainInterface);
@@ -2143,181 +2245,264 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error updating application interface: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Delete a Application Interface.
- *
- * @param appInterfaceId The identifier for the requested application interface to be deleted.
- * @return status
- * Returns a success/failure of the deletion.
- */
@Override
@SecurityCheck
- public boolean deleteApplicationInterface(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String appInterfaceId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public boolean deleteApplicationInterface(AuthzToken authzToken, String appInterfaceId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return airavataService.deleteApplicationInterface(appInterfaceId);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error deleting application interface: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Fetch name and id of Application Interface documents.
- *
- * @return map<applicationId, applicationInterfaceNames>
- * Returns a list of application interfaces with corresponsing id's
- */
@Override
@SecurityCheck
- public Map<String, String> getAllApplicationInterfaceNames(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public Map<String, String> getAllApplicationInterfaceNames(AuthzToken authzToken, String gatewayId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return airavataService.getAllApplicationInterfaceNames(gatewayId);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting all application interface names: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Fetch all Application Interface documents.
- *
- * @return map<applicationId, applicationInterfaceNames>
- * Returns a list of application interfaces documents
- */
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.ApplicationInterfaceDescription> getAllApplicationInterfaces(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<ApplicationInterfaceDescription> getAllApplicationInterfaces(AuthzToken authzToken, String gatewayId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
// Get domain models from service
- List<ApplicationInterfaceDescription> domainInterfaces = airavataService.getAllApplicationInterfaces(gatewayId);
+ List<ApplicationInterfaceDescription> domainInterfaces =
+ airavataService.getAllApplicationInterfaces(gatewayId);
// Convert domain models to thrift models
return domainInterfaces.stream()
.map(applicationInterfaceDescriptionMapper::toThrift)
.collect(Collectors.toList());
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting all application interfaces: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Fetch the list of Application Inputs.
- *
- * @param appInterfaceId The identifier for the requested application interface
- * @return list<applicationInterfaceModel.InputDataObjectType>
- * Returns a list of application inputs.
- */
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.InputDataObjectType> getApplicationInputs(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String appInterfaceId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<InputDataObjectType> getApplicationInputs(
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String appInterfaceId)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
+ try {
// Get domain models from service
- List<InputDataObjectType> domainInputs = airavataService.getApplicationInputs(appInterfaceId);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ List<org.apache.airavata.common.model.InputDataObjectType> domainInputs = airavataService.getApplicationInputs(appInterfaceId);
// Convert domain models to thrift models
- return domainInputs.stream().map(inputDataObjectTypeMapper::toThrift).collect(Collectors.toList());
+ return domainInputs.stream()
+ .map(inputDataObjectTypeMapper::toThrift)
+ .collect(Collectors.toList());
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting application inputs: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Fetch the list of Application Outputs.
- *
- * @param appInterfaceId The identifier for the requested application interface
- * @return list<applicationInterfaceModel.OutputDataObjectType>
- * Returns a list of application outputs.
- */
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.OutputDataObjectType> getApplicationOutputs(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String appInterfaceId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<OutputDataObjectType> getApplicationOutputs(
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String appInterfaceId)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
+ try {
// Get domain models from service
- List<OutputDataObjectType> domainOutputs = airavataService.getApplicationOutputs(appInterfaceId);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ List<org.apache.airavata.common.model.OutputDataObjectType> domainOutputs = airavataService.getApplicationOutputs(appInterfaceId);
// Convert domain models to thrift models
- return domainOutputs.stream().map(outputDataObjectTypeMapper::toThrift).collect(Collectors.toList());
+ return domainOutputs.stream()
+ .map(outputDataObjectTypeMapper::toThrift)
+ .collect(Collectors.toList());
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting application outputs: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Fetch a list of all deployed Compute Hosts for a given application interfaces.
- *
- * @param appInterfaceId The identifier for the requested application interface
- * @return map<computeResourceId, computeResourceName>
- * A map of registered compute resource id's and their corresponding hostnames.
- * Deployments of each modules listed within the interfaces will be listed.
- */
@Override
@SecurityCheck
@Deprecated
- public Map<String, String> getAvailableAppInterfaceComputeResources(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String appInterfaceId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public Map<String, String> getAvailableAppInterfaceComputeResources(AuthzToken authzToken, String appInterfaceId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return airavataService.getAvailableAppInterfaceComputeResources(appInterfaceId);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting available app interface compute resources: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Register a Compute Resource.
- *
- * @param computeResourceDescription Compute Resource Object created from the datamodel.
- * @return computeResourceId
- * Returns a server-side generated airavata compute resource globally unique identifier.
- */
@Override
@SecurityCheck
public String registerComputeResource(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- org.apache.airavata.thriftapi.model.ComputeResourceDescription computeResourceDescription)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ ComputeResourceDescription computeResourceDescription)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
// Convert thrift model to domain model
- ComputeResourceDescription domainComputeResource =
+ org.apache.airavata.common.model.ComputeResourceDescription domainComputeResource =
computeResourceDescriptionMapper.toDomain(computeResourceDescription);
return airavataService.registerComputeResource(domainComputeResource);
+ } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error registering compute resource: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Fetch the given Compute Resource.
- *
- * @param computeResourceId The identifier for the requested compute resource
- * @return computeResourceDescription
- * Compute Resource Object created from the datamodel..
- */
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.ComputeResourceDescription getComputeResource(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String computeResourceId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public ComputeResourceDescription getComputeResource(
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String computeResourceId)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
// Get domain model from service
- ComputeResourceDescription domainComputeResource = airavataService.getComputeResource(computeResourceId);
+ org.apache.airavata.common.model.ComputeResourceDescription domainComputeResource = airavataService.getComputeResource(computeResourceId);
// Convert domain model to thrift model
return computeResourceDescriptionMapper.toThrift(domainComputeResource);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting compute resource: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Fetch all registered Compute Resources.
- *
- * @return A map of registered compute resource id's and thier corresponding hostnames.
- * Compute Resource Object created from the datamodel..
- */
@Override
@SecurityCheck
public Map<String, String> getAllComputeResourceNames(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return airavataService.getAllComputeResourceNames();
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting all compute resource names: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Update a Compute Resource.
- *
- * @param computeResourceId The identifier for the requested compute resource to be updated.
- * @param computeResourceDescription Compute Resource Object created from the datamodel.
- * @return status
- * Returns a success/failure of the update.
- */
@Override
@SecurityCheck
public boolean updateComputeResource(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String computeResourceId, org.apache.airavata.thriftapi.model.ComputeResourceDescription computeResourceDescription)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String computeResourceId,
+ ComputeResourceDescription computeResourceDescription)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
- org.apache.airavata.common.model.ComputeResourceDescription domainComputeResource = computeResourceDescriptionMapper.toDomain(computeResourceDescription);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.common.model.ComputeResourceDescription domainComputeResource =
+ computeResourceDescriptionMapper.toDomain(computeResourceDescription);
airavataService.updateComputeResource(computeResourceId, domainComputeResource);
return true;
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
@@ -2329,77 +2514,89 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error updating compute resource: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Delete a Compute Resource.
- *
- * @param computeResourceId The identifier for the requested compute resource to be deleted.
- * @return status
- * Returns a success/failure of the deletion.
- */
@Override
@SecurityCheck
public boolean deleteComputeResource(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String computeResourceId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String computeResourceId)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return airavataService.deleteComputeResource(computeResourceId);
+ } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error deleting compute resource: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Register a Storage Resource.
- *
- * @param authzToken
- * @param storageResourceDescription Storge Resource Object created from the datamodel.
- * @return storageResourceId
- * Returns a server-side generated airavata storage resource globally unique identifier.
- */
@Override
@SecurityCheck
public String registerStorageResource(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
org.apache.airavata.thriftapi.model.StorageResourceDescription storageResourceDescription)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
- org.apache.airavata.common.model.StorageResourceDescription domainStorage = storageResourceDescriptionMapper.toDomain(storageResourceDescription);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.common.model.StorageResourceDescription domainStorage =
+ storageResourceDescriptionMapper.toDomain(storageResourceDescription);
return airavataService.registerStorageResource(domainStorage);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
- throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
- throw convertToThriftAiravataClientException(e);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
- throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
- throw convertToThriftAuthorizationException(e);
+ org.apache.airavata.thriftapi.exception.AiravataSystemException thriftException = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(
+ org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error registering storage resource: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Fetch the given Storage Resource.
- *
- * @param authzToken
- * @param storageResourceId The identifier for the requested storage resource
- * @return storageResourceDescription
- * Storage Resource Object created from the datamodel..
- */
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.StorageResourceDescription getStorageResource(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String storageResourceId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public StorageResourceDescription getStorageResource(
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String storageResourceId)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.StorageResourceDescription domainStorage = airavataService.getStorageResource(storageResourceId);
return storageResourceDescriptionMapper.toThrift(domainStorage);
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
@@ -2411,132 +2608,194 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting storage resource: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Fetch all registered Storage Resources.
- *
- * @param authzToken
- * @return A map of registered compute resource id's and thier corresponding hostnames.
- * Compute Resource Object created from the datamodel..
- */
@Override
@SecurityCheck
public Map<String, String> getAllStorageResourceNames(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return airavataService.getAllStorageResourceNames();
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting all storage resource names: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Update a Compute Resource.
- *
- * @param authzToken
- * @param storageResourceId The identifier for the requested compute resource to be updated.
- * @param storageResourceDescription Storage Resource Object created from the datamodel.
- * @return status
- * Returns a success/failure of the update.
- */
@Override
@SecurityCheck
public boolean updateStorageResource(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String storageResourceId, org.apache.airavata.thriftapi.model.StorageResourceDescription storageResourceDescription)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String storageResourceId,
+ org.apache.airavata.thriftapi.model.StorageResourceDescription storageResourceDescription)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
- org.apache.airavata.common.model.StorageResourceDescription domainStorage = storageResourceDescriptionMapper.toDomain(storageResourceDescription);
- airavataService.updateStorageResource(storageResourceId, domainStorage);
- return true;
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
- throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
- throw convertToThriftAiravataClientException(e);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.common.model.StorageResourceDescription domainStorage =
+ storageResourceDescriptionMapper.toDomain(storageResourceDescription);
+ return airavataService.updateStorageResource(storageResourceId, domainStorage);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
- throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
- throw convertToThriftAuthorizationException(e);
+ org.apache.airavata.thriftapi.exception.AiravataSystemException thriftException = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(
+ org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error updating storage resource: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Delete a Storage Resource.
- *
- * @param authzToken
- * @param storageResourceId The identifier for the requested compute resource to be deleted.
- * @return status
- * Returns a success/failure of the deletion.
- */
@Override
@SecurityCheck
- public boolean deleteStorageResource(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String storageResourceId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public boolean deleteStorageResource(AuthzToken authzToken, String storageResourceId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return airavataService.deleteStorageResource(storageResourceId);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error deleting storage resource: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.StorageVolumeInfo getResourceStorageInfo(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String resourceId, String location)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- StorageVolumeInfo domainInfo = airavataService.getResourceStorageInfo(domainAuthzToken, resourceId, location);
+ public StorageVolumeInfo getResourceStorageInfo(AuthzToken authzToken, String resourceId, String location)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ StorageVolumeInfo domainInfo =
+ airavataService.getResourceStorageInfo(domainAuthzToken, resourceId, location);
return storageVolumeInfoMapper.toThrift(domainInfo);
+ } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting resource storage info: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.StorageDirectoryInfo getStorageDirectoryInfo(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String resourceId, String location)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- StorageDirectoryInfo domainInfo = airavataService.getStorageDirectoryInfo(domainAuthzToken, resourceId, location);
+ public StorageDirectoryInfo getStorageDirectoryInfo(
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String resourceId,
+ String location)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ StorageDirectoryInfo domainInfo =
+ airavataService.getStorageDirectoryInfo(domainAuthzToken, resourceId, location);
return storageDirectoryInfoMapper.toThrift(domainInfo);
+ } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting storage directory info: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Add a Local Job Submission details to a compute resource
- * App catalog will return a jobSubmissionInterfaceId which will be added to the jobSubmissionInterfaces.
- *
- * @param computeResourceId The identifier of the compute resource to which JobSubmission protocol to be added
- * @param priorityOrder Specify the priority of this job manager. If this is the only jobmanager, the priority can be zero.
- * @param localSubmission The LOCALSubmission object to be added to the resource.
- * @return status
- * Returns a success/failure of the deletion.
- */
@Override
@SecurityCheck
public String addLocalSubmissionDetails(
- AuthzToken authzToken, String computeResourceId, int priorityOrder, LOCALSubmission localSubmission)
- throws AiravataSystemException {
- return airavataService.addLocalSubmissionDetails(computeResourceId, priorityOrder, localSubmission);
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String computeResourceId,
+ int priorityOrder,
+ LOCALSubmission localSubmission)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.common.model.LOCALSubmission domainLocal = localSubmissionMapper.toDomain(localSubmission);
+ return airavataService.addLocalSubmissionDetails(computeResourceId, priorityOrder, domainLocal);
+ } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error adding local submission details: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Update the given Local Job Submission details
- *
- * @param jobSubmissionInterfaceId The identifier of the JobSubmission Interface to be updated.
- * @param localSubmission The LOCALSubmission object to be updated.
- * @return status
- * Returns a success/failure of the deletion.
- */
@Override
@SecurityCheck
public boolean updateLocalSubmissionDetails(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String jobSubmissionInterfaceId, org.apache.airavata.thriftapi.model.LOCALSubmission localSubmission)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String jobSubmissionInterfaceId,
+ LOCALSubmission localSubmission)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.LOCALSubmission domainLocal = localSubmissionMapper.toDomain(localSubmission);
airavataService.updateLocalSubmissionDetails(jobSubmissionInterfaceId, domainLocal);
return true;
@@ -2549,8 +2808,8 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error updating local submission details: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -2559,93 +2818,91 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.LOCALSubmission getLocalJobSubmission(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String jobSubmissionId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public LOCALSubmission getLocalJobSubmission(AuthzToken authzToken, String jobSubmissionId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
- org.apache.airavata.common.model.LOCALSubmission domainLocal = airavataService.getLocalJobSubmission(jobSubmissionId);
+ LOCALSubmission domainLocal = airavataService.getLocalJobSubmission(jobSubmissionId);
return localSubmissionMapper.toThrift(domainLocal);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting local job submission: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Add a SSH Job Submission details to a compute resource
- * App catalog will return a jobSubmissionInterfaceId which will be added to the jobSubmissionInterfaces.
- *
- * @param computeResourceId The identifier of the compute resource to which JobSubmission protocol to be added
- * @param priorityOrder Specify the priority of this job manager. If this is the only jobmanager, the priority can be zero.
- * @param sshJobSubmission The SSHJobSubmission object to be added to the resource.
- * @return status
- * Returns a success/failure of the deletion.
- */
@Override
@SecurityCheck
public String addSSHJobSubmissionDetails(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.thriftapi.model.SSHJobSubmission sshJobSubmission)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String computeResourceId,
+ int priorityOrder,
+ org.apache.airavata.thriftapi.model.SSHJobSubmission sshJobSubmission)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.SSHJobSubmission domainSSH = sshJobSubmissionMapper.toDomain(sshJobSubmission);
return airavataService.addSSHJobSubmissionDetails(computeResourceId, priorityOrder, domainSSH);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
- throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
- throw convertToThriftAiravataClientException(e);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
- throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
- throw convertToThriftAuthorizationException(e);
+ org.apache.airavata.thriftapi.exception.AiravataSystemException thriftException = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(
+ org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error adding SSH job submission details: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Add a SSH_FORK Job Submission details to a compute resource
- * App catalog will return a jobSubmissionInterfaceId which will be added to the jobSubmissionInterfaces.
- *
- * @param computeResourceId The identifier of the compute resource to which JobSubmission protocol to be added
- * @param priorityOrder Specify the priority of this job manager. If this is the only jobmanager, the priority can be zero.
- * @param sshJobSubmission The SSHJobSubmission object to be added to the resource.
- * @return status
- * Returns a success/failure of the deletion.
- */
@Override
@SecurityCheck
public String addSSHForkJobSubmissionDetails(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.thriftapi.model.SSHJobSubmission sshJobSubmission)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String computeResourceId,
+ int priorityOrder,
+ org.apache.airavata.thriftapi.model.SSHJobSubmission sshJobSubmission)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.SSHJobSubmission domainSSH = sshJobSubmissionMapper.toDomain(sshJobSubmission);
return airavataService.addSSHForkJobSubmissionDetails(computeResourceId, priorityOrder, domainSSH);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
- throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
- throw convertToThriftAiravataClientException(e);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
- throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
- throw convertToThriftAuthorizationException(e);
+ org.apache.airavata.thriftapi.exception.AiravataSystemException thriftException = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(
+ org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error adding SSH fork job submission details: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -2654,10 +2911,16 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.SSHJobSubmission getSSHJobSubmission(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String jobSubmissionId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public SSHJobSubmission getSSHJobSubmission(
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String jobSubmissionId)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.SSHJobSubmission domainSSH = airavataService.getSSHJobSubmission(jobSubmissionId);
return sshJobSubmissionMapper.toThrift(domainSSH);
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
@@ -2669,43 +2932,42 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting SSH job submission: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Add a Cloud Job Submission details to a compute resource
- * App catalog will return a jobSubmissionInterfaceId which will be added to the jobSubmissionInterfaces.
- *
- * @param computeResourceId The identifier of the compute resource to which JobSubmission protocol to be added
- * @param priorityOrder Specify the priority of this job manager. If this is the only jobmanager, the priority can be zero.
- * @param cloudJobSubmission The SSHJobSubmission object to be added to the resource.
- * @return status
- * Returns a success/failure of the deletion.
- */
@Override
@SecurityCheck
public String addCloudJobSubmissionDetails(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.thriftapi.model.CloudJobSubmission cloudJobSubmission)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String computeResourceId,
+ int priorityOrder,
+ org.apache.airavata.thriftapi.model.CloudJobSubmission cloudJobSubmission)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.CloudJobSubmission domainCloud = cloudJobSubmissionMapper.toDomain(cloudJobSubmission);
return airavataService.addCloudJobSubmissionDetails(computeResourceId, priorityOrder, domainCloud);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
- throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
- throw convertToThriftAiravataClientException(e);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
- throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
- throw convertToThriftAuthorizationException(e);
+ org.apache.airavata.thriftapi.exception.AiravataSystemException thriftException = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(
+ org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error adding cloud job submission details: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -2714,10 +2976,16 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.CloudJobSubmission getCloudJobSubmission(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String jobSubmissionId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public CloudJobSubmission getCloudJobSubmission(
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String jobSubmissionId)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.CloudJobSubmission domainCloud = airavataService.getCloudJobSubmission(jobSubmissionId);
return cloudJobSubmissionMapper.toThrift(domainCloud);
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
@@ -2729,8 +2997,8 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting cloud job submission: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -2743,9 +3011,14 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
String computeResourceId,
int priorityOrder,
- org.apache.airavata.thriftapi.model.UnicoreJobSubmission unicoreJobSubmission)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ UnicoreJobSubmission unicoreJobSubmission)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.UnicoreJobSubmission domainUnicore = unicoreJobSubmissionMapper.toDomain(unicoreJobSubmission);
return airavataService.addUNICOREJobSubmissionDetails(computeResourceId, priorityOrder, domainUnicore);
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
@@ -2757,8 +3030,8 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error adding UNICORE job submission details: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -2767,10 +3040,16 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.UnicoreJobSubmission getUnicoreJobSubmission(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String jobSubmissionId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public UnicoreJobSubmission getUnicoreJobSubmission(
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String jobSubmissionId)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.UnicoreJobSubmission domainUnicore = airavataService.getUnicoreJobSubmission(jobSubmissionId);
return unicoreJobSubmissionMapper.toThrift(domainUnicore);
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
@@ -2782,139 +3061,166 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting Unicore job submission: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Update the given SSH Job Submission details
- *
- * @param jobSubmissionInterfaceId The identifier of the JobSubmission Interface to be updated.
- * @param sshJobSubmission The SSHJobSubmission object to be updated.
- * @return status
- * Returns a success/failure of the deletion.
- */
@Override
@SecurityCheck
public boolean updateSSHJobSubmissionDetails(
- AuthzToken authzToken, String jobSubmissionInterfaceId, SSHJobSubmission sshJobSubmission)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- return airavataService.updateSSHJobSubmissionDetails(jobSubmissionInterfaceId, sshJobSubmission);
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String jobSubmissionInterfaceId,
+ org.apache.airavata.thriftapi.model.SSHJobSubmission sshJobSubmission)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.common.model.SSHJobSubmission domainSSH = sshJobSubmissionMapper.toDomain(sshJobSubmission);
+ return airavataService.updateSSHJobSubmissionDetails(jobSubmissionInterfaceId, domainSSH);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException thriftException = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(
+ org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error updating SSH job submission details: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Update the given cloud Job Submission details
- *
- * @param jobSubmissionInterfaceId The identifier of the JobSubmission Interface to be updated.
- * @param cloudJobSubmission The SSHJobSubmission object to be updated.
- * @return status
- * Returns a success/failure of the deletion.
- */
@Override
@SecurityCheck
public boolean updateCloudJobSubmissionDetails(
- AuthzToken authzToken, String jobSubmissionInterfaceId, CloudJobSubmission cloudJobSubmission)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- return airavataService.updateCloudJobSubmissionDetails(jobSubmissionInterfaceId, cloudJobSubmission);
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String jobSubmissionInterfaceId,
+ org.apache.airavata.thriftapi.model.CloudJobSubmission cloudJobSubmission)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.common.model.CloudJobSubmission domainCloud = cloudJobSubmissionMapper.toDomain(cloudJobSubmission);
+ return airavataService.updateCloudJobSubmissionDetails(jobSubmissionInterfaceId, domainCloud);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException thriftException = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(
+ org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error updating cloud job submission details: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
public boolean updateUnicoreJobSubmissionDetails(
- AuthzToken authzToken, String jobSubmissionInterfaceId, UnicoreJobSubmission unicoreJobSubmission)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- return airavataService.updateUnicoreJobSubmissionDetails(jobSubmissionInterfaceId, unicoreJobSubmission);
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String jobSubmissionInterfaceId,
+ org.apache.airavata.thriftapi.model.UnicoreJobSubmission unicoreJobSubmission)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.common.model.UnicoreJobSubmission domainUnicore = unicoreJobSubmissionMapper.toDomain(unicoreJobSubmission);
+ return airavataService.updateUnicoreJobSubmissionDetails(jobSubmissionInterfaceId, domainUnicore);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException thriftException = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(
+ org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error updating unicore job submission details: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Add a Local data moevement details to a compute resource
- * App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
- *
- * @param resourceId The identifier of the compute resource to which JobSubmission protocol to be added
- * @param priorityOrder Specify the priority of this job manager. If this is the only jobmanager, the priority can be zero.
- * @param localDataMovement The LOCALDataMovement object to be added to the resource.
- * @return status
- * Returns a success/failure of the deletion.
- */
- /**
- * Update the given Local data movement details
- *
- * @param dataMovementInterfaceId The identifier of the JobSubmission Interface to be updated.
- * @param localDataMovement The LOCALDataMovement object to be updated.
- * @return status
- * Returns a success/failure of the update.
- */
@Override
@SecurityCheck
public boolean updateLocalDataMovementDetails(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String dataMovementInterfaceId, org.apache.airavata.thriftapi.model.LOCALDataMovement localDataMovement)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ AuthzToken authzToken, String dataMovementInterfaceId, LOCALDataMovement localDataMovement)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
- org.apache.airavata.common.model.LOCALDataMovement domainLocalDataMovement = localDataMovementMapper.toDomain(localDataMovement);
+ LOCALDataMovement domainLocalDataMovement = localDataMovementMapper.toDomain(localDataMovement);
airavataService.updateLocalDataMovementDetails(dataMovementInterfaceId, domainLocalDataMovement);
return true;
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error updating local data movement details: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Add a SCP data moevement details to a compute resource
- * App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
- *
- * @param resourceId The identifier of the compute resource to which JobSubmission protocol to be added
- * @param priorityOrder Specify the priority of this job manager. If this is the only jobmanager, the priority can be zero.
- * @param scpDataMovement The SCPDataMovement object to be added to the resource.
- * @return status
- * Returns a success/failure of the deletion.
- */
- // Missing method implementation - will be added later
-
- /**
- * Update the given scp data movement details
- * App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
- *
- * @param dataMovementInterfaceId The identifier of the JobSubmission Interface to be updated.
- * @param scpDataMovement The SCPDataMovement object to be updated.
- * @return status
- * Returns a success/failure of the update.
- */
@Override
@SecurityCheck
public boolean updateSCPDataMovementDetails(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String dataMovementInterfaceId, org.apache.airavata.thriftapi.model.SCPDataMovement scpDataMovement)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String dataMovementInterfaceId,
+ org.apache.airavata.thriftapi.model.SCPDataMovement scpDataMovement)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
org.apache.airavata.common.model.SCPDataMovement domainSCP = scpDataMovementMapper.toDomain(scpDataMovement);
- airavataService.updateSCPDataMovementDetails(dataMovementInterfaceId, domainSCP);
- return true;
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
- throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
- throw convertToThriftAiravataClientException(e);
+ return airavataService.updateSCPDataMovementDetails(dataMovementInterfaceId, domainSCP);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
- throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
- throw convertToThriftAuthorizationException(e);
+ org.apache.airavata.thriftapi.exception.AiravataSystemException thriftException = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(
+ org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error updating SCP data movement details: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -2923,14 +3229,18 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.SCPDataMovement getSCPDataMovement(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String dataMovementId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public SCPDataMovement getSCPDataMovement(
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String dataMovementId)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.SCPDataMovement domainSCP = airavataService.getSCPDataMovement(dataMovementId);
return scpDataMovementMapper.toThrift(domainSCP);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
- throw convertToThriftInvalidRequestException(e);
} catch (org.apache.airavata.common.exception.AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
@@ -2938,8 +3248,8 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting SCP data movement: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -2951,14 +3261,20 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
public String addUnicoreDataMovementDetails(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
String resourceId,
- org.apache.airavata.thriftapi.model.DMType dmType,
+ DMType dmType,
int priorityOrder,
- org.apache.airavata.thriftapi.model.UnicoreDataMovement unicoreDataMovement)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ UnicoreDataMovement unicoreDataMovement)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.DMType domainDMType = org.apache.airavata.common.model.DMType.valueOf(dmType.name());
org.apache.airavata.common.model.UnicoreDataMovement domainUnicore = unicoreDataMovementMapper.toDomain(unicoreDataMovement);
- return airavataService.addUnicoreDataMovementDetails(resourceId, domainDMType, priorityOrder, domainUnicore);
+ return airavataService.addUnicoreDataMovementDetails(
+ resourceId, domainDMType, priorityOrder, domainUnicore);
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
} catch (org.apache.airavata.common.exception.AiravataClientException e) {
@@ -2968,8 +3284,8 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error adding Unicore data movement details: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -2979,9 +3295,16 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
public boolean updateUnicoreDataMovementDetails(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String dataMovementInterfaceId, org.apache.airavata.thriftapi.model.UnicoreDataMovement unicoreDataMovement)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String dataMovementInterfaceId,
+ UnicoreDataMovement unicoreDataMovement)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.UnicoreDataMovement domainUnicore = unicoreDataMovementMapper.toDomain(unicoreDataMovement);
airavataService.updateUnicoreDataMovementDetails(dataMovementInterfaceId, domainUnicore);
return true;
@@ -2994,8 +3317,8 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error updating Unicore data movement details: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -3004,23 +3327,23 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.LOCALDataMovement getLocalDataMovement(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String dataMovementId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public LOCALDataMovement getLocalDataMovement(AuthzToken authzToken, String dataMovementId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
- org.apache.airavata.common.model.LOCALDataMovement domainLocal = airavataService.getLocalDataMovement(dataMovementId);
+ LOCALDataMovement domainLocal = airavataService.getLocalDataMovement(dataMovementId);
return localDataMovementMapper.toThrift(domainLocal);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting local data movement: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -3029,10 +3352,16 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.UnicoreDataMovement getUnicoreDataMovement(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String dataMovementId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public UnicoreDataMovement getUnicoreDataMovement(
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String dataMovementId)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.UnicoreDataMovement domainUnicore = airavataService.getUnicoreDataMovement(dataMovementId);
return unicoreDataMovementMapper.toThrift(domainUnicore);
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
@@ -3044,37 +3373,33 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting Unicore data movement: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Add a GridFTP data moevement details to a compute resource
- * App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
- *
- * @param computeResourceId The identifier of the compute resource to which JobSubmission protocol to be added
- * @param priorityOrder Specify the priority of this job manager. If this is the only jobmanager, the priority can be zero.
- * @param gridFTPDataMovement The GridFTPDataMovement object to be added to the resource.
- * @return status
- * Returns a success/failure of the deletion.
- */
@Override
@SecurityCheck
public String addGridFTPDataMovementDetails(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
String productUri,
- org.apache.airavata.thriftapi.model.DMType dataMoveType,
+ DMType dataMoveType,
int priorityOrder,
- org.apache.airavata.thriftapi.model.GridFTPDataMovement gridFTPDataMovement)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ GridFTPDataMovement gridFTPDataMovement)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.DMType domainDMType = org.apache.airavata.common.model.DMType.valueOf(dataMoveType.name());
org.apache.airavata.common.model.GridFTPDataMovement domainGridFTP = gridFTPDataMovementMapper.toDomain(gridFTPDataMovement);
- return airavataService.addGridFTPDataMovementDetails(productUri, domainDMType, priorityOrder, domainGridFTP);
+ return airavataService.addGridFTPDataMovementDetails(
+ productUri, domainDMType, priorityOrder, domainGridFTP);
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
} catch (org.apache.airavata.common.exception.AiravataClientException e) {
@@ -3084,29 +3409,27 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error adding GridFTP data movement details: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Update the given GridFTP data movement details to a compute resource
- * App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
- *
- * @param dataMovementInterfaceId The identifier of the JobSubmission Interface to be updated.
- * @param gridFTPDataMovement The GridFTPDataMovement object to be updated.
- * @return status
- * Returns a success/failure of the updation.
- */
@Override
@SecurityCheck
public boolean updateGridFTPDataMovementDetails(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String dataMovementInterfaceId, org.apache.airavata.thriftapi.model.GridFTPDataMovement gridFTPDataMovement)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String dataMovementInterfaceId,
+ GridFTPDataMovement gridFTPDataMovement)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.GridFTPDataMovement domainGridFTP = gridFTPDataMovementMapper.toDomain(gridFTPDataMovement);
airavataService.updateGridFTPDataMovementDetails(dataMovementInterfaceId, domainGridFTP);
return true;
@@ -3119,8 +3442,8 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error updating GridFTP data movement details: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -3129,115 +3452,75 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.GridFTPDataMovement getGridFTPDataMovement(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String dataMovementId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public GridFTPDataMovement getGridFTPDataMovement(AuthzToken authzToken, String dataMovementId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
- org.apache.airavata.common.model.GridFTPDataMovement domainGridFTP = airavataService.getGridFTPDataMovement(dataMovementId);
+ GridFTPDataMovement domainGridFTP = airavataService.getGridFTPDataMovement(dataMovementId);
return gridFTPDataMovementMapper.toThrift(domainGridFTP);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting GridFTP data movement: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Change the priority of a given job submisison interface
- *
- * @param jobSubmissionInterfaceId The identifier of the JobSubmission Interface to be changed
- * @param newPriorityOrder
- * @return status
- * Returns a success/failure of the change.
- */
@Override
@SecurityCheck
public boolean changeJobSubmissionPriority(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String jobSubmissionInterfaceId, int newPriorityOrder)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ AuthzToken authzToken, String jobSubmissionInterfaceId, int newPriorityOrder)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
return false;
}
- /**
- * Change the priority of a given data movement interface
- *
- * @param dataMovementInterfaceId The identifier of the DataMovement Interface to be changed
- * @param newPriorityOrder
- * @return status
- * Returns a success/failure of the change.
- */
@Override
@SecurityCheck
public boolean changeDataMovementPriority(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String dataMovementInterfaceId, int newPriorityOrder)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ AuthzToken authzToken, String dataMovementInterfaceId, int newPriorityOrder)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
return false;
}
- /**
- * Change the priorities of a given set of job submission interfaces
- *
- * @param jobSubmissionPriorityMap A Map of identifiers of the JobSubmission Interfaces and thier associated priorities to be set.
- * @return status
- * Returns a success/failure of the changes.
- */
@Override
@SecurityCheck
- public boolean changeJobSubmissionPriorities(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- Map<String, Integer> jobSubmissionPriorityMap)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public boolean changeJobSubmissionPriorities(AuthzToken authzToken, Map<String, Integer> jobSubmissionPriorityMap)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
return false;
}
- /**
- * Change the priorities of a given set of data movement interfaces
- *
- * @param dataMovementPriorityMap A Map of identifiers of the DataMovement Interfaces and thier associated priorities to be set.
- * @return status
- * Returns a success/failure of the changes.
- */
@Override
@SecurityCheck
- public boolean changeDataMovementPriorities(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- Map<String, Integer> dataMovementPriorityMap)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public boolean changeDataMovementPriorities(AuthzToken authzToken, Map<String, Integer> dataMovementPriorityMap)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
return false;
}
- /**
- * Delete a given job submisison interface
- *
- * @param jobSubmissionInterfaceId The identifier of the JobSubmission Interface to be changed
- * @return status
- * Returns a success/failure of the deletion.
- */
- // Missing deleteJobSubmissionInterface method - will be added later
-
- /**
- * Delete a given data movement interface
- *
- * @param dataMovementInterfaceId The identifier of the DataMovement Interface to be changed
- * @return status
- * Returns a success/failure of the deletion.
- */
@Override
@SecurityCheck
public String registerResourceJobManager(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, org.apache.airavata.thriftapi.model.ResourceJobManager resourceJobManager)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ ResourceJobManager resourceJobManager)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.ResourceJobManager domainRJM = resourceJobManagerMapper.toDomain(resourceJobManager);
return airavataService.registerResourceJobManager(domainRJM);
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
@@ -3249,8 +3532,8 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error registering resource job manager: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -3260,23 +3543,29 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
public boolean updateResourceJobManager(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String resourceJobManagerId, org.apache.airavata.thriftapi.model.ResourceJobManager updatedResourceJobManager)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String resourceJobManagerId,
+ org.apache.airavata.thriftapi.model.ResourceJobManager updatedResourceJobManager)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
org.apache.airavata.common.model.ResourceJobManager domainRJM = resourceJobManagerMapper.toDomain(updatedResourceJobManager);
- airavataService.updateResourceJobManager(resourceJobManagerId, domainRJM);
- return true;
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
- throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
- throw convertToThriftAiravataClientException(e);
+ return airavataService.updateResourceJobManager(resourceJobManagerId, domainRJM);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
- throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
- throw convertToThriftAuthorizationException(e);
+ org.apache.airavata.thriftapi.exception.AiravataSystemException thriftException = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(
+ org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error updating resource job manager: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -3285,23 +3574,23 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.ResourceJobManager getResourceJobManager(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String resourceJobManagerId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public ResourceJobManager getResourceJobManager(AuthzToken authzToken, String resourceJobManagerId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
- org.apache.airavata.common.model.ResourceJobManager domainRJM = airavataService.getResourceJobManager(resourceJobManagerId);
+ ResourceJobManager domainRJM = airavataService.getResourceJobManager(resourceJobManagerId);
return resourceJobManagerMapper.toThrift(domainRJM);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting resource job manager: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -3310,177 +3599,185 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public boolean deleteResourceJobManager(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String resourceJobManagerId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public boolean deleteResourceJobManager(AuthzToken authzToken, String resourceJobManagerId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return airavataService.deleteResourceJobManager(resourceJobManagerId);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error deleting resource job manager: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
- public boolean deleteBatchQueue(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- String computeResourceId,
- String queueName)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public boolean deleteBatchQueue(AuthzToken authzToken, String computeResourceId, String queueName)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return airavataService.deleteBatchQueue(computeResourceId, queueName);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error deleting batch queue: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Register a Gateway Resource Profile.
- *
- * @param gatewayResourceProfile Gateway Resource Profile Object.
- * The GatewayID should be obtained from Airavata gateway registration and passed to register a corresponding
- * resource profile.
- * @return status.
- * Returns a success/failure of the registration.
- */
@Override
@SecurityCheck
- public String registerGatewayResourceProfile(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- org.apache.airavata.thriftapi.model.GatewayResourceProfile gatewayResourceProfile)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public String registerGatewayResourceProfile(AuthzToken authzToken, GatewayResourceProfile gatewayResourceProfile)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
// Convert thrift model to domain model
- org.apache.airavata.common.model.GatewayResourceProfile domainProfile = gatewayResourceProfileMapper.toDomain(gatewayResourceProfile);
+ GatewayResourceProfile domainProfile = gatewayResourceProfileMapper.toDomain(gatewayResourceProfile);
return airavataService.registerGatewayResourceProfile(domainProfile);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error registering gateway resource profile: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Fetch the given Gateway Resource Profile.
- *
- * @param gatewayID The identifier for the requested gateway resource
- * @return gatewayResourceProfile
- * Gateway Resource Profile Object.
- */
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.GatewayResourceProfile getGatewayResourceProfile(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayID)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public GatewayResourceProfile getGatewayResourceProfile(AuthzToken authzToken, String gatewayID)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
// Get domain model from service
- org.apache.airavata.common.model.GatewayResourceProfile domainProfile = airavataService.getGatewayResourceProfile(gatewayID);
+ GatewayResourceProfile domainProfile = airavataService.getGatewayResourceProfile(gatewayID);
// Convert domain model to thrift model
return gatewayResourceProfileMapper.toThrift(domainProfile);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting gateway resource profile: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Update a Gateway Resource Profile.
- *
- * @param gatewayID The identifier for the requested gateway resource to be updated.
- * @param gatewayResourceProfile Gateway Resource Profile Object.
- * @return status
- * Returns a success/failure of the update.
- */
@Override
@SecurityCheck
public boolean updateGatewayResourceProfile(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- String gatewayID,
- org.apache.airavata.thriftapi.model.GatewayResourceProfile gatewayResourceProfile)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ AuthzToken authzToken, String gatewayID, GatewayResourceProfile gatewayResourceProfile)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
// Convert thrift model to domain model
- org.apache.airavata.common.model.GatewayResourceProfile domainProfile = gatewayResourceProfileMapper.toDomain(gatewayResourceProfile);
+ GatewayResourceProfile domainProfile = gatewayResourceProfileMapper.toDomain(gatewayResourceProfile);
airavataService.updateGatewayResourceProfile(gatewayID, domainProfile);
return true;
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error updating gateway resource profile: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Delete the given Gateway Resource Profile.
- *
- * @param gatewayID The identifier for the requested gateway resource to be deleted.
- * @return status
- * Returns a success/failure of the deletion.
- */
@Override
@SecurityCheck
- public boolean deleteGatewayResourceProfile(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayID)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public boolean deleteGatewayResourceProfile(AuthzToken authzToken, String gatewayID)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return airavataService.deleteGatewayResourceProfile(gatewayID);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error deleting gateway resource profile: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Add a Compute Resource Preference to a registered gateway profile.
- *
- * @param gatewayID The identifier for the gateway profile to be added.
- * @param computeResourceId Preferences related to a particular compute resource
- * @param computeResourcePreference The ComputeResourcePreference object to be added to the resource profile.
- * @return status
- * Returns a success/failure of the addition. If a profile already exists, this operation will fail.
- * Instead an update should be used.
- */
@Override
@SecurityCheck
public boolean addGatewayComputeResourcePreference(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ AuthzToken authzToken,
String gatewayID,
String computeResourceId,
- org.apache.airavata.thriftapi.model.ComputeResourcePreference computeResourcePreference)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ ComputeResourcePreference computeResourcePreference)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
- org.apache.airavata.common.model.ComputeResourcePreference domainPreference = computeResourcePreferenceMapper.toDomain(computeResourcePreference);
+ ComputeResourcePreference domainPreference =
+ computeResourcePreferenceMapper.toDomain(computeResourcePreference);
airavataService.addGatewayComputeResourcePreference(gatewayID, computeResourceId, domainPreference);
return true;
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error adding gateway compute resource preference: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -3490,103 +3787,135 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
public boolean addGatewayStoragePreference(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayID, String storageResourceId, org.apache.airavata.thriftapi.model.StoragePreference dataStoragePreference)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String gatewayID,
+ String storageResourceId,
+ org.apache.airavata.thriftapi.model.StoragePreference dataStoragePreference)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.StoragePreference domainPreference = storagePreferenceMapper.toDomain(dataStoragePreference);
- airavataService.addGatewayStoragePreference(gatewayID, storageResourceId, domainPreference);
- return true;
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
- throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
- throw convertToThriftAiravataClientException(e);
+ return airavataService.addGatewayStoragePreference(gatewayID, storageResourceId, domainPreference);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
- throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
- throw convertToThriftAuthorizationException(e);
+ org.apache.airavata.thriftapi.exception.AiravataSystemException thriftException = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(
+ org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error adding gateway storage preference: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Fetch a Compute Resource Preference of a registered gateway profile.
- *
- * @param gatewayID The identifier for the gateway profile to be requested
- * @param computeResourceId Preferences related to a particular compute resource
- * @return computeResourcePreference
- * Returns the ComputeResourcePreference object.
- */
@Override
@SecurityCheck
public ComputeResourcePreference getGatewayComputeResourcePreference(
AuthzToken authzToken, String gatewayID, String computeResourceId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- return airavataService.getGatewayComputeResourcePreference(gatewayID, computeResourceId);
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ ComputeResourcePreference domainPreference =
+ airavataService.getGatewayComputeResourcePreference(gatewayID, computeResourceId);
+ return computeResourcePreferenceMapper.toThrift(domainPreference);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting gateway compute resource preference: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.StoragePreference getGatewayStoragePreference(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayID, String storageId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public StoragePreference getGatewayStoragePreference(AuthzToken authzToken, String gatewayID, String storageId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
- org.apache.airavata.common.model.StoragePreference domainPreference = airavataService.getGatewayStoragePreference(gatewayID, storageId);
+ StoragePreference domainPreference = airavataService.getGatewayStoragePreference(gatewayID, storageId);
return storagePreferenceMapper.toThrift(domainPreference);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
throw convertToThriftSystemException(e);
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- throw new org.apache.airavata.thriftapi.exception.AiravataSystemException("Error getting gateway storage preference: " + e.getMessage());
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting gateway storage preference: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
}
}
- /**
- * Fetch all Compute Resource Preferences of a registered gateway profile.
- *
- * @param gatewayID The identifier for the gateway profile to be requested
- * @return computeResourcePreference
- * Returns the ComputeResourcePreference object.
- */
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.StoragePreference> getAllGatewayStoragePreferences(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayID)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- return airavataService.getAllGatewayStoragePreferences(gatewayID);
+ public List<StoragePreference> getAllGatewayStoragePreferences(AuthzToken authzToken, String gatewayID)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ List<StoragePreference> domainPreferences = airavataService.getAllGatewayStoragePreferences(gatewayID);
+ return domainPreferences.stream()
+ .map(storagePreferenceMapper::toThrift)
+ .collect(Collectors.toList());
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting all gateway storage preferences: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.GatewayResourceProfile> getAllGatewayResourceProfiles(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<GatewayResourceProfile> getAllGatewayResourceProfiles(AuthzToken authzToken)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
// Get domain models from service
List<GatewayResourceProfile> domainProfiles = airavataService.getAllGatewayResourceProfiles();
// Convert domain models to thrift models
return domainProfiles.stream()
.map(gatewayResourceProfileMapper::toThrift)
.collect(Collectors.toList());
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting all gateway resource profiles: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Update a Compute Resource Preference to a registered gateway profile.
- *
- * @param gatewayID The identifier for the gateway profile to be updated.
- * @param computeResourceId Preferences related to a particular compute resource
- * @param computeResourcePreference The ComputeResourcePreference object to be updated to the resource profile.
- * @return status
- * Returns a success/failure of the updation.
- */
@Override
@SecurityCheck
public boolean updateGatewayComputeResourcePreference(
@@ -3594,55 +3923,127 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
String gatewayID,
String computeResourceId,
ComputeResourcePreference computeResourcePreference)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ ComputeResourcePreference domainPreference =
+ computeResourcePreferenceMapper.toDomain(computeResourcePreference);
return airavataService.updateGatewayComputeResourcePreference(
- gatewayID, computeResourceId, computeResourcePreference);
+ gatewayID, computeResourceId, domainPreference);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error updating gateway compute resource preference: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
public boolean updateGatewayStoragePreference(
- AuthzToken authzToken, String gatewayID, String storageId, StoragePreference dataStoragePreference)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- return airavataService.updateGatewayStoragePreference(gatewayID, storageId, dataStoragePreference);
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String gatewayID,
+ String storageId,
+ org.apache.airavata.thriftapi.model.StoragePreference dataStoragePreference)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.common.model.StoragePreference domainPreference = storagePreferenceMapper.toDomain(dataStoragePreference);
+ return airavataService.updateGatewayStoragePreference(gatewayID, storageId, domainPreference);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException thriftException = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(
+ org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error updating gateway storage preference: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Delete the Compute Resource Preference of a registered gateway profile.
- *
- * @param gatewayID The identifier for the gateway profile to be deleted.
- * @param computeResourceId Preferences related to a particular compute resource
- * @return status
- * Returns a success/failure of the deletion.
- */
@Override
@SecurityCheck
public boolean deleteGatewayComputeResourcePreference(
AuthzToken authzToken, String gatewayID, String computeResourceId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return airavataService.deleteGatewayComputeResourcePreference(gatewayID, computeResourceId);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error deleting gateway compute resource preference: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
- public boolean deleteGatewayStoragePreference(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayID, String storageId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public boolean deleteGatewayStoragePreference(AuthzToken authzToken, String gatewayID, String storageId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return airavataService.deleteGatewayStoragePreference(gatewayID, storageId);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error deleting gateway storage preference: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.SSHAccountProvisionerDescription> getSSHAccountProvisioners(
- AuthzToken authzToken)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<SSHAccountProvisionerDescription> getSSHAccountProvisioners(AuthzToken authzToken)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
- List<org.apache.airavata.common.model.SSHAccountProvisionerDescription> domainProvisioners = new ArrayList<>();
+ List<SSHAccountProvisionerDescription> domainProvisioners = new ArrayList<>();
List<SSHAccountProvisionerProvider> sshAccountProvisionerProviders =
SSHAccountProvisionerFactory.getSSHAccountProvisionerProviders();
for (SSHAccountProvisionerProvider provider : sshAccountProvisionerProviders) {
- org.apache.airavata.common.model.SSHAccountProvisionerDescription sshAccountProvisionerStruct =
- new org.apache.airavata.common.model.SSHAccountProvisionerDescription();
+ SSHAccountProvisionerDescription sshAccountProvisionerStruct = new SSHAccountProvisionerDescription();
sshAccountProvisionerStruct.setCanCreateAccount(provider.canCreateAccount());
sshAccountProvisionerStruct.setCanInstallSSHKey(provider.canInstallSSHKey());
sshAccountProvisionerStruct.setName(provider.getName());
@@ -3675,147 +4076,246 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public boolean doesUserHaveSSHAccount(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String computeResourceId, String userId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- return airavataService.doesUserHaveSSHAccount(authzToken, computeResourceId, userId);
+ public boolean doesUserHaveSSHAccount(AuthzToken authzToken, String computeResourceId, String userId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ return airavataService.doesUserHaveSSHAccount(domainAuthzToken, computeResourceId, userId);
+ } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error checking if user has SSH account: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
public boolean isSSHSetupCompleteForUserComputeResourcePreference(
AuthzToken authzToken, String computeResourceId, String airavataCredStoreToken)
- throws AiravataClientException, AiravataSystemException, AuthorizationException {
- return airavataService.isSSHAccountSetupComplete(authzToken, computeResourceId, airavataCredStoreToken);
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ return airavataService.isSSHAccountSetupComplete(
+ domainAuthzToken, computeResourceId, airavataCredStoreToken);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error checking SSH setup completion: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
public UserComputeResourcePreference setupUserComputeResourcePreferencesForSSH(
AuthzToken authzToken, String computeResourceId, String userId, String airavataCredStoreToken)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- return airavataService.setupSSHAccount(authzToken, computeResourceId, userId, airavataCredStoreToken);
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ UserComputeResourcePreference domainPreference = airavataService.setupSSHAccount(
+ domainAuthzToken, computeResourceId, userId, airavataCredStoreToken);
+ return userComputeResourcePreferenceMapper.toThrift(domainPreference);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error setting up user compute resource preferences for SSH: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Register a User Resource Profile.
- *
- * @param userResourceProfile User Resource Profile Object.
- * The userId should be obtained from Airavata user profile registration and passed to register a corresponding
- * resource profile.
- * @return status.
- * Returns a success/failure of the registration.
- */
@Override
@SecurityCheck
- public String registerUserResourceProfile(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, UserResourceProfile userResourceProfile)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- return airavataService.registerUserResourceProfile(userResourceProfile);
+ public String registerUserResourceProfile(AuthzToken authzToken, UserResourceProfile userResourceProfile)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ UserResourceProfile domainProfile = userResourceProfileMapper.toDomain(userResourceProfile);
+ return airavataService.registerUserResourceProfile(domainProfile);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error registering user resource profile: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
- public boolean isUserResourceProfileExists(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String userId, String gatewayID)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public boolean isUserResourceProfileExists(AuthzToken authzToken, String userId, String gatewayID)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return airavataService.isUserResourceProfileExists(userId, gatewayID);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error checking if user resource profile exists: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Fetch the given User Resource Profile.
- *
- * @param userId The identifier for the requested User resource
- *
- * @param gatewayID The identifier to link a gateway for the requested User resource
- *
- * @return userResourceProfile
- * User Resource Profile Object.
- */
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.UserResourceProfile getUserResourceProfile(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String userId, String gatewayID)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public UserResourceProfile getUserResourceProfile(AuthzToken authzToken, String userId, String gatewayID)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
// Get domain model from service
UserResourceProfile domainProfile = airavataService.getUserResourceProfile(userId, gatewayID);
// Convert domain model to thrift model
return userResourceProfileMapper.toThrift(domainProfile);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting user resource profile: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Update a User Resource Profile.
- *
- * @param userId : The identifier for the requested user resource profile to be updated.
- * @param gatewayID The identifier to link a gateway for the requested User resource
- * @param userResourceProfile User Resource Profile Object.
- * @return status
- * Returns a success/failure of the update.
- */
@Override
@SecurityCheck
public boolean updateUserResourceProfile(
- AuthzToken authzToken,
- String userId,
- String gatewayID,
- org.apache.airavata.thriftapi.model.UserResourceProfile userResourceProfile)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ AuthzToken authzToken, String userId, String gatewayID, UserResourceProfile userResourceProfile)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
// Convert thrift model to domain model
UserResourceProfile domainProfile = userResourceProfileMapper.toDomain(userResourceProfile);
return airavataService.updateUserResourceProfile(userId, gatewayID, domainProfile);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error updating user resource profile: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Delete the given User Resource Profile.
- *
- * @param userId : The identifier for the requested userId resource to be deleted.
- * @param gatewayID The identifier to link a gateway for the requested User resource
- * @return status
- * Returns a success/failure of the deletion.
- */
@Override
@SecurityCheck
- public boolean deleteUserResourceProfile(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String userId, String gatewayID)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public boolean deleteUserResourceProfile(AuthzToken authzToken, String userId, String gatewayID)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return airavataService.deleteUserResourceProfile(userId, gatewayID);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error deleting user resource profile: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
- /**
- * Add a Compute Resource Preference to a registered User Resource profile.
- *
- * @param userId The identifier for the User Resource profile to be added.
- * @param gatewayID The identifier to link a gateway for the requested User resource
- * @param userComputeResourceId Preferences related to a particular compute resource
- * @param userComputeResourcePreference The ComputeResourcePreference object to be added to the resource profile.
- * @return status
- * Returns a success/failure of the addition. If a profile already exists, this operation will fail.
- * Instead an update should be used.
- */
@Override
@SecurityCheck
public boolean addUserComputeResourcePreference(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
String userId,
String gatewayID,
- String userComputeResourceId,
+ String computeResourceId,
org.apache.airavata.thriftapi.model.UserComputeResourcePreference userComputeResourcePreference)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
- org.apache.airavata.common.model.UserComputeResourcePreference domainPreference = userComputeResourcePreferenceMapper.toDomain(userComputeResourcePreference);
- airavataService.addUserComputeResourcePreference(userId, gatewayID, userComputeResourceId, domainPreference);
- return true;
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
- throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
- throw convertToThriftAiravataClientException(e);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.common.model.UserComputeResourcePreference domainPreference =
+ userComputeResourcePreferenceMapper.toDomain(userComputeResourcePreference);
+ return airavataService.addUserComputeResourcePreference(
+ userId, gatewayID, computeResourceId, domainPreference);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
- throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
- throw convertToThriftAuthorizationException(e);
+ org.apache.airavata.thriftapi.exception.AiravataSystemException thriftException = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(
+ org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error adding user compute resource preference: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -3830,56 +4330,54 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
String gatewayID,
String userStorageResourceId,
org.apache.airavata.thriftapi.model.UserStoragePreference dataStoragePreference)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.UserStoragePreference domainPreference = userStoragePreferenceMapper.toDomain(dataStoragePreference);
- airavataService.addUserStoragePreference(userId, gatewayID, userStorageResourceId, domainPreference);
- return true;
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
- throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
- throw convertToThriftAiravataClientException(e);
+ return airavataService.addUserStoragePreference(userId, gatewayID, userStorageResourceId, domainPreference);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
- throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
- throw convertToThriftAuthorizationException(e);
+ org.apache.airavata.thriftapi.exception.AiravataSystemException thriftException = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(
+ org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error adding user storage preference: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Fetch a Compute Resource Preference of a registered User Resource profile.
- *
- * @param userId : The identifier for the User Resource profile to be requested
- * @param gatewayID The identifier to link a gateway for the requested User resource
- * @param userComputeResourceId Preferences related to a particular compute resource
- * @return computeResourcePreference
- * Returns the ComputeResourcePreference object.
- */
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.UserComputeResourcePreference getUserComputeResourcePreference(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String userId, String gatewayID, String userComputeResourceId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public UserComputeResourcePreference getUserComputeResourcePreference(
+ AuthzToken authzToken, String userId, String gatewayID, String userComputeResourceId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
- org.apache.airavata.common.model.UserComputeResourcePreference domainPreference = airavataService.getUserComputeResourcePreference(userId, gatewayID, userComputeResourceId);
+ UserComputeResourcePreference domainPreference =
+ airavataService.getUserComputeResourcePreference(userId, gatewayID, userComputeResourceId);
return userComputeResourcePreferenceMapper.toThrift(domainPreference);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting user compute resource preference: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -3888,56 +4386,54 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.UserStoragePreference getUserStoragePreference(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String userId, String gatewayID, String userStorageId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public UserStoragePreference getUserStoragePreference(
+ AuthzToken authzToken, String userId, String gatewayID, String userStorageId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
- org.apache.airavata.common.model.UserStoragePreference domainPreference = airavataService.getUserStoragePreference(userId, gatewayID, userStorageId);
+ UserStoragePreference domainPreference =
+ airavataService.getUserStoragePreference(userId, gatewayID, userStorageId);
return userStoragePreferenceMapper.toThrift(domainPreference);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting user storage preference: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Fetch all User Compute Resource Preferences of a registered gateway profile.
- *
- * @param userId
- * @param gatewayID The identifier for the gateway profile to be requested
- * @return computeResourcePreference
- * Returns the ComputeResourcePreference object.
- */
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.UserComputeResourcePreference> getAllUserComputeResourcePreferences(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String userId, String gatewayID)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<UserComputeResourcePreference> getAllUserComputeResourcePreferences(
+ AuthzToken authzToken, String userId, String gatewayID)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
- List<org.apache.airavata.common.model.UserComputeResourcePreference> domainPreferences = airavataService.getAllUserComputeResourcePreferences(userId, gatewayID);
- return domainPreferences.stream().map(userComputeResourcePreferenceMapper::toThrift).collect(Collectors.toList());
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ List<UserComputeResourcePreference> domainPreferences =
+ airavataService.getAllUserComputeResourcePreferences(userId, gatewayID);
+ return domainPreferences.stream()
+ .map(userComputeResourcePreferenceMapper::toThrift)
+ .collect(Collectors.toList());
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting all user compute resource preferences: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -3946,23 +4442,27 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.UserStoragePreference> getAllUserStoragePreferences(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String userId, String gatewayID)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<UserStoragePreference> getAllUserStoragePreferences(
+ AuthzToken authzToken, String userId, String gatewayID)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
- List<org.apache.airavata.common.model.UserStoragePreference> domainPreferences = airavataService.getAllUserStoragePreferences(userId, gatewayID);
- return domainPreferences.stream().map(userStoragePreferenceMapper::toThrift).collect(Collectors.toList());
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ List<UserStoragePreference> domainPreferences =
+ airavataService.getAllUserStoragePreferences(userId, gatewayID);
+ return domainPreferences.stream()
+ .map(userStoragePreferenceMapper::toThrift)
+ .collect(Collectors.toList());
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting all user storage preferences: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -3971,39 +4471,31 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.UserResourceProfile> getAllUserResourceProfiles(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<UserResourceProfile> getAllUserResourceProfiles(AuthzToken authzToken)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
- List<org.apache.airavata.common.model.UserResourceProfile> domainProfiles = airavataService.getAllUserResourceProfiles();
- return domainProfiles.stream().map(userResourceProfileMapper::toThrift).collect(Collectors.toList());
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ List<UserResourceProfile> domainProfiles = airavataService.getAllUserResourceProfiles();
+ return domainProfiles.stream()
+ .map(userResourceProfileMapper::toThrift)
+ .collect(Collectors.toList());
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting all user resource profiles: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Update a Compute Resource Preference to a registered User Resource profile.
- *
- * @param userId : The identifier for the User Resource profile to be updated.
- * @param gatewayID The identifier to link a gateway for the requested User resource
- * @param userComputeResourceId Preferences related to a particular compute resource
- * @param userComputeResourcePreference The ComputeResourcePreference object to be updated to the resource profile.
- * @return status
- * Returns a success/failure of the updation.
- */
@Override
@SecurityCheck
public boolean updateUserComputeResourcePreference(
@@ -4011,11 +4503,18 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
String userId,
String gatewayID,
String userComputeResourceId,
- org.apache.airavata.thriftapi.model.UserComputeResourcePreference userComputeResourcePreference)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ UserComputeResourcePreference userComputeResourcePreference)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
- org.apache.airavata.common.model.UserComputeResourcePreference domainPreference = userComputeResourcePreferenceMapper.toDomain(userComputeResourcePreference);
- airavataService.updateUserComputeResourcePreference(userId, gatewayID, userComputeResourceId, domainPreference);
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.common.model.UserComputeResourcePreference domainPreference =
+ userComputeResourcePreferenceMapper.toDomain(userComputeResourcePreference);
+ airavataService.updateUserComputeResourcePreference(
+ userId, gatewayID, userComputeResourceId, domainPreference);
return true;
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
@@ -4023,11 +4522,11 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
throw convertToThriftAiravataClientException(e);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error updating user compute resource preference: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -4042,58 +4541,90 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
String gatewayID,
String userStorageId,
org.apache.airavata.thriftapi.model.UserStoragePreference dataStoragePreference)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.UserStoragePreference domainPreference = userStoragePreferenceMapper.toDomain(dataStoragePreference);
- airavataService.updateUserStoragePreference(userId, gatewayID, userStorageId, domainPreference);
- return true;
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
- throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
- throw convertToThriftAiravataClientException(e);
+ return airavataService.updateUserStoragePreference(userId, gatewayID, userStorageId, domainPreference);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
- throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
- throw convertToThriftAuthorizationException(e);
+ org.apache.airavata.thriftapi.exception.AiravataSystemException thriftException = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(
+ org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error updating user storage preference: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
- /**
- * Delete the Compute Resource Preference of a registered User Resource profile.
- *
- * @param userId The identifier for the User profile to be deleted.
- * @param gatewayID The identifier to link a gateway for the requested User resource
- * @param userComputeResourceId Preferences related to a particular compute resource
- * @return status
- * Returns a success/failure of the deletion.
- */
@Override
@SecurityCheck
public boolean deleteUserComputeResourcePreference(
AuthzToken authzToken, String userId, String gatewayID, String userComputeResourceId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return airavataService.deleteUserComputeResourcePreference(userId, gatewayID, userComputeResourceId);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error deleting user compute resource preference: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
public boolean deleteUserStoragePreference(
AuthzToken authzToken, String userId, String gatewayID, String userStorageId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return airavataService.deleteUserStoragePreference(userId, gatewayID, userStorageId);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error deleting user storage preference: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.QueueStatusModel> getLatestQueueStatuses(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<QueueStatusModel> getLatestQueueStatuses(AuthzToken authzToken)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
// Get domain models from service
List<QueueStatusModel> domainStatuses = airavataService.getLatestQueueStatuses();
// Convert domain models to thrift models
@@ -4102,17 +4633,11 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
.collect(Collectors.toList());
}
- /**
- * ReplicaCatalog Related Methods
- * @return
- * @throws ApplicationSettingsException
- */
@Override
@SecurityCheck
- public String registerDataProduct(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- org.apache.airavata.thriftapi.model.DataProductModel dataProductModel)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public String registerDataProduct(AuthzToken authzToken, DataProductModel dataProductModel)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
// Convert thrift model to domain model
DataProductModel domainDataProduct = dataProductModelMapper.toDomain(dataProductModel);
return airavataService.registerDataProduct(domainDataProduct);
@@ -4120,9 +4645,9 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.DataProductModel getDataProduct(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String productUri)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public DataProductModel getDataProduct(AuthzToken authzToken, String productUri)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
// Get domain model from service
DataProductModel domainDataProduct = airavataService.getDataProduct(productUri);
// Convert domain model to thrift model
@@ -4131,10 +4656,9 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public String registerReplicaLocation(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- org.apache.airavata.thriftapi.model.DataReplicaLocationModel replicaLocationModel)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public String registerReplicaLocation(AuthzToken authzToken, DataReplicaLocationModel replicaLocationModel)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
// Convert thrift model to domain model
DataReplicaLocationModel domainReplica = DataReplicaLocationModelMapper.INSTANCE.toDomain(replicaLocationModel);
return airavataService.registerReplicaLocation(domainReplica);
@@ -4142,9 +4666,9 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.DataProductModel getParentDataProduct(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String productUri)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public DataProductModel getParentDataProduct(AuthzToken authzToken, String productUri)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
// Get domain model from service
DataProductModel domainDataProduct = airavataService.getParentDataProduct(productUri);
// Convert domain model to thrift model
@@ -4153,47 +4677,41 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.DataProductModel> getChildDataProducts(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String productUri)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<DataProductModel> getChildDataProducts(AuthzToken authzToken, String productUri)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
// Get domain models from service
List<DataProductModel> domainDataProducts = airavataService.getChildDataProducts(productUri);
// Convert domain models to thrift models
return domainDataProducts.stream().map(dataProductModelMapper::toThrift).collect(Collectors.toList());
}
- /**
- * Group Manager and Data Sharing Related API methods
- *
- * @param authzToken
- * @param resourceId
- * @param userPermissionList
- */
@Override
@SecurityCheck
public boolean shareResourceWithUsers(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- String resourceId,
- Map<String, org.apache.airavata.thriftapi.model.ResourcePermissionType> userPermissionList)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ AuthzToken authzToken, String resourceId, Map<String, ResourcePermissionType> userPermissionList)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- Map<String, org.apache.airavata.common.model.ResourcePermissionType> domainUserPermissionList = new java.util.HashMap<>();
- for (Map.Entry<String, org.apache.airavata.thriftapi.model.ResourcePermissionType> entry : userPermissionList.entrySet()) {
- domainUserPermissionList.put(entry.getKey(), org.apache.airavata.common.model.ResourcePermissionType.valueOf(entry.getValue().name()));
+ Map<String, ResourcePermissionType> domainUserPermissionList = new java.util.HashMap<>();
+ for (Map.Entry<String, ResourcePermissionType> entry : userPermissionList.entrySet()) {
+ domainUserPermissionList.put(
+ entry.getKey(),
+ ResourcePermissionType.valueOf(entry.getValue().name()));
}
return airavataService.shareResourceWithUsers(domainAuthzToken, resourceId, domainUserPermissionList);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error sharing resource with users: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -4203,28 +4721,29 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
public boolean shareResourceWithGroups(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- String resourceId,
- Map<String, org.apache.airavata.thriftapi.model.ResourcePermissionType> groupPermissionList)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ AuthzToken authzToken, String resourceId, Map<String, ResourcePermissionType> groupPermissionList)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- Map<String, org.apache.airavata.common.model.ResourcePermissionType> domainGroupPermissionList = new java.util.HashMap<>();
- for (Map.Entry<String, org.apache.airavata.thriftapi.model.ResourcePermissionType> entry : groupPermissionList.entrySet()) {
- domainGroupPermissionList.put(entry.getKey(), org.apache.airavata.common.model.ResourcePermissionType.valueOf(entry.getValue().name()));
+ Map<String, ResourcePermissionType> domainGroupPermissionList = new java.util.HashMap<>();
+ for (Map.Entry<String, ResourcePermissionType> entry : groupPermissionList.entrySet()) {
+ domainGroupPermissionList.put(
+ entry.getKey(),
+ ResourcePermissionType.valueOf(entry.getValue().name()));
}
return airavataService.shareResourceWithGroups(domainAuthzToken, resourceId, domainGroupPermissionList);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error sharing resource with groups: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -4234,28 +4753,30 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
public boolean revokeSharingOfResourceFromUsers(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- String resourceId,
- Map<String, org.apache.airavata.thriftapi.model.ResourcePermissionType> userPermissionList)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ AuthzToken authzToken, String resourceId, Map<String, ResourcePermissionType> userPermissionList)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- Map<String, org.apache.airavata.common.model.ResourcePermissionType> domainUserPermissionList = new java.util.HashMap<>();
- for (Map.Entry<String, org.apache.airavata.thriftapi.model.ResourcePermissionType> entry : userPermissionList.entrySet()) {
- domainUserPermissionList.put(entry.getKey(), org.apache.airavata.common.model.ResourcePermissionType.valueOf(entry.getValue().name()));
+ Map<String, ResourcePermissionType> domainUserPermissionList = new java.util.HashMap<>();
+ for (Map.Entry<String, ResourcePermissionType> entry : userPermissionList.entrySet()) {
+ domainUserPermissionList.put(
+ entry.getKey(),
+ ResourcePermissionType.valueOf(entry.getValue().name()));
}
- return airavataService.revokeSharingOfResourceFromUsers(domainAuthzToken, resourceId, domainUserPermissionList);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ return airavataService.revokeSharingOfResourceFromUsers(
+ domainAuthzToken, resourceId, domainUserPermissionList);
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error revoking sharing of resource from users: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -4265,28 +4786,30 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
public boolean revokeSharingOfResourceFromGroups(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- String resourceId,
- Map<String, org.apache.airavata.thriftapi.model.ResourcePermissionType> groupPermissionList)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ AuthzToken authzToken, String resourceId, Map<String, ResourcePermissionType> groupPermissionList)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- Map<String, org.apache.airavata.common.model.ResourcePermissionType> domainGroupPermissionList = new java.util.HashMap<>();
- for (Map.Entry<String, org.apache.airavata.thriftapi.model.ResourcePermissionType> entry : groupPermissionList.entrySet()) {
- domainGroupPermissionList.put(entry.getKey(), org.apache.airavata.common.model.ResourcePermissionType.valueOf(entry.getValue().name()));
+ Map<String, ResourcePermissionType> domainGroupPermissionList = new java.util.HashMap<>();
+ for (Map.Entry<String, ResourcePermissionType> entry : groupPermissionList.entrySet()) {
+ domainGroupPermissionList.put(
+ entry.getKey(),
+ ResourcePermissionType.valueOf(entry.getValue().name()));
}
- return airavataService.revokeSharingOfResourceFromGroups(domainAuthzToken, resourceId, domainGroupPermissionList);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ return airavataService.revokeSharingOfResourceFromGroups(
+ domainAuthzToken, resourceId, domainGroupPermissionList);
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error revoking sharing of resource from groups: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -4296,11 +4819,10 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
public List<String> getAllAccessibleUsers(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- String resourceId,
- org.apache.airavata.thriftapi.model.ResourcePermissionType permissionType)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ AuthzToken authzToken, String resourceId, ResourcePermissionType permissionType)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
ResourcePermissionType domainPermissionType = ResourcePermissionType.valueOf(permissionType.name());
return airavataService.getAllAccessibleUsers(domainAuthzToken, resourceId, domainPermissionType, false);
}
@@ -4308,11 +4830,10 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
public List<String> getAllDirectlyAccessibleUsers(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- String resourceId,
- org.apache.airavata.thriftapi.model.ResourcePermissionType permissionType)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ AuthzToken authzToken, String resourceId, ResourcePermissionType permissionType)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
ResourcePermissionType domainPermissionType = ResourcePermissionType.valueOf(permissionType.name());
return airavataService.getAllAccessibleUsers(domainAuthzToken, resourceId, domainPermissionType, true);
}
@@ -4320,11 +4841,10 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
public List<String> getAllAccessibleGroups(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- String resourceId,
- org.apache.airavata.thriftapi.model.ResourcePermissionType permissionType)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ AuthzToken authzToken, String resourceId, ResourcePermissionType permissionType)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
ResourcePermissionType domainPermissionType = ResourcePermissionType.valueOf(permissionType.name());
return airavataService.getAllAccessibleGroups(domainAuthzToken, resourceId, domainPermissionType, false);
}
@@ -4334,67 +4854,68 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
public List<String> getAllDirectlyAccessibleGroups(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
String resourceId,
- org.apache.airavata.thriftapi.model.ResourcePermissionType permissionType)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- ResourcePermissionType domainPermissionType = ResourcePermissionType.valueOf(permissionType.name());
+ ResourcePermissionType permissionType)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.common.model.ResourcePermissionType domainPermissionType = org.apache.airavata.common.model.ResourcePermissionType.valueOf(permissionType.name());
return airavataService.getAllAccessibleGroups(domainAuthzToken, resourceId, domainPermissionType, true);
}
@Override
@SecurityCheck
- public boolean userHasAccess(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- String resourceId,
- org.apache.airavata.thriftapi.model.ResourcePermissionType permissionType)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ public boolean userHasAccess(AuthzToken authzToken, String resourceId, ResourcePermissionType permissionType)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
ResourcePermissionType domainPermissionType = ResourcePermissionType.valueOf(permissionType.name());
return airavataService.userHasAccess(domainAuthzToken, resourceId, domainPermissionType);
}
@Override
@SecurityCheck
- public String createGroupResourceProfile(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- org.apache.airavata.thriftapi.model.GroupResourceProfile groupResourceProfile)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ public String createGroupResourceProfile(AuthzToken authzToken, GroupResourceProfile groupResourceProfile)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
GroupResourceProfile domainGroupResourceProfile = groupResourceProfileMapper.toDomain(groupResourceProfile);
return airavataService.createGroupResourceProfile(domainAuthzToken, domainGroupResourceProfile);
}
@Override
@SecurityCheck
- public void updateGroupResourceProfile(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- org.apache.airavata.thriftapi.model.GroupResourceProfile groupResourceProfile)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ public void updateGroupResourceProfile(AuthzToken authzToken, GroupResourceProfile groupResourceProfile)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
GroupResourceProfile domainGroupResourceProfile = groupResourceProfileMapper.toDomain(groupResourceProfile);
airavataService.updateGroupResourceProfile(domainAuthzToken, domainGroupResourceProfile);
}
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.GroupResourceProfile getGroupResourceProfile(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String groupResourceProfileId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public GroupResourceProfile getGroupResourceProfile(AuthzToken authzToken, String groupResourceProfileId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- org.apache.airavata.common.model.GroupResourceProfile domainProfile = airavataService.getGroupResourceProfile(domainAuthzToken, groupResourceProfileId);
+ GroupResourceProfile domainProfile =
+ airavataService.getGroupResourceProfile(domainAuthzToken, groupResourceProfileId);
return groupResourceProfileMapper.toThrift(domainProfile);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting group resource profile: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -4403,32 +4924,48 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public boolean removeGroupResourceProfile(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String groupResourceProfileId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- return airavataService.removeGroupResourceProfile(authzToken, groupResourceProfileId);
+ public boolean removeGroupResourceProfile(AuthzToken authzToken, String groupResourceProfileId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ return airavataService.removeGroupResourceProfile(domainAuthzToken, groupResourceProfileId);
+ } catch (AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error removing group resource profile: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.GroupResourceProfile> getGroupResourceList(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<GroupResourceProfile> getGroupResourceList(AuthzToken authzToken, String gatewayId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- List<org.apache.airavata.common.model.GroupResourceProfile> domainProfiles = airavataService.getGroupResourceList(domainAuthzToken, gatewayId);
- return domainProfiles.stream().map(groupResourceProfileMapper::toThrift).collect(Collectors.toList());
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ List<GroupResourceProfile> domainProfiles =
+ airavataService.getGroupResourceList(domainAuthzToken, gatewayId);
+ return domainProfiles.stream()
+ .map(groupResourceProfileMapper::toThrift)
+ .collect(Collectors.toList());
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting group resource list: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -4438,47 +4975,97 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
public boolean removeGroupComputePrefs(
- AuthzToken authzToken, String computeResourceId, String groupResourceProfileId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- return airavataService.removeGroupComputePrefs(authzToken, computeResourceId, groupResourceProfileId);
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ String computeResourceId,
+ String groupResourceProfileId)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ return airavataService.removeGroupComputePrefs(domainAuthzToken, computeResourceId, groupResourceProfileId);
+ } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error removing group compute preferences: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
- public boolean removeGroupComputeResourcePolicy(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String resourcePolicyId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- return airavataService.removeGroupComputeResourcePolicy(authzToken, resourcePolicyId);
+ public boolean removeGroupComputeResourcePolicy(AuthzToken authzToken, String resourcePolicyId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ return airavataService.removeGroupComputeResourcePolicy(domainAuthzToken, resourcePolicyId);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error removing group compute resource policy: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
- public boolean removeGroupBatchQueueResourcePolicy(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String resourcePolicyId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- return airavataService.removeGroupBatchQueueResourcePolicy(authzToken, resourcePolicyId);
+ public boolean removeGroupBatchQueueResourcePolicy(AuthzToken authzToken, String resourcePolicyId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ return airavataService.removeGroupBatchQueueResourcePolicy(domainAuthzToken, resourcePolicyId);
+ } catch (AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error removing group batch queue resource policy: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.ComputeResourcePolicy getGroupComputeResourcePolicy(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String resourcePolicyId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public ComputeResourcePolicy getGroupComputeResourcePolicy(AuthzToken authzToken, String resourcePolicyId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- org.apache.airavata.common.model.ComputeResourcePolicy domainPolicy = airavataService.getGroupComputeResourcePolicy(domainAuthzToken, resourcePolicyId);
+ ComputeResourcePolicy domainPolicy =
+ airavataService.getGroupComputeResourcePolicy(domainAuthzToken, resourcePolicyId);
return computeResourcePolicyMapper.toThrift(domainPolicy);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
throw convertToThriftSystemException(e);
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting group compute resource policy: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -4487,24 +5074,25 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.BatchQueueResourcePolicy getBatchQueueResourcePolicy(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String resourcePolicyId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public BatchQueueResourcePolicy getBatchQueueResourcePolicy(AuthzToken authzToken, String resourcePolicyId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- org.apache.airavata.common.model.BatchQueueResourcePolicy domainPolicy = airavataService.getBatchQueueResourcePolicy(domainAuthzToken, resourcePolicyId);
+ BatchQueueResourcePolicy domainPolicy =
+ airavataService.getBatchQueueResourcePolicy(domainAuthzToken, resourcePolicyId);
return batchQueueResourcePolicyMapper.toThrift(domainPolicy);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting batch queue resource policy: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -4515,38 +5103,86 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@SecurityCheck
public List<GroupComputeResourcePreference> getGroupComputeResourcePrefList(
AuthzToken authzToken, String groupResourceProfileId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- return airavataService.getGroupComputeResourcePrefList(authzToken, groupResourceProfileId);
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ List<GroupComputeResourcePreference> domainPrefs =
+ airavataService.getGroupComputeResourcePrefList(domainAuthzToken, groupResourceProfileId);
+ return domainPrefs.stream()
+ .map(groupComputeResourcePreferenceMapper::toThrift)
+ .collect(Collectors.toList());
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting group compute resource preference list: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
public List<BatchQueueResourcePolicy> getGroupBatchQueueResourcePolicyList(
AuthzToken authzToken, String groupResourceProfileId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- return airavataService.getGroupBatchQueueResourcePolicyList(authzToken, groupResourceProfileId);
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ List<BatchQueueResourcePolicy> domainPolicies =
+ airavataService.getGroupBatchQueueResourcePolicyList(domainAuthzToken, groupResourceProfileId);
+ return domainPolicies.stream()
+ .map(batchQueueResourcePolicyMapper::toThrift)
+ .collect(Collectors.toList());
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error getting group batch queue resource policy list: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.ComputeResourcePolicy> getGroupComputeResourcePolicyList(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String groupResourceProfileId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<ComputeResourcePolicy> getGroupComputeResourcePolicyList(
+ AuthzToken authzToken, String groupResourceProfileId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- List<org.apache.airavata.common.model.ComputeResourcePolicy> domainPolicies = airavataService.getGroupComputeResourcePolicyList(domainAuthzToken, groupResourceProfileId);
- return domainPolicies.stream().map(computeResourcePolicyMapper::toThrift).collect(Collectors.toList());
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ List<ComputeResourcePolicy> domainPolicies =
+ airavataService.getGroupComputeResourcePolicyList(domainAuthzToken, groupResourceProfileId);
+ return domainPolicies.stream()
+ .map(computeResourcePolicyMapper::toThrift)
+ .collect(Collectors.toList());
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting group compute resource policy list: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -4555,23 +5191,25 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.GatewayGroups getGatewayGroups(org.apache.airavata.thriftapi.security.model.AuthzToken authzToken)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public GatewayGroups getGatewayGroups(AuthzToken authzToken)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- org.apache.airavata.common.model.GatewayGroups domainGroups = airavataService.getGatewayGroups(domainAuthzToken);
+ String gatewayId = domainAuthzToken.getClaimsMap().get(Constants.GATEWAY_ID);
+ GatewayGroups domainGroups = airavataService.getGatewayGroups(gatewayId);
return gatewayGroupsMapper.toThrift(domainGroups);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting gateway groups: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -4580,23 +5218,23 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.Parser getParser(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String parserId, String gatewayId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public Parser getParser(AuthzToken authzToken, String parserId, String gatewayId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
- org.apache.airavata.common.model.Parser domainParser = airavataService.getParser(parserId, gatewayId);
+ Parser domainParser = airavataService.getParser(parserId, gatewayId);
return parserMapper.toThrift(domainParser);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting parser: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -4605,9 +5243,16 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public String saveParser(org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, org.apache.airavata.thriftapi.model.Parser parser)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public String saveParser(
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ Parser parser)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.Parser domainParser = parserMapper.toDomain(parser);
return airavataService.saveParser(domainParser);
} catch (org.apache.airavata.common.exception.InvalidRequestException e) {
@@ -4619,8 +5264,8 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error saving parser: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -4629,23 +5274,23 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.Parser> listAllParsers(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<Parser> listAllParsers(AuthzToken authzToken, String gatewayId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
- List<org.apache.airavata.common.model.Parser> domainParsers = airavataService.listAllParsers(gatewayId);
+ List<Parser> domainParsers = airavataService.listAllParsers(gatewayId);
return domainParsers.stream().map(parserMapper::toThrift).collect(Collectors.toList());
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error listing parsers: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -4654,23 +5299,23 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public boolean removeParser(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String parserId, String gatewayId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public boolean removeParser(AuthzToken authzToken, String parserId, String gatewayId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
airavataService.removeParser(parserId, gatewayId);
return true;
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error removing parser: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -4679,23 +5324,23 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.ParsingTemplate getParsingTemplate(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String templateId, String gatewayId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public ParsingTemplate getParsingTemplate(AuthzToken authzToken, String templateId, String gatewayId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
- org.apache.airavata.common.model.ParsingTemplate domainTemplate = airavataService.getParsingTemplate(templateId, gatewayId);
+ ParsingTemplate domainTemplate = airavataService.getParsingTemplate(templateId, gatewayId);
return parsingTemplateMapper.toThrift(domainTemplate);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting parsing template: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -4704,23 +5349,25 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.ParsingTemplate> getParsingTemplatesForExperiment(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String experimentId, String gatewayId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<ParsingTemplate> getParsingTemplatesForExperiment(
+ AuthzToken authzToken, String experimentId, String gatewayId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
- List<org.apache.airavata.common.model.ParsingTemplate> domainTemplates = airavataService.getParsingTemplatesForExperiment(experimentId, gatewayId);
+ List<ParsingTemplate> domainTemplates =
+ airavataService.getParsingTemplatesForExperiment(experimentId, gatewayId);
return domainTemplates.stream().map(parsingTemplateMapper::toThrift).collect(Collectors.toList());
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting parsing templates for experiment: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -4730,22 +5377,29 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
public String saveParsingTemplate(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, org.apache.airavata.thriftapi.model.ParsingTemplate parsingTemplate)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
+ org.apache.airavata.thriftapi.model.ParsingTemplate parsingTemplate)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.ParsingTemplate domainTemplate = parsingTemplateMapper.toDomain(parsingTemplate);
return airavataService.saveParsingTemplate(domainTemplate);
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
- throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
- throw convertToThriftAiravataClientException(e);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
- throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
- throw convertToThriftAuthorizationException(e);
+ org.apache.airavata.thriftapi.exception.AiravataSystemException thriftException = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ thriftException.setMessage(e.getMessage());
+ if (e.getAiravataErrorType() != null) {
+ thriftException.setAiravataErrorType(
+ org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(e.getAiravataErrorType().name()));
+ }
+ thriftException.initCause(e);
+ throw thriftException;
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error saving parsing template: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -4754,32 +5408,32 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
@Override
@SecurityCheck
- public boolean removeParsingTemplate(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String templateId, String gatewayId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public boolean removeParsingTemplate(AuthzToken authzToken, String templateId, String gatewayId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
airavataService.removeParsingTemplate(templateId, gatewayId);
return true;
}
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.ParsingTemplate> listAllParsingTemplates(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public List<ParsingTemplate> listAllParsingTemplates(AuthzToken authzToken, String gatewayId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
try {
- List<org.apache.airavata.common.model.ParsingTemplate> domainTemplates = airavataService.listAllParsingTemplates(gatewayId);
+ List<ParsingTemplate> domainTemplates = airavataService.listAllParsingTemplates(gatewayId);
return domainTemplates.stream().map(parsingTemplateMapper::toThrift).collect(Collectors.toList());
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
- } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ } catch (AiravataSystemException e) {
throw convertToThriftSystemException(e);
- } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ } catch (AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error listing parsing templates: " + e.getMessage());
ex.initCause(e);
throw ex;
@@ -4789,179 +5443,169 @@ public class AiravataServiceHandler implements org.apache.airavata.thriftapi.ser
/**
* To hold storage info context (login username, credential token, and adaptor)
*/
-
-
-
-
-
-
-
-
@Override
@SecurityCheck
- public Map<String, org.apache.airavata.thriftapi.model.ProcessStatus> getIntermediateOutputProcessStatus(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- String experimentId,
- List<String> processIds)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ public ProcessStatus getIntermediateOutputProcessStatus(
+ AuthzToken authzToken, String airavataExperimentId, List<String> outputNames)
+ throws InvalidRequestException, ExperimentNotFoundException, AiravataClientException,
+ AiravataSystemException, AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- Map<String, org.apache.airavata.common.model.ProcessStatus> domainStatuses = airavataService.getIntermediateOutputProcessStatus(domainAuthzToken, experimentId, processIds);
- Map<String, org.apache.airavata.thriftapi.model.ProcessStatus> thriftStatuses = new java.util.HashMap<>();
- for (Map.Entry<String, org.apache.airavata.common.model.ProcessStatus> entry : domainStatuses.entrySet()) {
- thriftStatuses.put(entry.getKey(), processStatusMapper.toThrift(entry.getValue()));
- }
- return thriftStatuses;
- } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ ProcessStatus domainStatus = airavataService.getIntermediateOutputProcessStatus(
+ domainAuthzToken, airavataExperimentId, outputNames);
+ return processStatusMapper.toThrift(domainStatus);
+ } catch (InvalidRequestException e) {
throw convertToThriftInvalidRequestException(e);
- } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ } catch (ExperimentNotFoundException e) {
+ throw convertToThriftExperimentNotFoundException(e);
+ } catch (AiravataClientException e) {
throw convertToThriftAiravataClientException(e);
} catch (org.apache.airavata.common.exception.AiravataSystemException e) {
throw convertToThriftSystemException(e);
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
throw convertToThriftAuthorizationException(e);
} catch (Exception e) {
- org.apache.airavata.thriftapi.exception.AiravataSystemException ex =
- new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
ex.setMessage("Error getting intermediate output process status: " + e.getMessage());
ex.initCause(e);
throw ex;
}
}
-
-
- @Override
- @SecurityCheck
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.ApplicationDeploymentDescription> getAccessibleApplicationDeployments(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- String appModuleId,
- org.apache.airavata.thriftapi.model.ResourcePermissionType permissionType)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- ResourcePermissionType domainPermissionType = ResourcePermissionType.valueOf(permissionType.name());
- List<ApplicationDeploymentDescription> domainDeployments = airavataService.getAccessibleApplicationDeployments(appModuleId, domainPermissionType);
- return domainDeployments.stream().map(applicationDeploymentDescriptionMapper::toThrift).collect(Collectors.toList());
+ public void updateResourceScheduleing(
+ AuthzToken authzToken, String airavataExperimentId, ComputationalResourceSchedulingModel resourceScheduling)
+ throws AuthorizationException, TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ ComputationalResourceSchedulingModel domainScheduling =
+ computationalResourceSchedulingModelMapper.toDomain(resourceScheduling);
+ airavataService.updateResourceScheduleing(airavataExperimentId, domainScheduling);
+ } catch (AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error updating resource scheduling: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.ApplicationDeploymentDescription> getApplicationDeploymentsForAppModuleAndGroupResourceProfile(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- String appModuleId,
- String groupResourceProfileId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- List<ApplicationDeploymentDescription> domainDeployments = airavataService.getApplicationDeploymentsForAppModuleAndGroupResourceProfile(appModuleId, groupResourceProfileId);
- return domainDeployments.stream().map(applicationDeploymentDescriptionMapper::toThrift).collect(Collectors.toList());
+ public List<ComputeResourcePreference> getAllGatewayComputeResourcePreferences(
+ AuthzToken authzToken, String gatewayID)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ List<ComputeResourcePreference> domainPreferences =
+ airavataService.getAllGatewayComputeResourcePreferences(gatewayID);
+ return domainPreferences.stream()
+ .map(computeResourcePreferenceMapper::toThrift)
+ .collect(Collectors.toList());
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ @Override
@SecurityCheck
- public boolean updateResourceScheduleing(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- String computeResourceId,
- org.apache.airavata.thriftapi.model.ComputationalResourceSchedulingModel schedulingModel)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- ComputationalResourceSchedulingModel domainScheduling = computationalResourceSchedulingModelMapper.toDomain(schedulingModel);
- return airavataService.updateResourceScheduleing(computeResourceId, domainScheduling);
+ public GroupComputeResourcePreference getGroupComputeResourcePreference(
+ AuthzToken authzToken, String computeResourceId, String groupResourceProfileId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ GroupComputeResourcePreference domainPreference =
+ airavataService.getGroupComputeResourcePreference(groupResourceProfileId, computeResourceId);
+ return groupComputeResourcePreferenceMapper.toThrift(domainPreference);
}
@Override
@SecurityCheck
- public List<org.apache.airavata.thriftapi.model.ComputeResourcePreference> getAllGatewayComputeResourcePreferences(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- String gatewayID)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- List<ComputeResourcePreference> domainPreferences = airavataService.getAllGatewayComputeResourcePreferences(gatewayID);
- return domainPreferences.stream().map(computeResourcePreferenceMapper::toThrift).collect(Collectors.toList());
+ public boolean deleteJobSubmissionInterface(
+ AuthzToken authzToken, String computeResourceId, String jobSubmissionInterfaceId)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ return airavataService.deleteJobSubmissionInterface(computeResourceId, jobSubmissionInterfaceId);
}
@Override
@SecurityCheck
- public org.apache.airavata.thriftapi.model.GroupComputeResourcePreference getGroupComputeResourcePreference(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- String computeResourceId,
- String groupResourceProfileId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- GroupComputeResourcePreference domainPreference = airavataService.getGroupComputeResourcePreference(groupResourceProfileId, computeResourceId);
- return groupComputeResourcePreferenceMapper.toThrift(domainPreference);
+ public String addLocalDataMovementDetails(
+ AuthzToken authzToken,
+ String productUri,
+ DMType dataMoveType,
+ int priorityOrder,
+ LOCALDataMovement localDataMovement)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ DMType domainDMType = DMType.valueOf(dataMoveType.name());
+ LOCALDataMovement domainLocal = localDataMovementMapper.toDomain(localDataMovement);
+ return airavataService.addLocalDataMovementDetails(productUri, domainDMType, priorityOrder, domainLocal);
}
@Override
@SecurityCheck
- public boolean deleteJobSubmissionInterface(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
- String computeResourceId,
- String jobSubmissionInterfaceId)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- return airavataService.deleteJobSubmissionInterface(computeResourceId, jobSubmissionInterfaceId);
+ public boolean deleteDataMovementInterface(
+ AuthzToken authzToken, String productUri, String dataMovementInterfaceId, DMType dataMoveType)
+ throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ DMType domainDMType = DMType.valueOf(dataMoveType.name());
+ return airavataService.deleteDataMovementInterface(productUri, dataMovementInterfaceId, domainDMType);
+ } catch (InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ org.apache.airavata.thriftapi.exception.AiravataSystemException ex = new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ ex.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error deleting data movement interface: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
@Override
@SecurityCheck
- public String addLocalDataMovementDetails(
+ public String addSCPDataMovementDetails(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
String productUri,
- org.apache.airavata.thriftapi.model.DMType dataMoveType,
+ DMType dataMoveType,
int priorityOrder,
- org.apache.airavata.thriftapi.model.LOCALDataMovement localDataMovement)
- throws org.apache.airavata.thriftapi.exception.InvalidRequestException, org.apache.airavata.thriftapi.exception.AiravataClientException, org.apache.airavata.thriftapi.exception.AiravataSystemException, org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
- AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- DMType domainDMType = DMType.valueOf(dataMoveType.name());
- LOCALDataMovement domainLocal = localDataMovementMapper.toDomain(localDataMovement);
- return airavataService.addLocalDataMovementDetails(productUri, domainDMType, priorityOrder, domainLocal);
+ SCPDataMovement scpDataMovement)
+ throws org.apache.airavata.thriftapi.exception.InvalidRequestException,
+ org.apache.airavata.thriftapi.exception.AiravataClientException,
+ org.apache.airavata.thriftapi.exception.AiravataSystemException,
+ org.apache.airavata.thriftapi.exception.AuthorizationException,
+ TException {
+ try {
+ org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
+ org.apache.airavata.common.model.DMType domainDMType = org.apache.airavata.common.model.DMType.valueOf(dataMoveType.name());
+ org.apache.airavata.common.model.SCPDataMovement domainSCP = scpDataMovementMapper.toDomain(scpDataMovement);
+ return airavataService.addSCPDataMovementDetails(productUri, domainDMType, priorityOrder, domainSCP);
+ } catch (org.apache.airavata.common.exception.InvalidRequestException e) {
+ throw convertToThriftInvalidRequestException(e);
+ } catch (org.apache.airavata.common.exception.AiravataClientException e) {
+ throw convertToThriftAiravataClientException(e);
+ } catch (org.apache.airavata.common.exception.AiravataSystemException e) {
+ throw convertToThriftSystemException(e);
+ } catch (org.apache.airavata.common.exception.AuthorizationException e) {
+ throw convertToThriftAuthorizationException(e);
+ } catch (Exception e) {
+ var ex = new AiravataSystemException();
+ ex.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
+ ex.setMessage("Error adding SCP data movement details: " + e.getMessage());
+ ex.initCause(e);
+ throw ex;
+ }
}
}
diff --git a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/CredentialServiceHandler.java b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/CredentialServiceHandler.java
index 3794660f9b..9a9c69e252 100644
--- a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/CredentialServiceHandler.java
+++ b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/CredentialServiceHandler.java
@@ -21,7 +21,6 @@ package org.apache.airavata.thriftapi.handler;
import java.util.List;
import java.util.stream.Collectors;
-import org.apache.airavata.credential.exception.CredentialStoreException;
import org.apache.airavata.credential.model.CertificateCredential;
import org.apache.airavata.credential.model.CredentialSummary;
import org.apache.airavata.credential.model.PasswordCredential;
@@ -34,7 +33,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@Component
-public class CredentialServiceHandler implements org.apache.airavata.thriftapi.credential.model.CredentialStoreService.Iface {
+public class CredentialServiceHandler
+ implements org.apache.airavata.thriftapi.credential.model.CredentialStoreService.Iface {
protected static Logger log = LoggerFactory.getLogger(CredentialServiceHandler.class);
private final CredentialStoreService credentialStoreService;
@@ -96,7 +96,8 @@ public class CredentialServiceHandler implements org.apache.airavata.thriftapi.c
}
@Override
- public org.apache.airavata.thriftapi.credential.model.SSHCredential getSSHCredential(String tokenId, String gatewayId)
+ public org.apache.airavata.thriftapi.credential.model.SSHCredential getSSHCredential(
+ String tokenId, String gatewayId)
throws org.apache.airavata.thriftapi.credential.exception.CredentialStoreException, TException {
try {
SSHCredential domainCredential = credentialStoreService.getSSHCredential(tokenId, gatewayId);
@@ -139,7 +140,8 @@ public class CredentialServiceHandler implements org.apache.airavata.thriftapi.c
String tokenId, String gatewayId)
throws org.apache.airavata.thriftapi.credential.exception.CredentialStoreException, TException {
try {
- CertificateCredential domainCredential = credentialStoreService.getCertificateCredential(tokenId, gatewayId);
+ CertificateCredential domainCredential =
+ credentialStoreService.getCertificateCredential(tokenId, gatewayId);
return convertToThriftCertificate(domainCredential);
} catch (org.apache.airavata.credential.exception.CredentialStoreException e) {
throw wrapException(e);
@@ -268,7 +270,8 @@ public class CredentialServiceHandler implements org.apache.airavata.thriftapi.c
thrift.setDescription(domain.getDescription());
thrift.setPersistedTime(domain.getPersistedTime());
if (domain.getType() != null) {
- thrift.setType(org.apache.airavata.thriftapi.credential.model.SummaryType.valueOf(domain.getType().name()));
+ thrift.setType(org.apache.airavata.thriftapi.credential.model.SummaryType.valueOf(
+ domain.getType().name()));
}
return thrift;
}
diff --git a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/GroupManagerServiceHandler.java b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/GroupManagerServiceHandler.java
index a696407744..2ee695003a 100644
--- a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/GroupManagerServiceHandler.java
+++ b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/GroupManagerServiceHandler.java
@@ -21,19 +21,19 @@ package org.apache.airavata.thriftapi.handler;
import java.util.List;
import java.util.stream.Collectors;
-import org.apache.airavata.profile.exception.GroupManagerServiceException;
import org.apache.airavata.security.interceptor.SecurityCheck;
-import org.apache.airavata.thriftapi.mapper.AuthzTokenMapper;
-import org.apache.airavata.thriftapi.mapper.GroupModelMapper;
import org.apache.airavata.service.security.GroupManagerService;
import org.apache.airavata.sharing.model.SharingRegistryException;
+import org.apache.airavata.thriftapi.mapper.AuthzTokenMapper;
+import org.apache.airavata.thriftapi.mapper.GroupModelMapper;
import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@Component
-public class GroupManagerServiceHandler implements org.apache.airavata.thriftapi.profile.model.GroupManagerService.Iface {
+public class GroupManagerServiceHandler
+ implements org.apache.airavata.thriftapi.profile.model.GroupManagerService.Iface {
private static final Logger logger = LoggerFactory.getLogger(GroupManagerServiceHandler.class);
private final GroupManagerService groupManagerService;
@@ -56,7 +56,7 @@ public class GroupManagerServiceHandler implements org.apache.airavata.thriftapi
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
org.apache.airavata.thriftapi.model.GroupModel groupModel)
throws org.apache.airavata.thriftapi.profile.exception.GroupManagerServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.GroupModel domainGroup = groupModelMapper.toDomain(groupModel);
@@ -86,7 +86,7 @@ public class GroupManagerServiceHandler implements org.apache.airavata.thriftapi
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
org.apache.airavata.thriftapi.model.GroupModel groupModel)
throws org.apache.airavata.thriftapi.profile.exception.GroupManagerServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.GroupModel domainGroup = groupModelMapper.toDomain(groupModel);
@@ -115,7 +115,7 @@ public class GroupManagerServiceHandler implements org.apache.airavata.thriftapi
public boolean deleteGroup(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String groupId, String ownerId)
throws org.apache.airavata.thriftapi.profile.exception.GroupManagerServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return groupManagerService.deleteGroup(domainAuthzToken, groupId, ownerId);
@@ -143,10 +143,11 @@ public class GroupManagerServiceHandler implements org.apache.airavata.thriftapi
public org.apache.airavata.thriftapi.model.GroupModel getGroup(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String groupId)
throws org.apache.airavata.thriftapi.profile.exception.GroupManagerServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- org.apache.airavata.common.model.GroupModel domainGroup = groupManagerService.getGroup(domainAuthzToken, groupId);
+ org.apache.airavata.common.model.GroupModel domainGroup =
+ groupManagerService.getGroup(domainAuthzToken, groupId);
return groupModelMapper.toThrift(domainGroup);
} catch (SharingRegistryException e) {
org.apache.airavata.thriftapi.profile.exception.GroupManagerServiceException ex =
@@ -172,10 +173,11 @@ public class GroupManagerServiceHandler implements org.apache.airavata.thriftapi
public List<org.apache.airavata.thriftapi.model.GroupModel> getGroups(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken)
throws org.apache.airavata.thriftapi.profile.exception.GroupManagerServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- List<org.apache.airavata.common.model.GroupModel> domainGroups = groupManagerService.getGroups(domainAuthzToken);
+ List<org.apache.airavata.common.model.GroupModel> domainGroups =
+ groupManagerService.getGroups(domainAuthzToken);
return domainGroups.stream().map(groupModelMapper::toThrift).collect(Collectors.toList());
} catch (SharingRegistryException e) {
org.apache.airavata.thriftapi.profile.exception.GroupManagerServiceException ex =
@@ -201,7 +203,7 @@ public class GroupManagerServiceHandler implements org.apache.airavata.thriftapi
public List<org.apache.airavata.thriftapi.model.GroupModel> getAllGroupsUserBelongs(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String userName)
throws org.apache.airavata.thriftapi.profile.exception.GroupManagerServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
List<org.apache.airavata.common.model.GroupModel> domainGroups =
@@ -230,7 +232,7 @@ public class GroupManagerServiceHandler implements org.apache.airavata.thriftapi
public boolean addUsersToGroup(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, List<String> userIds, String groupId)
throws org.apache.airavata.thriftapi.profile.exception.GroupManagerServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return groupManagerService.addUsersToGroup(domainAuthzToken, userIds, groupId);
@@ -257,7 +259,7 @@ public class GroupManagerServiceHandler implements org.apache.airavata.thriftapi
public boolean removeUsersFromGroup(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, List<String> userIds, String groupId)
throws org.apache.airavata.thriftapi.profile.exception.GroupManagerServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return groupManagerService.removeUsersFromGroup(domainAuthzToken, userIds, groupId);
@@ -285,7 +287,7 @@ public class GroupManagerServiceHandler implements org.apache.airavata.thriftapi
public boolean transferGroupOwnership(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String groupId, String newOwnerId)
throws org.apache.airavata.thriftapi.profile.exception.GroupManagerServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return groupManagerService.transferGroupOwnership(domainAuthzToken, groupId, newOwnerId);
@@ -313,7 +315,7 @@ public class GroupManagerServiceHandler implements org.apache.airavata.thriftapi
public boolean addGroupAdmins(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String groupId, List<String> adminIds)
throws org.apache.airavata.thriftapi.profile.exception.GroupManagerServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return groupManagerService.addGroupAdmins(domainAuthzToken, groupId, adminIds);
@@ -341,7 +343,7 @@ public class GroupManagerServiceHandler implements org.apache.airavata.thriftapi
public boolean removeGroupAdmins(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String groupId, List<String> adminIds)
throws org.apache.airavata.thriftapi.profile.exception.GroupManagerServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return groupManagerService.removeGroupAdmins(domainAuthzToken, groupId, adminIds);
@@ -369,7 +371,7 @@ public class GroupManagerServiceHandler implements org.apache.airavata.thriftapi
public boolean hasAdminAccess(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String groupId, String adminId)
throws org.apache.airavata.thriftapi.profile.exception.GroupManagerServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return groupManagerService.hasAdminAccess(domainAuthzToken, groupId, adminId);
@@ -397,7 +399,7 @@ public class GroupManagerServiceHandler implements org.apache.airavata.thriftapi
public boolean hasOwnerAccess(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String groupId, String ownerId)
throws org.apache.airavata.thriftapi.profile.exception.GroupManagerServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return groupManagerService.hasOwnerAccess(domainAuthzToken, groupId, ownerId);
@@ -421,8 +423,9 @@ public class GroupManagerServiceHandler implements org.apache.airavata.thriftapi
}
// Helper methods for exception conversion
- private org.apache.airavata.thriftapi.profile.exception.GroupManagerServiceException convertToThriftGroupManagerServiceException(
- org.apache.airavata.profile.exception.GroupManagerServiceException e) {
+ private org.apache.airavata.thriftapi.profile.exception.GroupManagerServiceException
+ convertToThriftGroupManagerServiceException(
+ org.apache.airavata.profile.exception.GroupManagerServiceException e) {
org.apache.airavata.thriftapi.profile.exception.GroupManagerServiceException thriftException =
new org.apache.airavata.thriftapi.profile.exception.GroupManagerServiceException();
thriftException.setMessage(e.getMessage());
diff --git a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/IamAdminServiceHandler.java b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/IamAdminServiceHandler.java
index 8d7a36a136..8d07ce2086 100644
--- a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/IamAdminServiceHandler.java
+++ b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/IamAdminServiceHandler.java
@@ -22,12 +22,11 @@ package org.apache.airavata.thriftapi.handler;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.airavata.credential.exception.CredentialStoreException;
-import org.apache.airavata.profile.exception.IamAdminServicesException;
import org.apache.airavata.security.interceptor.SecurityCheck;
+import org.apache.airavata.service.security.IamAdminService;
import org.apache.airavata.thriftapi.mapper.AuthzTokenMapper;
import org.apache.airavata.thriftapi.mapper.GatewayMapper;
import org.apache.airavata.thriftapi.mapper.UserProfileMapper;
-import org.apache.airavata.service.security.IamAdminService;
import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,7 +48,13 @@ public class IamAdminServiceHandler implements org.apache.airavata.thriftapi.pro
@Override
public String getAPIVersion() throws org.apache.airavata.thriftapi.exception.AiravataSystemException, TException {
- return org.apache.airavata.thriftapi.profile.model.iam_admin_services_cpiConstants.IAM_ADMIN_SERVICES_CPI_VERSION;
+ return org.apache
+ .airavata
+ .thriftapi
+ .profile
+ .model
+ .iam_admin_services_cpiConstants
+ .IAM_ADMIN_SERVICES_CPI_VERSION;
}
@Override
@@ -58,11 +63,12 @@ public class IamAdminServiceHandler implements org.apache.airavata.thriftapi.pro
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
org.apache.airavata.thriftapi.model.Gateway gateway)
throws org.apache.airavata.thriftapi.profile.exception.IamAdminServicesException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.Gateway domainGateway = gatewayMapper.toDomain(gateway);
- org.apache.airavata.common.model.Gateway result = iamAdminService.setUpGateway(domainAuthzToken, domainGateway);
+ org.apache.airavata.common.model.Gateway result =
+ iamAdminService.setUpGateway(domainAuthzToken, domainGateway);
return gatewayMapper.toThrift(result);
} catch (CredentialStoreException e) {
org.apache.airavata.thriftapi.profile.exception.IamAdminServicesException ex =
@@ -88,7 +94,7 @@ public class IamAdminServiceHandler implements org.apache.airavata.thriftapi.pro
public boolean isUsernameAvailable(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String username)
throws org.apache.airavata.thriftapi.profile.exception.IamAdminServicesException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return iamAdminService.isUsernameAvailable(domainAuthzToken, username);
@@ -115,10 +121,11 @@ public class IamAdminServiceHandler implements org.apache.airavata.thriftapi.pro
String lastName,
String newPassword)
throws org.apache.airavata.thriftapi.profile.exception.IamAdminServicesException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- return iamAdminService.registerUser(domainAuthzToken, username, emailAddress, firstName, lastName, newPassword);
+ return iamAdminService.registerUser(
+ domainAuthzToken, username, emailAddress, firstName, lastName, newPassword);
} catch (org.apache.airavata.profile.exception.IamAdminServicesException e) {
throw convertToThriftIamAdminServicesException(e);
} catch (org.apache.airavata.common.exception.AuthorizationException e) {
@@ -136,7 +143,7 @@ public class IamAdminServiceHandler implements org.apache.airavata.thriftapi.pro
@SecurityCheck
public boolean enableUser(org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String username)
throws org.apache.airavata.thriftapi.profile.exception.IamAdminServicesException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return iamAdminService.enableUser(domainAuthzToken, username);
@@ -157,7 +164,7 @@ public class IamAdminServiceHandler implements org.apache.airavata.thriftapi.pro
@SecurityCheck
public boolean isUserEnabled(org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String username)
throws org.apache.airavata.thriftapi.profile.exception.IamAdminServicesException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return iamAdminService.isUserEnabled(domainAuthzToken, username);
@@ -178,7 +185,7 @@ public class IamAdminServiceHandler implements org.apache.airavata.thriftapi.pro
@SecurityCheck
public boolean isUserExist(org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String username)
throws org.apache.airavata.thriftapi.profile.exception.IamAdminServicesException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return iamAdminService.isUserExist(domainAuthzToken, username);
@@ -200,10 +207,11 @@ public class IamAdminServiceHandler implements org.apache.airavata.thriftapi.pro
public org.apache.airavata.thriftapi.model.UserProfile getUser(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String username)
throws org.apache.airavata.thriftapi.profile.exception.IamAdminServicesException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
- org.apache.airavata.common.model.UserProfile domainProfile = iamAdminService.getUser(domainAuthzToken, username);
+ org.apache.airavata.common.model.UserProfile domainProfile =
+ iamAdminService.getUser(domainAuthzToken, username);
return userProfileMapper.toThrift(domainProfile);
} catch (org.apache.airavata.profile.exception.IamAdminServicesException e) {
throw convertToThriftIamAdminServicesException(e);
@@ -223,7 +231,7 @@ public class IamAdminServiceHandler implements org.apache.airavata.thriftapi.pro
public List<org.apache.airavata.thriftapi.model.UserProfile> getUsers(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, int offset, int limit, String search)
throws org.apache.airavata.thriftapi.profile.exception.IamAdminServicesException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
List<org.apache.airavata.common.model.UserProfile> domainProfiles =
@@ -247,7 +255,7 @@ public class IamAdminServiceHandler implements org.apache.airavata.thriftapi.pro
public boolean resetUserPassword(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String username, String newPassword)
throws org.apache.airavata.thriftapi.profile.exception.IamAdminServicesException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return iamAdminService.resetUserPassword(domainAuthzToken, username, newPassword);
@@ -269,7 +277,7 @@ public class IamAdminServiceHandler implements org.apache.airavata.thriftapi.pro
public List<org.apache.airavata.thriftapi.model.UserProfile> findUsers(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String email, String userId)
throws org.apache.airavata.thriftapi.profile.exception.IamAdminServicesException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
List<org.apache.airavata.common.model.UserProfile> domainProfiles =
@@ -294,7 +302,7 @@ public class IamAdminServiceHandler implements org.apache.airavata.thriftapi.pro
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
org.apache.airavata.thriftapi.model.UserProfile userDetails)
throws org.apache.airavata.thriftapi.profile.exception.IamAdminServicesException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.UserProfile domainProfile = userProfileMapper.toDomain(userDetails);
@@ -316,7 +324,7 @@ public class IamAdminServiceHandler implements org.apache.airavata.thriftapi.pro
@SecurityCheck
public boolean deleteUser(org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String username)
throws org.apache.airavata.thriftapi.profile.exception.IamAdminServicesException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return iamAdminService.deleteUser(domainAuthzToken, username);
@@ -334,8 +342,9 @@ public class IamAdminServiceHandler implements org.apache.airavata.thriftapi.pro
}
// Helper methods for exception conversion
- private org.apache.airavata.thriftapi.profile.exception.IamAdminServicesException convertToThriftIamAdminServicesException(
- org.apache.airavata.profile.exception.IamAdminServicesException e) {
+ private org.apache.airavata.thriftapi.profile.exception.IamAdminServicesException
+ convertToThriftIamAdminServicesException(
+ org.apache.airavata.profile.exception.IamAdminServicesException e) {
org.apache.airavata.thriftapi.profile.exception.IamAdminServicesException thriftException =
new org.apache.airavata.thriftapi.profile.exception.IamAdminServicesException();
thriftException.setMessage(e.getMessage());
diff --git a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/OrchestratorServiceHandler.java b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/OrchestratorServiceHandler.java
index a30bb781ce..22a1d27320 100644
--- a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/OrchestratorServiceHandler.java
+++ b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/OrchestratorServiceHandler.java
@@ -31,7 +31,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@Component
-public class OrchestratorServiceHandler implements org.apache.airavata.thriftapi.orchestrator.model.OrchestratorService.Iface {
+public class OrchestratorServiceHandler
+ implements org.apache.airavata.thriftapi.orchestrator.model.OrchestratorService.Iface {
private static Logger log = LoggerFactory.getLogger(OrchestratorServiceHandler.class);
private final OrchestratorService orchestratorService;
private final ProcessModelMapper processModelMapper = ProcessModelMapper.INSTANCE;
@@ -69,8 +70,7 @@ public class OrchestratorServiceHandler implements org.apache.airavata.thriftapi
log.error("Error launching experiment: " + experimentId, e);
org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
new org.apache.airavata.thriftapi.exception.AiravataSystemException();
- exception.setAiravataErrorType(
- org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ exception.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
exception.setMessage("Error launching experiment: " + experimentId + ". More info: " + e.getMessage());
exception.initCause(e);
throw exception;
@@ -142,8 +142,7 @@ public class OrchestratorServiceHandler implements org.apache.airavata.thriftapi
log.error("Error terminating experiment: " + experimentId, e);
org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
new org.apache.airavata.thriftapi.exception.AiravataSystemException();
- exception.setAiravataErrorType(
- org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ exception.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
exception.setMessage("Error terminating experiment: " + experimentId + ". More info: " + e.getMessage());
exception.initCause(e);
throw exception;
@@ -160,8 +159,7 @@ public class OrchestratorServiceHandler implements org.apache.airavata.thriftapi
log.error("Error fetching intermediate outputs for experiment: " + experimentId, e);
org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
new org.apache.airavata.thriftapi.exception.AiravataSystemException();
- exception.setAiravataErrorType(
- org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ exception.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
exception.setMessage("Error fetching intermediate outputs for experiment: " + experimentId + ". More info: "
+ e.getMessage());
exception.initCause(e);
@@ -180,8 +178,7 @@ public class OrchestratorServiceHandler implements org.apache.airavata.thriftapi
log.error("Error launching process: " + processId, e);
org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
new org.apache.airavata.thriftapi.exception.AiravataSystemException();
- exception.setAiravataErrorType(
- org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ exception.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
exception.setMessage("Error launching process: " + processId + ". More info: " + e.getMessage());
exception.initCause(e);
throw exception;
@@ -195,8 +192,8 @@ public class OrchestratorServiceHandler implements org.apache.airavata.thriftapi
new org.apache.airavata.thriftapi.exception.AiravataSystemException();
thriftException.setMessage(e.getMessage());
if (e.getAiravataErrorType() != null) {
- thriftException.setAiravataErrorType(
- org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(e.getAiravataErrorType().name()));
+ thriftException.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.valueOf(
+ e.getAiravataErrorType().name()));
}
thriftException.initCause(e);
return thriftException;
diff --git a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/SharingRegistryServerHandler.java b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/SharingRegistryServerHandler.java
index 26c87e9cbb..acf6043467 100644
--- a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/SharingRegistryServerHandler.java
+++ b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/SharingRegistryServerHandler.java
@@ -33,7 +33,8 @@ import org.apache.airavata.sharing.model.UserGroup;
import org.springframework.stereotype.Component;
@Component
-public class SharingRegistryServerHandler implements org.apache.airavata.thriftapi.sharing.model.SharingRegistryService.Iface {
+public class SharingRegistryServerHandler
+ implements org.apache.airavata.thriftapi.sharing.model.SharingRegistryService.Iface {
private final SharingRegistryService sharingRegistryService;
public SharingRegistryServerHandler(SharingRegistryService sharingRegistryService) {
diff --git a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/TenantProfileServiceHandler.java b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/TenantProfileServiceHandler.java
index bb22f3cc21..c07f4206ef 100644
--- a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/TenantProfileServiceHandler.java
+++ b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/TenantProfileServiceHandler.java
@@ -22,7 +22,6 @@ package org.apache.airavata.thriftapi.handler;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.airavata.credential.exception.CredentialStoreException;
-import org.apache.airavata.profile.exception.TenantProfileServiceException;
import org.apache.airavata.security.interceptor.SecurityCheck;
import org.apache.airavata.service.profile.TenantProfileService;
import org.apache.airavata.thriftapi.mapper.AuthzTokenMapper;
@@ -36,7 +35,8 @@ import org.springframework.stereotype.Component;
* Created by goshenoy on 3/6/17.
*/
@Component
-public class TenantProfileServiceHandler implements org.apache.airavata.thriftapi.profile.model.TenantProfileService.Iface {
+public class TenantProfileServiceHandler
+ implements org.apache.airavata.thriftapi.profile.model.TenantProfileService.Iface {
private static final Logger logger = LoggerFactory.getLogger(TenantProfileServiceHandler.class);
@@ -60,7 +60,7 @@ public class TenantProfileServiceHandler implements org.apache.airavata.thriftap
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
org.apache.airavata.thriftapi.model.Gateway gateway)
throws org.apache.airavata.thriftapi.profile.exception.TenantProfileServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.Gateway domainGateway = gatewayMapper.toDomain(gateway);
@@ -90,7 +90,7 @@ public class TenantProfileServiceHandler implements org.apache.airavata.thriftap
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
org.apache.airavata.thriftapi.model.Gateway updatedGateway)
throws org.apache.airavata.thriftapi.profile.exception.TenantProfileServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.Gateway domainGateway = gatewayMapper.toDomain(updatedGateway);
@@ -119,7 +119,7 @@ public class TenantProfileServiceHandler implements org.apache.airavata.thriftap
public org.apache.airavata.thriftapi.model.Gateway getGateway(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String airavataInternalGatewayId)
throws org.apache.airavata.thriftapi.profile.exception.TenantProfileServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
org.apache.airavata.common.model.Gateway domainGateway =
@@ -145,7 +145,7 @@ public class TenantProfileServiceHandler implements org.apache.airavata.thriftap
String airavataInternalGatewayId,
String gatewayId)
throws org.apache.airavata.thriftapi.profile.exception.TenantProfileServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return tenantProfileService.deleteGateway(domainAuthzToken, airavataInternalGatewayId, gatewayId);
@@ -167,7 +167,7 @@ public class TenantProfileServiceHandler implements org.apache.airavata.thriftap
public List<org.apache.airavata.thriftapi.model.Gateway> getAllGateways(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken)
throws org.apache.airavata.thriftapi.profile.exception.TenantProfileServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
List<org.apache.airavata.common.model.Gateway> domainGateways =
@@ -188,10 +188,9 @@ public class TenantProfileServiceHandler implements org.apache.airavata.thriftap
@Override
@SecurityCheck
- public boolean isGatewayExist(
- org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayId)
+ public boolean isGatewayExist(org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayId)
throws org.apache.airavata.thriftapi.profile.exception.TenantProfileServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
return tenantProfileService.isGatewayExist(domainAuthzToken, gatewayId);
@@ -213,7 +212,7 @@ public class TenantProfileServiceHandler implements org.apache.airavata.thriftap
public List<org.apache.airavata.thriftapi.model.Gateway> getAllGatewaysForUser(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String requesterUsername)
throws org.apache.airavata.thriftapi.profile.exception.TenantProfileServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = authzTokenMapper.toDomain(authzToken);
List<org.apache.airavata.common.model.Gateway> domainGateways =
@@ -233,8 +232,9 @@ public class TenantProfileServiceHandler implements org.apache.airavata.thriftap
}
// Helper methods for exception conversion
- private org.apache.airavata.thriftapi.profile.exception.TenantProfileServiceException convertToThriftTenantProfileServiceException(
- org.apache.airavata.profile.exception.TenantProfileServiceException e) {
+ private org.apache.airavata.thriftapi.profile.exception.TenantProfileServiceException
+ convertToThriftTenantProfileServiceException(
+ org.apache.airavata.profile.exception.TenantProfileServiceException e) {
org.apache.airavata.thriftapi.profile.exception.TenantProfileServiceException thriftException =
new org.apache.airavata.thriftapi.profile.exception.TenantProfileServiceException();
thriftException.setMessage(e.getMessage());
diff --git a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/UserProfileServiceHandler.java b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/UserProfileServiceHandler.java
index 3931e5bad6..53b1c466bb 100644
--- a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/UserProfileServiceHandler.java
+++ b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/handler/UserProfileServiceHandler.java
@@ -22,7 +22,6 @@ package org.apache.airavata.thriftapi.handler;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.airavata.profile.exception.IamAdminServicesException;
-import org.apache.airavata.profile.exception.UserProfileServiceException;
import org.apache.airavata.security.interceptor.SecurityCheck;
import org.apache.thrift.TException;
import org.springframework.stereotype.Component;
@@ -45,7 +44,7 @@ public class UserProfileServiceHandler implements org.apache.airavata.thriftapi.
@SecurityCheck
public String initializeUserProfile(org.apache.airavata.thriftapi.security.model.AuthzToken authzToken)
throws org.apache.airavata.thriftapi.profile.exception.UserProfileServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = convertToDomainAuthzToken(authzToken);
return userProfileService.initializeUserProfile(domainAuthzToken);
@@ -68,7 +67,7 @@ public class UserProfileServiceHandler implements org.apache.airavata.thriftapi.
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
org.apache.airavata.thriftapi.model.UserProfile userProfile)
throws org.apache.airavata.thriftapi.profile.exception.UserProfileServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = convertToDomainAuthzToken(authzToken);
org.apache.airavata.common.model.UserProfile domainProfile = convertToDomainUserProfile(userProfile);
@@ -98,7 +97,7 @@ public class UserProfileServiceHandler implements org.apache.airavata.thriftapi.
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken,
org.apache.airavata.thriftapi.model.UserProfile userProfile)
throws org.apache.airavata.thriftapi.profile.exception.UserProfileServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = convertToDomainAuthzToken(authzToken);
org.apache.airavata.common.model.UserProfile domainProfile = convertToDomainUserProfile(userProfile);
@@ -127,7 +126,7 @@ public class UserProfileServiceHandler implements org.apache.airavata.thriftapi.
public org.apache.airavata.thriftapi.model.UserProfile getUserProfileById(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String userId, String gatewayId)
throws org.apache.airavata.thriftapi.profile.exception.UserProfileServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = convertToDomainAuthzToken(authzToken);
org.apache.airavata.common.model.UserProfile domainProfile =
@@ -151,7 +150,7 @@ public class UserProfileServiceHandler implements org.apache.airavata.thriftapi.
public boolean deleteUserProfile(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String userId, String gatewayId)
throws org.apache.airavata.thriftapi.profile.exception.UserProfileServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = convertToDomainAuthzToken(authzToken);
return userProfileService.deleteUserProfile(domainAuthzToken, userId, gatewayId);
@@ -173,7 +172,7 @@ public class UserProfileServiceHandler implements org.apache.airavata.thriftapi.
public List<org.apache.airavata.thriftapi.model.UserProfile> getAllUserProfilesInGateway(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String gatewayId, int offset, int limit)
throws org.apache.airavata.thriftapi.profile.exception.UserProfileServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = convertToDomainAuthzToken(authzToken);
List<org.apache.airavata.common.model.UserProfile> domainProfiles =
@@ -196,7 +195,7 @@ public class UserProfileServiceHandler implements org.apache.airavata.thriftapi.
public boolean doesUserExist(
org.apache.airavata.thriftapi.security.model.AuthzToken authzToken, String userId, String gatewayId)
throws org.apache.airavata.thriftapi.profile.exception.UserProfileServiceException,
- org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
+ org.apache.airavata.thriftapi.exception.AuthorizationException, TException {
try {
org.apache.airavata.security.model.AuthzToken domainAuthzToken = convertToDomainAuthzToken(authzToken);
return userProfileService.doesUserExist(domainAuthzToken, userId, gatewayId);
@@ -243,8 +242,7 @@ public class UserProfileServiceHandler implements org.apache.airavata.thriftapi.
private org.apache.airavata.thriftapi.model.UserProfile convertToThriftUserProfile(
org.apache.airavata.common.model.UserProfile domain) {
- org.apache.airavata.thriftapi.model.UserProfile thrift =
- new org.apache.airavata.thriftapi.model.UserProfile();
+ org.apache.airavata.thriftapi.model.UserProfile thrift = new org.apache.airavata.thriftapi.model.UserProfile();
thrift.setUserId(domain.getUserId());
thrift.setGatewayId(domain.getGatewayId());
if (domain.getFirstName() != null) {
@@ -260,8 +258,9 @@ public class UserProfileServiceHandler implements org.apache.airavata.thriftapi.
return thrift;
}
- private org.apache.airavata.thriftapi.profile.exception.UserProfileServiceException convertToThriftUserProfileServiceException(
- org.apache.airavata.profile.exception.UserProfileServiceException e) {
+ private org.apache.airavata.thriftapi.profile.exception.UserProfileServiceException
+ convertToThriftUserProfileServiceException(
+ org.apache.airavata.profile.exception.UserProfileServiceException e) {
org.apache.airavata.thriftapi.profile.exception.UserProfileServiceException thriftException =
new org.apache.airavata.thriftapi.profile.exception.UserProfileServiceException();
thriftException.setMessage(e.getMessage());
diff --git a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/mapper/ExperimentModelMapper.java b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/mapper/ExperimentModelMapper.java
index 107ad6b2c3..4c65111f92 100644
--- a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/mapper/ExperimentModelMapper.java
+++ b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/mapper/ExperimentModelMapper.java
@@ -21,7 +21,6 @@ package org.apache.airavata.thriftapi.mapper;
import org.apache.airavata.common.model.ExperimentModel;
import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
/**
diff --git a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/mapper/ProcessModelMapper.java b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/mapper/ProcessModelMapper.java
index 03a8cc7a02..f6b0304bff 100644
--- a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/mapper/ProcessModelMapper.java
+++ b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/mapper/ProcessModelMapper.java
@@ -21,7 +21,6 @@ package org.apache.airavata.thriftapi.mapper;
import org.apache.airavata.common.model.ProcessModel;
import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
/**
diff --git a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/server/AiravataServiceServer.java b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/server/AiravataServiceServer.java
index bc77246798..81bcebb9bc 100644
--- a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/server/AiravataServiceServer.java
+++ b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/server/AiravataServiceServer.java
@@ -19,12 +19,10 @@
*/
package org.apache.airavata.thriftapi.server;
-import org.apache.airavata.thriftapi.service.Airavata;
-import org.apache.airavata.common.exception.AiravataErrorType;
-import org.apache.airavata.common.exception.AiravataSystemException;
import org.apache.airavata.common.utils.IServer;
import org.apache.airavata.config.AiravataServerProperties;
import org.apache.airavata.thriftapi.handler.AiravataServiceHandler;
+import org.apache.airavata.thriftapi.service.Airavata;
import org.apache.thrift.server.TServer;
import org.apache.thrift.server.TThreadPoolServer;
import org.apache.thrift.transport.TSSLTransportFactory;
@@ -57,7 +55,7 @@ public class AiravataServiceServer implements IServer {
}
public void startAiravataServer(Airavata.Processor<Airavata.Iface> airavataAPIServer)
- throws AiravataSystemException {
+ throws org.apache.airavata.thriftapi.exception.AiravataSystemException {
try {
final int serverPort = properties.services.api.port;
@@ -123,7 +121,12 @@ public class AiravataServiceServer implements IServer {
} catch (TTransportException e) {
logger.error("Failed to start API server ...", e);
setStatus(ServerStatus.FAILED);
- throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
+ org.apache.airavata.thriftapi.exception.AiravataSystemException exception =
+ new org.apache.airavata.thriftapi.exception.AiravataSystemException();
+ exception.setAiravataErrorType(org.apache.airavata.thriftapi.exception.AiravataErrorType.INTERNAL_ERROR);
+ exception.setMessage("Failed to start API server: " + e.getMessage());
+ exception.initCause(e);
+ throw exception;
}
}
diff --git a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/server/OrchestratorServiceServer.java b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/server/OrchestratorServiceServer.java
index 83894308a3..9894a74f2e 100644
--- a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/server/OrchestratorServiceServer.java
+++ b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/server/OrchestratorServiceServer.java
@@ -24,8 +24,8 @@ import org.apache.airavata.config.AiravataServerProperties;
import org.apache.airavata.metascheduler.metadata.analyzer.DataInterpreterService;
import org.apache.airavata.metascheduler.process.scheduling.engine.rescheduler.ProcessReschedulingService;
import org.apache.airavata.monitor.compute.ComputationalResourceMonitoringService;
-import org.apache.airavata.thriftapi.orchestrator.model.OrchestratorService;
import org.apache.airavata.thriftapi.handler.OrchestratorServiceHandler;
+import org.apache.airavata.thriftapi.orchestrator.model.OrchestratorService;
import org.apache.thrift.server.TServer;
import org.apache.thrift.server.TThreadPoolServer;
import org.apache.thrift.transport.TServerSocket;
diff --git a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/server/ProfileServiceServer.java b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/server/ProfileServiceServer.java
index 43bc44087b..857ee480af 100644
--- a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/server/ProfileServiceServer.java
+++ b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/server/ProfileServiceServer.java
@@ -26,6 +26,11 @@ import org.apache.airavata.common.utils.DBInitConfig;
import org.apache.airavata.common.utils.DBInitializer;
import org.apache.airavata.common.utils.IServer;
import org.apache.airavata.config.AiravataServerProperties;
+import org.apache.airavata.profile.utils.UserProfileCatalogDBInitConfig;
+import org.apache.airavata.thriftapi.handler.GroupManagerServiceHandler;
+import org.apache.airavata.thriftapi.handler.IamAdminServiceHandler;
+import org.apache.airavata.thriftapi.handler.TenantProfileServiceHandler;
+import org.apache.airavata.thriftapi.handler.UserProfileServiceHandler;
import org.apache.airavata.thriftapi.profile.model.GroupManagerService;
import org.apache.airavata.thriftapi.profile.model.IamAdminServices;
import org.apache.airavata.thriftapi.profile.model.TenantProfileService;
@@ -34,11 +39,6 @@ import org.apache.airavata.thriftapi.profile.model.group_manager_cpiConstants;
import org.apache.airavata.thriftapi.profile.model.iam_admin_services_cpiConstants;
import org.apache.airavata.thriftapi.profile.model.profile_tenant_cpiConstants;
import org.apache.airavata.thriftapi.profile.model.profile_user_cpiConstants;
-import org.apache.airavata.profile.utils.UserProfileCatalogDBInitConfig;
-import org.apache.airavata.thriftapi.handler.GroupManagerServiceHandler;
-import org.apache.airavata.thriftapi.handler.IamAdminServiceHandler;
-import org.apache.airavata.thriftapi.handler.TenantProfileServiceHandler;
-import org.apache.airavata.thriftapi.handler.UserProfileServiceHandler;
import org.apache.thrift.TMultiplexedProcessor;
import org.apache.thrift.server.TServer;
import org.apache.thrift.server.TThreadPoolServer;
diff --git a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/server/RegistryServiceServer.java b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/server/RegistryServiceServer.java
index e58202ef19..288f1f093e 100644
--- a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/server/RegistryServiceServer.java
+++ b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/server/RegistryServiceServer.java
@@ -27,11 +27,11 @@ import org.apache.airavata.common.utils.DBInitializer;
import org.apache.airavata.common.utils.IServer;
import org.apache.airavata.config.AiravataServerProperties;
import org.apache.airavata.registry.messaging.RegistryServiceDBEventMessagingFactory;
-import org.apache.airavata.thriftapi.registry.model.RegistryService;
import org.apache.airavata.registry.utils.AppCatalogDBInitConfig;
import org.apache.airavata.registry.utils.ExpCatalogDBInitConfig;
import org.apache.airavata.registry.utils.ReplicaCatalogDBInitConfig;
import org.apache.airavata.thriftapi.handler.RegistryServiceHandler;
+import org.apache.airavata.thriftapi.registry.model.RegistryService;
import org.apache.airavata.thriftapi.util.RegistryServiceConstants;
import org.apache.thrift.server.TServer;
import org.apache.thrift.server.TThreadPoolServer;
diff --git a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/server/SharingRegistryServer.java b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/server/SharingRegistryServer.java
index 89636761d8..1ebde74f4e 100644
--- a/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/server/SharingRegistryServer.java
+++ b/modules/thrift-api/src/main/java/org/apache/airavata/thriftapi/server/SharingRegistryServer.java
@@ -24,8 +24,8 @@ import org.apache.airavata.common.utils.IServer;
import org.apache.airavata.config.AiravataServerProperties;
import org.apache.airavata.sharing.messaging.SharingServiceDBEventMessagingFactory;
import org.apache.airavata.sharing.model.SharingRegistryException;
-import org.apache.airavata.thriftapi.sharing.model.SharingRegistryService;
import org.apache.airavata.thriftapi.handler.SharingRegistryServerHandler;
+import org.apache.airavata.thriftapi.sharing.model.SharingRegistryService;
import org.apache.airavata.thriftapi.util.SharingRegistryConstants;
import org.apache.thrift.server.TServer;
import org.apache.thrift.server.TThreadPoolServer;
diff --git a/modules/thrift-api/src/test/java/org/apache/airavata/thriftapi/client/TestAiravataServiceClientFactory.java b/modules/thrift-api/src/test/java/org/apache/airavata/thriftapi/client/TestAiravataServiceClientFactory.java
index abd0415f2f..40e3ccabcf 100644
--- a/modules/thrift-api/src/test/java/org/apache/airavata/thriftapi/client/TestAiravataServiceClientFactory.java
+++ b/modules/thrift-api/src/test/java/org/apache/airavata/thriftapi/client/TestAiravataServiceClientFactory.java
@@ -28,7 +28,7 @@ import org.apache.airavata.common.exception.AiravataErrorType;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.Constants;
import org.apache.airavata.config.AiravataServerProperties;
-import org.apache.airavata.security.model.AuthzToken;
+import org.apache.airavata.thriftapi.security.model.AuthzToken;
import org.apache.airavata.thriftapi.service.Airavata;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;