Skip to content

fix private operator throwing for V2 endpoints #153

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix private operator throwing for V2 endpoints #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a12e6aa
fix private operator throwing for V2 endpoints
jon8787 Oct 24, 2023
a7aa447
comment
jon8787 Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/uid2/shared/store/reader/RotatingSiteStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@


public class RotatingSiteStore implements ISiteStore, StoreReader<Collection<Site>> {
public static final String SITES_METADATA_PATH = "sites_metadata_path";
private final ScopedStoreReader<Map<Integer, Site>> reader;

public RotatingSiteStore(DownloadCloudStorage fileStreamProvider, StoreScope scope) {
Expand All @@ -36,7 +35,8 @@ public Collection<Site> getAll() {

@Override
public Site getSite(int siteId) {
return reader.getSnapshot().get(siteId);
final var snapshot = reader.getSnapshot();
return snapshot != null ? snapshot.get(siteId) : null;
}

public JsonObject getMetadata() throws Exception {
Expand Down
9 changes: 7 additions & 2 deletions src/test/java/com/uid2/shared/store/RotatingSiteStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
import java.util.List;

import static com.uid2.shared.TestUtilites.makeInputStream;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.when;

public class RotatingSiteStoreTest {
Expand Down Expand Up @@ -97,4 +96,10 @@ public void loadContentMultipleSites() throws Exception {
assertTrue(siteStore.getAllSites().contains(s3));
assertTrue(siteStore.getAllSites().contains(s4));
}

@Test
public void getSiteReturnsNullBeforeLoadContentIsCalled() { //eg, loadContent() is never called for Private Operators as they don't currently require site data
final var site = siteStore.getSite(1);
assertNull(site);
}
}