Skip to content
Snippets Groups Projects
Commit 0b5b125c authored by Nicola Fulvio Calabria's avatar Nicola Fulvio Calabria
Browse files

Fixes due to merge

parent e28aa4c6
No related branches found
No related tags found
No related merge requests found
......@@ -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);
......
......@@ -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;
}
......
......@@ -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;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment