updated currentkey variable names

sophia-chen-ttd · sophia-chen-ttd · commit 221aad876879 · 2025-08-26T14:20:56.000+10:00
diff --git a/src/main/java/com/uid2/admin/salt/SaltRotation.java b/src/main/java/com/uid2/admin/salt/SaltRotation.java
@@ -135,12 +135,12 @@ private SaltEntry updateSalt(SaltEntry oldBucket, TargetDate targetDate, boolean
         );
     }
 
-    private long calculateRefreshFrom(SaltEntry salt, TargetDate targetDate) {
-        long multiplier = targetDate.saltAgeInDays(salt) / 30 + 1;
-        return Instant.ofEpochMilli(salt.lastUpdated()).truncatedTo(ChronoUnit.DAYS).toEpochMilli() + (multiplier * THIRTY_DAYS_IN_MS);
+    private long calculateRefreshFrom(SaltEntry bucket, TargetDate targetDate) {
+        long multiplier = targetDate.saltAgeInDays(bucket) / 30 + 1;
+        return Instant.ofEpochMilli(bucket.lastUpdated()).truncatedTo(ChronoUnit.DAYS).toEpochMilli() + (multiplier * THIRTY_DAYS_IN_MS);
     }
 
-    private String calculateCurrentSalt(SaltEntry salt, boolean shouldRotate) throws Exception {
+    private String calculateCurrentSalt(SaltEntry bucket, boolean shouldRotate) throws Exception {
         if (shouldRotate) {
             if (ENABLE_V4_RAW_UID) {
                 return null;
@@ -149,15 +149,15 @@ private String calculateCurrentSalt(SaltEntry salt, boolean shouldRotate) throws
                 return this.keyGenerator.generateRandomKeyString(32);
             }
         }
-        return salt.currentSalt();
+        return bucket.currentSalt();
     }
 
-    private String calculatePreviousSalt(SaltEntry salt, boolean shouldRotate, TargetDate targetDate) {
+    private String calculatePreviousSalt(SaltEntry bucket, boolean shouldRotate, TargetDate targetDate) {
         if (shouldRotate) {
-            return salt.currentSalt();
+            return bucket.currentSalt();
         }
-        if (targetDate.saltAgeInDays(salt) < 90) {
-            return salt.previousSalt();
+        if (targetDate.saltAgeInDays(bucket) < 90) {
+            return bucket.previousSalt();
         }
         return null;
     }
diff --git a/src/test/java/com/uid2/admin/salt/SaltRotationTest.java b/src/test/java/com/uid2/admin/salt/SaltRotationTest.java
@@ -553,10 +553,10 @@ void testKeyRotationKeyIdWrap(int[] existingIds, int[] nextIds) throws Exception
         var willNotRefresh = targetDate().plusDays(30);
         var lastSnapshot = SaltSnapshotBuilder.start()
                 .entries(
-                        SaltBuilder.start().lastUpdated(targetDate().minusDays(90)).refreshFrom(willNotRefresh).currentKey(existingIds[0]),
-                        SaltBuilder.start().lastUpdated(targetDate().minusDays(60)).refreshFrom(willNotRefresh).currentKey(existingIds[1]),
-                        SaltBuilder.start().lastUpdated(targetDate().minusDays(60)).refreshFrom(willNotRefresh).currentKey(existingIds[2]),
-                        SaltBuilder.start().lastUpdated(targetDate().minusDays(60)).refreshFrom(willNotRefresh).currentKey(existingIds[3]),
+                        SaltBuilder.start().lastUpdated(targetDate().minusDays(90)).refreshFrom(willNotRefresh).currentKeySalt(existingIds[0]),
+                        SaltBuilder.start().lastUpdated(targetDate().minusDays(60)).refreshFrom(willNotRefresh).currentKeySalt(existingIds[1]),
+                        SaltBuilder.start().lastUpdated(targetDate().minusDays(60)).refreshFrom(willNotRefresh).currentKeySalt(existingIds[2]),
+                        SaltBuilder.start().lastUpdated(targetDate().minusDays(60)).refreshFrom(willNotRefresh).currentKeySalt(existingIds[3]),
                         SaltBuilder.start().lastUpdated(targetDate().minusDays(60)).refreshFrom(willRefresh).currentSalt(),
                         SaltBuilder.start().lastUpdated(targetDate().minusDays(60)).refreshFrom(willRefresh).currentSalt(),
                         SaltBuilder.start().lastUpdated(targetDate().minusDays(60)).refreshFrom(willRefresh).currentSalt())
@@ -585,9 +585,9 @@ void testKeyRotationPopulatePreviousKey() throws Exception {
         var willRefresh = targetDate();
         var willNotRefresh = targetDate().plusDays(30);
         var lastSnapshot = SaltSnapshotBuilder.start()
-                .entries(SaltBuilder.start().lastUpdated(targetDate().minusDays(60)).refreshFrom(willRefresh).currentKey(0, "keyKey", "keySalt"),
-                        SaltBuilder.start().lastUpdated(targetDate().minusDays(60)).refreshFrom(willNotRefresh).currentKey(1),
-                        SaltBuilder.start().lastUpdated(targetDate().minusDays(60)).refreshFrom(willNotRefresh).currentKey(2))
+                .entries(SaltBuilder.start().lastUpdated(targetDate().minusDays(60)).refreshFrom(willRefresh).currentKeySalt(0, "keyKey", "keySalt"),
+                        SaltBuilder.start().lastUpdated(targetDate().minusDays(60)).refreshFrom(willNotRefresh).currentKeySalt(1),
+                        SaltBuilder.start().lastUpdated(targetDate().minusDays(60)).refreshFrom(willNotRefresh).currentKeySalt(2))
                 .build();
 
         var result = saltRotation.rotateSalts(lastSnapshot, minAges, 1, targetDate());
@@ -622,8 +622,8 @@ void testKeyRotationPreviousKeyVisibleFor90Days(int lastUpdatedDaysAgo, boolean
         var willRefresh = targetDate();
         var willNotRefresh = targetDate().plusDays(30);
         var lastSnapshot = SaltSnapshotBuilder.start()
-                .entries(SaltBuilder.start().lastUpdated(targetDate().minusDays(lastUpdatedDaysAgo)).refreshFrom(willNotRefresh).currentKey(2).previousKey(0),
-                        SaltBuilder.start().lastUpdated(targetDate().minusDays(lastUpdatedDaysAgo)).refreshFrom(willRefresh).currentKey(1)) // for sake of getting snapshot
+                .entries(SaltBuilder.start().lastUpdated(targetDate().minusDays(lastUpdatedDaysAgo)).refreshFrom(willNotRefresh).currentKeySalt(2).previousKeySalt(0),
+                        SaltBuilder.start().lastUpdated(targetDate().minusDays(lastUpdatedDaysAgo)).refreshFrom(willRefresh).currentKeySalt(1)) // for sake of getting snapshot
                 .build();
 
         var result = saltRotation.rotateSalts(lastSnapshot, minAges, 1, targetDate());
@@ -644,7 +644,7 @@ void testKeyRotationKeyToSaltRotation() throws Exception {
         var willRefresh = targetDate();
         var willNotRefresh = targetDate().plusDays(30);
         var lastSnapshot = SaltSnapshotBuilder.start()
-                .entries(SaltBuilder.start().lastUpdated(targetDate().minusDays(60)).refreshFrom(willRefresh).currentKey(0, "keyKey1", "keySalt1"),
+                .entries(SaltBuilder.start().lastUpdated(targetDate().minusDays(60)).refreshFrom(willRefresh).currentKeySalt(0, "keyKey1", "keySalt1"),
                         SaltBuilder.start().lastUpdated(targetDate().minusDays(60)).refreshFrom(willNotRefresh).currentSalt())
                 .build();
 
diff --git a/src/test/java/com/uid2/admin/salt/helper/SaltBuilder.java b/src/test/java/com/uid2/admin/salt/helper/SaltBuilder.java
@@ -14,8 +14,8 @@ public class SaltBuilder {
     private Instant refreshFrom = Instant.now();
     private String currentSalt = null;
     private String previousSalt = null;
-    private SaltEntry.KeyMaterial currentKey = null;
-    private SaltEntry.KeyMaterial previousKey = null;
+    private SaltEntry.KeyMaterial currentKeySalt = null;
+    private SaltEntry.KeyMaterial previousKeySalt = null;
 
     private SaltBuilder() {
     }
@@ -64,21 +64,21 @@ public SaltBuilder previousSalt(String previousSalt) {
         return this;
     }
 
-    public SaltBuilder currentKey(int keyId) {
-        return this.currentKey(keyId, "currentKeyKey" + id, "currentKeySalt" + id);
+    public SaltBuilder currentKeySalt(int keyId) {
+        return this.currentKeySalt(keyId, "currentKeyKey" + id, "currentKeySalt" + id);
     }
 
-    public SaltBuilder previousKey(int keyId) {
-        return this.previousKey(keyId, "previousKeyKey" + id, "previousKeySalt" + id);
+    public SaltBuilder previousKeySalt(int keyId) {
+        return this.previousKeySalt(keyId, "previousKeyKey" + id, "previousKeySalt" + id);
     }
 
-    public SaltBuilder currentKey(int keyId, String key, String salt) {
-        this.currentKey = new SaltEntry.KeyMaterial(keyId, key, salt);
+    public SaltBuilder currentKeySalt(int keyId, String key, String salt) {
+        this.currentKeySalt = new SaltEntry.KeyMaterial(keyId, key, salt);
         return this;
     }
 
-    public SaltBuilder previousKey(int keyId, String key, String salt) {
-        this.previousKey = new SaltEntry.KeyMaterial(keyId, key, salt);
+    public SaltBuilder previousKeySalt(int keyId, String key, String salt) {
+        this.previousKeySalt = new SaltEntry.KeyMaterial(keyId, key, salt);
         return this;
     }
 
@@ -90,8 +90,8 @@ public SaltEntry build() {
                 currentSalt,
                 refreshFrom.toEpochMilli(),
                 previousSalt,
-                currentKey,
-                previousKey
+                currentKeySalt,
+                previousKeySalt
         );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -135,12 +135,12 @@ private SaltEntry updateSalt(SaltEntry oldBucket, TargetDate targetDate, boolean`
`135`	`135`	`);`
`136`	`136`	`}`
`137`	`137`
`138`		`- private long calculateRefreshFrom(SaltEntry salt, TargetDate targetDate) {`
`139`		`- long multiplier = targetDate.saltAgeInDays(salt) / 30 + 1;`
`140`		`- return Instant.ofEpochMilli(salt.lastUpdated()).truncatedTo(ChronoUnit.DAYS).toEpochMilli() + (multiplier * THIRTY_DAYS_IN_MS);`
	`138`	`+ private long calculateRefreshFrom(SaltEntry bucket, TargetDate targetDate) {`
	`139`	`+ long multiplier = targetDate.saltAgeInDays(bucket) / 30 + 1;`
	`140`	`+ return Instant.ofEpochMilli(bucket.lastUpdated()).truncatedTo(ChronoUnit.DAYS).toEpochMilli() + (multiplier * THIRTY_DAYS_IN_MS);`
`141`	`141`	`}`
`142`	`142`
`143`		`- private String calculateCurrentSalt(SaltEntry salt, boolean shouldRotate) throws Exception {`
	`143`	`+ private String calculateCurrentSalt(SaltEntry bucket, boolean shouldRotate) throws Exception {`
`144`	`144`	`if (shouldRotate) {`
`145`	`145`	`if (ENABLE_V4_RAW_UID) {`
`146`	`146`	`return null;`
`@@ -149,15 +149,15 @@ private String calculateCurrentSalt(SaltEntry salt, boolean shouldRotate) throws`
`149`	`149`	`return this.keyGenerator.generateRandomKeyString(32);`
`150`	`150`	`}`
`151`	`151`	`}`
`152`		`- return salt.currentSalt();`
	`152`	`+ return bucket.currentSalt();`
`153`	`153`	`}`
`154`	`154`
`155`		`- private String calculatePreviousSalt(SaltEntry salt, boolean shouldRotate, TargetDate targetDate) {`
	`155`	`+ private String calculatePreviousSalt(SaltEntry bucket, boolean shouldRotate, TargetDate targetDate) {`
`156`	`156`	`if (shouldRotate) {`
`157`		`- return salt.currentSalt();`
	`157`	`+ return bucket.currentSalt();`
`158`	`158`	`}`
`159`		`- if (targetDate.saltAgeInDays(salt) < 90) {`
`160`		`- return salt.previousSalt();`
	`159`	`+ if (targetDate.saltAgeInDays(bucket) < 90) {`
	`160`	`+ return bucket.previousSalt();`
`161`	`161`	`}`
`162`	`162`	`return null;`
`163`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ public class SaltBuilder {`
`14`	`14`	`private Instant refreshFrom = Instant.now();`
`15`	`15`	`private String currentSalt = null;`
`16`	`16`	`private String previousSalt = null;`
`17`		`- private SaltEntry.KeyMaterial currentKey = null;`
`18`		`- private SaltEntry.KeyMaterial previousKey = null;`
	`17`	`+ private SaltEntry.KeyMaterial currentKeySalt = null;`
	`18`	`+ private SaltEntry.KeyMaterial previousKeySalt = null;`
`19`	`19`
`20`	`20`	`private SaltBuilder() {`
`21`	`21`	`}`
`@@ -64,21 +64,21 @@ public SaltBuilder previousSalt(String previousSalt) {`
`64`	`64`	`return this;`
`65`	`65`	`}`
`66`	`66`
`67`		`- public SaltBuilder currentKey(int keyId) {`
`68`		`- return this.currentKey(keyId, "currentKeyKey" + id, "currentKeySalt" + id);`
	`67`	`+ public SaltBuilder currentKeySalt(int keyId) {`
	`68`	`+ return this.currentKeySalt(keyId, "currentKeyKey" + id, "currentKeySalt" + id);`
`69`	`69`	`}`
`70`	`70`
`71`		`- public SaltBuilder previousKey(int keyId) {`
`72`		`- return this.previousKey(keyId, "previousKeyKey" + id, "previousKeySalt" + id);`
	`71`	`+ public SaltBuilder previousKeySalt(int keyId) {`
	`72`	`+ return this.previousKeySalt(keyId, "previousKeyKey" + id, "previousKeySalt" + id);`
`73`	`73`	`}`
`74`	`74`
`75`		`- public SaltBuilder currentKey(int keyId, String key, String salt) {`
`76`		`- this.currentKey = new SaltEntry.KeyMaterial(keyId, key, salt);`
	`75`	`+ public SaltBuilder currentKeySalt(int keyId, String key, String salt) {`
	`76`	`+ this.currentKeySalt = new SaltEntry.KeyMaterial(keyId, key, salt);`
`77`	`77`	`return this;`
`78`	`78`	`}`
`79`	`79`
`80`		`- public SaltBuilder previousKey(int keyId, String key, String salt) {`
`81`		`- this.previousKey = new SaltEntry.KeyMaterial(keyId, key, salt);`
	`80`	`+ public SaltBuilder previousKeySalt(int keyId, String key, String salt) {`
	`81`	`+ this.previousKeySalt = new SaltEntry.KeyMaterial(keyId, key, salt);`
`82`	`82`	`return this;`
`83`	`83`	`}`
`84`	`84`
`@@ -90,8 +90,8 @@ public SaltEntry build() {`
`90`	`90`	`currentSalt,`
`91`	`91`	`refreshFrom.toEpochMilli(),`
`92`	`92`	`previousSalt,`
`93`		`- currentKey,`
`94`		`- previousKey`
	`93`	`+ currentKeySalt,`
	`94`	`+ previousKeySalt`
`95`	`95`	`);`
`96`	`96`	`}`
`97`	`97`	`}`