Merge pull request #570 from IABTechLab/gdm-hotfix

Made refreshFrom not nullable

Author: gmsdelmundo

pom.xml

@@ -16,7 +16,7 @@
         <!-- check micrometer.version vertx-micrometer-metrics consumes before bumping up -->
         <micrometer.version>1.12.2</micrometer.version>
         <junit-jupiter.version>5.11.2</junit-jupiter.version>
-        <uid2-shared.version>11.0.0</uid2-shared.version>
+        <uid2-shared.version>11.0.4</uid2-shared.version>
         <okta-jwt.version>0.5.10</okta-jwt.version>
         <image.version>${project.version}</image.version>
     </properties>

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

@@ -3,7 +3,8 @@
 import com.uid2.shared.model.SaltEntry;
 
 public final class SaltSerializer {
-    private SaltSerializer() {}
+    private SaltSerializer() {
+    }
 
     public static String toCsv(SaltEntry[] entries) {
         StringBuilder stringBuilder = new StringBuilder();
@@ -25,7 +26,7 @@ private static void addLine(SaltEntry entry, StringBuilder stringBuilder) {
                 .append(serializeNullable(entry.currentSalt()));
 
         stringBuilder.append(",");
-        stringBuilder.append(serializeNullable(entry.refreshFrom()));
+        stringBuilder.append(entry.refreshFrom());
 
         stringBuilder.append(",");
         stringBuilder.append(serializeNullable(entry.previousSalt()));
@@ -45,8 +46,7 @@ private static void appendKey(StringBuilder stringBuilder, SaltEntry.KeyMaterial
                     .append(serializeNullable(key.key()))
                     .append(",")
                     .append(serializeNullable(key.salt()));
-        }
-        else  {
+        } else {
             stringBuilder.append(",,,");
         }
     }

src/main/java/com/uid2/admin/vertx/service/SaltService.java

@@ -50,7 +50,6 @@ public class SaltService implements IService {
     private final RotatingSaltProvider saltProvider;
     private final SaltRotation saltRotation;
 
-
     public SaltService(AdminAuthMiddleware auth,
                        WriteLock writeLock,
                        SaltStoreWriter storageManager,
@@ -178,4 +177,4 @@ private JsonObject toJson(RotatingSaltProvider.SaltSnapshot snapshot) {
                 .max(Long::compare).orElse(null));
         return jo;
     }
-}
+}

src/test/java/com/uid2/admin/salt/helper/SaltBuilder.java

@@ -6,7 +6,7 @@
 import java.time.Instant;
 import java.util.concurrent.atomic.AtomicInteger;
 
-public class SaltBuilder {
+public final class SaltBuilder {
     private static final AtomicInteger LAST_AUTO_ID = new AtomicInteger(0);
 
     private int id = LAST_AUTO_ID.incrementAndGet();

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

@@ -20,13 +20,13 @@ void toCsv_serializesNoSalts() {
     @Test
     void toCsv_serializesSaltsWithNoOptionalFields() {
         var expected = """
-1,100,salt1,,,,,,,,
-2,200,salt2,,,,,,,,
+1,100,salt1,1000,,,,,,,
+2,200,salt2,2000,,,,,,,
 """;
 
         var salts = new SaltEntry[]{
-                new SaltEntry(1, "hashedId1", 100, "salt1", null, null, null, null),
-                new SaltEntry(2, "hashedId2", 200, "salt2", null, null, null, null),
+                new SaltEntry(1, "hashedId1", 100, "salt1", 1000L, null, null, null),
+                new SaltEntry(2, "hashedId2", 200, "salt2", 2000L, null, null, null),
         };
         var actual = SaltSerializer.toCsv(salts);
 
@@ -131,13 +131,13 @@ void toCsv_mixedNullsInKeysAndSalts() {
         var previousKey = new KeyMaterial(1, "previousKeyKey", "previousKeySalt");
 
         var salts = new SaltEntry[]{
-            new SaltEntry(1, "hashedId1", 100, null, 1000L, "previousSalt", currentKey, null),
-            new SaltEntry(2, "hashedId2", 200, null, 2000L, null, currentKey, previousKey),
-            new SaltEntry(3, "hashedId3", 300, "salt", 3000L, null, null, previousKey),
-            new SaltEntry(4, "hashedId4", 400, null, 4000L, null, currentKey, null),
+                new SaltEntry(1, "hashedId1", 100, null, 1000L, "previousSalt", currentKey, null),
+                new SaltEntry(2, "hashedId2", 200, null, 2000L, null, currentKey, previousKey),
+                new SaltEntry(3, "hashedId3", 300, "salt", 3000L, null, null, previousKey),
+                new SaltEntry(4, "hashedId4", 400, null, 4000L, null, currentKey, null),
         };
         var actual = SaltSerializer.toCsv(salts);
 
         assertThat(actual).isEqualTo(expected);
     }
-}
+}