Implement comments

Author: esrakartalOpt

core-api/src/main/java/com/optimizely/ab/config/DatafileProjectConfig.java

@@ -103,20 +103,20 @@ public class DatafileProjectConfig implements ProjectConfig {
     // v2 constructor
     public DatafileProjectConfig(String accountId, String projectId, String version, String revision, List<Group> groups,
                                  List<Experiment> experiments, List<Attribute> attributes, List<EventType> eventType,
-                                 List<Audience> audiences, String region) {
-        this(accountId, projectId, version, revision, groups, experiments, attributes, eventType, audiences, false, region);
+                                 List<Audience> audiences) {
+        this(accountId, projectId, version, revision, groups, experiments, attributes, eventType, audiences, false);
     }
 
     // v3 constructor
     public DatafileProjectConfig(String accountId, String projectId, String version, String revision, List<Group> groups,
                                  List<Experiment> experiments, List<Attribute> attributes, List<EventType> eventType,
-                                 List<Audience> audiences, boolean anonymizeIP, String region) {
+                                 List<Audience> audiences, boolean anonymizeIP) {
         this(
             accountId,
             anonymizeIP,
             false,
             null,
-            region,
+            null,
             projectId,
             revision,
             null,

core-api/src/main/java/com/optimizely/ab/config/ProjectConfig.java

@@ -143,6 +143,5 @@ public String toString() {
         }
     }
 
-
     String getRegion();
 }

core-api/src/main/java/com/optimizely/ab/config/parser/JsonConfigParser.java

@@ -103,9 +103,6 @@ public ProjectConfig parseProjectConfig(@Nonnull String json) throws ConfigParse
             String region = "US"; // Default to US
             if (rootObject.has("region")) {
                 String regionString = rootObject.getString("region");
-                if ("EU".equalsIgnoreCase(regionString)) {
-                    region = "EU";
-                }
             }
 
             return new DatafileProjectConfig(

core-api/src/main/java/com/optimizely/ab/config/parser/JsonSimpleConfigParser.java

@@ -106,9 +106,6 @@ public ProjectConfig parseProjectConfig(@Nonnull String json) throws ConfigParse
             String region = "US"; // Default to US
             if (rootObject.containsKey("region")) {
                 String regionString = (String) rootObject.get("region");
-                if ("EU".equalsIgnoreCase(regionString)) {
-                    region = "EU";
-                }
             }
 
             return new DatafileProjectConfig(

core-api/src/main/java/com/optimizely/ab/event/internal/EventEndpoints.java

@@ -15,7 +15,6 @@
  *    limitations under the License.
  */
 package com.optimizely.ab.event.internal;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -40,18 +39,9 @@ public class EventEndpoints {
      * @return the endpoint URL for the specified region, or US endpoint if region is null
      */
     public static String getEndpointForRegion(String region) {
-        if (region == null) {
-            return LOGX_ENDPOINTS.get("US");
+        if (region != null && region.equals("EU")) {
+            return LOGX_ENDPOINTS.get("EU");
         }
-        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("US");
     }
 }

core-api/src/test/java/com/optimizely/ab/config/DatafileProjectConfigTestUtils.java

@@ -156,7 +156,7 @@ private static ProjectConfig generateValidProjectConfigV2() {
             Collections.<TrafficAllocation>emptyList());
         List<Group> groups = asList(randomPolicyGroup, overlappingPolicyGroup);
 
-        return new DatafileProjectConfig("789", "1234", "2", "42", groups, experiments, attributes, events, audiences, "US");
+        return new DatafileProjectConfig("789", "1234", "2", "42", groups, experiments, attributes, events, audiences);
     }
 
     private static final ProjectConfig NO_AUDIENCE_PROJECT_CONFIG_V2 = generateNoAudienceProjectConfigV2();
@@ -209,7 +209,7 @@ private static ProjectConfig generateNoAudienceProjectConfigV2() {
         );
 
         return new DatafileProjectConfig("789", "1234", "2", "42", Collections.<Group>emptyList(), experiments, attributes,
-            events, Collections.<Audience>emptyList(), "US");
+            events, Collections.<Audience>emptyList());
     }
 
     private static final ProjectConfig VALID_PROJECT_CONFIG_V3 = generateValidProjectConfigV3();
@@ -326,7 +326,7 @@ private static ProjectConfig generateValidProjectConfigV3() {
         List<Group> groups = asList(randomPolicyGroup, overlappingPolicyGroup);
 
         return new DatafileProjectConfig("789", "1234", "3", "42", groups, experiments, attributes, events, audiences,
-            true, "US");
+            true);
     }
 
     private static final ProjectConfig NO_AUDIENCE_PROJECT_CONFIG_V3 = generateNoAudienceProjectConfigV3();
@@ -379,7 +379,7 @@ private static ProjectConfig generateNoAudienceProjectConfigV3() {
         );
 
         return new DatafileProjectConfig("789", "1234", "3", "42", Collections.<Group>emptyList(), experiments, attributes,
-            events, Collections.<Audience>emptyList(), true, "US");
+            events, Collections.<Audience>emptyList(), true);
     }
 
     private static final ProjectConfig VALID_PROJECT_CONFIG_V4 = generateValidProjectConfigV4();

core-api/src/test/java/com/optimizely/ab/event/ForwardingEventProcessorTest.java

@@ -50,7 +50,7 @@ public void setUp() throws Exception {
         eventProcessor = new ForwardingEventProcessor(logEvent -> {
             assertNotNull(logEvent.getEventBatch());
             assertEquals(logEvent.getRequestMethod(), LogEvent.RequestMethod.POST);
-            assertEquals(logEvent.getEndpointUrl(), EventEndpoints.getDefaultEndpoint());
+            assertEquals(logEvent.getEndpointUrl(), EventEndpoints.getEndpointForRegion("US"));
             atomicBoolean.set(true);
         }, notificationCenter);
     }

core-api/src/test/java/com/optimizely/ab/event/internal/EventEndpointsTest.java

@@ -38,7 +38,7 @@ public void testGetEndpointForEURegion() {
 
     @Test
     public void testGetDefaultEndpoint() {
-        String defaultEndpoint = EventEndpoints.getDefaultEndpoint();
+        String defaultEndpoint = EventEndpoints.getEndpointForRegion("US");
         assertEquals("https://logx.optimizely.com/v1/events", defaultEndpoint);
     }
 
@@ -48,11 +48,17 @@ public void testGetEndpointForNullRegion() {
         assertEquals("https://logx.optimizely.com/v1/events", endpoint);
     }
 
+    @Test
+    public void testGetEndpointForInvalidRegion() {
+        String endpoint = EventEndpoints.getEndpointForRegion("ZZ");
+        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 defaultEndpoint = EventEndpoints.getEndpointForRegion("US");
         String usEndpoint = EventEndpoints.getEndpointForRegion("US");
 
         assertEquals("All should return US endpoint", usEndpoint, nullRegionEndpoint);