Skip to content

Commit b383fb8

Browse files
esrakartalOptesrakartalOpt
committed
Implement changes
1 parent 635b174 commit b383fb8

File tree

11 files changed

+30
-46
lines changed

11 files changed

+30
-46
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public class DatafileProjectConfig implements ProjectConfig {
6363
private final boolean anonymizeIP;
6464
private final boolean sendFlagDecisions;
6565
private final Boolean botFiltering;
66-
private final Region region;
66+
private final String region;
6767
private final String hostForODP;
6868
private final String publicKeyForODP;
6969
private final List<Attribute> attributes;
@@ -103,14 +103,14 @@ public class DatafileProjectConfig implements ProjectConfig {
103103
// v2 constructor
104104
public DatafileProjectConfig(String accountId, String projectId, String version, String revision, List<Group> groups,
105105
List<Experiment> experiments, List<Attribute> attributes, List<EventType> eventType,
106-
List<Audience> audiences, Region region) {
106+
List<Audience> audiences, String region) {
107107
this(accountId, projectId, version, revision, groups, experiments, attributes, eventType, audiences, false, region);
108108
}
109109

110110
// v3 constructor
111111
public DatafileProjectConfig(String accountId, String projectId, String version, String revision, List<Group> groups,
112112
List<Experiment> experiments, List<Attribute> attributes, List<EventType> eventType,
113-
List<Audience> audiences, boolean anonymizeIP, Region region) {
113+
List<Audience> audiences, boolean anonymizeIP, String region) {
114114
this(
115115
accountId,
116116
anonymizeIP,
@@ -140,7 +140,7 @@ public DatafileProjectConfig(String accountId,
140140
boolean anonymizeIP,
141141
boolean sendFlagDecisions,
142142
Boolean botFiltering,
143-
Region region,
143+
String region,
144144
String projectId,
145145
String revision,
146146
String sdkKey,
@@ -165,7 +165,7 @@ public DatafileProjectConfig(String accountId,
165165
this.anonymizeIP = anonymizeIP;
166166
this.sendFlagDecisions = sendFlagDecisions;
167167
this.botFiltering = botFiltering;
168-
this.region = region != null ? region : Region.US;
168+
this.region = region != null ? region : "US";
169169

170170
this.attributes = Collections.unmodifiableList(attributes);
171171
this.audiences = Collections.unmodifiableList(audiences);
@@ -439,7 +439,7 @@ public Boolean getBotFiltering() {
439439
}
440440

441441
@Override
442-
public Region getRegion() {
442+
public String getRegion() {
443443
return region;
444444
}
445445

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

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -143,20 +143,6 @@ public String toString() {
143143
}
144144
}
145145

146-
public enum Region {
147-
US("US"), EU("EU");
148146

149-
private final String region;
150-
151-
Region(String region) {
152-
this.region = region;
153-
}
154-
155-
@Override
156-
public String toString() {
157-
return region;
158-
}
159-
}
160-
161-
Region getRegion();
147+
String getRegion();
162148
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@ public ProjectConfig deserialize(JsonElement json, Type typeOfT, JsonDeserializa
121121
sendFlagDecisions = jsonObject.get("sendFlagDecisions").getAsBoolean();
122122
}
123123

124-
ProjectConfig.Region region = ProjectConfig.Region.US;
124+
String region = "US";
125125

126126
if (jsonObject.has("region")) {
127-
region = ProjectConfig.Region.valueOf(jsonObject.get("region").getAsString());
127+
region = jsonObject.get("region").getAsString();
128128
}
129129

130130
return new DatafileProjectConfig(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ public DatafileProjectConfig deserialize(JsonParser parser, DeserializationConte
9595
}
9696
}
9797

98-
ProjectConfig.Region region = ProjectConfig.Region.US;
98+
String region = "US";
9999

100100
if (node.hasNonNull("region")) {
101-
region = ProjectConfig.Region.valueOf(node.get("region").asText());
101+
region = node.get("region").textValue();
102102
}
103103

104104
return new DatafileProjectConfig(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ public ProjectConfig parseProjectConfig(@Nonnull String json) throws ConfigParse
100100
sendFlagDecisions = rootObject.getBoolean("sendFlagDecisions");
101101
}
102102

103-
ProjectConfig.Region region = ProjectConfig.Region.US; // Default to US
103+
String region = "US"; // Default to US
104104
if (rootObject.has("region")) {
105105
String regionString = rootObject.getString("region");
106106
if ("EU".equalsIgnoreCase(regionString)) {
107-
region = ProjectConfig.Region.EU;
107+
region = "EU";
108108
}
109109
}
110110

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,11 @@ public ProjectConfig parseProjectConfig(@Nonnull String json) throws ConfigParse
103103
sendFlagDecisions = (Boolean) rootObject.get("sendFlagDecisions");
104104
}
105105

106-
ProjectConfig.Region region = ProjectConfig.Region.US; // Default to US
106+
String region = "US"; // Default to US
107107
if (rootObject.containsKey("region")) {
108108
String regionString = (String) rootObject.get("region");
109109
if ("EU".equalsIgnoreCase(regionString)) {
110-
region = ProjectConfig.Region.EU;
110+
region = "EU";
111111
}
112112
}
113113

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
package com.optimizely.ab.event.internal;
1818

19-
import com.optimizely.ab.config.ProjectConfig.Region;
2019
import java.util.HashMap;
2120
import java.util.Map;
2221

@@ -26,11 +25,11 @@
2625
*/
2726
public class EventEndpoints {
2827

29-
private static final Map<Region, String> LOGX_ENDPOINTS = new HashMap<>();
28+
private static final Map<String, String> LOGX_ENDPOINTS = new HashMap<>();
3029

3130
static {
32-
LOGX_ENDPOINTS.put(Region.US, "https://logx.optimizely.com/v1/events");
33-
LOGX_ENDPOINTS.put(Region.EU, "https://eu.logx.optimizely.com/v1/events");
31+
LOGX_ENDPOINTS.put("US", "https://logx.optimizely.com/v1/events");
32+
LOGX_ENDPOINTS.put("EU", "https://eu.logx.optimizely.com/v1/events");
3433
}
3534

3635
/**
@@ -40,9 +39,9 @@ public class EventEndpoints {
4039
* @param region the region for which to get the endpoint
4140
* @return the endpoint URL for the specified region, or US endpoint if region is null
4241
*/
43-
public static String getEndpointForRegion(Region region) {
42+
public static String getEndpointForRegion(String region) {
4443
if (region == null) {
45-
return LOGX_ENDPOINTS.get(Region.US);
44+
return LOGX_ENDPOINTS.get("US");
4645
}
4746
return LOGX_ENDPOINTS.get(region);
4847
}
@@ -53,6 +52,6 @@ public static String getEndpointForRegion(Region region) {
5352
* @return the default endpoint URL
5453
*/
5554
public static String getDefaultEndpoint() {
56-
return LOGX_ENDPOINTS.get(Region.US);
55+
return LOGX_ENDPOINTS.get("US");
5756
}
5857
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ private static ProjectConfig generateValidProjectConfigV2() {
156156
Collections.<TrafficAllocation>emptyList());
157157
List<Group> groups = asList(randomPolicyGroup, overlappingPolicyGroup);
158158

159-
return new DatafileProjectConfig("789", "1234", "2", "42", groups, experiments, attributes, events, audiences, ProjectConfig.Region.US);
159+
return new DatafileProjectConfig("789", "1234", "2", "42", groups, experiments, attributes, events, audiences, "US");
160160
}
161161

162162
private static final ProjectConfig NO_AUDIENCE_PROJECT_CONFIG_V2 = generateNoAudienceProjectConfigV2();
@@ -209,7 +209,7 @@ private static ProjectConfig generateNoAudienceProjectConfigV2() {
209209
);
210210

211211
return new DatafileProjectConfig("789", "1234", "2", "42", Collections.<Group>emptyList(), experiments, attributes,
212-
events, Collections.<Audience>emptyList(), ProjectConfig.Region.US);
212+
events, Collections.<Audience>emptyList(), "US");
213213
}
214214

215215
private static final ProjectConfig VALID_PROJECT_CONFIG_V3 = generateValidProjectConfigV3();
@@ -326,7 +326,7 @@ private static ProjectConfig generateValidProjectConfigV3() {
326326
List<Group> groups = asList(randomPolicyGroup, overlappingPolicyGroup);
327327

328328
return new DatafileProjectConfig("789", "1234", "3", "42", groups, experiments, attributes, events, audiences,
329-
true, ProjectConfig.Region.US);
329+
true, "US");
330330
}
331331

332332
private static final ProjectConfig NO_AUDIENCE_PROJECT_CONFIG_V3 = generateNoAudienceProjectConfigV3();
@@ -379,7 +379,7 @@ private static ProjectConfig generateNoAudienceProjectConfigV3() {
379379
);
380380

381381
return new DatafileProjectConfig("789", "1234", "3", "42", Collections.<Group>emptyList(), experiments, attributes,
382-
events, Collections.<Audience>emptyList(), true, ProjectConfig.Region.US);
382+
events, Collections.<Audience>emptyList(), true, "US");
383383
}
384384

385385
private static final ProjectConfig VALID_PROJECT_CONFIG_V4 = generateValidProjectConfigV4();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class ValidProjectConfigV4 {
4141
private static final String ENVIRONMENT_KEY = "production";
4242
private static final String VERSION = "4";
4343
private static final Boolean SEND_FLAG_DECISIONS = true;
44-
private static final ProjectConfig.Region REGION = ProjectConfig.Region.US;
44+
private static final String REGION = "US";
4545

4646
// attributes
4747
private static final String ATTRIBUTE_HOUSE_ID = "553339214";

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
package com.optimizely.ab.event.internal;
1818

19-
import com.optimizely.ab.config.ProjectConfig.Region;
2019
import org.junit.Test;
2120
import static org.junit.Assert.*;
2221

@@ -27,13 +26,13 @@ public class EventEndpointsTest {
2726

2827
@Test
2928
public void testGetEndpointForUSRegion() {
30-
String endpoint = EventEndpoints.getEndpointForRegion(Region.US);
29+
String endpoint = EventEndpoints.getEndpointForRegion("US");
3130
assertEquals("https://logx.optimizely.com/v1/events", endpoint);
3231
}
3332

3433
@Test
3534
public void testGetEndpointForEURegion() {
36-
String endpoint = EventEndpoints.getEndpointForRegion(Region.EU);
35+
String endpoint = EventEndpoints.getEndpointForRegion("EU");
3736
assertEquals("https://eu.logx.optimizely.com/v1/events", endpoint);
3837
}
3938

@@ -54,7 +53,7 @@ public void testDefaultBehaviorAlwaysReturnsUS() {
5453
// Test that both null region and default endpoint return the same US endpoint
5554
String nullRegionEndpoint = EventEndpoints.getEndpointForRegion(null);
5655
String defaultEndpoint = EventEndpoints.getDefaultEndpoint();
57-
String usEndpoint = EventEndpoints.getEndpointForRegion(Region.US);
56+
String usEndpoint = EventEndpoints.getEndpointForRegion("US");
5857

5958
assertEquals("All should return US endpoint", usEndpoint, nullRegionEndpoint);
6059
assertEquals("All should return US endpoint", usEndpoint, defaultEndpoint);

0 commit comments

Comments
 (0)