Skip to content

Commit fe05ba0

Browse files
committed
Made refresh_from not nullable
1 parent 349b2c8 commit fe05ba0

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
import com.uid2.shared.model.SaltEntry;
44

55
public final class SaltSerializer {
6-
private SaltSerializer() {}
6+
private SaltSerializer() {
7+
}
78

89
public static String toCsv(SaltEntry[] entries) {
910
StringBuilder stringBuilder = new StringBuilder();
@@ -25,7 +26,7 @@ private static void addLine(SaltEntry entry, StringBuilder stringBuilder) {
2526
.append(entry.currentSalt());
2627

2728
stringBuilder.append(",");
28-
stringBuilder.append(serializeNullable(entry.refreshFrom()));
29+
stringBuilder.append(entry.refreshFrom());
2930

3031
stringBuilder.append(",");
3132
stringBuilder.append(serializeNullable(entry.previousSalt()));
@@ -45,8 +46,7 @@ private static void appendKey(StringBuilder stringBuilder, SaltEntry.KeyMaterial
4546
.append(serializeNullable(key.key()))
4647
.append(",")
4748
.append(serializeNullable(key.salt()));
48-
}
49-
else {
49+
} else {
5050
stringBuilder.append(",,,");
5151
}
5252
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ public class SaltService implements IService {
5050
private final RotatingSaltProvider saltProvider;
5151
private final SaltRotation saltRotation;
5252

53-
5453
public SaltService(AdminAuthMiddleware auth,
5554
WriteLock writeLock,
5655
SaltStoreWriter storageManager,
@@ -178,4 +177,4 @@ private JsonObject toJson(RotatingSaltProvider.SaltSnapshot snapshot) {
178177
.max(Long::compare).orElse(null));
179178
return jo;
180179
}
181-
}
180+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import java.time.Instant;
77
import java.util.concurrent.atomic.AtomicInteger;
88

9-
public class SaltBuilder {
9+
public final class SaltBuilder {
1010
private static final AtomicInteger LAST_AUTO_ID = new AtomicInteger(0);
1111

1212
private int id = LAST_AUTO_ID.incrementAndGet();

0 commit comments

Comments
 (0)