[DB TimeLock] 3A.2 Silly errors (#5521)

palantir · Jun 25, 2021 · aa3e499 · aa3e499
1 parent f458cd0
commit aa3e499
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/changelog/@unreleased/pr-5521.v2.yml b/changelog/@unreleased/pr-5521.v2.yml
@@ -0,0 +1,6 @@
+type: fix
+fix:
+  description: The DB persister runtime config for TimeLock now has the correct serialisation
+    type `database`.
+  links:
+  - https://github.com/palantir/atlasdb/pull/5521
diff --git a/.../main/java/com/palantir/timelock/config/DatabaseTsBoundPersisterRuntimeConfiguration.java b/.../main/java/com/palantir/timelock/config/DatabaseTsBoundPersisterRuntimeConfiguration.java
@@ -17,12 +17,14 @@
 package com.palantir.timelock.config;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.palantir.atlasdb.spi.KeyValueServiceRuntimeConfig;
 import org.immutables.value.Value;
 
 @Value.Immutable
 @JsonDeserialize(as = ImmutableDatabaseTsBoundPersisterRuntimeConfiguration.class)
+@JsonTypeName("database")
 public interface DatabaseTsBoundPersisterRuntimeConfiguration extends TsBoundPersisterRuntimeConfiguration {
     @JsonProperty("key-value-service")
     KeyValueServiceRuntimeConfig keyValueServiceRuntimeConfig();

diff --git a/timelock-agent/src/main/java/com/palantir/timelock/config/TimeLockRuntimeConfiguration.java b/timelock-agent/src/main/java/com/palantir/timelock/config/TimeLockRuntimeConfiguration.java
@@ -70,7 +70,7 @@ public TimeLockAdjudicationConfiguration adjudication() {
         return ImmutableTimeLockAdjudicationConfiguration.builder().build();
     }
 
-    @JsonProperty
+    @JsonProperty("timestamp-bound-persistence")
     public abstract Optional<TsBoundPersisterRuntimeConfiguration> timestampBoundPersistence();
 
     @Value.Check