[FSSDK-11455] Java - Add SDK Multi-Region Support for Data Hosting

esrakartalOpt · esrakartalOpt · commit d42622e4a91b · 2025-07-24T15:23:01.000-05:00
diff --git a/core-api/src/main/java/com/optimizely/ab/config/DatafileProjectConfig.java b/core-api/src/main/java/com/optimizely/ab/config/DatafileProjectConfig.java
@@ -63,6 +63,7 @@ public class DatafileProjectConfig implements ProjectConfig {
     private final boolean anonymizeIP;
     private final boolean sendFlagDecisions;
     private final Boolean botFiltering;
+    private final Region region;
     private final String hostForODP;
     private final String publicKeyForODP;
     private final List<Attribute> attributes;
@@ -113,6 +114,7 @@ public DatafileProjectConfig(String accountId, String projectId, String version,
             anonymizeIP,
             false,
             null,
+            Region.US,
             projectId,
             revision,
             null,
@@ -135,6 +137,7 @@ public DatafileProjectConfig(String accountId,
                                  boolean anonymizeIP,
                                  boolean sendFlagDecisions,
                                  Boolean botFiltering,
+                                 Region region,
                                  String projectId,
                                  String revision,
                                  String sdkKey,
@@ -158,6 +161,7 @@ public DatafileProjectConfig(String accountId,
         this.anonymizeIP = anonymizeIP;
         this.sendFlagDecisions = sendFlagDecisions;
         this.botFiltering = botFiltering;
+        this.region = region != null ? region : Region.US;
 
         this.attributes = Collections.unmodifiableList(attributes);
         this.audiences = Collections.unmodifiableList(audiences);
@@ -424,6 +428,11 @@ public Boolean getBotFiltering() {
         return botFiltering;
     }
 
+    @Override
+    public Region getRegion() {
+        return region;
+    }
+
     @Override
     public List<Group> getGroups() {
         return groups;
@@ -587,6 +596,7 @@ public String toString() {
             ", version='" + version + '\'' +
             ", anonymizeIP=" + anonymizeIP +
             ", botFiltering=" + botFiltering +
+            ", region=" + region +
             ", attributes=" + attributes +
             ", audiences=" + audiences +
             ", typedAudiences=" + typedAudiences +
diff --git a/core-api/src/main/java/com/optimizely/ab/config/ProjectConfig.java b/core-api/src/main/java/com/optimizely/ab/config/ProjectConfig.java
@@ -135,4 +135,21 @@ public String toString() {
             return version;
         }
     }
+
+    public enum Region {
+        US("US"), EU("EU");
+
+        private final String region;
+
+        Region(String region) {
+            this.region = region;
+        }
+
+        @Override
+        public String toString() {
+            return region;
+        }
+    }
+
+    Region getRegion();
 }
diff --git a/core-api/src/main/java/com/optimizely/ab/config/parser/JsonConfigParser.java b/core-api/src/main/java/com/optimizely/ab/config/parser/JsonConfigParser.java
@@ -93,11 +93,20 @@ public ProjectConfig parseProjectConfig(@Nonnull String json) throws ConfigParse
                     sendFlagDecisions = rootObject.getBoolean("sendFlagDecisions");
             }
 
+            ProjectConfig.Region region = ProjectConfig.Region.US; // Default to US
+            if (rootObject.has("region")) {
+                String regionString = rootObject.getString("region");
+                if ("EU".equalsIgnoreCase(regionString)) {
+                    region = ProjectConfig.Region.EU;
+                }
+            }
+
             return new DatafileProjectConfig(
                 accountId,
                 anonymizeIP,
                 sendFlagDecisions,
                 botFiltering,
+                region,
                 projectId,
                 revision,
                 sdkKey,
diff --git a/core-api/src/main/java/com/optimizely/ab/config/parser/JsonSimpleConfigParser.java b/core-api/src/main/java/com/optimizely/ab/config/parser/JsonSimpleConfigParser.java
@@ -96,11 +96,20 @@ public ProjectConfig parseProjectConfig(@Nonnull String json) throws ConfigParse
                     sendFlagDecisions = (Boolean) rootObject.get("sendFlagDecisions");
             }
 
+            ProjectConfig.Region region = ProjectConfig.Region.US; // Default to US
+            if (rootObject.containsKey("region")) {
+                String regionString = (String) rootObject.get("region");
+                if ("EU".equalsIgnoreCase(regionString)) {
+                    region = ProjectConfig.Region.EU;
+                }
+            }
+
             return new DatafileProjectConfig(
                 accountId,
                 anonymizeIP,
                 sendFlagDecisions,
                 botFiltering,
+                region,
                 projectId,
                 revision,
                 sdkKey,
diff --git a/core-api/src/main/java/com/optimizely/ab/event/internal/EventEndpoints.java b/core-api/src/main/java/com/optimizely/ab/event/internal/EventEndpoints.java
@@ -0,0 +1,58 @@
+/**
+ *
+ *    Copyright 2016-2020, 2022, Optimizely and contributors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package com.optimizely.ab.event.internal;
+
+import com.optimizely.ab.config.ProjectConfig.Region;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * EventEndpoints provides region-specific endpoint URLs for Optimizely events.
+ * Similar to the TypeScript logxEndpoint configuration.
+ */
+public class EventEndpoints {
+    
+    private static final Map<Region, String> LOGX_ENDPOINTS = new HashMap<>();
+    
+    static {
+        LOGX_ENDPOINTS.put(Region.US, "https://logx.optimizely.com/v1/events");
+        LOGX_ENDPOINTS.put(Region.EU, "https://eu.logx.optimizely.com/v1/events");
+    }
+    
+    /**
+     * Get the event endpoint URL for the specified region.
+     * Defaults to US region endpoint if region is null.
+     *
+     * @param region the region for which to get the endpoint
+     * @return the endpoint URL for the specified region, or US endpoint if region is null
+     */
+    public static String getEndpointForRegion(Region region) {
+        if (region == null) {
+            return LOGX_ENDPOINTS.get(Region.US);
+        }
+        return LOGX_ENDPOINTS.get(region);
+    }
+    
+    /**
+     * Get the default event endpoint URL (US region).
+     *
+     * @return the default endpoint URL
+     */
+    public static String getDefaultEndpoint() {
+        return LOGX_ENDPOINTS.get(Region.US);
+    }
+}
diff --git a/core-api/src/main/java/com/optimizely/ab/event/internal/EventFactory.java b/core-api/src/main/java/com/optimizely/ab/event/internal/EventFactory.java
@@ -42,7 +42,6 @@
  */
 public class EventFactory {
     private static final Logger logger = LoggerFactory.getLogger(EventFactory.class);
-    public static final String EVENT_ENDPOINT = "https://logx.optimizely.com/v1/events";  // Should be part of the datafile
     private static final String ACTIVATE_EVENT_KEY = "campaign_activated";
 
     public static LogEvent createLogEvent(UserEvent userEvent) {
@@ -52,6 +51,7 @@ public static LogEvent createLogEvent(UserEvent userEvent) {
     public static LogEvent createLogEvent(List<UserEvent> userEvents) {
         EventBatch.Builder builder = new EventBatch.Builder();
         List<Visitor> visitors = new ArrayList<>(userEvents.size());
+        String eventEndpoint = "https://logx.optimizely.com/v1/events";
 
         for (UserEvent userEvent: userEvents) {
 
@@ -71,6 +71,8 @@ public static LogEvent createLogEvent(List<UserEvent> userEvents) {
             UserContext userContext = userEvent.getUserContext();
             ProjectConfig projectConfig = userContext.getProjectConfig();
 
+            eventEndpoint = EventEndpoints.getEndpointForRegion(projectConfig.getRegion());
+
             builder
                 .setClientName(ClientEngineInfo.getClientEngineName())
                 .setClientVersion(BuildVersionInfo.getClientVersion())
@@ -85,7 +87,7 @@ public static LogEvent createLogEvent(List<UserEvent> userEvents) {
         }
 
         builder.setVisitors(visitors);
-        return new LogEvent(LogEvent.RequestMethod.POST, EVENT_ENDPOINT, Collections.emptyMap(), builder.build());
+        return new LogEvent(LogEvent.RequestMethod.POST, eventEndpoint, Collections.emptyMap(), builder.build());
     }
 
     private static Visitor createVisitor(ImpressionEvent impressionEvent) {
diff --git a/core-api/src/test/java/com/optimizely/ab/event/internal/EventEndpointsTest.java b/core-api/src/test/java/com/optimizely/ab/event/internal/EventEndpointsTest.java
@@ -0,0 +1,63 @@
+/**
+ *
+ *    Copyright 2025, Optimizely and contributors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package com.optimizely.ab.event.internal;
+
+import com.optimizely.ab.config.ProjectConfig.Region;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ * Tests for EventEndpoints class
+ */
+public class EventEndpointsTest {
+
+    @Test
+    public void testGetEndpointForUSRegion() {
+        String endpoint = EventEndpoints.getEndpointForRegion(Region.US);
+        assertEquals("https://logx.optimizely.com/v1/events", endpoint);
+    }
+
+    @Test
+    public void testGetEndpointForEURegion() {
+        String endpoint = EventEndpoints.getEndpointForRegion(Region.EU);
+        assertEquals("https://eu.logx.optimizely.com/v1/events", endpoint);
+    }
+
+    @Test
+    public void testGetDefaultEndpoint() {
+        String defaultEndpoint = EventEndpoints.getDefaultEndpoint();
+        assertEquals("https://logx.optimizely.com/v1/events", defaultEndpoint);
+    }
+
+    @Test
+    public void testGetEndpointForNullRegion() {
+        String endpoint = EventEndpoints.getEndpointForRegion(null);
+        assertEquals("https://logx.optimizely.com/v1/events", endpoint);
+    }
+
+    @Test
+    public void testDefaultBehaviorAlwaysReturnsUS() {
+        // Test that both null region and default endpoint return the same US endpoint
+        String nullRegionEndpoint = EventEndpoints.getEndpointForRegion(null);
+        String defaultEndpoint = EventEndpoints.getDefaultEndpoint();
+        String usEndpoint = EventEndpoints.getEndpointForRegion(Region.US);
+        
+        assertEquals("All should return US endpoint", usEndpoint, nullRegionEndpoint);
+        assertEquals("All should return US endpoint", usEndpoint, defaultEndpoint);
+        assertEquals("Should be US endpoint", "https://logx.optimizely.com/v1/events", nullRegionEndpoint);
+    }
+}
diff --git a/core-api/src/test/java/com/optimizely/ab/event/internal/EventFactoryTest.java b/core-api/src/test/java/com/optimizely/ab/event/internal/EventFactoryTest.java
@@ -140,7 +140,7 @@ public void createImpressionEventPassingUserAgentAttribute() throws Exception {
             userId, attributeMap);
 
         // verify that request endpoint is correct
-        assertThat(impressionEvent.getEndpointUrl(), is(EventFactory.EVENT_ENDPOINT));
+        assertThat(impressionEvent.getEndpointUrl(), is(EventEndpoints.getEndpointForRegion(validProjectConfig.getRegion())));
 
         EventBatch eventBatch = gson.fromJson(impressionEvent.getBody(), EventBatch.class);
 
@@ -207,7 +207,7 @@ public void createImpressionEvent() throws Exception {
             userId, attributeMap);
 
         // verify that request endpoint is correct
-        assertThat(impressionEvent.getEndpointUrl(), is(EventFactory.EVENT_ENDPOINT));
+        assertThat(impressionEvent.getEndpointUrl(), is(EventEndpoints.getEndpointForRegion(validProjectConfig.getRegion())));
 
         EventBatch eventBatch = gson.fromJson(impressionEvent.getBody(), EventBatch.class);
 
@@ -616,7 +616,7 @@ public void createConversionEvent() throws Exception {
                 eventTagMap);
 
         // verify that the request endpoint is correct
-        assertThat(conversionEvent.getEndpointUrl(), is(EventFactory.EVENT_ENDPOINT));
+        assertThat(conversionEvent.getEndpointUrl(), is(EventEndpoints.getEndpointForRegion(validProjectConfig.getRegion())));
 
         EventBatch conversion = gson.fromJson(conversionEvent.getBody(), EventBatch.class);
 
@@ -678,7 +678,7 @@ public void createConversionEventPassingUserAgentAttribute() throws Exception {
                 eventTagMap);
 
         // verify that the request endpoint is correct
-        assertThat(conversionEvent.getEndpointUrl(), is(EventFactory.EVENT_ENDPOINT));
+        assertThat(conversionEvent.getEndpointUrl(), is(EventEndpoints.getEndpointForRegion(validProjectConfig.getRegion())));
 
         EventBatch conversion = gson.fromJson(conversionEvent.getBody(), EventBatch.class);
 
@@ -944,7 +944,7 @@ public void createImpressionEventWithBucketingId() throws Exception {
             userId, attributeMap);
 
         // verify that request endpoint is correct
-        assertThat(impressionEvent.getEndpointUrl(), is(EventFactory.EVENT_ENDPOINT));
+        assertThat(impressionEvent.getEndpointUrl(), is(EventEndpoints.getEndpointForRegion(validProjectConfig.getRegion())));
 
         EventBatch impression = gson.fromJson(impressionEvent.getBody(), EventBatch.class);
 
@@ -993,7 +993,7 @@ public void createConversionEventWithBucketingId() throws Exception {
                 eventTagMap);
 
         // verify that the request endpoint is correct
-        assertThat(conversionEvent.getEndpointUrl(), is(EventFactory.EVENT_ENDPOINT));
+        assertThat(conversionEvent.getEndpointUrl(), is(EventEndpoints.getEndpointForRegion(validProjectConfig.getRegion())));
 
         EventBatch conversion = gson.fromJson(conversionEvent.getBody(), EventBatch.class);
 
