[FME-10341] fix vulns, update versions and add shutdown

Author: ZamoraEmmanuel

pom.xml

@@ -49,11 +49,6 @@
 			<artifactId>java-client</artifactId>
 			<version>4.18.1</version>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-			<version>4.5.14</version>
-		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
@@ -65,16 +60,6 @@
 			<artifactId>sdk</artifactId>
 			<version>1.18.1</version>
 		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-			<version>2.20.0</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>2.20.0</version>
-		</dependency>
 	</dependencies>
 	<build>
 		<pluginManagement>
@@ -85,6 +70,22 @@
 					<artifactId>maven-clean-plugin</artifactId>
 					<version>3.5.0</version>
 				</plugin>
+				<plugin>
+					<groupId>org.owasp</groupId>
+					<artifactId>dependency-check-maven</artifactId>
+					<version>12.1.6</version>
+					<configuration>
+						<nvdApiKey>41aa3456-48f3-466a-a8ea-db1e84caba36</nvdApiKey>
+						<failBuildOnCVSS>7</failBuildOnCVSS>
+					</configuration>
+					<executions>
+						<execution>
+							<goals>
+								<goal>check</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
 				<!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
 				<plugin>
 					<artifactId>maven-resources-plugin</artifactId>

src/main/java/io/split/openfeature/SplitProvider.java

@@ -158,6 +158,11 @@ public Map<String, Object> transformContext(EvaluationContext context) {
     return context.asObjectMap();
   }
 
+  @Override
+  public void shutdown() {
+    client.destroy();
+  }
+
   private SplitResult evaluateTreatment(String key, EvaluationContext evaluationContext) {
     String id = evaluationContext.getTargetingKey();
     if (id == null || id.isEmpty()) {

src/main/java/io/split/openfeature/utils/Serialization.java

@@ -1,12 +1,10 @@
 package io.split.openfeature.utils;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Map;
+
 import dev.openfeature.sdk.ErrorCode;
 import dev.openfeature.sdk.exceptions.ParseError;
-
-import java.util.Map;
+import io.split.client.utils.Json;
 
 public class Serialization {
 
@@ -15,10 +13,8 @@ private Serialization() {
 
   public static Map<String, Object> stringToMap(final String obj) {
     try {
-      return new ObjectMapper()
-        .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-        .readValue(obj, Map.class);
-    } catch (JsonProcessingException e) {
+      return Json.fromJson(obj, Map.class);
+    } catch (Exception e) {
       throw new ParseError(ErrorCode.PARSE_ERROR.name());
     }
   }

src/test/java/io/split/openfeature/ClientTest.java

@@ -30,14 +30,15 @@
 public class ClientTest {
   OpenFeatureAPI openFeatureAPI;
   Client client;
+  SplitClient splitClient;
 
   @BeforeEach
   public void init() {
     openFeatureAPI = OpenFeatureAPI.getInstance();
     try {
       SplitClientConfig config = SplitClientConfig.builder().splitFile("src/test/resources/split.yaml").build();
-      SplitClient client = SplitFactoryBuilder.build("localhost", config).client();
-      openFeatureAPI.setProviderAndWait(new SplitProvider(client));
+      splitClient = SplitFactoryBuilder.build("localhost", config).client();
+      openFeatureAPI.setProviderAndWait(new SplitProvider(splitClient));
     } catch (URISyntaxException | IOException e) {
       System.out.println("Unexpected Exception occurred initializing Split Provider.");
     }
@@ -267,6 +268,13 @@ public void getObjectFailTest() {
     assertNull(details.getVariant());
   }
 
+  @Test
+  public void destroySplitClientTest() {
+    assertEquals("32", splitClient.getTreatment("key","int_feature"));
+    openFeatureAPI.shutdown();
+    assertEquals("control", splitClient.getTreatment("key","int_feature"));
+  }
+
   private Value mapToValue(Map<String, Value> map) {
     return new Value(new MutableStructure(map));
   }

src/test/java/io/split/openfeature/SplitProviderTest.java

@@ -420,27 +420,26 @@ public void evalStructureComplexTest() {
     Instant instant = Instant.ofEpochMilli(1665698754828L);
     Value treatment = mapToValue(Map.of(
       "string", new Value("blah"),
-      "int", new Value(10),
+      "int", new Value(10D),
       "double", new Value(100D),
       "bool", new Value(true),
       "struct", mapToValue(Map.of(
           "foo", new Value("bar"),
-          "baz", new Value(10),
+          "baz", new Value(10D),
           "innerMap", mapToValue(Map.of(
               "aa", new Value("bb"))))),
       "list", new Value(
         List.of(
-          new Value(1),
           new Value(true),
           mapToValue(Map.of(
               "cc", new Value("dd")
             )),
           mapToValue(Map.of(
-              "ee", new Value(1)
+              "ee", new Value(1D)
             )))),
       "dateTime", new Value(instant)
     ));
-    String treatmentAsString = "{\"string\":\"blah\",\"int\":10,\"double\":100.0,\"bool\":true, \"struct\":{\"foo\":\"bar\",\"baz\":10,\"innerMap\":{\"aa\":\"bb\"}},\"list\":[1,true,{\"cc\":\"dd\"},{\"ee\":1}],\"dateTime\":\"2022-10-13T22:05:54.828Z\"}";
+    String treatmentAsString = "{\"string\":\"blah\",\"int\":10,\"double\":100.0,\"bool\":true, \"struct\":{\"foo\":\"bar\",\"baz\":10,\"innerMap\":{\"aa\":\"bb\"}},\"list\":[true,{\"cc\":\"dd\"},{\"ee\":1}],\"dateTime\":\"2022-10-13T22:05:54.828Z\"}";
 
     when(mockSplitClient.getTreatmentWithConfig(eq(key), eq(flagName), anyMap())).thenReturn(new SplitResult(treatmentAsString,""));
 
@@ -525,6 +524,13 @@ public void trackTrafficTypeErrorTest() {
     verifyNoInteractions(mockSplitClient);
   }
 
+  @Test
+  public void destroySplitClientTest() {
+    SplitProvider provider = new SplitProvider(mockSplitClient);
+    provider.shutdown();
+    verify(mockSplitClient).destroy();
+  }
+
   private Value mapToValue(Map<String, Value> map) {
     return new Value(new MutableStructure(map));
   }