Merge pull request #121 from Flagsmith/release/6.2.0

Release 6.2.0

Author: matthewelwell

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>com.flagsmith</groupId>
   <artifactId>flagsmith-java-client</artifactId>
-  <version>6.1.0</version>
+  <version>6.2.0</version>
   <packaging>jar</packaging>
 
   <name>Flagsmith Java Client</name>

src/main/java/com/flagsmith/FlagsmithApiWrapper.java

@@ -20,12 +20,13 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import lombok.Data;
+import lombok.Getter;
 import okhttp3.HttpUrl;
 import okhttp3.MediaType;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 
-@Data
+@Getter
 public class FlagsmithApiWrapper implements FlagsmithSdk {
 
   private static final String AUTH_HEADER = "X-Environment-Key";
@@ -261,6 +262,15 @@ public EnvironmentModel getEnvironment() {
     return null;
   }
 
+  @Override
+  public RequestProcessor getRequestor() {
+    return this.requestor;
+  }
+
+  public void setRequestor(RequestProcessor requestor) {
+    this.requestor = requestor;
+  }
+
   @Override
   public FlagsmithConfig getConfig() {
     return this.defaultConfig;

src/main/java/com/flagsmith/config/FlagsmithCacheConfig.java

@@ -1,18 +1,16 @@
 package com.flagsmith.config;
 
-import com.flagsmith.flagengine.features.FeatureStateModel;
 import com.flagsmith.interfaces.FlagsmithCache;
 import com.flagsmith.models.Flags;
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.stats.CacheStats;
-import java.util.List;
+
 import java.util.concurrent.TimeUnit;
-import lombok.Data;
-import lombok.NonNull;
+import lombok.Getter;
 import org.apache.commons.lang3.StringUtils;
 
-@Data
+@Getter
 public final class FlagsmithCacheConfig {
 
   private static final int DEFAULT_MAX_SIZE = 10;
@@ -163,7 +161,7 @@ public class FlagsmithCacheImpl implements FlagsmithCache {
     private final String envFlagsCacheKey;
 
     public FlagsmithCacheImpl(final Cache<String, Flags> cache,
-                              final String envFlagsCacheKey) {
+        final String envFlagsCacheKey) {
       this.cache = cache;
       this.envFlagsCacheKey = envFlagsCacheKey;
     }

src/main/java/com/flagsmith/config/FlagsmithConfig.java

@@ -1,8 +1,6 @@
 package com.flagsmith.config;
 
-import com.flagsmith.FlagsmithClient;
 import com.flagsmith.FlagsmithFlagDefaults;
-import com.flagsmith.interfaces.DefaultFlagHandler;
 import com.flagsmith.threads.AnalyticsProcessor;
 
 import java.net.Proxy;
@@ -11,7 +9,8 @@
 import java.util.concurrent.TimeUnit;
 import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.X509TrustManager;
-import lombok.Data;
+
+import lombok.Getter;
 import okhttp3.HttpUrl;
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
@@ -21,7 +20,7 @@
  *
  * <p>Created by Pavlo Maksymchuk.
  */
-@Data
+@Getter
 public final class FlagsmithConfig {
 
   private static final int DEFAULT_CONNECT_TIMEOUT_MILLIS = 2000;
@@ -82,6 +81,10 @@ public static FlagsmithConfig.Builder newBuilder() {
     return new FlagsmithConfig.Builder();
   }
 
+  public void setFlagsmithFlagDefaults(FlagsmithFlagDefaults flagsmithFlagDefaults) {
+    this.flagsmithFlagDefaults = flagsmithFlagDefaults;
+  }
+
   public static class Builder {
 
     private final List<Interceptor> interceptors = new ArrayList<>();
@@ -187,6 +190,7 @@ public Builder withProxy(Proxy proxy) {
 
     /**
      * Add retries for HTTP request to the builder.
+     *
      * @param retries no of retries for requests
      * @return
      */
@@ -197,6 +201,7 @@ public Builder retries(Retry retries) {
 
     /**
      * Local evaluation config.
+     *
      * @param localEvaluation boolean to enable
      * @return
      */
@@ -206,7 +211,9 @@ public Builder withLocalEvaluation(Boolean localEvaluation) {
     }
 
     /**
-     * set environment refresh rate with polling manager. Only needed when local evaluation is true.
+     * set environment refresh rate with polling manager. Only needed when local evaluation is
+     * true.
+     *
      * @param seconds seconds
      * @return
      */
@@ -230,6 +237,7 @@ public Builder withAnalyticsProcessor(AnalyticsProcessor processor) {
 
     /**
      * Enable Analytics Processor.
+     *
      * @param enable boolean to enable
      * @return
      */

src/main/java/com/flagsmith/threads/AnalyticsProcessor.java

@@ -8,15 +8,15 @@
 import java.time.Instant;
 import java.util.HashMap;
 import java.util.Map;
-import lombok.Data;
+import lombok.Getter;
 import lombok.ToString;
 import okhttp3.HttpUrl;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 
-@Data
+@Getter
 public class AnalyticsProcessor {
 
   private final String analyticsEndpoint = "analytics/flags/";
@@ -92,6 +92,11 @@ public void setLogger(FlagsmithLogger logger) {
     this.logger = logger;
   }
 
+
+  public void setApi(FlagsmithSdk api) {
+    this.api = api;
+  }
+
   /**
    * Get the analytics url.
    */

src/main/java/com/flagsmith/threads/RequestProcessor.java

@@ -18,7 +18,6 @@
 import okhttp3.Request;
 import okhttp3.Response;
 
-@Data
 public class RequestProcessor {
 
   private ExecutorService executor = Executors.newFixedThreadPool(3);
@@ -124,4 +123,11 @@ public void close() {
     this.executor.shutdown();
   }
 
+  public FlagsmithLogger getLogger() {
+    return logger;
+  }
+
+  public OkHttpClient getClient() {
+    return client;
+  }
 }

src/test/java/com/flagsmith/FlagsmithApiWrapperCachingTest.java

@@ -35,6 +35,7 @@
 
 
 public class FlagsmithApiWrapperCachingTest {
+
   private final String API_KEY = "OUR_API_KEY";
   private final String BASE_URL = "https://unit-test.com";
   private FlagsmithCache flagsmithCacheImpl;
@@ -61,7 +62,8 @@ public void init() {
     flagsmithLogger = mock(FlagsmithLogger.class);
     requestProcessor = mock(RequestProcessor.class);
 
-    flagsmithAPIWrapper = new FlagsmithApiWrapper(flagsmithCacheImpl, defaultConfig, null, flagsmithLogger, API_KEY);
+    flagsmithAPIWrapper = new FlagsmithApiWrapper(
+        flagsmithCacheImpl, defaultConfig, null, flagsmithLogger, API_KEY);
     flagsmithAPIWrapper.setRequestor(requestProcessor);
   }
 
@@ -177,7 +179,7 @@ public void testGetFeatureFlags_ReturnsFeatureFlagsFromApi_IfCacheButNoEnvCacheK
 
     final List<FeatureStateModel> featureStateModels = new ArrayList<>();
     when(requestProcessor.executeAsync(any(), any(), any()))
-            .thenReturn(FlagsmithTestHelper.futurableReturn(featureStateModels));
+        .thenReturn(FlagsmithTestHelper.futurableReturn(featureStateModels));
 
     // When
     Flags flags = flagsmithAPIWrapper.getFeatureFlags(false);