Merge branch 'main' into aul-UID2-5349-logging-salt-stats

Author: aulme

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-admin</artifactId>
-    <version>5.22.9-alpha-165-SNAPSHOT</version>
+    <version>5.23.7</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/com/uid2/admin/store/writer/SaltSerializer.java

@@ -16,10 +16,11 @@ public static String toCsv(SaltEntry[] entries) {
     }
 
     private static void addLine(SaltEntry entry, StringBuilder stringBuilder) {
+        long lastUpdated = entry.lastUpdated();
         stringBuilder
                 .append(entry.id())
                 .append(",")
-                .append(entry.lastUpdated())
+                .append(lastUpdated % 1000 == 0 ? lastUpdated + 1 : lastUpdated)
                 .append(",")
                 .append(entry.currentSalt());
 

src/test/java/com/uid2/admin/store/writer/EncryptedSaltStoreWriterTest.java

@@ -232,11 +232,12 @@ private void assertWrittenFileEquals(String fileLocation, RotatingSaltProvider.S
         for (int i = 0; i < lines.length; i++) {
             var line = lines[i];
             var entry = entries[i];
+            var lastUpdated = entry.lastUpdated() % 1000 == 0 ? entry.lastUpdated() + 1 : entry.lastUpdated();
             String[] fields = line.split(",");
 
             assertAll(
                     () -> assertEquals(entry.id(), parseLong(fields[0])),
-                    () -> assertEquals(entry.lastUpdated(), parseLong(fields[1])),
+                    () -> assertEquals(lastUpdated, parseLong(fields[1])),
                     () -> assertEquals(entry.currentSalt(), fields[2]),
                     () -> assertEquals(entry.refreshFrom(), parseLong(fields[3])),
                     () -> assertEquals(entry.previousSalt(), fields[4]),

version.json

@@ -1 +1 @@
-{ "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", "version": "5.22", "publicReleaseRefSpec": [ "^refs/heads/master$", "^refs/heads/v\\d+(?:\\.\\d+)?$" ], "cloudBuild": { "setVersionVariables": true, "buildNumber": { "enabled": true, "includeCommitId": { "when": "always" } } } }
+{ "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", "version": "5.23", "publicReleaseRefSpec": [ "^refs/heads/master$", "^refs/heads/v\\d+(?:\\.\\d+)?$" ], "cloudBuild": { "setVersionVariables": true, "buildNumber": { "enabled": true, "includeCommitId": { "when": "always" } } } }