From 50abf782e007c0e3164668a7b5581af44d3761ff Mon Sep 17 00:00:00 2001 From: Cristhian Castaneda Date: Wed, 29 Sep 2021 14:38:03 -0500 Subject: [PATCH] Revert "fix(api): fix type mismatch regression with Pipeline boolean properties (#1046)" This reverts commit b082bae3c459abaf9da959e3084508804a60c6c2. --- .../spinnaker/front50/api/model/pipeline/Pipeline.java | 6 +++--- .../front50/jackson/mixins/PipelineMixins.java | 6 +++--- .../front50/model/pipeline/PipelineSpec.groovy | 10 ---------- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/front50-api/src/main/java/com/netflix/spinnaker/front50/api/model/pipeline/Pipeline.java b/front50-api/src/main/java/com/netflix/spinnaker/front50/api/model/pipeline/Pipeline.java index 45003dc54..5c5eb2513 100644 --- a/front50-api/src/main/java/com/netflix/spinnaker/front50/api/model/pipeline/Pipeline.java +++ b/front50-api/src/main/java/com/netflix/spinnaker/front50/api/model/pipeline/Pipeline.java @@ -42,7 +42,7 @@ public class Pipeline implements Timestamped { private String lastModified; @Getter @Setter private String email; - @Getter @Setter private String disabled; + @Getter @Setter private Boolean disabled; @Getter @Setter private Map template; @Getter @Setter private List roles; @Getter @Setter private String serviceAccount; @@ -51,8 +51,8 @@ public class Pipeline implements Timestamped { @Getter @Setter private List> stages; @Getter @Setter private Map constraints; @Getter @Setter private Map payloadConstraints; - @Getter @Setter private String keepWaitingPipelines; - @Getter @Setter private String limitConcurrent; + @Getter @Setter private Boolean keepWaitingPipelines; + @Getter @Setter private Boolean limitConcurrent; @Getter @Setter private List> parameterConfig; @Getter @Setter private String spelEvaluator; diff --git a/front50-core/src/main/java/com/netflix/spinnaker/front50/jackson/mixins/PipelineMixins.java b/front50-core/src/main/java/com/netflix/spinnaker/front50/jackson/mixins/PipelineMixins.java index 847e2c05d..e90cf88a7 100644 --- a/front50-core/src/main/java/com/netflix/spinnaker/front50/jackson/mixins/PipelineMixins.java +++ b/front50-core/src/main/java/com/netflix/spinnaker/front50/jackson/mixins/PipelineMixins.java @@ -87,7 +87,7 @@ public abstract class PipelineMixins { @JsonInclude(Include.NON_NULL) @Getter @Setter - private String disabled; + private Boolean disabled; @JsonInclude(Include.NON_NULL) @Getter @@ -137,12 +137,12 @@ public abstract class PipelineMixins { @JsonInclude(Include.NON_NULL) @Getter @Setter - private String keepWaitingPipelines; + private Boolean keepWaitingPipelines; @JsonInclude(Include.NON_NULL) @Getter @Setter - private String limitConcurrent; + private Boolean limitConcurrent; @JsonInclude(Include.NON_NULL) @Getter diff --git a/front50-core/src/test/groovy/com/netflix/spinnaker/front50/model/pipeline/PipelineSpec.groovy b/front50-core/src/test/groovy/com/netflix/spinnaker/front50/model/pipeline/PipelineSpec.groovy index 54cd5d512..00071b5ef 100644 --- a/front50-core/src/test/groovy/com/netflix/spinnaker/front50/model/pipeline/PipelineSpec.groovy +++ b/front50-core/src/test/groovy/com/netflix/spinnaker/front50/model/pipeline/PipelineSpec.groovy @@ -49,16 +49,6 @@ class PipelineSpec extends Specification { pipeline == pipelineJSON } - def 'boolean properties should be strings'() { - given: - String pipelineJSON = '{"id":"1","schema":"1","triggers":[],"disabled":"true","keepWaitingPipelines":"true","limitConcurrent":"true"}' - Pipeline pipelineObj = objectMapper.readValue(pipelineJSON, Pipeline.class) - String pipeline = objectMapper.writeValueAsString(pipelineObj) - - expect: - pipeline == pipelineJSON - } - def 'should grab triggers after deserializing JSON into Pipeline'() { given: String pipelineJSON = '{"triggers": [{"type": "cron", "id": "a"}, {"type": "cron", "id": "b"}]}'