fix(saga): Shift placement of @JsonIgnore so that the attribute is …

…actually ignored (#5112)
spinnaker · Nov 20, 2020 · d413d4d · d413d4d
1 parent 6b10ce3
commit d413d4d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/...r-event/src/main/kotlin/com/netflix/spinnaker/clouddriver/event/AbstractSpinnakerEvent.kt b/...r-event/src/main/kotlin/com/netflix/spinnaker/clouddriver/event/AbstractSpinnakerEvent.kt
@@ -27,14 +27,16 @@ abstract class AbstractSpinnakerEvent : SpinnakerEvent {
   /**
    * Not a lateinit to make Java/Lombok & Jackson compatibility a little easier, although behavior is exactly the same.
    */
-  @JsonIgnore
   private var metadata: EventMetadata? = null
 
+  @JsonIgnore
   override fun getMetadata(): EventMetadata {
     return metadata ?: throw UninitializedEventException()
   }
 
   override fun setMetadata(eventMetadata: EventMetadata) {
     metadata = eventMetadata
   }
+
+  fun hasMetadata() = metadata != null
 }
diff --git a/...driver-event/src/test/kotlin/com/netflix/spinnaker/clouddriver/event/ObjectMappingTest.kt b/...driver-event/src/test/kotlin/com/netflix/spinnaker/clouddriver/event/ObjectMappingTest.kt
@@ -49,19 +49,23 @@ class ObjectMappingTest : JUnit5Minutests {
         )
       )
 
-      val serialized = writeValueAsString(event)
-
-      expectThat(readValue<MyEvent>(serialized))
+      val serializedEvent = writeValueAsString(event)
+      expectThat(readValue<MyEvent>(serializedEvent))
         .isA<MyEvent>()
         .and {
           get { hello }.isEqualTo("world")
-          get { getMetadata() }.and {
-            get { id }.isEqualTo("myid")
-            get { aggregateType }.isEqualTo("type")
-            get { aggregateId }.isEqualTo("id")
-            get { sequence }.isEqualTo(999)
-            get { originatingVersion }.isEqualTo(100)
-          }
+          // EventMetadata should be excluded from SpinnakerEvent serialization
+          get { hasMetadata() }.isEqualTo(false)
+        }
+
+      val serializedEventMetadata = writeValueAsString(event.getMetadata())
+      expectThat(readValue<EventMetadata>(serializedEventMetadata))
+        .and {
+          get { id }.isEqualTo("myid")
+          get { aggregateType }.isEqualTo("type")
+          get { aggregateId }.isEqualTo("id")
+          get { sequence }.isEqualTo(999)
+          get { originatingVersion }.isEqualTo(100)
         }
     }
   }