-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Added ODPManager implementation (#489)
## Summary Added ODPManager Implementation which does the following. 1. Initializes and provides access to ODPEventManager and ODPSegmentManager 2. Provides updated ODPConfig settings to event manager and segment manager. 3. Stops Event Manager thread when closed. ## Test plan 1. Manually tested thoroughly 2. Added unit tests. ## Issues [FSSDK-8388](https://jira.sso.episerver.net/browse/FSSDK-8388)
- Loading branch information
1 parent
913b8e4
commit 7428c4c
Showing
7 changed files
with
277 additions
and
7 deletions.
There are no files selected for viewing
This file contains 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 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 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
61 changes: 61 additions & 0 deletions
61
core-api/src/main/java/com/optimizely/ab/odp/ODPManager.java
This file contains 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,61 @@ | ||
| /** | ||
| * | ||
| * Copyright 2022, Optimizely | ||
| * | ||
| * 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.odp; | ||
|
|
||
| import javax.annotation.Nonnull; | ||
| import java.util.List; | ||
|
|
||
| public class ODPManager { | ||
| private volatile ODPConfig odpConfig; | ||
| private final ODPSegmentManager segmentManager; | ||
| private final ODPEventManager eventManager; | ||
|
|
||
| public ODPManager(@Nonnull ODPConfig odpConfig, @Nonnull ODPApiManager apiManager) { | ||
| this(odpConfig, new ODPSegmentManager(odpConfig, apiManager), new ODPEventManager(odpConfig, apiManager)); | ||
| } | ||
|
|
||
| public ODPManager(@Nonnull ODPConfig odpConfig, @Nonnull ODPSegmentManager segmentManager, @Nonnull ODPEventManager eventManager) { | ||
| this.odpConfig = odpConfig; | ||
| this.segmentManager = segmentManager; | ||
| this.eventManager = eventManager; | ||
| this.eventManager.start(); | ||
| } | ||
|
|
||
| public ODPSegmentManager getSegmentManager() { | ||
| return segmentManager; | ||
| } | ||
|
|
||
| public ODPEventManager getEventManager() { | ||
| return eventManager; | ||
| } | ||
|
|
||
| public Boolean updateSettings(String apiHost, String apiKey, List<String> allSegments) { | ||
| ODPConfig newConfig = new ODPConfig(apiKey, apiHost, allSegments); | ||
| if (!odpConfig.equals(newConfig)) { | ||
| odpConfig = newConfig; | ||
| eventManager.updateSettings(odpConfig); | ||
| segmentManager.resetCache(); | ||
| segmentManager.updateSettings(odpConfig); | ||
| return true; | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| public void close() { | ||
| eventManager.stop(); | ||
| } | ||
| } |
This file contains 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 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
123 changes: 123 additions & 0 deletions
123
core-api/src/test/java/com/optimizely/ab/odp/ODPManagerTest.java
This file contains 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,123 @@ | ||
| /** | ||
| * | ||
| * Copyright 2022, Optimizely | ||
| * | ||
| * 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.odp; | ||
|
|
||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.mockito.Mock; | ||
| import org.mockito.Mockito; | ||
|
|
||
| import java.util.Arrays; | ||
|
|
||
| import static org.mockito.Matchers.*; | ||
| import static org.mockito.Mockito.*; | ||
| import static org.junit.Assert.*; | ||
|
|
||
| public class ODPManagerTest { | ||
| private static final String API_RESPONSE = "{\"data\":{\"customer\":{\"audiences\":{\"edges\":[{\"node\":{\"name\":\"segment1\",\"state\":\"qualified\"}},{\"node\":{\"name\":\"segment2\",\"state\":\"qualified\"}}]}}}}"; | ||
|
|
||
| @Mock | ||
| ODPApiManager mockApiManager; | ||
|
|
||
| @Mock | ||
| ODPEventManager mockEventManager; | ||
|
|
||
| @Mock | ||
| ODPSegmentManager mockSegmentManager; | ||
|
|
||
| @Before | ||
| public void setup() { | ||
| mockApiManager = mock(ODPApiManager.class); | ||
| mockEventManager = mock(ODPEventManager.class); | ||
| mockSegmentManager = mock(ODPSegmentManager.class); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldStartEventManagerWhenODPManagerIsInitialized() { | ||
| ODPConfig config = new ODPConfig("test-key", "test-host"); | ||
| new ODPManager(config, mockSegmentManager, mockEventManager); | ||
| verify(mockEventManager, times(1)).start(); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldStopEventManagerWhenCloseIsCalled() { | ||
| ODPConfig config = new ODPConfig("test-key", "test-host"); | ||
| ODPManager odpManager = new ODPManager(config, mockSegmentManager, mockEventManager); | ||
|
|
||
| // Stop is not called in the default flow. | ||
| verify(mockEventManager, times(0)).stop(); | ||
|
|
||
| odpManager.close(); | ||
| // stop should be called when odpManager is closed. | ||
| verify(mockEventManager, times(1)).stop(); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldUseNewSettingsInEventManagerWhenODPConfigIsUpdated() throws InterruptedException { | ||
| Mockito.when(mockApiManager.sendEvents(any(), any(), any())).thenReturn(200); | ||
| ODPConfig config = new ODPConfig("test-key", "test-host", Arrays.asList("segment1", "segment2")); | ||
| ODPManager odpManager = new ODPManager(config, mockApiManager); | ||
|
|
||
| odpManager.getEventManager().identifyUser("vuid", "fsuid"); | ||
| Thread.sleep(2000); | ||
| verify(mockApiManager, times(1)) | ||
| .sendEvents(eq("test-key"), eq("test-host/v3/events"), any()); | ||
|
|
||
| odpManager.updateSettings("test-host-updated", "test-key-updated", Arrays.asList("segment1")); | ||
| odpManager.getEventManager().identifyUser("vuid", "fsuid"); | ||
| Thread.sleep(1200); | ||
| verify(mockApiManager, times(1)) | ||
| .sendEvents(eq("test-key-updated"), eq("test-host-updated/v3/events"), any()); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldUseNewSettingsInSegmentManagerWhenODPConfigIsUpdated() { | ||
| Mockito.when(mockApiManager.fetchQualifiedSegments(anyString(), anyString(), anyString(), anyString(), anyList())) | ||
| .thenReturn(API_RESPONSE); | ||
| ODPConfig config = new ODPConfig("test-key", "test-host", Arrays.asList("segment1", "segment2")); | ||
| ODPManager odpManager = new ODPManager(config, mockApiManager); | ||
|
|
||
| odpManager.getSegmentManager().getQualifiedSegments("test-id"); | ||
| verify(mockApiManager, times(1)) | ||
| .fetchQualifiedSegments(eq("test-key"), eq("test-host/v3/graphql"), any(), any(), any()); | ||
|
|
||
| odpManager.updateSettings("test-host-updated", "test-key-updated", Arrays.asList("segment1")); | ||
| odpManager.getSegmentManager().getQualifiedSegments("test-id"); | ||
| verify(mockApiManager, times(1)) | ||
| .fetchQualifiedSegments(eq("test-key-updated"), eq("test-host-updated/v3/graphql"), any(), any(), any()); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldGetEventManager() { | ||
| ODPConfig config = new ODPConfig("test-key", "test-host"); | ||
| ODPManager odpManager = new ODPManager(config, mockSegmentManager, mockEventManager); | ||
| assertNotNull(odpManager.getEventManager()); | ||
|
|
||
| odpManager = new ODPManager(config, mockApiManager); | ||
| assertNotNull(odpManager.getEventManager()); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldGetSegmentManager() { | ||
| ODPConfig config = new ODPConfig("test-key", "test-host"); | ||
| ODPManager odpManager = new ODPManager(config, mockSegmentManager, mockEventManager); | ||
| assertNotNull(odpManager.getSegmentManager()); | ||
|
|
||
| odpManager = new ODPManager(config, mockApiManager); | ||
| assertNotNull(odpManager.getSegmentManager()); | ||
| } | ||
| } |