Skip to content

Reverting to old foreach logic #381

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

Merged
abuabraham-ttd merged 3 commits into from
Mar 10, 2025
Merged

Reverting to old foreach logic #381

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac13e64
Reverting to old foreach logic
abuabraham-ttd Mar 10, 2025
cac33d3
Reverting to old foreach logic
abuabraham-ttd Mar 10, 2025
b086279
Reverting to old foreach logic
abuabraham-ttd Mar 10, 2025
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
28 changes: 16 additions & 12 deletions src/main/java/com/uid2/admin/store/writer/SaltStoreWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.time.Instant;
import java.util.Collections;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -48,23 +48,27 @@ protected List<RotatingSaltProvider.SaltSnapshot> getSnapshots(RotatingSaltProvi
throw new IllegalStateException("Snapshots cannot be null");
Copy link
Contributor Author

@abuabraham-ttd abuabraham-ttd Mar 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

making this behave same way as in https://github.com/IABTechLab/uid2-admin/blob/345a708128c0b2937bc325b83082df5cd33f[…]/src/main/java/com/uid2/admin/store/writer/SaltStoreWriter.java

}
final Instant now = Instant.now();
List<RotatingSaltProvider.SaltSnapshot> currentSnapshots = Stream.concat(provider.getSnapshots().stream(), Stream.of(data))
List<RotatingSaltProvider.SaltSnapshot> currentSnapshots = provider.getSnapshots();
List<RotatingSaltProvider.SaltSnapshot> snapshots = null;
snapshots = Stream.concat(currentSnapshots.stream(), Stream.of(data))
.sorted(Comparator.comparing(RotatingSaltProvider.SaltSnapshot::getEffective))
.collect(Collectors.toList());
RotatingSaltProvider.SaltSnapshot newestEffectiveSnapshot = currentSnapshots.stream()
RotatingSaltProvider.SaltSnapshot newestEffectiveSnapshot = snapshots.stream()
.filter(snapshot -> snapshot.isEffective(now))
.reduce((a, b) -> b).orElse(null);
return Stream.concat(provider.getSnapshots().stream(), Stream.of(data))
.filter(snapshot -> {
boolean isValid = newestEffectiveSnapshot == null || snapshot == newestEffectiveSnapshot;
if (!isValid) {

List<RotatingSaltProvider.SaltSnapshot> filteredSnapshots = new ArrayList<>();

for (RotatingSaltProvider.SaltSnapshot snapshot : snapshots) {
if (newestEffectiveSnapshot != null && snapshot != newestEffectiveSnapshot) {
LOGGER.info("Skipping effective snapshot, effective=" + snapshot.getEffective() + ", expires=" + snapshot.getExpires()
+ " in favour of newer snapshot, effective=" + newestEffectiveSnapshot.getEffective() + ", expires=" + newestEffectiveSnapshot.getExpires());
}
return isValid;
})
.sorted(Comparator.comparing(RotatingSaltProvider.SaltSnapshot::getEffective))
.collect(Collectors.toList());
continue;
}
filteredSnapshots.add(snapshot);
newestEffectiveSnapshot = null;
}
return filteredSnapshots;
}

public void upload(RotatingSaltProvider.SaltSnapshot data) throws Exception {
Expand Down