cleanup RecordMetadata.formatRecordMetadata

evolution-gaming · Nov 4, 2023 · 0d14df7 · 0d14df7
1 parent b7ce030
commit 0d14df7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 20 deletions.
diff --git a/journal/src/main/scala/com/evolutiongaming/kafka/journal/RecordMetadata.scala b/journal/src/main/scala/com/evolutiongaming/kafka/journal/RecordMetadata.scala
@@ -14,25 +14,14 @@ object RecordMetadata {
 
   val empty: RecordMetadata = RecordMetadata()
 
-
   implicit val formatRecordMetadata: OFormat[RecordMetadata] = {
-
     val format = Json.format[RecordMetadata]
-
-    // TODO expiry: temporary, remove after 01-02-2020
-    val writes = new OWrites[RecordMetadata] {
-      def writes(a: RecordMetadata) = {
-        Json.toJsObject(a.header) ++ format.writes(a)
-      }
-    }
-
-    val reads = format.orElse((json: JsValue) => {
+    val reads = format.orElse { json: JsValue =>
       json
         .validate[HeaderMetadata]
         .map { a => RecordMetadata(a, PayloadMetadata.empty) }
-    })
-
-    OFormat(reads, writes)
+    }
+    OFormat(reads, format)
   }
 
 

diff --git a/journal/src/test/scala/com/evolutiongaming/kafka/journal/RecordMetadataTest.scala b/journal/src/test/scala/com/evolutiongaming/kafka/journal/RecordMetadataTest.scala
@@ -27,8 +27,7 @@ class RecordMetadataTest extends AnyFunSuite with Matchers {
             ("data", Json.obj(("key0", "value0"))))),
           ("payload", Json.obj(
             ("expireAfter", "1 day"),
-            ("data", Json.obj(("key1", "value1"))))),
-          ("data", Json.obj(("key0", "value0"))))),
+            ("data", Json.obj(("key1", "value1"))))))),
       (
         RecordMetadata(
           HeaderMetadata(Json.obj(("key0", "value0")).some),
@@ -37,8 +36,7 @@ class RecordMetadataTest extends AnyFunSuite with Matchers {
           ("header", Json.obj(
             ("data", Json.obj(("key0", "value0"))))),
           ("payload", Json.obj(
-            ("data", Json.obj(("key1", "value1"))))),
-          ("data", Json.obj(("key0", "value0"))))),
+            ("data", Json.obj(("key1", "value1"))))))),
       (
         RecordMetadata(
           HeaderMetadata.empty,
@@ -55,8 +53,7 @@ class RecordMetadataTest extends AnyFunSuite with Matchers {
         Json.obj(
           ("header", Json.obj(
             ("data", Json.obj(("key0", "value0"))))),
-          ("payload", Json.obj()),
-          ("data", Json.obj(("key0", "value0"))))))
+          ("payload", Json.obj()))))
   } {
     test(s"formatRecordMetadata reads & writes $json") {
       Json.toJson(metadata) shouldEqual json