chore(dependencies): Upgrade Spring Boot to 2.2.1 cont'd

* jackson-module-kotlin changed the serialization behaviour for fields starting with 'is': FasterXML/jackson-module-kotlin#80 * jackson 2.10's objectMapper.convertValue() now converts everything even if the source is already from the target type. The fixed test was expected a value from a not fully converted Map.
pdelagrave · Dec 12, 2019 · 579fa88 · 579fa88
1 parent 5670953
commit 579fa88
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/model/Trigger.kt b/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/model/Trigger.kt
@@ -18,6 +18,7 @@ package com.netflix.spinnaker.orca.pipeline.model
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter
 import com.fasterxml.jackson.annotation.JsonAnySetter
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import com.netflix.spinnaker.kork.artifacts.model.Artifact
 import com.netflix.spinnaker.kork.artifacts.model.ExpectedArtifact
@@ -31,8 +32,11 @@ interface Trigger {
   val parameters: Map<String, Any>
   val artifacts: List<Artifact>
   val notifications: List<Map<String, Any>>
+  @get:JsonProperty("rebake")
   var isRebake: Boolean
+  @get:JsonProperty("dryRun")
   var isDryRun: Boolean
+  @get:JsonProperty("strategy")
   var isStrategy: Boolean
   var resolvedExpectedArtifacts: List<ExpectedArtifact>
   @set:JsonAnySetter

diff --git a/...test/groovy/com/netflix/spinnaker/orca/pipeline/util/ContextParameterProcessorSpec.groovy b/...test/groovy/com/netflix/spinnaker/orca/pipeline/util/ContextParameterProcessorSpec.groovy
@@ -161,7 +161,7 @@ class ContextParameterProcessorSpec extends Specification {
     result.test == source.test
     summary[escapedExpression].size() == 1
     summary[escapedExpression][0].level as String == ExpressionEvaluationSummary.Result.Level.ERROR.name()
-    summary[escapedExpression][0].exceptionType == SpelEvaluationException
+    summary[escapedExpression][0].exceptionType == SpelEvaluationException.typeName
 
     where:
     testCase                                                            | desc
@@ -184,7 +184,7 @@ class ContextParameterProcessorSpec extends Specification {
     result.test == source.test
     summary[escapedExpression].size() == 1
     summary[escapedExpression][0].level as String == ExpressionEvaluationSummary.Result.Level.ERROR.name()
-    summary[escapedExpression][0].exceptionType == SpelEvaluationException
+    summary[escapedExpression][0].exceptionType == SpelEvaluationException.typeName
 
     where:
     testCase                                                   | desc