restore IOfflineHandler

Author: khvn26

src/main/java/com/flagsmith/FlagsmithClient.java

@@ -549,7 +549,8 @@ public FlagsmithClient build() {
           throw new FlagsmithRuntimeError(
               "Cannot use both default flag handler and offline handler.");
         }
-        client.evaluationContext = configuration.getOfflineHandler().getEvaluationContext();
+        client.evaluationContext = EngineMappers.mapEnvironmentToContext(
+          configuration.getOfflineHandler().getEnvironment());
       }
 
       return this.client;

src/main/java/com/flagsmith/interfaces/IOfflineHandler.java

@@ -1,7 +1,7 @@
 package com.flagsmith.interfaces;
 
-import com.flagsmith.flagengine.EvaluationContext;
+import com.flagsmith.models.environments.EnvironmentModel;
 
 public interface IOfflineHandler {
-  EvaluationContext getEvaluationContext();
+  EnvironmentModel getEnvironment();
 }

src/main/java/com/flagsmith/offline/LocalFileHandler.java

@@ -1,17 +1,15 @@
 package com.flagsmith.offline;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.flagsmith.MapperFactory;
 import com.flagsmith.exceptions.FlagsmithClientError;
-import com.flagsmith.flagengine.EvaluationContext;
 import com.flagsmith.interfaces.IOfflineHandler;
-import com.flagsmith.mappers.EngineMappers;
+import com.flagsmith.models.environments.EnvironmentModel;
 import java.io.File;
 import java.io.IOException;
 
 public class LocalFileHandler implements IOfflineHandler {
-  private EvaluationContext evaluationContext;
+  private EnvironmentModel environmentModel;
   private ObjectMapper objectMapper = MapperFactory.getMapper();
 
   /**
@@ -22,14 +20,13 @@ public class LocalFileHandler implements IOfflineHandler {
   public LocalFileHandler(String filePath) throws FlagsmithClientError {
     File file = new File(filePath);
     try {
-      JsonNode environmentDocument = objectMapper.readValue(file, JsonNode.class);
-      this.evaluationContext = EngineMappers.mapEnvironmentDocumentToContext(environmentDocument);
+      this.environmentModel = objectMapper.readValue(file, EnvironmentModel.class);
     } catch (IOException e) {
       throw new FlagsmithClientError("Unable to read environment from file " + filePath);
     }
   }
 
-  public EvaluationContext getEvaluationContext() {
-    return evaluationContext;
+  public EnvironmentModel getEnvironment() {
+    return environmentModel;
   }
 }

src/test/java/com/flagsmith/DummyOfflineHandler.java

@@ -1,10 +1,10 @@
 package com.flagsmith;
 
-import com.flagsmith.flagengine.EvaluationContext;
 import com.flagsmith.interfaces.IOfflineHandler;
+import com.flagsmith.models.environments.EnvironmentModel;
 
 public class DummyOfflineHandler implements IOfflineHandler {
-  public EvaluationContext getEvaluationContext() {
-    return FlagsmithTestHelper.evaluationContext();
+  public EnvironmentModel getEnvironment() {
+    return FlagsmithTestHelper.environmentModel();
   }
 }

src/test/java/com/flagsmith/FlagsmithTestHelper.java

@@ -13,6 +13,7 @@
 import com.flagsmith.models.FeatureStateModel;
 import com.flagsmith.models.Flag;
 import com.flagsmith.models.TraitModel;
+import com.flagsmith.models.environments.EnvironmentModel;
 import com.google.common.collect.ImmutableMap;
 import io.restassured.RestAssured;
 import io.restassured.http.Header;
@@ -348,6 +349,14 @@ public static String environmentString() {
             "}";
   }
 
+  public static EnvironmentModel environmentModel() {
+    try {
+      return MapperFactory.getMapper().readValue(environmentString(), EnvironmentModel.class);
+    } catch (JsonProcessingException e) {
+      throw new RuntimeException("Failed to parse environment JSON", e);
+    }
+  }
+
   public static EvaluationContext evaluationContext() {
     try {
       return EngineMappers.mapEnvironmentDocumentToContext(MapperFactory.getMapper().readTree(environmentString()));

src/test/java/com/flagsmith/offline/LocalFileHandlerTest.java

@@ -24,7 +24,7 @@ public void testLocalFileHandler() throws FlagsmithClientError, IOException {
         LocalFileHandler handler = new LocalFileHandler(file.getAbsolutePath());
 
         // Then
-        assertEquals(FlagsmithTestHelper.evaluationContext(), handler.getEvaluationContext());
+        assertEquals(FlagsmithTestHelper.environmentModel(), handler.getEnvironment());
 
         file.delete();
     }