Merge pull request #471 from splitio/development

Release 4.11.0

Author: nmayorsplit

.github/workflows/ci.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

.github/workflows/update-license-year.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -24,7 +24,7 @@ jobs:
         run: "echo PREVIOUS=$(($CURRENT-1)) >> $GITHUB_ENV"
 
       - name: Update LICENSE
-        uses: jacobtomlinson/gha-find-replace@v2
+        uses: jacobtomlinson/gha-find-replace@v3
         with:
           find: ${{ env.PREVIOUS }}
           replace: ${{ env.CURRENT }}
@@ -38,7 +38,7 @@ jobs:
           git commit -m "Updated License Year" -a
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           title: Update License Year

CHANGES.txt

@@ -1,3 +1,7 @@
+4.11.0 (Jan 9, 2024)
+- Added impressionsListener method in the IntegrationConfig builder to set Sync or Async Listener execution.
+- Fixed localhost to read files with yml ending.
+
 4.10.2 (Dec 1, 2023)
 - Added getTreatmentsByFlagSets without attributes.
 - Fixed some issues for flag sets: Not logging a warning when using flag sets that don't contain cached feature flags.

client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.split.client</groupId>
         <artifactId>java-client-parent</artifactId>
-        <version>4.10.2</version>
+        <version>4.11.0</version>
     </parent>
     <artifactId>java-client</artifactId>
     <packaging>jar</packaging>

client/src/main/java/io/split/client/SplitFactoryImpl.java

@@ -674,6 +674,7 @@ private SplitChangeFetcher createSplitChangeFetcher(SplitClientConfig splitClien
                 case JSON:
                     return new JsonLocalhostSplitChangeFetcher(inputStreamProvider);
                 case YAML:
+                case YML:
                     return new YamlLocalhostSplitChangeFetcher(inputStreamProvider);
                 default:
                     _log.warn(LEGACY_LOG_MESSAGE);

client/src/main/java/io/split/client/utils/FileTypeEnum.java

@@ -3,5 +3,6 @@
 public enum FileTypeEnum {
     LEGACY,
     YAML,
+    YML,
     JSON
 }

client/src/main/java/io/split/integrations/IntegrationsConfig.java

@@ -51,10 +51,14 @@ public Builder() {
         }
 
         public Builder impressionsListener(ImpressionListener listener, int queueSize) {
+            return impressionsListener(listener, queueSize, Execution.ASYNC);
+        }
+
+        public Builder impressionsListener(ImpressionListener listener, int queueSize, Execution executionType) {
             if (queueSize <= 0) {
                 throw new IllegalArgumentException("An ImpressionListener was provided, but its capacity was non-positive: " + queueSize);
             }
-            _listeners.add(new ImpressionListenerWithMeta(listener, Execution.ASYNC, queueSize));
+            _listeners.add(new ImpressionListenerWithMeta(listener, executionType, queueSize));
             return this;
         }
 

client/src/test/java/io/split/client/LocalhostSplitFactoryYamlCompactSampleTest.java

@@ -42,4 +42,29 @@ public void works() throws IOException, URISyntaxException {
         assertThat(client.getTreatmentWithConfig("user_e", "split_2").treatment(), is(equalTo("off")));
         assertThat(client.getTreatmentWithConfig("user_e", "split_2").config(), is(equalTo("{ \"size\" : 55 }")));
     }
+
+    @Test
+    public void worksYML() throws IOException, URISyntaxException {
+
+        String file = getClass().getClassLoader().getResource("split_compact.yml").getFile();
+
+        SplitClientConfig config = SplitClientConfig.builder().splitFile(file).build();
+        SplitFactory splitFactory = SplitFactoryBuilder.build("localhost", config);
+        SplitClient client = splitFactory.client();
+
+        assertThat(client.getTreatment(null, "foo"), is(equalTo(Treatments.CONTROL)));
+        assertThat(client.getTreatment("user_c", "foo"), is(equalTo(Treatments.CONTROL)));
+
+        assertThat(client.getTreatment("user_c", "split_1"), is(equalTo("off")));
+        assertThat(client.getTreatmentWithConfig("user_c", "split_1").treatment(), is(equalTo("off")));
+        assertThat(client.getTreatmentWithConfig("user_c", "split_1").config(), is(equalTo("{ \"size\" : 10 }")));
+
+        assertThat(client.getTreatment("user_d", "split_1"), is(equalTo("on")));
+        assertThat(client.getTreatmentWithConfig("user_d", "split_1").treatment(), is(equalTo("on")));
+        assertThat(client.getTreatmentWithConfig("user_d", "split_1").config(), is(nullValue()));
+
+        assertThat(client.getTreatment("user_e", "split_2"), is(equalTo("off")));
+        assertThat(client.getTreatmentWithConfig("user_e", "split_2").treatment(), is(equalTo("off")));
+        assertThat(client.getTreatmentWithConfig("user_e", "split_2").config(), is(equalTo("{ \"size\" : 55 }")));
+    }
 }

client/src/test/java/io/split/client/SplitClientConfigTest.java

@@ -7,6 +7,7 @@
 import io.split.integrations.IntegrationsConfig;
 import org.junit.Assert;
 import org.junit.Test;
+import org.mockito.Mockito;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -214,4 +215,24 @@ public void threadFactoryNotNull() {
         SplitClientConfig config = SplitClientConfig.builder().threadFactory(new ThreadFactoryBuilder().build()).build();
         Assert.assertNotNull(config.getThreadFactory());
     }
+
+    @Test
+    public void IntegrationConfigSyncNotNull() {
+        SplitClientConfig config = SplitClientConfig.builder().integrations(IntegrationsConfig.builder()
+                .impressionsListener(Mockito.mock(ImpressionListener.class), 500, IntegrationsConfig.Execution.SYNC)
+                .build()).build();
+        Assert.assertNotNull(config.integrationsConfig());
+        Assert.assertEquals(1, config.integrationsConfig().getImpressionsListeners(IntegrationsConfig.Execution.SYNC).size());
+        Assert.assertEquals(0, config.integrationsConfig().getImpressionsListeners(IntegrationsConfig.Execution.ASYNC).size());
+    }
+
+    @Test
+    public void IntegrationConfigAsyncNotNull() {
+        SplitClientConfig config = SplitClientConfig.builder().integrations(IntegrationsConfig.builder()
+                .impressionsListener(Mockito.mock(ImpressionListener.class), 500, IntegrationsConfig.Execution.ASYNC)
+                .build()).build();
+        Assert.assertNotNull(config.integrationsConfig());
+        Assert.assertEquals(0, config.integrationsConfig().getImpressionsListeners(IntegrationsConfig.Execution.SYNC).size());
+        Assert.assertEquals(1, config.integrationsConfig().getImpressionsListeners(IntegrationsConfig.Execution.ASYNC).size());
+    }
 }

client/src/test/resources/split_compact.yml

@@ -0,0 +1,3 @@
+- split_1: {keys: user_c, treatment: 'off', config: '{ "size" : 10 }'}
+- split_1: {keys: user_d, treatment: 'on'}
+- split_2: {keys: user_e, treatment: 'off', config: '{ "size" : 55 }'}