Skip to content
Snippets Groups Projects
Commit 516e6412 authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Fixed last issues post merge

parent 8d92d702
No related branches found
No related tags found
No related merge requests found
...@@ -96,7 +96,7 @@ public class UriService { ...@@ -96,7 +96,7 @@ public class UriService {
endpoint += "?jobId=" + job.getJobId(); endpoint += "?jobId=" + job.getJobId();
if (!"true".equals(NodeProperties.getNodePropertyAsListByURI(node, NodeProperties.PUBLIC_READ_URI))) { if (!"true".equals(NodeProperties.getNodePropertyByURI(node, NodeProperties.PUBLIC_READ_URI))) {
endpoint += "&token=" + getEndpointToken(fileServiceUrl + relativePath); endpoint += "&token=" + getEndpointToken(fileServiceUrl + relativePath);
} }
......
...@@ -18,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -18,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestPropertySource;
......
...@@ -2,6 +2,7 @@ package it.inaf.oats.vospace; ...@@ -2,6 +2,7 @@ package it.inaf.oats.vospace;
import it.inaf.ia2.aa.ServletRapClient; import it.inaf.ia2.aa.ServletRapClient;
import it.inaf.ia2.aa.data.User; import it.inaf.ia2.aa.data.User;
import it.inaf.oats.vospace.datamodel.NodeProperties;
import it.inaf.oats.vospace.persistence.LocationDAO; import it.inaf.oats.vospace.persistence.LocationDAO;
import it.inaf.oats.vospace.persistence.NodeDAO; import it.inaf.oats.vospace.persistence.NodeDAO;
import it.inaf.oats.vospace.persistence.model.Location; import it.inaf.oats.vospace.persistence.model.Location;
...@@ -76,7 +77,7 @@ public class UriServiceTest { ...@@ -76,7 +77,7 @@ public class UriServiceTest {
Node node = new DataNode(); Node node = new DataNode();
Property property = new Property(); Property property = new Property();
property.setUri("ivo://ivoa.net/vospace/core#publicread"); property.setUri(NodeProperties.PUBLIC_READ_URI);
property.setValue("true"); property.setValue("true");
node.getProperties().add(property); node.getProperties().add(property);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment