fix: getEnvironmentFlags includes segments in evaluation context (#193)

Author: khvn26

pom.xml

@@ -162,10 +162,16 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
+      <artifactId>mockito-inline</artifactId>
       <version>3.8.0</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+        <!-- see https://github.com/mockito/mockito/issues/3328#issuecomment-2260087310 -->
+        <groupId>net.bytebuddy</groupId>
+        <artifactId>byte-buddy</artifactId>
+        <version>1.14.17</version>
+    </dependency>
     <dependency>
       <groupId>com.github.gmazzo</groupId>
       <artifactId>okhttp-mock</artifactId>

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

@@ -216,7 +216,10 @@ private Flags getEnvironmentFlagsFromEvaluationContext() throws FlagsmithClientE
       return getDefaultFlags();
     }
 
-    final EvaluationResult result = Engine.getEvaluationResult(evaluationContext);
+    final EvaluationResult result = Engine.getEvaluationResult(
+      new EvaluationContext(evaluationContext)
+        .withSegments(null)
+    );
 
     return Flags.fromEvaluationResult(
         result,

src/test/java/com/flagsmith/FlagsmithClientTest.java

@@ -20,6 +20,7 @@
 import com.flagsmith.exceptions.FlagsmithClientError;
 import com.flagsmith.exceptions.FlagsmithRuntimeError;
 import com.flagsmith.flagengine.EvaluationContext;
+import com.flagsmith.flagengine.EvaluationResult;
 import com.flagsmith.interfaces.FlagsmithCache;
 import com.flagsmith.models.BaseFlag;
 import com.flagsmith.models.DefaultFlag;
@@ -47,11 +48,13 @@
 import okhttp3.ResponseBody;
 import okhttp3.mock.MockInterceptor;
 import okio.Buffer;
+import com.flagsmith.flagengine.Engine;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.ArgumentCaptor;
+import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.mockito.invocation.Invocation;
 import org.slf4j.Logger;
@@ -776,6 +779,49 @@ public void testLocalEvaluation_ReturnsIdentityOverrides() throws FlagsmithClien
         assertEquals(flagsWithOverride.getFeatureValue("some_feature"), "overridden-value");
     }
 
+    @Test
+    public void testLocalEvaluation_getEnvironmentFlags_NoTargeting() throws FlagsmithClientError {
+        // Given
+        EvaluationContext evaluationContext = FlagsmithTestHelper.evaluationContext();
+        EvaluationResult evaluationResult = Engine.getEvaluationResult(
+                new EvaluationContext(evaluationContext)
+                        .withSegments(null)
+        );
+
+        FlagsmithConfig config = FlagsmithConfig.newBuilder().withLocalEvaluation(true).build();
+
+        FlagsmithApiWrapper mockedApiWrapper = mock(FlagsmithApiWrapper.class);
+        when(mockedApiWrapper.getEvaluationContext())
+                .thenReturn(evaluationContext);
+        when(mockedApiWrapper.getConfig()).thenReturn(config);
+
+        FlagsmithClient client = FlagsmithClient.newBuilder()
+                .withFlagsmithApiWrapper(mockedApiWrapper)
+                .withConfiguration(config)
+                .setApiKey("ser.dummy-key")
+                .build();
+
+        // When
+        try (MockedStatic<Engine> mockedEngine = mockStatic(Engine.class)) {
+                mockedEngine.when(
+                        () -> Engine.getEvaluationResult(
+                                new EvaluationContext(evaluationContext)
+                                        .withSegments(null)
+                        )
+                ).thenReturn(evaluationResult);
+
+                client.getEnvironmentFlags();
+
+                // Then
+                mockedEngine.verify(
+                        () -> Engine.getEvaluationResult(
+                                new EvaluationContext(evaluationContext)
+                                        .withSegments(null)
+                        )
+                );
+        }
+    }
+
     @Test
     public void testGetEnvironmentFlags_UsesDefaultFlags_IfLocalEvaluationEnvironmentNull()
             throws FlagsmithClientError {