fix: handle unicode strings on Windows (#261)

pom.xml

@@ -10,7 +10,7 @@
         <version.junit5>5.10.3</version.junit5>
         <version.okhttp>4.12.0</version.okhttp>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <version.unleash.specification>5.1.7</version.unleash.specification>
+        <version.unleash.specification>5.1.9</version.unleash.specification>
         <arguments />
         <version.jackson>2.17.2</version.jackson>
         <version.logback>1.3.14</version.logback>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>io.getunleash</groupId>
             <artifactId>yggdrasil-engine</artifactId>
-            <version>0.1.0-alpha.12</version>
+            <version>0.1.0-alpha.14</version>
             <classifier>${os.detected.classifier}</classifier>
         </dependency>
         <dependency>

src/main/java/io/getunleash/DefaultUnleash.java

@@ -106,7 +106,7 @@ public DefaultUnleash(
                     try {
                         this.unleashEngine.takeState(
                                 JsonFeatureParser.toJsonString(featureCollection));
-                    } catch (YggdrasilInvalidInputException e) {
+                    } catch (YggdrasilInvalidInputException | YggdrasilError e) {
                         LOGGER.error("Unable to update features", e);
                     }
                 });

src/main/java/io/getunleash/metric/ClientMetrics.java

@@ -1,6 +1,7 @@
 package io.getunleash.metric;
 
 import io.getunleash.engine.MetricsBucket;
+import io.getunleash.engine.UnleashEngine;
 import io.getunleash.event.UnleashEvent;
 import io.getunleash.event.UnleashSubscriber;
 import io.getunleash.lang.Nullable;
