added noop trigger xcontent tests

opensearch-project · May 4, 2023 · ee8e651 · ee8e651
1 parent 6dee931
commit ee8e651
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/NoOpTrigger.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/NoOpTrigger.kt
@@ -26,7 +26,9 @@ data class NoOpTrigger(
     override fun toXContent(builder: XContentBuilder, params: ToXContent.Params): XContentBuilder {
         builder.startObject()
             .startObject(NOOP_TRIGGER_FIELD)
+            .field(ID_FIELD, id)
             .endObject()
+        .endObject()
         return builder
     }
 
@@ -43,6 +45,7 @@ data class NoOpTrigger(
     }
 
     companion object {
+        const val ID_FIELD = "id"
         const val NOOP_TRIGGER_FIELD = "noop_trigger"
         val XCONTENT_REGISTRY = NamedXContentRegistry.Entry(
             Trigger::class.java, ParseField(NOOP_TRIGGER_FIELD),
@@ -51,19 +54,17 @@ data class NoOpTrigger(
 
         @JvmStatic @Throws(IOException::class)
         fun parseInner(xcp: XContentParser): NoOpTrigger {
-            if (xcp.currentToken() != XContentParser.Token.START_OBJECT && xcp.currentToken() != XContentParser.Token.FIELD_NAME) {
-                XContentParserUtils.throwUnknownToken(xcp.currentToken(), xcp.tokenLocation)
-            }
-
-            // If the parser began on START_OBJECT, move to the next token so that the while loop enters on
-            // the fieldName (or END_OBJECT if it's empty).
+            var id = ""
             if (xcp.currentToken() == XContentParser.Token.START_OBJECT) xcp.nextToken()
-            if (xcp.currentToken() != XContentParser.Token.END_OBJECT) {
-                XContentParserUtils.throwUnknownToken(xcp.currentToken(), xcp.tokenLocation)
-            } else {
+            if (xcp.currentName() == ID_FIELD) {
                 xcp.nextToken()
+                id = xcp.text()
+                xcp.nextToken()
+            }
+            if (xcp.currentToken() != XContentParser.Token.END_OBJECT || id == "") {
+                XContentParserUtils.throwUnknownToken(xcp.currentToken(), xcp.tokenLocation)
             }
-            return NoOpTrigger()
+            return NoOpTrigger(id = id)
         }
 
         @JvmStatic

diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/Trigger.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/Trigger.kt
@@ -12,7 +12,8 @@ interface Trigger : BaseModel {
     enum class Type(val value: String) {
         DOCUMENT_LEVEL_TRIGGER(DocumentLevelTrigger.DOCUMENT_LEVEL_TRIGGER_FIELD),
         QUERY_LEVEL_TRIGGER(QueryLevelTrigger.QUERY_LEVEL_TRIGGER_FIELD),
-        BUCKET_LEVEL_TRIGGER(BucketLevelTrigger.BUCKET_LEVEL_TRIGGER_FIELD);
+        BUCKET_LEVEL_TRIGGER(BucketLevelTrigger.BUCKET_LEVEL_TRIGGER_FIELD),
+        NOOP_TRIGGER(NoOpTrigger.NOOP_TRIGGER_FIELD);
 
         override fun toString(): String {
             return value

diff --git a/src/test/kotlin/org/opensearch/commons/alerting/model/XContentTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/model/XContentTests.kt
@@ -180,6 +180,16 @@ class XContentTests {
         Assertions.assertEquals(trigger, parsedTrigger, "Round tripping BucketLevelTrigger doesn't work")
     }
 
+    @Test
+    fun `test no-op trigger parsing`() {
+        val trigger = NoOpTrigger()
+
+        val triggerString = trigger.toXContent(builder(), ToXContent.EMPTY_PARAMS).string()
+        val parsedTrigger = Trigger.parse(parser(triggerString))
+
+        Assertions.assertEquals(trigger, parsedTrigger, "Round tripping BucketLevelTrigger doesn't work")
+    }
+
     @Test
     fun `test creating a monitor with duplicate trigger ids fails`() {
         try {