From dadf817c3ab8b17029ba4ce84c77a0c4c4fff13c Mon Sep 17 00:00:00 2001 From: Ahmed Ibrahim Date: Fri, 1 Dec 2023 15:01:35 +0100 Subject: [PATCH] New social client --- CHANGELOG.md | 2 +- .../BaseClient.java | 38 +++++++++++-------- .../LibClient.java | 2 +- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6b6096..cff262e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [v1.2.1] - 2023-11-20 +## [v1.3.1] - 2023-11-20 - Corresponding API calls for all the public functions in Social Networking Library diff --git a/src/main/java/org/gcube/social_networking/social_networking_client_library/BaseClient.java b/src/main/java/org/gcube/social_networking/social_networking_client_library/BaseClient.java index 3f7aaae..87cad83 100644 --- a/src/main/java/org/gcube/social_networking/social_networking_client_library/BaseClient.java +++ b/src/main/java/org/gcube/social_networking/social_networking_client_library/BaseClient.java @@ -10,20 +10,28 @@ import org.slf4j.LoggerFactory; */ public abstract class BaseClient { - private static Logger logger = LoggerFactory.getLogger(BaseClient.class); - private String serviceEndpoint; - - public BaseClient(String subPath) throws Exception { - ServiceDiscoverer discoverer = new ServiceDiscoverer(); - logger.debug("Discovering service..."); - serviceEndpoint = discoverer.getEntryPoint(); - serviceEndpoint = serviceEndpoint.endsWith("/") ? serviceEndpoint + subPath : - serviceEndpoint + "/" + subPath; - logger.debug("Discovered service " + serviceEndpoint); - } + private static Logger logger = LoggerFactory.getLogger(BaseClient.class); + private String serviceEndpoint; - public String getServiceEndpoint() { - return serviceEndpoint; - } - + public BaseClient(String subPath) throws Exception { + //ServiceDiscoverer discoverer = new ServiceDiscoverer(); + //serviceEndpoint = discoverer.getEntryPoint(); + logger.debug("Discovering service..."); + + + logger.debug(" \n\n\n *** I found " + serviceEndpoint); + + serviceEndpoint = "https://api.dev.d4science.org/rest"; + + logger.debug("\n replacing it with "+ serviceEndpoint); + + serviceEndpoint = serviceEndpoint.endsWith("/") ? serviceEndpoint + subPath : + serviceEndpoint + "/" + subPath; + logger.info("\n\n ABZ Discovered service " + serviceEndpoint); + } + + public String getServiceEndpoint() { + logger.info("\n\n RETURNING Discovered service " + serviceEndpoint); + return serviceEndpoint; + } } diff --git a/src/main/java/org/gcube/social_networking/social_networking_client_library/LibClient.java b/src/main/java/org/gcube/social_networking/social_networking_client_library/LibClient.java index 3bbe747..d552903 100644 --- a/src/main/java/org/gcube/social_networking/social_networking_client_library/LibClient.java +++ b/src/main/java/org/gcube/social_networking/social_networking_client_library/LibClient.java @@ -15,7 +15,7 @@ import java.util.Map; public class LibClient extends BaseClient{ - private static final String SUB_SERVICE_PATH = "lib/"; + private static final String SUB_SERVICE_PATH = "2/lib/"; private static Logger logger = LoggerFactory.getLogger(LibClient.class);