diff --git a/src/main/java/it/inaf/oats/vospace/CopyService.java b/src/main/java/it/inaf/oats/vospace/CopyService.java index a1c40e4b36456de541e4d0c580729bb5dcb10a7d..47f12cd0836c8e017f7f2a620bd57e26a17f1f15 100644 --- a/src/main/java/it/inaf/oats/vospace/CopyService.java +++ b/src/main/java/it/inaf/oats/vospace/CopyService.java @@ -10,7 +10,6 @@ import it.inaf.oats.vospace.datamodel.NodeUtils; import it.inaf.oats.vospace.exception.InvalidArgumentException; import it.inaf.oats.vospace.exception.NodeBusyException; import it.inaf.oats.vospace.persistence.NodeDAO.ShortNodeDescriptor; -import java.util.List; import java.util.Optional; import net.ivoa.xml.vospace.v2.Transfer; import org.springframework.beans.factory.annotation.Autowired; @@ -29,12 +28,9 @@ public class CopyService extends AbstractNodeService { @Transactional(rollbackFor = {Exception.class}, isolation = Isolation.REPEATABLE_READ) public String processCopyNodes(Transfer transfer, String jobId, User user) { - if (transfer.getTarget().size() != 1) { - throw new InvalidArgumentException("Invalid target size for copyNode: " + transfer.getTarget().size()); - } // Get Source Vos Path - String sourcePath = URIUtils.returnVosPathFromNodeURI(transfer.getTarget().get(0), authority); + String sourcePath = URIUtils.returnVosPathFromNodeURI(transfer.getTarget(), authority); // Get Destination Vos Path (it's in transfer direction) String destinationPath = URIUtils.returnVosPathFromNodeURI(transfer.getDirection(), authority); diff --git a/src/test/java/it/inaf/oats/vospace/CopyServiceTest.java b/src/test/java/it/inaf/oats/vospace/CopyServiceTest.java index 98045c08155443004610d97e827be81244055487..8b9cb7a4d71e8dbd24a21630bb98232dd19c7dbe 100644 --- a/src/test/java/it/inaf/oats/vospace/CopyServiceTest.java +++ b/src/test/java/it/inaf/oats/vospace/CopyServiceTest.java @@ -212,7 +212,7 @@ public class CopyServiceTest { private Transfer getTransfer(String vosTarget, String vosDestination) { Transfer transfer = new Transfer(); - transfer.setTarget(Arrays.asList("vos://" + this.authority + vosTarget)); + transfer.setTarget("vos://" + this.authority + vosTarget); transfer.setDirection("vos://" + this.authority + vosDestination); return transfer; } diff --git a/src/test/java/it/inaf/oats/vospace/NodeBranchServiceTest.java b/src/test/java/it/inaf/oats/vospace/NodeBranchServiceTest.java index 84c8a22937fa215c00382374c6ae6589513b586c..1a07c39015e129a1d7ac1ce4ff4d521e5475552a 100644 --- a/src/test/java/it/inaf/oats/vospace/NodeBranchServiceTest.java +++ b/src/test/java/it/inaf/oats/vospace/NodeBranchServiceTest.java @@ -6,24 +6,11 @@ package it.inaf.oats.vospace; import it.inaf.ia2.aa.data.User; -import it.inaf.oats.vospace.exception.NodeBusyException; -import it.inaf.oats.vospace.exception.NodeNotFoundException; -import it.inaf.oats.vospace.exception.PermissionDeniedException; import it.inaf.oats.vospace.persistence.DataSourceConfigSingleton; import it.inaf.oats.vospace.persistence.NodeDAO; -import java.util.Arrays; -import java.util.List; -import java.util.Optional; import net.ivoa.xml.vospace.v2.Transfer; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; -import org.junit.jupiter.api.Order; -import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; @@ -53,7 +40,7 @@ public class NodeBranchServiceTest { private Transfer getTransfer(String vosTarget, String vosDestination) { Transfer transfer = new Transfer(); - transfer.setTarget(Arrays.asList("vos://" + this.authority + vosTarget)); + transfer.setTarget("vos://" + this.authority + vosTarget); transfer.setDirection("vos://" + this.authority + vosDestination); return transfer; }