Skip to content
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

jyg-UID2-1736 return null instead of [] when allow_sites is empty #164

Merged
merged 4 commits into from
Oct 10, 2023
Merged

jyg-UID2-1736 return null instead of [] when allow_sites is empty #164

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
902cbfa
return null instead of []
jingyi-gao-ttd Oct 5, 2023
8ffab99
Add sorting
jingyi-gao-ttd Oct 5, 2023
5e9658c
Merge branch 'master' into jyg-UID2-1736-return-null-instead-of-empty…
jingyi-gao-ttd Oct 5, 2023
621343b
Fix sort
jingyi-gao-ttd Oct 5, 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
16 changes: 4 additions & 12 deletions src/main/java/com/uid2/admin/vertx/service/SharingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,13 +232,9 @@ private void handleListAllowedSites(RoutingContext rc) {
return;
}

JsonArray listedSites = new JsonArray();
Set<Integer> allowedSites = keyset.getAllowedSites();
if (allowedSites != null) {
allowedSites.stream().sorted().forEach((listedSiteId) -> listedSites.add(listedSiteId));
lionell-pack-ttd marked this conversation as resolved.
Show resolved Hide resolved
}
JsonObject jo = new JsonObject();
jo.put("allowed_sites", listedSites);
Set<Integer> allowedSites = keyset.getAllowedSites();
jo.put("allowed_sites", allowedSites != null ? allowedSites.stream().sorted().toArray() : null);
jo.put("allowed_types", keyset.getAllowedTypes());
jo.put("hash", keyset.hashCode());

Expand All @@ -252,15 +248,11 @@ private void handleListAllAllowedSites(RoutingContext rc) {
JsonArray ja = new JsonArray();
Map<Integer, AdminKeyset> collection = this.keysetProvider.getSnapshot().getAllKeysets();
for (Map.Entry<Integer, AdminKeyset> keyset : collection.entrySet()) {
JsonArray listedSites = new JsonArray();
Set<Integer> allowedSites = keyset.getValue().getAllowedSites();
if (allowedSites != null) {
allowedSites.stream().sorted().forEach((listedSiteId) -> listedSites.add(listedSiteId));
}
JsonObject jo = new JsonObject();
jo.put("keyset_id", keyset.getValue().getKeysetId());
jo.put("site_id", keyset.getValue().getSiteId());
jo.put("allowed_sites", listedSites);
Set<Integer> allowedSites = keyset.getValue().getAllowedSites();
jo.put("allowed_sites", allowedSites != null ? allowedSites.stream().sorted().toArray() : null);
jo.put("allowed_types", keyset.getValue().getAllowedTypes());
jo.put("hash", keyset.getValue().hashCode());
ja.add(jo);
Expand Down