From 3388d413b9930dd66e93b43971f87663758e177d Mon Sep 17 00:00:00 2001 From: Nicola Fulvio Calabria <nicola.calabria@inaf.it> Date: Mon, 26 Jul 2021 21:43:49 +0200 Subject: [PATCH] Merge commit --- .../controller/AuthenticatedFileController.java | 2 +- .../it/inaf/ia2/transfer/service/FileCopyService.java | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/it/inaf/ia2/transfer/controller/AuthenticatedFileController.java b/src/main/java/it/inaf/ia2/transfer/controller/AuthenticatedFileController.java index cefea30..b00ab8c 100644 --- a/src/main/java/it/inaf/ia2/transfer/controller/AuthenticatedFileController.java +++ b/src/main/java/it/inaf/ia2/transfer/controller/AuthenticatedFileController.java @@ -6,7 +6,7 @@ package it.inaf.ia2.transfer.controller; import it.inaf.ia2.transfer.auth.TokenPrincipal; -import it.inaf.ia2.transfer.exception.PermissionDeniedException; +import it.inaf.oats.vospace.exception.PermissionDeniedException; public abstract class AuthenticatedFileController extends FileController { diff --git a/src/main/java/it/inaf/ia2/transfer/service/FileCopyService.java b/src/main/java/it/inaf/ia2/transfer/service/FileCopyService.java index d9e493e..2898ead 100644 --- a/src/main/java/it/inaf/ia2/transfer/service/FileCopyService.java +++ b/src/main/java/it/inaf/ia2/transfer/service/FileCopyService.java @@ -6,11 +6,11 @@ package it.inaf.ia2.transfer.service; import it.inaf.ia2.transfer.auth.TokenPrincipal; -import it.inaf.ia2.transfer.exception.JobException; -import it.inaf.ia2.transfer.exception.JobException.Type; import it.inaf.ia2.transfer.persistence.FileDAO; import it.inaf.ia2.transfer.persistence.LocationDAO; import it.inaf.ia2.transfer.persistence.model.FileInfo; +import it.inaf.oats.vospace.exception.InternalFaultException; +import it.inaf.oats.vospace.exception.PermissionDeniedException; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -160,8 +160,7 @@ public class FileCopyService { if (baseUrl == null) { LOG.error("Location URL not found for location " + sourceFile.getLocationId()); - throw new JobException(Type.FATAL, "Internal Fault") - .setErrorDetail("InternalFault: Unable to retrieve location of file " + sourceFile.getVirtualPath()); + throw new InternalFaultException("Unable to retrieve location of file " + sourceFile.getVirtualPath()); } String url = baseUrl + "/" + sourceFile.getVirtualName(); @@ -191,8 +190,7 @@ public class FileCopyService { private void copyLocalFile(FileInfo sourceFileInfo, FileInfo destinationFileInfo, TokenPrincipal tokenPrincipal) { if (!authorizationService.isDownloadable(sourceFileInfo, tokenPrincipal)) { - throw new JobException(Type.FATAL, "Permission Denied") - .setErrorDetail("PermissionDenied: " + sourceFileInfo.getVirtualPath()); + throw PermissionDeniedException.forPath(sourceFileInfo.getVirtualPath()); } File file = new File(sourceFileInfo.getOsPath()); -- GitLab