Merge branch 'master' into feat/update-dot-com-domain

Author: sirio7g

README.md

@@ -20,14 +20,14 @@ If you decide to go for the *Apache HttpClient* implementation, add the followin
 <dependency>
     <groupId>io.getstream.client</groupId>
     <artifactId>stream-repo-apache</artifactId>
-    <version>1.3.2</version>
+    <version>1.3.3</version>
 </dependency>
 ```
 
 or in your build.gradle:
 
 ```gradle
-compile 'io.getstream.client:stream-repo-apache:1.3.2'
+compile 'io.getstream.client:stream-repo-apache:1.3.3'
 ```
 
 Instead, if you opted for the *OkHttp* implementation please add it to your pom.xml
@@ -36,14 +36,14 @@ Instead, if you opted for the *OkHttp* implementation please add it to your pom.
 <dependency>
     <groupId>io.getstream.client</groupId>
     <artifactId>stream-repo-okhttp</artifactId>
-    <version>1.3.2</version>
+    <version>1.3.3</version>
 </dependency>
 ```
 
 or in your build.gradle:
 
 ```gradle
-compile 'io.getstream.client:stream-repo-okhttp:1.3.2'
+compile 'io.getstream.client:stream-repo-okhttp:1.3.3'
 ```
 
 In case you want to download the artifact and put it manually into your project,

pom.xml

@@ -5,7 +5,7 @@
     <groupId>io.getstream.client</groupId>
     <artifactId>stream-java</artifactId>
     <packaging>pom</packaging>
-    <version>1.3.4-SNAPSHOT</version>
+    <version>1.3.5-SNAPSHOT</version>
 
 	<name>stream-java</name>
 	<description>stream-java is a Java client for http://getstream.io.</description>

stream-core/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>stream-java</artifactId>
         <groupId>io.getstream.client</groupId>
-        <version>1.3.4-SNAPSHOT</version>
+        <version>1.3.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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/exception/RateLimitExceededException.java

@@ -0,0 +1,27 @@
+package io.getstream.client.exception;
+
+/**
+ * In case you have exceed your allowed calls per time interval (i.e. 1min, 15min or 1hr)
+ */
+public class RateLimitExceededException extends StreamClientException {
+
+    public RateLimitExceededException() {
+        super();
+    }
+
+    public RateLimitExceededException(String message) {
+        super(message);
+    }
+
+    public RateLimitExceededException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public RateLimitExceededException(Throwable cause) {
+        super(cause);
+    }
+
+    protected RateLimitExceededException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}

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/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>stream-java</artifactId>
         <groupId>io.getstream.client</groupId>
-        <version>1.3.4-SNAPSHOT</version>
+        <version>1.3.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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-apache/src/main/java/io/getstream/client/apache/repo/handlers/StreamExceptionHandler.java

@@ -2,13 +2,13 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.getstream.client.exception.AuthenticationFailedException;
-import io.getstream.client.exception.InvalidOrMissingInputException;
-import io.getstream.client.exception.StreamClientException;
 import io.getstream.client.exception.InternalServerException;
+import io.getstream.client.exception.InvalidOrMissingInputException;
+import io.getstream.client.exception.RateLimitExceededException;
 import io.getstream.client.exception.ResourceNotFoundException;
+import io.getstream.client.exception.StreamClientException;
 import io.getstream.client.model.beans.StreamErrorResponse;
 import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.util.EntityUtils;
 
 import java.io.IOException;
 
@@ -38,7 +38,15 @@ public StreamExceptionHandler(ObjectMapper objectMapper) {
      * @throws StreamClientException in case of functional or server-side exception
      */
     public void handleResponseCode(final CloseableHttpResponse response) throws IOException, StreamClientException {
-        switch (response.getStatusLine().getStatusCode()) {
+        int statusCode = response.getStatusLine().getStatusCode();
+        if (statusCode < 200 || statusCode > 299) {
+            parseException(response);
+        }
+    }
+
+    private void parseException(final CloseableHttpResponse response) throws IOException, StreamClientException {
+        int statusCode = response.getStatusLine().getStatusCode();
+        switch (statusCode) {
             case 400:
                 throw buildException(new InvalidOrMissingInputException(), response);
             case 401:
@@ -47,19 +55,27 @@ public void handleResponseCode(final CloseableHttpResponse response) throws IOEx
                 throw buildException(new AuthenticationFailedException(), response);
             case 404:
                 throw buildException(new ResourceNotFoundException(), response);
+            case 429:
+                throw buildException(new RateLimitExceededException(), response);
             case 500:
                 throw buildException(new InternalServerException(), response);
+            default:
+                StreamClientException e = new InternalServerException();
+                e.setCode(statusCode);
+                e.setHttpStatusCode(statusCode);
+                throw e;
         }
     }
 
     private StreamClientException buildException(StreamClientException exception,
                                                  CloseableHttpResponse response) throws IOException {
-        String responseMessage = EntityUtils.toString(response.getEntity());
-        StreamErrorResponse error = objectMapper.readValue(responseMessage, StreamErrorResponse.class);
-        exception.setCode(error.getCode());
-        exception.setHttpStatusCode(error.getStatusCode());
-        exception.setDetail(error.getDetail());
-        exception.setExceptionField(error.getException());
+        StreamErrorResponse error = objectMapper.readValue(response.getEntity().getContent(), StreamErrorResponse.class);
+        if (null != error) {
+            exception.setCode(error.getCode());
+            exception.setHttpStatusCode(response.getStatusLine().getStatusCode());
+            exception.setDetail(error.getDetail());
+            exception.setExceptionField(error.getException());
+        }
         return exception;
     }
 }