Merge pull request #39 from shinusuresh/38-handling-timeouts-in-api

#38 - Default timeout settings

src/main/java/io/github/shinusuresh/productsup/client/config/ProductsUpAutoConfiguration.java

@@ -21,6 +21,9 @@
 import org.springframework.web.reactive.function.client.support.WebClientAdapter;
 import org.springframework.web.service.invoker.HttpServiceProxyFactory;
 
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+
 /**
  * Autoconfiguration class for ProductsUp client.
  */
@@ -56,6 +59,7 @@ public PlatformApiClient platformApiClient() {
                 .build();
         var factory = HttpServiceProxyFactory
                 .builder(WebClientAdapter.forClient(webClient))
+                .blockTimeout(Duration.of(productsUpProperties.getTimeout(), ChronoUnit.SECONDS))
                 .build();
         return factory.createClient(PlatformApiClient.class);
     }
@@ -84,6 +88,7 @@ public StreamApiClient streamApiClient() {
                 .build();
         var factory = HttpServiceProxyFactory
                 .builder(WebClientAdapter.forClient(webClient))
+                .blockTimeout(Duration.of(productsUpProperties.getTimeout(), ChronoUnit.SECONDS))
                 .build();
         return factory.createClient(StreamApiClient.class);
     }
@@ -113,6 +118,7 @@ public StreamApiUploadClient streamApiUploadClient() {
                 .build();
         var factory = HttpServiceProxyFactory
                 .builder(WebClientAdapter.forClient(webClient))
+                .blockTimeout(Duration.of(productsUpProperties.getTimeout(), ChronoUnit.SECONDS))
                 .build();
         return factory.createClient(StreamApiUploadClient.class);
     }

src/main/java/io/github/shinusuresh/productsup/client/config/ProductsUpProperties.java

@@ -1,90 +1,41 @@
 package io.github.shinusuresh.productsup.client.config;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
  * Products up related configurations.
  */
 @ConfigurationProperties("productsup")
+@Getter
+@Setter
 public class ProductsUpProperties {
 
-    private String token;
-
-    private String authorizationToken;
-
-    private String platformEndpoint = "https://platform-api.productsup.io/platform/v2";
-
-    private String streamEndpoint = "https://stream-api.productsup.com/";
-
-    /**
-     * Returns platform endpoint.
-     *
-     * @return platform endpoint url
-     */
-    public String getPlatformEndpoint() {
-        return platformEndpoint;
-    }
-
     /**
-     * Sets platform endpoint.
-     *
-     * @param platformEndpoint - endpoint for platform calls.
+     * Token for platform api calls
      */
-    public void setPlatformEndpoint(String platformEndpoint) {
-        this.platformEndpoint = platformEndpoint;
-    }
-
+    private String token;
 
     /**
-     * Returns Products up token configured for a client.
-     *
-     * @return token
+     * Timeout for API calls.
      */
-    public String getToken() {
-        return token;
-    }
+    private long timeout = 5L;
 
     /**
-     * Sets token
-     * @param token - token for the client.
+     * Authorization token for Stream api calls.
      */
-    public void setToken(String token) {
-        this.token = token;
-    }
+    private String authorizationToken;
 
-    /**
-     * Returns stream endpoint.
-     *
-     * @return Stream api endpoint.
-     */
-    public String getStreamEndpoint() {
-        return streamEndpoint;
-    }
 
     /**
-     * Sets stream endpoint.
-     *
-     * @param streamEndpoint - stream endpoint.
+     *  Platform endpoint.
      */
-    public void setStreamEndpoint(String streamEndpoint) {
-        this.streamEndpoint = streamEndpoint;
-    }
+    private String platformEndpoint = "https://platform-api.productsup.io/platform/v2";
 
     /**
-     * Returns authorization token for Stream api calls.
-     *
-     * @return authorization token
+     * Stream api endpoint.
      */
-    public String getAuthorizationToken() {
-        return authorizationToken;
-    }
+    private String streamEndpoint = "https://stream-api.productsup.com/";
 
-    /**
-     * Sets authorization token for stream api calls.
-     *
-     * @param authorizationToken - Authorization token.
-     */
-    public void setAuthorizationToken(String authorizationToken) {
-        this.authorizationToken = authorizationToken;
-    }
 }

src/main/resources/productsup-application.yml

@@ -1,4 +1,6 @@
 productsup:
+  #Timeout in seconds
+  timeout: 5
   token: "client_id:client_secret"
   stream:
     enabled: false