Skip to content

Commit 5c8957f

Browse files
authored
lwcapi: fix npe when samples missing (#1731)
If the payload didn't include a samples key, then it would get set to `null` and result in errors. Default to an empty list.
1 parent 57369c1 commit 5c8957f

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

Diff for: atlas-lwcapi/src/main/scala/com/netflix/atlas/lwcapi/EvaluateApi.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ object EvaluateApi {
8888
id: String,
8989
@JsonDeserialize(`using` = classOf[SortedTagMapDeserializer]) tags: SortedTagMap,
9090
value: Double,
91-
samples: List[List[Any]]
91+
samples: List[List[Any]] = Nil
9292
)
9393

9494
case class EvaluateRequest(

Diff for: atlas-lwcapi/src/test/scala/com/netflix/atlas/lwcapi/EvaluateApiSuite.scala

+6
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,10 @@ class EvaluateApiSuite extends MUnitRouteSuite {
8888
assertEquals(response.status, StatusCodes.OK)
8989
}
9090
}
91+
92+
test("item samples decode") {
93+
val json = """{"id":"1","tags":{"name":"test"},"value":1.0}"""
94+
val expected = EvaluateApi.Item("1", SortedTagMap("name" -> "test"), 1.0, Nil)
95+
assertEquals(Json.decode[EvaluateApi.Item](json), expected)
96+
}
9197
}

0 commit comments

Comments
 (0)