From a9af0c0d3c1a30f9a6ba339ea63ceb7c2626ae60 Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Sat, 17 Feb 2018 17:51:38 +0000 Subject: [PATCH] added intermediate object for WorkspaceMessage. Added filter for authentication purpose git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/social-networking/social-networking-client-library@163354 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../FullTextSearchClient.java | 3 +- .../HashTagsClient.java | 3 +- .../MessagesClient.java | 40 +++++++------- .../NotificationsClient.java | 5 +- .../PeopleClient.java | 3 +- .../PostsClient.java | 21 ++++---- .../TokensClient.java | 3 +- .../UsersClient.java | 19 ++++--- .../VREsClient.java | 3 +- .../filter/AuthorizationFilter.java | 21 ++++++++ .../utils/HttpClient.java | 53 ++++--------------- .../TestClientServices.java | 19 ++++--- 12 files changed, 84 insertions(+), 109 deletions(-) create mode 100644 src/main/java/org/gcube/portal/social_networking_client_library/filter/AuthorizationFilter.java diff --git a/src/main/java/org/gcube/portal/social_networking_client_library/FullTextSearchClient.java b/src/main/java/org/gcube/portal/social_networking_client_library/FullTextSearchClient.java index e05e0d9..c63dc59 100644 --- a/src/main/java/org/gcube/portal/social_networking_client_library/FullTextSearchClient.java +++ b/src/main/java/org/gcube/portal/social_networking_client_library/FullTextSearchClient.java @@ -7,7 +7,6 @@ import java.util.ArrayList; import javax.ws.rs.core.GenericType; import org.apache.commons.lang.Validate; -import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.portal.databook.shared.EnhancedFeed; import org.gcube.portal.social_networking_client_library.utils.HttpClient; import org.gcube.portal.socialnetworking.model.output.ResponseBean; @@ -44,7 +43,7 @@ public class FullTextSearchClient extends BaseClient{ logger.debug("Request for query " + query + " and from " + from + " and quantity is " + quantity); String thisMethodSignature = "search-by-query"; String request = getServiceEndpoint() + thisMethodSignature + "?" + "query=" + URLEncoder.encode(query, "UTF-8") + "&from=" + from + "&quantity=" + quantity; - return HttpClient.get(new GenericType>>(){}, request, SecurityTokenProvider.instance.get()); + return HttpClient.get(new GenericType>>(){}, request); } diff --git a/src/main/java/org/gcube/portal/social_networking_client_library/HashTagsClient.java b/src/main/java/org/gcube/portal/social_networking_client_library/HashTagsClient.java index e5b1c86..78de3b5 100644 --- a/src/main/java/org/gcube/portal/social_networking_client_library/HashTagsClient.java +++ b/src/main/java/org/gcube/portal/social_networking_client_library/HashTagsClient.java @@ -5,7 +5,6 @@ import java.util.Map; import javax.ws.rs.core.GenericType; -import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.portal.social_networking_client_library.utils.HttpClient; import org.gcube.portal.socialnetworking.model.output.ResponseBean; import org.slf4j.Logger; @@ -33,7 +32,7 @@ public class HashTagsClient extends BaseClient{ logger.debug("Request for hastags"); String thisMethodSignature = "get-hashtags-and-occurrences"; String request = getServiceEndpoint() + thisMethodSignature; - return HttpClient.get(new GenericType>>(){}, request, SecurityTokenProvider.instance.get()); + return HttpClient.get(new GenericType>>(){}, request); } diff --git a/src/main/java/org/gcube/portal/social_networking_client_library/MessagesClient.java b/src/main/java/org/gcube/portal/social_networking_client_library/MessagesClient.java index d2dd0a7..441dff6 100644 --- a/src/main/java/org/gcube/portal/social_networking_client_library/MessagesClient.java +++ b/src/main/java/org/gcube/portal/social_networking_client_library/MessagesClient.java @@ -6,10 +6,8 @@ import java.util.List; import javax.ws.rs.core.GenericType; import org.apache.commons.lang.Validate; -import org.gcube.common.authorization.library.provider.SecurityTokenProvider; -import org.gcube.common.homelibrary.home.workspace.sharing.WorkspaceMessage; import org.gcube.portal.social_networking_client_library.utils.HttpClient; -import org.gcube.portal.socialnetworking.model.input.MessageInputBean; +import org.gcube.portal.socialnetworking.model.input.Message; import org.gcube.portal.socialnetworking.model.output.ResponseBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,50 +20,50 @@ public class MessagesClient extends BaseClient{ private static final String SUB_SERVICE_PATH = "2/messages/"; private static Logger logger = LoggerFactory.getLogger(MessagesClient.class); - - + + public MessagesClient() throws Exception { super(SUB_SERVICE_PATH); } - + /** * Get sent messages * @return */ - public List getSentMessages(){ - + public List getSentMessages(){ + logger.debug("Request for sent messages"); String thisMethodSignature = "get-sent-messages"; String request = getServiceEndpoint() + thisMethodSignature + "?"; - return HttpClient.get(new GenericType>>(){}, request, SecurityTokenProvider.instance.get()); - + return HttpClient.get(new GenericType>>(){}, request); + } - + /** * Get received messages * @return */ - public List getReceivedMessages(){ - + public List getReceivedMessages(){ + logger.debug("Request for received messages"); String thisMethodSignature = "get-received-messages"; String request = getServiceEndpoint() + thisMethodSignature + "?"; - return HttpClient.get(new GenericType>>(){}, request, SecurityTokenProvider.instance.get()); - + return HttpClient.get(new GenericType>>(){}, request); + } - + /** * Write message * @return message id */ - public String writeMessage(MessageInputBean m){ - + public String writeMessage(Message m){ + Validate.isTrue(m != null, "Message cannot be null"); - + logger.debug("Request for writing new message"); String thisMethodSignature = "write-message"; String request = getServiceEndpoint() + thisMethodSignature + "?"; - return HttpClient.post(new GenericType>(){}, request, SecurityTokenProvider.instance.get(), m); - + return HttpClient.post(new GenericType>(){}, request, m); + } } diff --git a/src/main/java/org/gcube/portal/social_networking_client_library/NotificationsClient.java b/src/main/java/org/gcube/portal/social_networking_client_library/NotificationsClient.java index 8f404da..4593f16 100644 --- a/src/main/java/org/gcube/portal/social_networking_client_library/NotificationsClient.java +++ b/src/main/java/org/gcube/portal/social_networking_client_library/NotificationsClient.java @@ -6,7 +6,6 @@ import java.util.List; import javax.ws.rs.core.GenericType; import org.apache.commons.lang.Validate; -import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.portal.databook.shared.Notification; import org.gcube.portal.social_networking_client_library.utils.HttpClient; import org.gcube.portal.socialnetworking.model.input.JobNotificationBean; @@ -42,7 +41,7 @@ public class NotificationsClient extends BaseClient{ logger.debug("Request for getting notifications"); String thisMethodSignature = "get-range-notifications"; String request = getServiceEndpoint() + thisMethodSignature + "?from=" + from + "&quantity=" +quantity; - return HttpClient.get(new GenericType>>(){}, request, SecurityTokenProvider.instance.get()); + return HttpClient.get(new GenericType>>(){}, request); } @@ -57,7 +56,7 @@ public class NotificationsClient extends BaseClient{ logger.debug("Request for getting notifications"); String thisMethodSignature = "notify-job-status"; String request = getServiceEndpoint() + thisMethodSignature; - HttpClient.post(new GenericType>(){}, request, SecurityTokenProvider.instance.get(), notification); + HttpClient.post(new GenericType>(){}, request, notification); } diff --git a/src/main/java/org/gcube/portal/social_networking_client_library/PeopleClient.java b/src/main/java/org/gcube/portal/social_networking_client_library/PeopleClient.java index 0889779..492eed1 100644 --- a/src/main/java/org/gcube/portal/social_networking_client_library/PeopleClient.java +++ b/src/main/java/org/gcube/portal/social_networking_client_library/PeopleClient.java @@ -2,7 +2,6 @@ package org.gcube.portal.social_networking_client_library; import javax.ws.rs.core.GenericType; -import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.portal.social_networking_client_library.utils.HttpClient; import org.gcube.portal.socialnetworking.model.output.ResponseBean; import org.json.JSONObject; @@ -32,7 +31,7 @@ public class PeopleClient extends BaseClient{ logger.debug("Request for getting profile"); String thisMethodSignature = "profile"; String request = getServiceEndpoint() + thisMethodSignature; - return HttpClient.get(new GenericType>(){}, request, SecurityTokenProvider.instance.get()); + return HttpClient.get(new GenericType>(){}, request); } } diff --git a/src/main/java/org/gcube/portal/social_networking_client_library/PostsClient.java b/src/main/java/org/gcube/portal/social_networking_client_library/PostsClient.java index 775f688..3fac04a 100644 --- a/src/main/java/org/gcube/portal/social_networking_client_library/PostsClient.java +++ b/src/main/java/org/gcube/portal/social_networking_client_library/PostsClient.java @@ -6,7 +6,6 @@ import java.util.List; import javax.ws.rs.core.GenericType; import org.apache.commons.lang.Validate; -import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.portal.databook.shared.Feed; import org.gcube.portal.social_networking_client_library.utils.HttpClient; import org.gcube.portal.socialnetworking.model.input.PostInputBean; @@ -39,7 +38,7 @@ public class PostsClient extends BaseClient{ logger.debug("Request for getting posts"); String thisMethodSignature = "get-posts-user-since"; String request = getServiceEndpoint() + thisMethodSignature; - return HttpClient.get(new GenericType>>(){}, request, SecurityTokenProvider.instance.get()); + return HttpClient.get(new GenericType>>(){}, request); } @@ -54,7 +53,7 @@ public class PostsClient extends BaseClient{ logger.debug("Request for getting posts"); String thisMethodSignature = "get-posts-user"; String request = getServiceEndpoint() + thisMethodSignature; - return HttpClient.get(new GenericType>>(){}, request, SecurityTokenProvider.instance.get()); + return HttpClient.get(new GenericType>>(){}, request); } @@ -69,7 +68,7 @@ public class PostsClient extends BaseClient{ logger.debug("Request for getting posts"); String thisMethodSignature = "get-posts-user-quantity"; String request = getServiceEndpoint() + thisMethodSignature; - return HttpClient.get(new GenericType>>(){}, request, SecurityTokenProvider.instance.get()); + return HttpClient.get(new GenericType>>(){}, request); } @@ -84,7 +83,7 @@ public class PostsClient extends BaseClient{ logger.debug("Request for writing post"); String thisMethodSignature = "write-post-user"; String request = getServiceEndpoint() + thisMethodSignature; - return HttpClient.post(new GenericType>(){}, request, SecurityTokenProvider.instance.get(), toWrite); + return HttpClient.post(new GenericType>(){}, request, toWrite); } @@ -97,7 +96,7 @@ public class PostsClient extends BaseClient{ logger.debug("Request for getting posts"); String thisMethodSignature = "get-posts-app"; String request = getServiceEndpoint() + thisMethodSignature; - return HttpClient.get(new GenericType>>(){}, request, SecurityTokenProvider.instance.get()); + return HttpClient.get(new GenericType>>(){}, request); } @@ -112,7 +111,7 @@ public class PostsClient extends BaseClient{ logger.debug("Request for writing application post"); String thisMethodSignature = "write-post-app"; String request = getServiceEndpoint() + thisMethodSignature; - return HttpClient.post(new GenericType>(){}, request, SecurityTokenProvider.instance.get(), toWrite); + return HttpClient.post(new GenericType>(){}, request, toWrite); } @@ -125,7 +124,7 @@ public class PostsClient extends BaseClient{ logger.debug("Request for getting posts vre"); String thisMethodSignature = "get-posts-vre"; String request = getServiceEndpoint() + thisMethodSignature; - return HttpClient.get(new GenericType>>(){}, request, SecurityTokenProvider.instance.get()); + return HttpClient.get(new GenericType>>(){}, request); } @@ -140,7 +139,7 @@ public class PostsClient extends BaseClient{ logger.debug("Request for getting posts with hashtag " + hashtag); String thisMethodSignature = "get-posts-by-hashtag"; String request = getServiceEndpoint() + thisMethodSignature; - return HttpClient.get(new GenericType>>(){}, request, SecurityTokenProvider.instance.get()); + return HttpClient.get(new GenericType>>(){}, request); } @@ -153,7 +152,7 @@ public class PostsClient extends BaseClient{ logger.debug("Request for getting posts liked"); String thisMethodSignature = "get-liked-posts"; String request = getServiceEndpoint() + thisMethodSignature; - return HttpClient.get(new GenericType>>(){}, request, SecurityTokenProvider.instance.get()); + return HttpClient.get(new GenericType>>(){}, request); } @@ -166,7 +165,7 @@ public class PostsClient extends BaseClient{ logger.debug("Request for getting posts liked"); String thisMethodSignature = "get-id-liked-posts"; String request = getServiceEndpoint() + thisMethodSignature; - return HttpClient.get(new GenericType>>(){}, request, SecurityTokenProvider.instance.get()); + return HttpClient.get(new GenericType>>(){}, request); } diff --git a/src/main/java/org/gcube/portal/social_networking_client_library/TokensClient.java b/src/main/java/org/gcube/portal/social_networking_client_library/TokensClient.java index b1e17eb..65c2b55 100644 --- a/src/main/java/org/gcube/portal/social_networking_client_library/TokensClient.java +++ b/src/main/java/org/gcube/portal/social_networking_client_library/TokensClient.java @@ -3,7 +3,6 @@ package org.gcube.portal.social_networking_client_library; import javax.ws.rs.core.GenericType; import org.apache.commons.lang.Validate; -import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.portal.social_networking_client_library.utils.HttpClient; import org.gcube.portal.socialnetworking.model.input.ApplicationId; import org.gcube.portal.socialnetworking.model.output.ResponseBean; @@ -35,7 +34,7 @@ public class TokensClient extends BaseClient{ logger.debug("Request for writing new message"); String thisMethodSignature = "generate-application-token"; String request = getServiceEndpoint() + thisMethodSignature + "?"; - return HttpClient.post(new GenericType>(){}, request, SecurityTokenProvider.instance.get(), appId); + return HttpClient.post(new GenericType>(){}, request, appId); } diff --git a/src/main/java/org/gcube/portal/social_networking_client_library/UsersClient.java b/src/main/java/org/gcube/portal/social_networking_client_library/UsersClient.java index 5cd150d..5acf5e8 100644 --- a/src/main/java/org/gcube/portal/social_networking_client_library/UsersClient.java +++ b/src/main/java/org/gcube/portal/social_networking_client_library/UsersClient.java @@ -8,7 +8,6 @@ import java.util.Map; import javax.ws.rs.core.GenericType; import org.apache.commons.lang.Validate; -import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.portal.social_networking_client_library.utils.HttpClient; import org.gcube.portal.socialnetworking.model.output.ResponseBean; import org.json.JSONObject; @@ -40,7 +39,7 @@ public class UsersClient extends BaseClient{ logger.debug("Request for attribute value"); String thisMethodSignature = "get-custom-attribute"; String request = getServiceEndpoint() + thisMethodSignature + "?attribute=" + attributeKey; - return HttpClient.get(new GenericType>(){}, request, SecurityTokenProvider.instance.get()); + return HttpClient.get(new GenericType>(){}, request); } @@ -53,7 +52,7 @@ public class UsersClient extends BaseClient{ logger.debug("Request for fullname"); String thisMethodSignature = "get-fullname"; String request = getServiceEndpoint() + thisMethodSignature; - return HttpClient.get(new GenericType>(){}, request, SecurityTokenProvider.instance.get()); + return HttpClient.get(new GenericType>(){}, request); } @@ -66,7 +65,7 @@ public class UsersClient extends BaseClient{ logger.debug("Request for email"); String thisMethodSignature = "get-email"; String request = getServiceEndpoint() + thisMethodSignature; - return HttpClient.get(new GenericType>(){}, request, SecurityTokenProvider.instance.get()); + return HttpClient.get(new GenericType>(){}, request); } @@ -79,7 +78,7 @@ public class UsersClient extends BaseClient{ logger.debug("Request for getting profile"); String thisMethodSignature = "get-profile"; String request = getServiceEndpoint() + thisMethodSignature; - return HttpClient.get(new GenericType>(){}, request, SecurityTokenProvider.instance.get()); + return HttpClient.get(new GenericType>(){}, request); } @@ -92,7 +91,7 @@ public class UsersClient extends BaseClient{ logger.debug("Request for getting usernames in this context"); String thisMethodSignature = "get-all-usernames"; String request = getServiceEndpoint() + thisMethodSignature; - return HttpClient.get(new GenericType>>(){}, request, SecurityTokenProvider.instance.get()); + return HttpClient.get(new GenericType>>(){}, request); } @@ -105,7 +104,7 @@ public class UsersClient extends BaseClient{ logger.debug("Request for getting usernames and fullnames in this context"); String thisMethodSignature = "get-all-fullnames-and-usernames"; String request = getServiceEndpoint() + thisMethodSignature; - return HttpClient.get(new GenericType>>(){}, request, SecurityTokenProvider.instance.get()); + return HttpClient.get(new GenericType>>(){}, request); } @@ -120,7 +119,7 @@ public class UsersClient extends BaseClient{ logger.debug("Request for getting usernames with global role"); String thisMethodSignature = "get-usernames-by-global-role"; String request = getServiceEndpoint() + thisMethodSignature + "?role-name=" + globalRole; - return HttpClient.get(new GenericType>>(){}, request, SecurityTokenProvider.instance.get()); + return HttpClient.get(new GenericType>>(){}, request); } @@ -135,7 +134,7 @@ public class UsersClient extends BaseClient{ logger.debug("Request for getting usernames with global role"); String thisMethodSignature = "get-usernames-by-role"; String request = getServiceEndpoint() + thisMethodSignature + "?role-name=" + localRole; - return HttpClient.get(new GenericType>>(){}, request, SecurityTokenProvider.instance.get()); + return HttpClient.get(new GenericType>>(){}, request); } @@ -150,7 +149,7 @@ public class UsersClient extends BaseClient{ logger.debug("Request for getting usernames with global role"); String thisMethodSignature = "user-exists"; String request = getServiceEndpoint() + thisMethodSignature + "?username=" + username; - return HttpClient.get(new GenericType>(){}, request, SecurityTokenProvider.instance.get()); + return HttpClient.get(new GenericType>(){}, request); } diff --git a/src/main/java/org/gcube/portal/social_networking_client_library/VREsClient.java b/src/main/java/org/gcube/portal/social_networking_client_library/VREsClient.java index bfdf0a2..f8050ac 100644 --- a/src/main/java/org/gcube/portal/social_networking_client_library/VREsClient.java +++ b/src/main/java/org/gcube/portal/social_networking_client_library/VREsClient.java @@ -2,7 +2,6 @@ package org.gcube.portal.social_networking_client_library; import javax.ws.rs.core.GenericType; -import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.portal.social_networking_client_library.utils.HttpClient; import org.gcube.portal.socialnetworking.model.output.ResponseBean; import org.json.JSONArray; @@ -32,7 +31,7 @@ public class VREsClient extends BaseClient{ logger.debug("Request for writing new message"); String thisMethodSignature = "get-my-vres"; String request = getServiceEndpoint() + thisMethodSignature + "?"; - return HttpClient.get(new GenericType>(){}, request, SecurityTokenProvider.instance.get()); + return HttpClient.get(new GenericType>(){}, request); } diff --git a/src/main/java/org/gcube/portal/social_networking_client_library/filter/AuthorizationFilter.java b/src/main/java/org/gcube/portal/social_networking_client_library/filter/AuthorizationFilter.java new file mode 100644 index 0000000..5d64105 --- /dev/null +++ b/src/main/java/org/gcube/portal/social_networking_client_library/filter/AuthorizationFilter.java @@ -0,0 +1,21 @@ +package org.gcube.portal.social_networking_client_library.filter; + +import java.io.IOException; + +import javax.ws.rs.client.ClientRequestContext; + +import org.gcube.common.authorization.library.provider.SecurityTokenProvider; + +/** + * Authorization filter for the jersey client. + * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it) + */ +public class AuthorizationFilter { + + private final static String AUTH_TOKEN_PARAMETER = "gcube-token"; + + public void filter(ClientRequestContext clientRequestContext) throws IOException { + String token = SecurityTokenProvider.instance.get(); + clientRequestContext.getHeaders().add(AUTH_TOKEN_PARAMETER, token); + } +} diff --git a/src/main/java/org/gcube/portal/social_networking_client_library/utils/HttpClient.java b/src/main/java/org/gcube/portal/social_networking_client_library/utils/HttpClient.java index 7f5f3d2..3fb3993 100644 --- a/src/main/java/org/gcube/portal/social_networking_client_library/utils/HttpClient.java +++ b/src/main/java/org/gcube/portal/social_networking_client_library/utils/HttpClient.java @@ -8,6 +8,7 @@ import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.GenericType; import javax.ws.rs.core.MediaType; +import org.gcube.portal.social_networking_client_library.filter.AuthorizationFilter; import org.gcube.portal.socialnetworking.model.output.ResponseBean; import org.glassfish.jersey.client.ClientConfig; import org.glassfish.jersey.jackson.JacksonFeature; @@ -34,13 +35,13 @@ public class HttpClient{ * @param token * @return */ - public static R get(GenericType> returnType, String requestUrl, String token){ + public static R get(GenericType> returnType, String requestUrl){ - logger.debug("Executing get request at url " + requestUrl + " and token is " + maskedToken(token)); + logger.debug("Executing get request at url " + requestUrl); - ClientConfig cc = new ClientConfig().register(new JacksonFeature());//.register(new JacksonJsonProvider(getMapper())); + ClientConfig cc = new ClientConfig().register(new JacksonFeature()).register(new AuthorizationFilter()); Client client = ClientBuilder.newClient(cc); - WebTarget webResourceGet = client.target(requestUrl).queryParam("gcube-token", token); + WebTarget webResourceGet = client.target(requestUrl); ResponseBean response = webResourceGet.request(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON).get(returnType); if(response == null) @@ -53,15 +54,6 @@ public class HttpClient{ return response.getResult(); } - // public static ObjectMapper getMapper(){ - // - // ObjectMapper mapper = new ObjectMapper(); - // mapper.enable(SerializationFeature.INDENT_OUTPUT); - // mapper.addMixIn(WorkspaceMessage.class, MessageOutputBeanMixIn.class); - // mapper.setPropertyNamingStrategy(PropertyNamingStrategy.CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES); - // return mapper; - // } - /** * Executes a post request * @param returnType @@ -71,25 +63,13 @@ public class HttpClient{ * @return * @throws JsonProcessingException */ - public static R post(GenericType> returnType, String requestUrl, String token, Object obj){ + public static R post(GenericType> returnType, String requestUrl, Object obj){ - logger.debug("Executing post request at url " + requestUrl + " and token is " + maskedToken(token)); + logger.debug("Executing post request at url " + requestUrl); - ClientConfig cc = new ClientConfig().register(new JacksonFeature()); + ClientConfig cc = new ClientConfig().register(new JacksonFeature()).register(new AuthorizationFilter()); Client client = ClientBuilder.newClient(cc); - WebTarget webResourceGet = client.target(requestUrl).queryParam("gcube-token", token); - // - // String asJson = null; - // try{ - // ObjectMapper mapper = new ObjectMapper(); - // mapper.enable(SerializationFeature.INDENT_OUTPUT); - // mapper.setPropertyNamingStrategy(PropertyNamingStrategy.CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES); - // mapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true); - // asJson = mapper.writeValueAsString(obj); - // logger.debug("Request body looks like\n"+asJson); - // }catch(Exception e){ - // logger.error("Failed to parse data", e); - // } + WebTarget webResourceGet = client.target(requestUrl); logger.debug("Entity looks like " + Entity.json(obj)); @@ -104,19 +84,4 @@ public class HttpClient{ return response.getResult(); } - - /** - * Avoid to show the token - * @param token - * @return - */ - private static String maskedToken(String token){ - - if(token == null) - return ""; - else - return token.substring(0, 5) + "**************************"; - - } - } diff --git a/src/test/java/org/gcube/portal/social_networking_client_library/TestClientServices.java b/src/test/java/org/gcube/portal/social_networking_client_library/TestClientServices.java index 33db6a4..ab859da 100644 --- a/src/test/java/org/gcube/portal/social_networking_client_library/TestClientServices.java +++ b/src/test/java/org/gcube/portal/social_networking_client_library/TestClientServices.java @@ -7,13 +7,12 @@ import java.util.Map; import java.util.UUID; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; -import org.gcube.common.homelibrary.home.workspace.sharing.WorkspaceMessage; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.portal.databook.shared.EnhancedFeed; import org.gcube.portal.databook.shared.JobStatusType; import org.gcube.portal.databook.shared.Notification; import org.gcube.portal.socialnetworking.model.input.JobNotificationBean; -import org.gcube.portal.socialnetworking.model.input.MessageInputBean; +import org.gcube.portal.socialnetworking.model.input.Message; import org.gcube.portal.socialnetworking.model.input.Recipient; import org.junit.After; import org.junit.Before; @@ -63,27 +62,27 @@ public class TestClientServices { @Test public void testMessagesReceived() throws Exception { MessagesClient messagesClient = new MessagesClient(); - List receivedMessages = messagesClient.getReceivedMessages(); - for (WorkspaceMessage workspaceMessage : receivedMessages) { + List receivedMessages = messagesClient.getReceivedMessages(); + for (Message workspaceMessage : receivedMessages) { logger.debug("Received message " + workspaceMessage.toString()); } } - + //@Test public void testMessagesSent() throws Exception { MessagesClient messagesClient = new MessagesClient(); - List sentMessages = messagesClient.getSentMessages(); - for (WorkspaceMessage workspaceMessage : sentMessages) { + List sentMessages = messagesClient.getSentMessages(); + for (Message workspaceMessage : sentMessages) { logger.debug("Sent message was " + workspaceMessage); } } - + //@Test public void sendMessage() throws Exception{ logger.debug("Sending message "); MessagesClient messagesClient = new MessagesClient(); List rec = Arrays.asList(new Recipient("andrea.rossi")); - MessageInputBean message = new MessageInputBean( + Message message = new Message( "Test message", "Sending message via client " + System.currentTimeMillis(), new ArrayList(rec)); @@ -113,7 +112,7 @@ public class TestClientServices { notificationsClient.sendJobNotification(notification); logger.debug("Sent job notification "); } - + @After public void reset(){ ScopeProvider.instance.reset();