From 8876b9f446de2650fee962779308665468958b70 Mon Sep 17 00:00:00 2001
From: Lucio Lelii <lucio.lelii@isti.cnr.it>
Date: Thu, 11 Apr 2019 12:56:34 +0000
Subject: [PATCH] git-svn-id:
 https://svn.d4science-ii.research-infrastructures.eu/gcube/branches/data-access/storagehub-webapp/1.0@178996
 82a268e6-3cf1-43bd-a215-b396298e98cf

---
 .../data/access/storagehub/services/GroupManager.java     | 8 +++-----
 .../data/access/storagehub/services/UserManager.java      | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/gcube/data/access/storagehub/services/GroupManager.java b/src/main/java/org/gcube/data/access/storagehub/services/GroupManager.java
index edc5d96..95fcef1 100644
--- a/src/main/java/org/gcube/data/access/storagehub/services/GroupManager.java
+++ b/src/main/java/org/gcube/data/access/storagehub/services/GroupManager.java
@@ -10,15 +10,12 @@ import javax.jcr.security.AccessControlManager;
 import javax.jcr.security.Privilege;
 import javax.servlet.ServletContext;
 import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.apache.jackrabbit.api.JackrabbitSession;
@@ -40,6 +37,7 @@ import org.gcube.data.access.storagehub.Constants;
 import org.gcube.data.access.storagehub.Utils;
 import org.gcube.data.access.storagehub.exception.MyAuthException;
 import org.gcube.data.access.storagehub.handlers.CredentialHandler;
+import org.glassfish.jersey.media.multipart.FormDataParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -89,7 +87,7 @@ public class GroupManager {
 	@POST
 	@Path("")
 	@AuthorizationControl(allowed={"lucio.lelii"}, exception=MyAuthException.class)
-	public String createGroup(@FormParam("group") String group){
+	public String createGroup(@FormDataParam("group") String group){
 
 		JackrabbitSession session = null;
 		String groupId = null;
@@ -147,7 +145,7 @@ public class GroupManager {
 	@PUT
 	@Path("{id}")
 	@AuthorizationControl(allowed={"lucio.lelii"}, exception=MyAuthException.class)
-	public boolean addUserToGroup(@PathParam("id") String groupId, @FormParam("userId") String userId){
+	public boolean addUserToGroup(@PathParam("id") String groupId, @FormDataParam("userId") String userId){
 
 		JackrabbitSession session = null;
 		boolean success = false;
diff --git a/src/main/java/org/gcube/data/access/storagehub/services/UserManager.java b/src/main/java/org/gcube/data/access/storagehub/services/UserManager.java
index 3c8ce2f..8ca4f8b 100644
--- a/src/main/java/org/gcube/data/access/storagehub/services/UserManager.java
+++ b/src/main/java/org/gcube/data/access/storagehub/services/UserManager.java
@@ -11,7 +11,6 @@ import javax.jcr.NodeIterator;
 import javax.jcr.query.QueryResult;
 import javax.servlet.ServletContext;
 import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -35,6 +34,7 @@ import org.gcube.data.access.storagehub.Utils;
 import org.gcube.data.access.storagehub.exception.MyAuthException;
 import org.gcube.data.access.storagehub.handlers.CredentialHandler;
 import org.gcube.data.access.storagehub.handlers.UnshareHandler;
+import org.glassfish.jersey.media.multipart.FormDataParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -88,7 +88,7 @@ public class UserManager {
 	@POST
 	@Path("")
 	@AuthorizationControl(allowed={"lucio.lelii"}, exception=MyAuthException.class)
-	public String createUser(@FormParam("user") String user, @FormParam("password") String password){
+	public String createUser(@FormDataParam("user") String user, @FormDataParam("password") String password){
 
 		JackrabbitSession session = null;
 		String userId = null;