From 4516dff1ed8889c6c972714aafa276bd4fc919bf Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Wed, 7 Dec 2016 13:22:56 +0000
Subject: [PATCH] Completed working on [Task #6119] Provide CatalogueResolver:
 get/resolve a link to a CKAN Entity

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-transfer/uri-resolver@139765 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../resolver/UriResolverRewriteFilter.java    |  7 +++-
 .../resolver/catalogue/CatalogueResolver.java | 24 -------------
 src/test/java/CatalogueResolverTest.java      | 36 +++++++++++++++++++
 3 files changed, 42 insertions(+), 25 deletions(-)
 create mode 100644 src/test/java/CatalogueResolverTest.java

diff --git a/src/main/java/org/gcube/datatransfer/resolver/UriResolverRewriteFilter.java b/src/main/java/org/gcube/datatransfer/resolver/UriResolverRewriteFilter.java
index b64bb91..2473ff1 100644
--- a/src/main/java/org/gcube/datatransfer/resolver/UriResolverRewriteFilter.java
+++ b/src/main/java/org/gcube/datatransfer/resolver/UriResolverRewriteFilter.java
@@ -86,7 +86,12 @@ public class UriResolverRewriteFilter implements Filter{
 			logger.debug("is a catalogue request");
 			int lastSlash = requestURI.lastIndexOf(PATH_SEPARATOR);
 			String toCatalogueLink = requestURI.substring(lastSlash + 1, requestURI.length());
-			String newURI = SERVLET_CATALOGUE + "?" + PARAMETER_CATALOGUE_LINK + "=" + toCatalogueLink;
+			HttpServletRequest request = (HttpServletRequest) req;
+			String newURI = SERVLET_CATALOGUE;
+			logger.debug("method is: "+request.getMethod());
+			if(request.getMethod().compareTo("GET")==0)
+				newURI+=  "?" + PARAMETER_CATALOGUE_LINK + "=" + toCatalogueLink;
+
 			logger.debug("forward to: " + newURI);
 			multiReadRequest.getRequestDispatcher(newURI).forward(multiReadRequest, response);
 			//chain.doFilter(multiReadRequest, response);
diff --git a/src/main/java/org/gcube/datatransfer/resolver/catalogue/CatalogueResolver.java b/src/main/java/org/gcube/datatransfer/resolver/catalogue/CatalogueResolver.java
index 5e1ab4e..8272ee6 100644
--- a/src/main/java/org/gcube/datatransfer/resolver/catalogue/CatalogueResolver.java
+++ b/src/main/java/org/gcube/datatransfer/resolver/catalogue/CatalogueResolver.java
@@ -384,28 +384,4 @@ public class CatalogueResolver extends HttpServlet{
 			return s;
 		}
 	}
-
-	/**
-	 * The main method.
-	 *
-	 * @param args
-	 *            the arguments
-	 */
-	public static void main(String[] args) {
-
-		// jsonRequest = "{" +
-		// "\"gcube_scope\" : \"/gcube\"," +
-		// "\"entity_context\" : \"dataset\"," +
-		// "\"entity_name\" : \"sarda-sarda\"" +
-		// "}";
-		// //String test = "{" +
-		// // "\"gcube_scope\" : \"/gcube\"," +
-		// // "\"entity_context\" : \"dataset\"," +
-		// // "\"entity_name\" : \"sarda-sarda\"," +
-		// // "\"query\" : {\"key1\" : \"value1\", \"key2\":\"value2\"}" +
-		//
-		//
-		// // "}";
-
-	}
 }
diff --git a/src/test/java/CatalogueResolverTest.java b/src/test/java/CatalogueResolverTest.java
new file mode 100644
index 0000000..9ad5027
--- /dev/null
+++ b/src/test/java/CatalogueResolverTest.java
@@ -0,0 +1,36 @@
+
+/**
+ *
+ */
+/**
+ *
+ * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
+ * Dec 7, 2016
+ */
+public class CatalogueResolverTest {
+
+
+	/**
+	 * The main method.
+	 *
+	 * @param args
+	 *            the arguments
+	 */
+	public static void main(String[] args) {
+
+		// jsonRequest = "{" +
+		// "\"gcube_scope\" : \"/gcube\"," +
+		// "\"entity_context\" : \"dataset\"," +
+		// "\"entity_name\" : \"sarda-sarda\"" +
+		// "}";
+		// //String test = "{" +
+		// // "\"gcube_scope\" : \"/gcube\"," +
+		// // "\"entity_context\" : \"dataset\"," +
+		// // "\"entity_name\" : \"sarda-sarda\"," +
+		// // "\"query\" : {\"key1\" : \"value1\", \"key2\":\"value2\"}" +
+		//
+		//
+		// // "}";
+
+	}
+}