@@ -25,7 +26,7 @@ public class ClientMetrics implements UnleashEvent {
         this.specVersion = config.getClientSpecificationVersion();
         this.platformName = System.getProperty("java.vm.name");
         this.platformVersion = System.getProperty("java.version");
-        this.yggdrasilVersion = null;
+        this.yggdrasilVersion = UnleashEngine.getCoreVersion();
     }
 
     public String getAppName() {

src/main/java/io/getunleash/metric/ClientRegistration.java

@@ -1,5 +1,6 @@
 package io.getunleash.metric;
 
+import io.getunleash.engine.UnleashEngine;
 import io.getunleash.event.UnleashEvent;
 import io.getunleash.event.UnleashSubscriber;
 import io.getunleash.lang.Nullable;
@@ -31,7 +32,7 @@ public class ClientRegistration implements UnleashEvent {
         this.specVersion = config.getClientSpecificationVersion();
         this.platformName = System.getProperty("java.vm.name");
         this.platformVersion = System.getProperty("java.version");
-        this.yggdrasilVersion = null;
+        this.yggdrasilVersion = UnleashEngine.getCoreVersion();
     }
 
     public String getAppName() {

src/test/java/io/getunleash/DefaultUnleashTest.java

@@ -310,6 +310,7 @@ public void asynchronous_fetch_on_initialisation_fails_silently_and_retries()
                         .build();
 
         Unleash unleash = new DefaultUnleash(config);
+        Thread.sleep(1);
         verify(fetcher, times(1)).fetchFeatures();
         Thread.sleep(1200);
         verify(fetcher, times(2)).fetchFeatures();

src/test/java/io/getunleash/integration/ClientSpecificationTest.java

@@ -1,16 +1,8 @@
 package io.getunleash.integration;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.post;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import io.getunleash.DefaultUnleash;
@@ -21,8 +13,6 @@
 import io.getunleash.strategy.constraints.DateParser;
 import io.getunleash.util.UnleashConfig;
 import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -35,17 +25,9 @@
 import java.util.stream.Stream;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.TestFactory;
-import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class ClientSpecificationTest {
 
-    @RegisterExtension
-    static WireMockExtension serverMock =
-            WireMockExtension.newInstance()
-                    .configureStaticDsl(true)
-                    .options(wireMockConfig().dynamicPort().dynamicHttpsPort())
-                    .build();
-
     @TestFactory
     public Stream<DynamicTest> clientSpecification() throws IOException, URISyntaxException {
         Reader content = getFileReader("/client-specification/specifications/index.json");
@@ -122,20 +104,14 @@ private List<DynamicTest> createVariantTests(String fileName)
     }
 
     private Unleash setupUnleash(TestDefinition testDefinition) throws URISyntaxException {
-        mockUnleashAPI(testDefinition);
-
-        // Required because the client is available before it may have had the chance to
-        // talk with
-        // the API
-        String backupFile = writeUnleashBackup(testDefinition);
 
         // Set-up a unleash instance, using mocked API and backup-file
         UnleashConfig config =
                 UnleashConfig.builder()
                         .appName(testDefinition.getName())
-                        .unleashAPI(new URI("http://localhost:" + serverMock.getPort() + "/api/"))
-                        .synchronousFetchOnInitialisation(true)
-                        .backupFile(backupFile)
+                        .disableMetrics()
+                        .disablePolling()
+                        .unleashAPI(new URI("http://notusedbutrequired:9999/api/"))
                         .build();
 
         DefaultUnleash defaultUnleash = new DefaultUnleash(config);
@@ -144,18 +120,6 @@ private Unleash setupUnleash(TestDefinition testDefinition) throws URISyntaxExce
         return defaultUnleash;
     }
 
-    private void mockUnleashAPI(TestDefinition definition) {
-        stubFor(
-                get(urlEqualTo("/api/client/features"))
-                        .withHeader("Accept", equalTo("application/json"))
-                        .willReturn(
-                                aResponse()
-                                        .withStatus(200)
-                                        .withHeader("Content-Type", "application/json")
-                                        .withBody(definition.getState().toString())));
-        stubFor(post(urlEqualTo("/api/client/register")).willReturn(aResponse().withStatus(200)));
-    }
-
     private TestDefinition getTestDefinition(String fileName) throws IOException {
         Reader content = getFileReader("/client-specification/specifications/" + fileName);
         return new Gson().fromJson(content, TestDefinition.class);
@@ -190,23 +154,4 @@ private Reader getFileReader(String filename) throws IOException {
         InputStreamReader reader = new InputStreamReader(in);
         return new BufferedReader(reader);
     }
-
-    private String writeUnleashBackup(TestDefinition definition) {
-        String backupFile =
-                System.getProperty("java.io.tmpdir")
-                        + File.separatorChar
-                        + "unleash-test-"
-                        + definition.getName()
-                        + ".json";
-
-        // TODO: we can probably drop this after introduction of
-        // `synchronousFetchOnInitialisation`.
-        try (FileWriter writer = new FileWriter(backupFile)) {
-            writer.write(definition.getState().toString());
-        } catch (IOException e) {
-            System.out.println("Unable to write toggles to file");
-        }
-
-        return backupFile;
-    }
 }

src/test/java/io/getunleash/metric/UnleashMetricServiceImplTest.java

@@ -448,7 +448,7 @@ public void should_add_new_metrics_data_to_bucket() {
         verify(sender, times(1)).sendMetrics(metricsSent.capture());
         ClientMetrics metrics = metricsSent.getValue();
         assertThat(metrics.getSpecVersion()).isNotEmpty();
-        assertThat(metrics.getYggdrasilVersion()).isNull();
+        assertThat(metrics.getYggdrasilVersion()).isNotEmpty();
         assertThat(metrics.getPlatformName()).isNotEmpty();
         assertThat(metrics.getPlatformVersion()).isNotEmpty();
     }
@@ -467,6 +467,6 @@ public void client_registration_also_includes_new_metrics_metadata() {
         assertThat(reg.getPlatformName()).isNotEmpty();
         assertThat(reg.getPlatformVersion()).isNotEmpty();
         assertThat(reg.getSpecVersion()).isEqualTo(config.getClientSpecificationVersion());
-        assertThat(reg.getYggdrasilVersion()).isNull();
+        assertThat(reg.getYggdrasilVersion()).isNotEmpty();
     }
 }

src/test/java/io/getunleash/repository/UnleashEngineStateHandler.java

@@ -55,7 +55,7 @@ public MetricsBucket captureMetrics() {
     public void setState(String raw) {
         try {
             this.unleashEngine.takeState(raw);
-        } catch (YggdrasilInvalidInputException e) {
+        } catch (YggdrasilInvalidInputException | YggdrasilError e) {
             throw new RuntimeException(e);
         }
     }