gCubeSystem
/
uri-resolver
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

feature_23156 #6

Closed
francesco.mangiacrapa wants to merge 6 commits from feature_23156 into master
pull from: feature_23156
merge into: gCubeSystem:master
Conversation 0 Commits 6 Files Changed 15 +20 -12
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 25f54f122c - Show all commits

11
.settings/org.eclipse.wst.common.component
View File

@ -6,7 +6,9 @@
<wb-module deploy-name="uri-resolver-2.7.2">
<wb-module deploy-name="uri-resolver-2.8.0-SNAPSHOT">
@ -22,6 +24,7 @@
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
@ -30,6 +33,7 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
@ -38,6 +42,7 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
@ -46,6 +51,7 @@
<property name="context-root" value="uri-resolver"/> <property name="context-root" value="uri-resolver"/>
@ -54,6 +60,7 @@
<property name="java-output-path" value="/uri-resolver/target/classes"/> <property name="java-output-path" value="/uri-resolver/target/classes"/>
@ -62,6 +69,7 @@
</wb-module> </wb-module>
@ -70,4 +78,5 @@
</project-modules> </project-modules>

3
src/main/java/org/gcube/datatransfer/resolver/services/CatalogueResolver.java
View File

@ -206,8 +206,7 @@ public class CatalogueResolver {
String linkURL = String.format("%s/%s/%s/%s", serverUrl, rc.getId(), vreName, jsonRequest.getEntity_name()); String linkURL = String.format("%s/%s/%s/%s", serverUrl, rc.getId(), vreName, jsonRequest.getEntity_name());
if (jsonRequest.getQuery_string() != null) { if (jsonRequest.getQuery_string() != null) {
String qsEnc = URLEncoder.encode(jsonRequest.getQuery_string(), "UTF-8"); linkURL += "?" + jsonRequest.getQuery_string();
linkURL += "?" + qsEnc;
} }
logger.info("Returining Catalogue URL: " + linkURL); logger.info("Returining Catalogue URL: " + linkURL);