From aa3e499492e11473f5ed23dba95697a53d6bb1eb Mon Sep 17 00:00:00 2001
From: Jeremy Kong <jeremykong@hotmail.com>
Date: Fri, 25 Jun 2021 11:30:43 +0100
Subject: [PATCH] [DB TimeLock] 3A.2 Silly errors (#5521)

---
 changelog/@unreleased/pr-5521.v2.yml                        | 6 ++++++
 .../DatabaseTsBoundPersisterRuntimeConfiguration.java       | 2 ++
 .../timelock/config/TimeLockRuntimeConfiguration.java       | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 changelog/@unreleased/pr-5521.v2.yml

diff --git a/changelog/@unreleased/pr-5521.v2.yml b/changelog/@unreleased/pr-5521.v2.yml
new file mode 100644
index 00000000000..46fbe3fa77e
--- /dev/null
+++ 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/timelock-agent/src/main/java/com/palantir/timelock/config/DatabaseTsBoundPersisterRuntimeConfiguration.java b/timelock-agent/src/main/java/com/palantir/timelock/config/DatabaseTsBoundPersisterRuntimeConfiguration.java
index b7e2163cc67..1eb27460f8a 100644
--- a/timelock-agent/src/main/java/com/palantir/timelock/config/DatabaseTsBoundPersisterRuntimeConfiguration.java
+++ b/timelock-agent/src/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
index d6e6c6fcf76..9c3eb450824 100644
--- 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