This is an automated email from the ASF dual-hosted git repository. lahirujayathilake pushed a commit to branch storage-update in repository https://gitbox.apache.org/repos/asf/airavata.git
commit e4ff76de3569129a11688fc0874ece42baee0935 Author: lahiruj <[email protected]> AuthorDate: Thu Oct 30 18:04:05 2025 -0400 apply spotless styles --- .../airavata/helix/impl/task/TaskContext.java | 34 ++++++++++---- .../helix/impl/task/staging/ArchiveTask.java | 4 +- .../helix/impl/task/staging/DataStagingTask.java | 53 ++++++++++++++++------ 3 files changed, 66 insertions(+), 25 deletions(-) diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java index 24e01bf606..5bab41ae8f 100644 --- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java +++ b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java @@ -330,7 +330,7 @@ public class TaskContext { /** * Returns the default storage preference for the gateway. * Prefers gateway-specific storage (ID starting with gatewayId), otherwise uses the first available preference. - * + * * @deprecated Use {@link #getInputGatewayStorageResourcePreference()} for input staging operations * or {@link #getOutputGatewayStorageResourcePreference()} for output staging operations. */ @@ -340,7 +340,7 @@ public class TaskContext { try { GatewayResourceProfile gatewayProfile = getGatewayResourceProfile(); List<StoragePreference> storagePreferences = gatewayProfile.getStoragePreferences(); - + if (storagePreferences == null || storagePreferences.isEmpty()) { throw new Exception("No storage preferences found for gateway " + gatewayId); } @@ -353,12 +353,16 @@ public class TaskContext { }) .findFirst() .orElseGet(() -> { - logger.debug("No gateway-specific storage found, using first available: {}", storagePreferences.get(0).getStorageResourceId()); + logger.debug( + "No gateway-specific storage found, using first available: {}", + storagePreferences.get(0).getStorageResourceId()); return storagePreferences.get(0); }); if (this.gatewayStorageResourcePreference.getStorageResourceId().startsWith(gatewayPrefix)) { - logger.debug("Using gateway-specific storage preference: {}", this.gatewayStorageResourcePreference.getStorageResourceId()); + logger.debug( + "Using gateway-specific storage preference: {}", + this.gatewayStorageResourcePreference.getStorageResourceId()); } } catch (TException e) { logger.error("Failed to fetch gateway storage preference for gateway {}", gatewayId, e); @@ -764,7 +768,8 @@ public class TaskContext { } public String getInputStorageResourceId() throws Exception { - if (processModel.getInputStorageResourceId() != null && !processModel.getInputStorageResourceId().trim().isEmpty()) { + if (processModel.getInputStorageResourceId() != null + && !processModel.getInputStorageResourceId().trim().isEmpty()) { return processModel.getInputStorageResourceId(); } return getStorageResourceId(); @@ -775,15 +780,20 @@ public class TaskContext { try { return registryClient.getGatewayStoragePreference(gatewayId, inputStorageId); } catch (TException e) { - logger.error("Failed to fetch gateway storage preference for input storage {} in gateway {}", inputStorageId, gatewayId, e); + logger.error( + "Failed to fetch gateway storage preference for input storage {} in gateway {}", + inputStorageId, + gatewayId, + e); throw e; } } public String getOutputStorageResourceId() throws Exception { - if (processModel.getOutputStorageResourceId() != null && !processModel.getOutputStorageResourceId().trim().isEmpty()) { - return processModel.getOutputStorageResourceId(); - } + if (processModel.getOutputStorageResourceId() != null + && !processModel.getOutputStorageResourceId().trim().isEmpty()) { + return processModel.getOutputStorageResourceId(); + } return getStorageResourceId(); } @@ -792,7 +802,11 @@ public class TaskContext { try { return registryClient.getGatewayStoragePreference(gatewayId, outputStorageId); } catch (TException e) { - logger.error("Failed to fetch gateway storage preference for output storage {} in gateway {}", outputStorageId, gatewayId, e); + logger.error( + "Failed to fetch gateway storage preference for output storage {} in gateway {}", + outputStorageId, + gatewayId, + e); throw e; } } diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/staging/ArchiveTask.java b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/staging/ArchiveTask.java index 95cd43c6e6..46ed806e6f 100644 --- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/staging/ArchiveTask.java +++ b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/staging/ArchiveTask.java @@ -68,7 +68,9 @@ public class ArchiveTask extends DataStagingTask { tarDirPath = sourceURI.getPath(); } - String inputPath = getTaskContext().getOutputGatewayStorageResourcePreference().getFileSystemRootLocation(); + String inputPath = getTaskContext() + .getOutputGatewayStorageResourcePreference() + .getFileSystemRootLocation(); destFilePath = buildDestinationFilePath(inputPath, archiveFileName); tarCreationAbsPath = tarDirPath + File.separator + archiveFileName; diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/staging/DataStagingTask.java b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/staging/DataStagingTask.java index b090619763..4320f72463 100644 --- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/staging/DataStagingTask.java +++ b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/staging/DataStagingTask.java @@ -30,13 +30,13 @@ import org.apache.airavata.agents.api.AgentAdaptor; import org.apache.airavata.agents.api.AgentException; import org.apache.airavata.agents.api.FileMetadata; import org.apache.airavata.agents.api.StorageResourceAdaptor; -import org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference; import org.apache.airavata.agents.streaming.TransferResult; import org.apache.airavata.agents.streaming.VirtualStreamProducer; import org.apache.airavata.common.utils.ServerSettings; import org.apache.airavata.helix.impl.task.AiravataTask; import org.apache.airavata.helix.impl.task.TaskOnFailException; import org.apache.airavata.helix.task.api.support.AdaptorSupport; +import org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference; import org.apache.airavata.model.appcatalog.storageresource.StorageResourceDescription; import org.apache.airavata.model.task.DataStagingTaskModel; import org.apache.airavata.patform.monitoring.CountMonitor; @@ -90,8 +90,12 @@ public abstract class DataStagingTask extends AiravataTask { return createStorageAdaptorFromPreference(adaptorSupport, storageId, gatewayStoragePref, "Default"); } catch (Exception e) { - logger.error("Failed to obtain adaptor for default storage resource {} in task {}", storageId, getTaskId(), e); - throw new TaskOnFailException("Failed to obtain adaptor for default storage resource " + storageId + " in task " + getTaskId(), false, e); + logger.error( + "Failed to obtain adaptor for default storage resource {} in task {}", storageId, getTaskId(), e); + throw new TaskOnFailException( + "Failed to obtain adaptor for default storage resource " + storageId + " in task " + getTaskId(), + false, + e); } } @@ -105,7 +109,11 @@ public abstract class DataStagingTask extends AiravataTask { storageId = getTaskContext().getInputStorageResourceId(); if (getTaskContext().getProcessModel().getInputStorageResourceId() != null - && !getTaskContext().getProcessModel().getInputStorageResourceId().trim().isEmpty()) { + && !getTaskContext() + .getProcessModel() + .getInputStorageResourceId() + .trim() + .isEmpty()) { StoragePreference inputStoragePref = getTaskContext().getInputGatewayStorageResourcePreference(); return createStorageAdaptorFromPreference(adaptorSupport, storageId, inputStoragePref, "Input"); @@ -114,8 +122,12 @@ public abstract class DataStagingTask extends AiravataTask { return getStorageAdaptor(adaptorSupport); } } catch (Exception e) { - logger.error("Failed to obtain adaptor for input storage resource {} in task {}", storageId, getTaskId(), e); - throw new TaskOnFailException("Failed to obtain adaptor for input storage resource " + storageId + " in task " + getTaskId(), false, e); + logger.error( + "Failed to obtain adaptor for input storage resource {} in task {}", storageId, getTaskId(), e); + throw new TaskOnFailException( + "Failed to obtain adaptor for input storage resource " + storageId + " in task " + getTaskId(), + false, + e); } } @@ -129,7 +141,11 @@ public abstract class DataStagingTask extends AiravataTask { storageId = getTaskContext().getOutputStorageResourceId(); if (getTaskContext().getProcessModel().getOutputStorageResourceId() != null - && !getTaskContext().getProcessModel().getOutputStorageResourceId().trim().isEmpty()) { + && !getTaskContext() + .getProcessModel() + .getOutputStorageResourceId() + .trim() + .isEmpty()) { StoragePreference outputStoragePref = getTaskContext().getOutputGatewayStorageResourcePreference(); return createStorageAdaptorFromPreference(adaptorSupport, storageId, outputStoragePref, "Output"); @@ -138,8 +154,12 @@ public abstract class DataStagingTask extends AiravataTask { return getStorageAdaptor(adaptorSupport); } } catch (Exception e) { - logger.error("Failed to obtain adaptor for output storage resource {} in task {}", storageId, getTaskId(), e); - throw new TaskOnFailException("Failed to obtain adaptor for output storage resource " + storageId + " in task " + getTaskId(), false, e); + logger.error( + "Failed to obtain adaptor for output storage resource {} in task {}", storageId, getTaskId(), e); + throw new TaskOnFailException( + "Failed to obtain adaptor for output storage resource " + storageId + " in task " + getTaskId(), + false, + e); } } @@ -459,8 +479,9 @@ public abstract class DataStagingTask extends AiravataTask { /** * Common method to create StorageResourceAdaptor from a StoragePreference. */ - private StorageResourceAdaptor createStorageAdaptorFromPreference(AdaptorSupport adaptorSupport, String storageId, - StoragePreference storagePreference, String adaptorType) throws TaskOnFailException { + private StorageResourceAdaptor createStorageAdaptorFromPreference( + AdaptorSupport adaptorSupport, String storageId, StoragePreference storagePreference, String adaptorType) + throws TaskOnFailException { try { String credentialToken = storagePreference.getResourceSpecificCredentialStoreToken() != null ? storagePreference.getResourceSpecificCredentialStoreToken() @@ -474,13 +495,17 @@ public abstract class DataStagingTask extends AiravataTask { storagePreference.getLoginUserName()); if (storageResourceAdaptor == null) { - throw new TaskOnFailException(adaptorType + " storage resource adaptor for " + storageId + " can not be null", true, null); + throw new TaskOnFailException( + adaptorType + " storage resource adaptor for " + storageId + " can not be null", true, null); } return storageResourceAdaptor; } catch (Exception e) { - throw new TaskOnFailException("Failed to obtain adaptor for " + adaptorType.toLowerCase() + " storage resource " + - storageId + " in task " + getTaskId(), false, e); + throw new TaskOnFailException( + "Failed to obtain adaptor for " + adaptorType.toLowerCase() + " storage resource " + storageId + + " in task " + getTaskId(), + false, + e); } } }
