Other fixes for special characters

src/main/java/it/inaf/oats/vospace/FileServiceClient.java

@@ -54,7 +54,7 @@ public class FileServiceClient {
 
     public String startArchiveJob(Transfer transfer, String jobId) {
 
-        String target = transfer.getTarget().substring("vos://".length() + authority.length());
+        String target = NodeUtils.getVosPath(transfer.getTarget());
 
         String viewUri = transfer.getView().getUri();
 

src/main/java/it/inaf/oats/vospace/UriService.java

@@ -181,8 +181,7 @@ public class UriService {
 
     private String getEndpoint(JobSummary job, Transfer transfer) {
 
-        String relativePath = StringUtils.uriDecode(URIUtils
-                .returnVosPathFromNodeURI(transfer.getTarget(), authority), StandardCharsets.UTF_8);
+        String relativePath = NodeUtils.getVosPath(transfer.getTarget());
 
         User user = (User) servletRequest.getUserPrincipal();
         String creator = user.getName();
@@ -204,7 +203,6 @@ public class UriService {
             case pullFromVoSpace:
                 // Refresh relative path: it can differ in case of links followed 
                 relativePath = NodeUtils.getVosPath(node);
-                relativePath = StringUtils.uriDecode(relativePath, StandardCharsets.UTF_8);
                 if (!NodeUtils.checkIfReadable(node, creator, groups)) {
                     throw PermissionDeniedException.forPath(relativePath);
                 }

src/main/resources/auth.properties

@@ -3,3 +3,4 @@ gms_uri=https://sso.ia2.inaf.it/gms/
 groups_autoload=true
 client_id=vospace_test
 client_secret=***REMOVED***
+

src/test/java/it/inaf/oats/vospace/FileServiceClientTest.java

@@ -101,23 +101,23 @@ public class FileServiceClientTest {
 
         Transfer transfer = new Transfer();
         transfer.setDirection("pullFromVoSpace");
-        transfer.setTarget("vos://example.com!vospace/mydir");
+        transfer.setTarget("vos://example.com!vospace/mydir(%20+%20)x");
         View view = new View();
         view.setUri(Views.ZIP_VIEW_URI);
         transfer.setView(view);
         
         ContainerNode node = Mockito.mock(ContainerNode.class);
         when(node.getNodes()).thenReturn(List.of());
-        when(node.getUri()).thenReturn("vos://example.com!vospace/mydir");
-        when(nodeDAO.listNode(eq("/mydir"))).thenReturn(Optional.of(node));
+        when(node.getUri()).thenReturn("vos://example.com!vospace/mydir(%20+%20)x");
+        when(nodeDAO.listNode(eq("/mydir( + )x"))).thenReturn(Optional.of(node));
         
         when(linkService.followLinksForArchiveService(any()))
-                .thenReturn(List.of(new ArchiveEntryDescriptor("/mydir")));
+                .thenReturn(List.of(new ArchiveEntryDescriptor("/mydir( + )x")));
 
         ArchiveRequest archiveRequest = testStartArchiveJob(transfer);
 
         assertEquals(1, archiveRequest.getEntryDescriptors().size());
-        assertEquals("/mydir", archiveRequest.getEntryDescriptors().get(0).getTargetNodeVosPath());
+        assertEquals("/mydir( + )x", archiveRequest.getEntryDescriptors().get(0).getTargetNodeVosPath());
     }
 
     @Test