made default threshold ages static

Author: sophia-chen-ttd

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

@@ -27,13 +27,28 @@
 
 public class SaltService implements IService {
     private static final Logger LOGGER = LoggerFactory.getLogger(SaltService.class);
+    private static final Duration[] SALT_ROTATION_AGE_THRESHOLDS = new Duration[]{
+            Duration.ofDays(30),
+            Duration.ofDays(60),
+            Duration.ofDays(90),
+            Duration.ofDays(120),
+            Duration.ofDays(150),
+            Duration.ofDays(180),
+            Duration.ofDays(210),
+            Duration.ofDays(240),
+            Duration.ofDays(270),
+            Duration.ofDays(300),
+            Duration.ofDays(330),
+            Duration.ofDays(360),
+            Duration.ofDays(390)
+    };
 
     private final AdminAuthMiddleware auth;
     private final WriteLock writeLock;
     private final SaltStoreWriter storageManager;
     private final RotatingSaltProvider saltProvider;
     private final SaltRotation saltRotation;
-    private final Duration[] defaultSaltRotationAgeThresholds;
+
 
     public SaltService(AdminAuthMiddleware auth,
                        WriteLock writeLock,
@@ -45,7 +60,6 @@ public SaltService(AdminAuthMiddleware auth,
         this.storageManager = storageManager;
         this.saltProvider = saltProvider;
         this.saltRotation = saltRotation;
-        this.defaultSaltRotationAgeThresholds = generateThresholds(30, 390, 30);
     }
 
     @Override
@@ -122,9 +136,9 @@ private void handleSaltRotate(RoutingContext rc) {
                  ageThresholds = RequestUtil.getDurations(rc, "min_ages_in_seconds");
                  if (ageThresholds == null) return;
             } else {
-                ageThresholds = defaultSaltRotationAgeThresholds;
+                ageThresholds = SALT_ROTATION_AGE_THRESHOLDS;
             }
-
+            LOGGER.info("Salt rotation age thresholds: {}", Arrays.toString(ageThresholds));
 
             final TargetDate targetDate =
                     RequestUtil.getDate(rc, "target_date", DateTimeFormatter.ISO_LOCAL_DATE)
@@ -157,14 +171,6 @@ private void handleSaltRotate(RoutingContext rc) {
         }
     }
 
-    private Duration[] generateThresholds(int minAge, int maxAge, int interval) {
-        List<Duration> thresholds = new ArrayList<>();
-        for (int i = minAge; i <= maxAge; i += interval) {
-            thresholds.add(Duration.ofDays(i));
-        }
-        return thresholds.toArray(new Duration[0]);
-    }
-
     private JsonObject toJson(RotatingSaltProvider.SaltSnapshot snapshot) {
         JsonObject jo = new JsonObject();
         jo.put("effective", snapshot.getEffective().toEpochMilli());

src/test/java/com/uid2/admin/salt/SaltServiceTest.java

@@ -153,6 +153,7 @@ void rotateSaltsWithCustomAgeThresholdsEnabled(Vertx vertx, VertxTestContext tes
         when(saltRotation.rotateSalts(any(), eq(expectedCustomAgeThresholds), eq(0.2), eq(utcTomorrow))).thenReturn(result);
 
         post(vertx, testContext, "api/salt/rotate?min_ages_in_seconds=50,60,70&fraction=0.2", "", response -> {
+            verify(saltRotation).rotateSalts(any(), eq(expectedCustomAgeThresholds), eq(0.2), eq(utcTomorrow));
             assertEquals(200, response.statusCode());
             testContext.completeNow();
         });
@@ -179,6 +180,7 @@ void rotateSaltsWithDefaultAgeThresholds(Vertx vertx, VertxTestContext testConte
         when(saltRotation.rotateSalts(any(), eq(expectedDefaultAgeThresholds), eq(0.2), eq(utcTomorrow))).thenReturn(result);
 
         post(vertx, testContext, "api/salt/rotate?min_ages_in_seconds=50,60,70&fraction=0.2", "", response -> {
+            verify(saltRotation).rotateSalts(any(), eq(expectedDefaultAgeThresholds), eq(0.2), eq(utcTomorrow));
             assertEquals(200, response.statusCode());
             testContext.completeNow();
         });
@@ -194,6 +196,7 @@ void rotateSaltsWithCustomAgeThresholdsEnabledButMissingParameter(Vertx vertx, V
         setSnapshots(lastSnapshot);
 
         post(vertx, testContext, "api/salt/rotate?fraction=0.2", "", response -> {
+            verify(saltRotation, never()).rotateSalts(any(), any(), anyDouble(), any());
             assertEquals(400, response.statusCode());
             testContext.completeNow();
         });