Commit b3e61f00 authored by Nicola Fulvio Calabria's avatar Nicola Fulvio Calabria
Browse files

various fixes

parent a51a9bd1

src/main/java/it/inaf/ia2/transfer/controller/CopyController.java

+0 −2
Original line number Diff line number Diff line
@@ -41,8 +41,6 @@ public class CopyController extends AuthenticatedFileController { 
            throw new InvalidArgumentException("Job " + jobId + " not found");

        }

        

        

        

        LOG.debug("copyFiles called from jobId {}", jobId);



        TokenPrincipal principal = getPrincipal();

src/main/java/it/inaf/ia2/transfer/controller/GetFileController.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

src/main/java/it/inaf/ia2/transfer/service/ArchiveService.java

+1 −1
Original line number Diff line number Diff line
@@ -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)) {

src/main/java/it/inaf/ia2/transfer/service/FileCopyService.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

src/main/java/it/inaf/ia2/transfer/service/PutFileService.java

+1 −1
Original line number Diff line number Diff line
@@ -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());