Added a new configuration param to override the default GetStream.io regional endpoint

Author: sirio7g

stream-core/src/main/java/io/getstream/client/config/ClientConfiguration.java

@@ -52,6 +52,14 @@ public class ClientConfiguration {
      */
     private String personalizedFeedEndpoint;
 
+    /**
+     * Set a custom endpoint.
+     * If set the client will use the given endpoint instead of the default one associated with
+     * the selected region.
+     * It is usually not needed to provide an endpoint here.
+     */
+    private String defaultEndpoint;
+
 
     private AuthenticationHandlerConfiguration authenticationHandlerConfiguration;
 
@@ -155,4 +163,12 @@ public String getPersonalizedFeedEndpoint() {
     public void setPersonalizedFeedEndpoint(String personalizedFeedEndpoint) {
         this.personalizedFeedEndpoint = personalizedFeedEndpoint;
     }
+
+    public String getDefaultEndpoint() {
+        return defaultEndpoint;
+    }
+
+    public void setDefaultEndpoint(String defaultEndpoint) {
+        this.defaultEndpoint = defaultEndpoint;
+    }
 }

stream-core/src/main/java/io/getstream/client/util/EndpointUtil.java

@@ -38,4 +38,21 @@ public static URI getPersonalizedEndpoint(ClientConfiguration streamClient) {
             throw new UriBuilderException("Malformed personalized feed's URL.");
         }
     }
+
+    /**
+     * Build the base endpoint.
+     * @param streamClient Configuration container
+     * @return A valid URI endpoint
+     * @throws UriBuilderException In case the URI is malformed
+     */
+    public static URI getBaseEndpoint(final ClientConfiguration streamClient) throws UriBuilderException {
+        if (null != streamClient.getDefaultEndpoint()) {
+            try {
+                return new URI(streamClient.getDefaultEndpoint());
+            } catch (URISyntaxException e) {
+                throw new UriBuilderException("Malformed GetStream.io base URL.");
+            }
+        }
+        return streamClient.getRegion().getEndpoint();
+    }
 }

stream-core/src/test/java/io/getstream/client/util/EndpointUtilTest.java

@@ -1,6 +1,7 @@
 package io.getstream.client.util;
 
 import io.getstream.client.config.ClientConfiguration;
+import io.getstream.client.config.StreamRegion;
 import org.junit.Test;
 
 import java.net.URI;
@@ -28,6 +29,23 @@ public void shouldGetPersonalizedEndpointWithoutDoubleSlash() throws Exception {
         assertThat(personalizedEndpoint.toString(), is("http://yourcompany.getstream.io/yourcompany/"));
     }
 
+    @Test
+    public void shouldGetCustomEndpoint() throws Exception {
+        ClientConfiguration clientConfiguration = new ClientConfiguration();
+        clientConfiguration.setDefaultEndpoint("http://www.example.com/v1");
+
+        URI personalizedEndpoint = EndpointUtil.getBaseEndpoint(clientConfiguration);
+        assertThat(personalizedEndpoint.toString(), is("http://www.example.com/v1"));
+    }
+
+    @Test
+    public void shouldGetRegionDefaultEndpoint() throws Exception {
+        ClientConfiguration clientConfiguration = new ClientConfiguration(StreamRegion.US_EAST);
+
+        URI personalizedEndpoint = EndpointUtil.getBaseEndpoint(clientConfiguration);
+        assertThat(personalizedEndpoint.toString(), is(StreamRegion.US_EAST.getEndpoint().toString()));
+    }
+
     @Test(expected = NullPointerException.class)
     public void shouldFail() throws Exception {
         ClientConfiguration clientConfiguration = new ClientConfiguration();

stream-repo-apache/src/main/java/io/getstream/client/apache/repo/StreamRepositoryImpl.java

@@ -20,6 +20,7 @@
 import io.getstream.client.model.feeds.BaseFeed;
 import io.getstream.client.model.filters.FeedFilter;
 import io.getstream.client.repo.StreamRepository;
+import io.getstream.client.util.EndpointUtil;
 import io.getstream.client.util.JwtAuthenticationUtil;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpDelete;
@@ -67,7 +68,7 @@ public class StreamRepositoryImpl implements StreamRepository {
 	 */
 	public StreamRepositoryImpl(ObjectMapper objectMapper, ClientConfiguration streamClient, CloseableHttpClient closeableHttpClient) {
 		this.objectMapper = objectMapper;
-		this.baseEndpoint = streamClient.getRegion().getEndpoint();
+		this.baseEndpoint = EndpointUtil.getBaseEndpoint(streamClient);
 		this.apiKey = streamClient.getAuthenticationHandlerConfiguration().getApiKey();
 		this.secretKey = streamClient.getAuthenticationHandlerConfiguration().getSecretKey();
 		this.exceptionHandler = new StreamExceptionHandler(objectMapper);

stream-repo-okhttp/src/main/java/io/getstream/client/okhttp/repo/StreamRepositoryImpl.java

@@ -26,6 +26,7 @@
 import io.getstream.client.okhttp.repo.utils.StreamRepoUtils;
 import io.getstream.client.okhttp.repo.utils.UriBuilder;
 import io.getstream.client.repo.StreamRepository;
+import io.getstream.client.util.EndpointUtil;
 import io.getstream.client.util.HttpSignatureHandler;
 import io.getstream.client.util.JwtAuthenticationUtil;
 import org.slf4j.Logger;
@@ -64,7 +65,7 @@ public class StreamRepositoryImpl implements StreamRepository {
 	 * @param closeableHttpClient Actual instance of OkHTTP client
 	 */
 	public StreamRepositoryImpl(ObjectMapper objectMapper, ClientConfiguration streamClient, OkHttpClient closeableHttpClient) {
-		this.baseEndpoint = streamClient.getRegion().getEndpoint();
+		this.baseEndpoint = EndpointUtil.getBaseEndpoint(streamClient);
 		this.apiKey = streamClient.getAuthenticationHandlerConfiguration().getApiKey();
 		this.secretKey = streamClient.getAuthenticationHandlerConfiguration().getSecretKey();
 		this.exceptionHandler = new StreamExceptionHandler(objectMapper);