Merge pull request #476 from IABTechLab/sch-IM-1697-add-milliseconds-to-salt-files

sch-IM-1697 added a millisecond to last updated in salt files

Author: sophia-chen-ttd

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]),