Commit 2361be8e authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Set transfer target element as string instead of list of strings again. Used... 

Set transfer target element as string instead of list of strings again. Used view with include param instead of custom protocol for async recall operations
parent b9f1cbdb

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

+1 −6
Original line number Original line Diff line number Diff line
@@ -41,12 +41,7 @@ public class FileServiceClient { 




    public String startArchiveJob(Transfer transfer, String jobId) {

    public String startArchiveJob(Transfer transfer, String jobId) {





        if (transfer.getTarget().size() != 1) {

        String target = transfer.getTarget().substring("vos://".length() + authority.length());

            throw new IllegalArgumentException("Target size is " + transfer.getTarget().size());

        }



        String target = transfer.getTarget().get(0)

                .substring("vos://".length() + authority.length());





        String viewUri = transfer.getView().getUri();

        String viewUri = transfer.getView().getUri();

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

+2 −5
Original line number Original line Diff line number Diff line
@@ -140,10 +140,7 @@ public class JobService { 
        for (Protocol protocol : transfer.getProtocols()) {

        for (Protocol protocol : transfer.getProtocols()) {

            switch (protocol.getUri()) {

            switch (protocol.getUri()) {

                case "ivo://ivoa.net/vospace/core#httpget":

                case "ivo://ivoa.net/vospace/core#httpget":

                    if (transfer.getTarget().size() != 1) {

                    String nodeUri = transfer.getTarget();

                        throw new InvalidArgumentException("Invalid target size for pullToVoSpace: " + transfer.getTarget().size());

                    }

                    String nodeUri = transfer.getTarget().get(0);

                    String contentUri = protocol.getEndpoint();

                    String contentUri = protocol.getEndpoint();

                    uriService.setNodeRemoteLocation(nodeUri, contentUri);

                    uriService.setNodeRemoteLocation(nodeUri, contentUri);

                    Transfer negotiatedTransfer = uriService.getNegotiatedTransfer(job, transfer);

                    Transfer negotiatedTransfer = uriService.getNegotiatedTransfer(job, transfer);
@@ -249,7 +246,7 @@ public class JobService { 
            case pushToVoSpace:

            case pushToVoSpace:

                ResultReference dataNodeRef = new ResultReference();

                ResultReference dataNodeRef = new ResultReference();

                dataNodeRef.setId("dataNode");

                dataNodeRef.setId("dataNode");

                dataNodeRef.setHref(transfer.getTarget().get(0));

                dataNodeRef.setHref(transfer.getTarget());

                jobSummary.getResults().add(dataNodeRef);

                jobSummary.getResults().add(dataNodeRef);

                break;

                break;

        }

        }

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

+1 −6
Original line number Original line Diff line number Diff line
@@ -8,7 +8,6 @@ package it.inaf.oats.vospace; 
import it.inaf.ia2.aa.data.User;

import it.inaf.ia2.aa.data.User;

import it.inaf.oats.vospace.datamodel.NodeUtils;

import it.inaf.oats.vospace.datamodel.NodeUtils;

import it.inaf.oats.vospace.exception.InternalFaultException;

import it.inaf.oats.vospace.exception.InternalFaultException;

import it.inaf.oats.vospace.exception.InvalidArgumentException;

import it.inaf.oats.vospace.exception.NodeBusyException;

import it.inaf.oats.vospace.exception.NodeBusyException;

import it.inaf.oats.vospace.exception.NodeNotFoundException;

import it.inaf.oats.vospace.exception.NodeNotFoundException;

import it.inaf.oats.vospace.exception.PermissionDeniedException;

import it.inaf.oats.vospace.exception.PermissionDeniedException;
@@ -42,12 +41,8 @@ public class MoveService { 
    @Transactional(rollbackFor = { Exception.class }, isolation = Isolation.REPEATABLE_READ)

    @Transactional(rollbackFor = { Exception.class }, isolation = Isolation.REPEATABLE_READ)

    public void processMoveJob(Transfer transfer, User user) {

    public void processMoveJob(Transfer transfer, User user) {





        if (transfer.getTarget().size() != 1) {

            throw new InvalidArgumentException("Invalid target size for moveNode: " + transfer.getTarget().size());

        }



        // Get Source Vos Path

        // 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)

        // Get Destination Vos Path (it's in transfer direction)

        String destinationPath = URIUtils.returnVosPathFromNodeURI(transfer.getDirection(), authority);

        String destinationPath = URIUtils.returnVosPathFromNodeURI(transfer.getDirection(), authority);

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -81,7 +81,7 @@ public class TransferController { 
            @RequestParam("DIRECTION") String direction, @RequestParam("PROTOCOL") String protocolUris, User principal) {

            @RequestParam("DIRECTION") String direction, @RequestParam("PROTOCOL") String protocolUris, User principal) {





        Transfer transfer = new Transfer();

        Transfer transfer = new Transfer();

        transfer.setTarget(Arrays.asList(target));

        transfer.setTarget(target);

        transfer.setDirection(direction);

        transfer.setDirection(direction);





        // CADC client sends multiple protocol parameters and Spring join them using a comma separator.

        // CADC client sends multiple protocol parameters and Spring join them using a comma separator.

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

+2 −7
Original line number Original line Diff line number Diff line
@@ -144,13 +144,8 @@ public class UriService { 
    }

    }





    private String getEndpoint(JobSummary job, Transfer transfer) {

    private String getEndpoint(JobSummary job, Transfer transfer) {

        boolean isArchiveView = isArchiveView(transfer);





        if (!isArchiveView && transfer.getTarget().size() != 1) {

        String relativePath = URIUtils.returnVosPathFromNodeURI(transfer.getTarget(), authority);

            throw new InvalidArgumentException("Invalid target size: " + transfer.getTarget().size());

        }



        String relativePath = URIUtils.returnVosPathFromNodeURI(transfer.getTarget().get(0), authority);





        User user = (User) servletRequest.getUserPrincipal();

        User user = (User) servletRequest.getUserPrincipal();

        String creator = user.getName();

        String creator = user.getName();
@@ -183,7 +178,7 @@ public class UriService { 
            throw new NodeBusyException(relativePath);

            throw new NodeBusyException(relativePath);

        }

        }





        if (isArchiveView) {

        if (isArchiveView(transfer)) {

            return fileServiceClient.startArchiveJob(transfer, job.getJobId());

            return fileServiceClient.startArchiveJob(transfer, job.getJobId());

        }

        }