Merge branch 'main' into zero-copy-contexts

Author: tanderson-ld

.release-please-manifest.json

@@ -3,5 +3,5 @@
   "lib/java-server-sdk-redis-store": "3.0.1",
   "lib/shared/common": "2.1.1",
   "lib/shared/internal": "1.5.0",
-  "lib/sdk/server": "7.9.0"
+  "lib/sdk/server": "7.9.1"
 }

lib/sdk/server/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to the LaunchDarkly Java SDK will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
 
+## [7.9.1](https://github.com/launchdarkly/java-core/compare/launchdarkly-java-server-sdk-7.9.0...launchdarkly-java-server-sdk-7.9.1) (2025-06-20)
+
+
+### Performance Improvements
+
+* optimize EvaluatorWithHooks ([#73](https://github.com/launchdarkly/java-core/issues/73)) ([6b42592](https://github.com/launchdarkly/java-core/commit/6b42592c7efd84eae7bb13977a5a3f3fb2237c9c))
+
 ## [7.9.0](https://github.com/launchdarkly/java-core/compare/launchdarkly-java-server-sdk-7.8.0...launchdarkly-java-server-sdk-7.9.0) (2025-05-23)
 
 

lib/sdk/server/gradle.properties

@@ -1,5 +1,5 @@
 #x-release-please-start-version
-version=7.9.0
+version=7.9.1
 #x-release-please-end
 
 # See https://github.com/gradle/gradle/issues/11308 regarding the following property

lib/sdk/server/src/main/java/com/launchdarkly/sdk/server/EvaluatorWithHooks.java

@@ -37,24 +37,26 @@ class EvaluatorWithHooks implements EvaluatorInterface {
   public EvalResultAndFlag evalAndFlag(String method, String featureKey, LDContext context, LDValue defaultValue, LDValueType requireType, EvaluationOptions options) {
     // Each hook will have an opportunity to provide series data to carry along to later stages.  This list
     // is to track that data.
-    List<Map> seriesDataList = new ArrayList<>(hooks.size());
+    int size = hooks.size();
+    List<Map> seriesDataList = new ArrayList<>(size);
 
     EvaluationSeriesContext seriesContext = new EvaluationSeriesContext(method, featureKey, context, defaultValue);
-    for (int i = 0; i < hooks.size(); i++) {
+    Map<String, Object> emptyMap = Collections.emptyMap();
+    for (int i = 0; i < size; i++) {
       Hook currentHook = hooks.get(i);
       try {
-        Map<String, Object> seriesData = currentHook.beforeEvaluation(seriesContext, Collections.emptyMap());
-        seriesDataList.add(Collections.unmodifiableMap(seriesData)); // make data immutable
+        Map<String, Object> seriesData = currentHook.beforeEvaluation(seriesContext, emptyMap);
+        seriesDataList.add(seriesData.isEmpty() ? emptyMap : Collections.unmodifiableMap(seriesData)); // make data immutable
       } catch (Exception e) {
-        seriesDataList.add(Collections.emptyMap()); // since the provided hook failed to execute, we default the series data to an empty map in this case
+        seriesDataList.add(emptyMap); // since the provided hook failed to execute, we default the series data to an empty map in this case
         logger.error("During evaluation of flag \"{}\". Stage \"BeforeEvaluation\" of hook \"{}\" reported error: {}", featureKey, currentHook.getMetadata().getName(), e.toString());
       }
     }
 
     EvalResultAndFlag result = underlyingEvaluator.evalAndFlag(method, featureKey, context, defaultValue, requireType, options);
 
     // Invoke hooks in reverse order and give them back the series data they gave us.
-    for (int i = hooks.size() - 1; i >= 0; i--) {
+    for (int i = size - 1; i >= 0; i--) {
       Hook currentHook = hooks.get(i);
       try {
         currentHook.afterEvaluation(seriesContext, seriesDataList.get(i), result.getResult().getAnyType());

lib/sdk/server/src/main/java/com/launchdarkly/sdk/server/Version.java

@@ -5,6 +5,6 @@ private Version() {}
 
   // This constant is updated automatically by our Gradle script during a release, if the project version has changed
   // x-release-please-start-version
-  static final String SDK_VERSION = "7.9.0";
+  static final String SDK_VERSION = "7.9.1";
   // x-release-please-end
 }