-
Notifications
You must be signed in to change notification settings - Fork 32
[FSSDK-11455] Java - Add SDK Multi-Region Support for Data Hosting #573
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
d42622e
[FSSDK-11455] Java - Add SDK Multi-Region Support for Data Hosting
esrakartalOpt 2a7c54e
Update test comment
esrakartalOpt 4235781
Fix failures
esrakartalOpt a4d8a78
Update Nebula version
esrakartalOpt f515dcc
Merge branch 'master' into esra/FSSDK-11455_eu_data_hosting
esrakartalOpt 635b174
Fix tests
esrakartalOpt b383fb8
Implement changes
esrakartalOpt d7d38ca
Implement comments
esrakartalOpt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
core-api/src/main/java/com/optimizely/ab/event/internal/EventEndpoints.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
/** | ||
* | ||
* 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 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<String, String> LOGX_ENDPOINTS = new HashMap<>(); | ||
|
||
static { | ||
LOGX_ENDPOINTS.put("US", "https://logx.optimizely.com/v1/events"); | ||
LOGX_ENDPOINTS.put("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(String region) { | ||
if (region == null) { | ||
return LOGX_ENDPOINTS.get("US"); | ||
} | ||
return LOGX_ENDPOINTS.get(region); | ||
esrakartalOpt marked this conversation as resolved.
Show resolved
Hide resolved
esrakartalOpt marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
|
||
/** | ||
* Get the default event endpoint URL (US region). | ||
* | ||
* @return the default endpoint URL | ||
*/ | ||
public static String getDefaultEndpoint() { | ||
esrakartalOpt marked this conversation as resolved.
Show resolved
Hide resolved
|
||
return LOGX_ENDPOINTS.get("US"); | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
core-api/src/test/java/com/optimizely/ab/event/internal/EventEndpointsTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
/** | ||
* | ||
* 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 org.junit.Test; | ||
import static org.junit.Assert.*; | ||
|
||
/** | ||
* Tests for EventEndpoints class to test event endpoints | ||
*/ | ||
public class EventEndpointsTest { | ||
|
||
@Test | ||
public void testGetEndpointForUSRegion() { | ||
String endpoint = EventEndpoints.getEndpointForRegion("US"); | ||
assertEquals("https://logx.optimizely.com/v1/events", endpoint); | ||
} | ||
|
||
@Test | ||
public void testGetEndpointForEURegion() { | ||
String endpoint = EventEndpoints.getEndpointForRegion("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("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); | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.