From b3e61f00275c466db54463b26f2061d0e730ef01 Mon Sep 17 00:00:00 2001
From: Nicola Fulvio Calabria <nicola.calabria@inaf.it>
Date: Sat, 25 Sep 2021 12:38:47 +0200
Subject: [PATCH] various fixes
---
.../java/it/inaf/ia2/transfer/controller/CopyController.java | 2 --
.../it/inaf/ia2/transfer/controller/GetFileController.java | 2 +-
.../java/it/inaf/ia2/transfer/service/ArchiveService.java | 2 +-
.../java/it/inaf/ia2/transfer/service/FileCopyService.java | 4 ++--
.../java/it/inaf/ia2/transfer/service/PutFileService.java | 2 +-
5 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/main/java/it/inaf/ia2/transfer/controller/CopyController.java b/src/main/java/it/inaf/ia2/transfer/controller/CopyController.java
index d711d16..0a50dcd 100644
--- a/src/main/java/it/inaf/ia2/transfer/controller/CopyController.java
+++ b/src/main/java/it/inaf/ia2/transfer/controller/CopyController.java
@@ -40,8 +40,6 @@ public class CopyController extends AuthenticatedFileController {
} else if (!jobDAO.isJobExisting(jobId)) {
throw new InvalidArgumentException("Job " + jobId + " not found");
}
-
-
LOG.debug("copyFiles called from jobId {}", jobId);
diff --git a/src/main/java/it/inaf/ia2/transfer/controller/GetFileController.java b/src/main/java/it/inaf/ia2/transfer/controller/GetFileController.java
index 9fa6456..ac28b3a 100644
--- a/src/main/java/it/inaf/ia2/transfer/controller/GetFileController.java
+++ b/src/main/java/it/inaf/ia2/transfer/controller/GetFileController.java
@@ -68,7 +68,7 @@ public class GetFileController extends FileController {
throw PermissionDeniedException.forPath(path);
}
- File file = new File(fileInfo.getFsPath());
+ File file = new File(fileInfo.getFilePath());
FileResponseUtil.getFileResponse(response, file, path);
} else {
throw new NodeNotFoundException(path);
diff --git a/src/main/java/it/inaf/ia2/transfer/service/ArchiveService.java b/src/main/java/it/inaf/ia2/transfer/service/ArchiveService.java
index 2fa2ce3..2a98e89 100644
--- a/src/main/java/it/inaf/ia2/transfer/service/ArchiveService.java
+++ b/src/main/java/it/inaf/ia2/transfer/service/ArchiveService.java
@@ -308,7 +308,7 @@ public class ArchiveService {
throw PermissionDeniedException.forPath(fileInfo.getVirtualPath());
}
- File file = new File(fileInfo.getFsPath());
+ File file = new File(fileInfo.getFilePath());
LOG.trace("Adding file " + file.getAbsolutePath() + " to tar archive");
try ( InputStream is = new FileInputStream(file)) {
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 1981bcd..73634e5 100644
--- a/src/main/java/it/inaf/ia2/transfer/service/FileCopyService.java
+++ b/src/main/java/it/inaf/ia2/transfer/service/FileCopyService.java
@@ -206,8 +206,8 @@ public class FileCopyService {
throw PermissionDeniedException.forPath(sourceFileInfo.getVirtualPath());
}
- File file = new File(sourceFileInfo.getFsPath());
- LOG.trace("Copying file: {} to {}",file.getAbsolutePath(), destinationFileInfo.getFsPath());
+ File file = new File(sourceFileInfo.getFilePath());
+ LOG.trace("Copying file: {} to {}",file.getAbsolutePath(), destinationFileInfo.getFilePath());
putFileService.copyLocalFile(sourceFileInfo, destinationFileInfo, remainingQuota);
diff --git a/src/main/java/it/inaf/ia2/transfer/service/PutFileService.java b/src/main/java/it/inaf/ia2/transfer/service/PutFileService.java
index 596d3ca..102f281 100644
--- a/src/main/java/it/inaf/ia2/transfer/service/PutFileService.java
+++ b/src/main/java/it/inaf/ia2/transfer/service/PutFileService.java
@@ -53,7 +53,7 @@ public class PutFileService {
public void copyLocalFile(FileInfo sourceFileInfo, FileInfo destinationFileInfo, Long remainingQuota) {
File destinationFile = this.prepareDestination(destinationFileInfo);
- File sourceFile = new File(sourceFileInfo.getFsPath());
+ File sourceFile = new File(sourceFileInfo.getFilePath());
try {
Files.copy(sourceFile.toPath(), destinationFile.toPath());
--
GitLab