Fix failures

Author: esrakartalOpt

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

@@ -101,20 +101,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) {
-        this(accountId, projectId, version, revision, groups, experiments, attributes, eventType, audiences, false);
+                                 List<Audience> audiences, Region region) {
+        this(accountId, projectId, version, revision, groups, experiments, attributes, eventType, audiences, false, region);
     }
 
     // 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) {
+                                 List<Audience> audiences, boolean anonymizeIP, Region region) {
         this(
             accountId,
             anonymizeIP,
             false,
             null,
-            Region.US,
+            region,
             projectId,
             revision,
             null,

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

@@ -112,11 +112,18 @@ public ProjectConfig deserialize(JsonElement json, Type typeOfT, JsonDeserializa
                 sendFlagDecisions = jsonObject.get("sendFlagDecisions").getAsBoolean();
         }
 
+        ProjectConfig.Region region = ProjectConfig.Region.US;
+
+        if (jsonObject.has("region")) {
+            region = ProjectConfig.Region.valueOf(jsonObject.get("region").getAsString());
+        }
+
         return new DatafileProjectConfig(
             accountId,
             anonymizeIP,
             sendFlagDecisions,
             botFiltering,
+            region,
             projectId,
             revision,
             sdkKey,

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

@@ -88,11 +88,18 @@ public DatafileProjectConfig deserialize(JsonParser parser, DeserializationConte
             }
         }
 
+        ProjectConfig.Region region = ProjectConfig.Region.US;
+
+        if (node.hasNonNull("region")) {
+            region = ProjectConfig.Region.valueOf(node.get("region").asText());
+        }
+
         return new DatafileProjectConfig(
             accountId,
             anonymizeIP,
             sendFlagDecisions,
             botFiltering,
+            region,
             projectId,
             revision,
             sdkKey,

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

@@ -155,7 +155,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);
+        return new DatafileProjectConfig("789", "1234", "2", "42", groups, experiments, attributes, events, audiences, ProjectConfig.Region.US);
     }
 
     private static final ProjectConfig NO_AUDIENCE_PROJECT_CONFIG_V2 = generateNoAudienceProjectConfigV2();
@@ -208,7 +208,7 @@ private static ProjectConfig generateNoAudienceProjectConfigV2() {
         );
 
         return new DatafileProjectConfig("789", "1234", "2", "42", Collections.<Group>emptyList(), experiments, attributes,
-            events, Collections.<Audience>emptyList());
+            events, Collections.<Audience>emptyList(), ProjectConfig.Region.US);
     }
 
     private static final ProjectConfig VALID_PROJECT_CONFIG_V3 = generateValidProjectConfigV3();
@@ -325,7 +325,7 @@ private static ProjectConfig generateValidProjectConfigV3() {
         List<Group> groups = asList(randomPolicyGroup, overlappingPolicyGroup);
 
         return new DatafileProjectConfig("789", "1234", "3", "42", groups, experiments, attributes, events, audiences,
-            true);
+            true, ProjectConfig.Region.US);
     }
 
     private static final ProjectConfig NO_AUDIENCE_PROJECT_CONFIG_V3 = generateNoAudienceProjectConfigV3();
@@ -378,7 +378,7 @@ private static ProjectConfig generateNoAudienceProjectConfigV3() {
         );
 
         return new DatafileProjectConfig("789", "1234", "3", "42", Collections.<Group>emptyList(), experiments, attributes,
-            events, Collections.<Audience>emptyList(), true);
+            events, Collections.<Audience>emptyList(), true, ProjectConfig.Region.US);
     }
 
     private static final ProjectConfig VALID_PROJECT_CONFIG_V4 = generateValidProjectConfigV4();

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

@@ -40,6 +40,7 @@ public class ValidProjectConfigV4 {
     private static final String ENVIRONMENT_KEY = "production";
     private static final String VERSION = "4";
     private static final Boolean SEND_FLAG_DECISIONS = true;
+    private static final ProjectConfig.Region REGION = ProjectConfig.Region.US;
 
     // attributes
     private static final String ATTRIBUTE_HOUSE_ID = "553339214";
@@ -1451,6 +1452,7 @@ public static ProjectConfig generateValidProjectConfigV4() {
             ANONYMIZE_IP,
             SEND_FLAG_DECISIONS,
             BOT_FILTERING,
+            REGION,
             PROJECT_ID,
             REVISION,
             SDK_KEY,

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(), EventFactory.EVENT_ENDPOINT);
+            assertEquals(logEvent.getEndpointUrl(), EventEndpoints.getDefaultEndpoint());
             atomicBoolean.set(true);
         }, notificationCenter);
     }

core-api/src/test/java/com/optimizely/ab/optimizelyconfig/OptimizelyConfigServiceTest.java

@@ -212,6 +212,7 @@ private ProjectConfig generateOptimizelyConfig() {
             true,
             true,
             true,
+            ProjectConfig.Region.US,
             "3918735994",
             "1480511547",
             "ValidProjectConfigV4",