rename field

weibocom · Oct 29, 2024 · e9fe038 · e9fe038
1 parent e2b4603
commit e9fe038
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 11 deletions.
diff --git a/...mpicene-core/src/main/java/com/weibo/rill/flow/olympicene/core/model/task/ChoiceTask.java b/...mpicene-core/src/main/java/com/weibo/rill/flow/olympicene/core/model/task/ChoiceTask.java
@@ -53,7 +53,7 @@ public ChoiceTask(
             @JsonProperty("progress") Progress progress,
             @JsonProperty("degrade") Degrade degrade,
             @JsonProperty("timeline") Timeline timeline,
-            @JsonProperty("keyCallback") @JsonAlias({"key_callback", "isKeyCallback"}) boolean keyCallback,
+            @JsonProperty("keyCallback") boolean keyCallback,
             @JsonProperty("keyExp") String keyExp,
             @JsonProperty("parameters") Map<String, Object> parameters,
             @JsonProperty("templateId") String templateId,

diff --git a/...picene-core/src/main/java/com/weibo/rill/flow/olympicene/core/model/task/ForeachTask.java b/...picene-core/src/main/java/com/weibo/rill/flow/olympicene/core/model/task/ForeachTask.java
@@ -56,7 +56,7 @@ public ForeachTask(
             @JsonProperty("progress") Progress progress,
             @JsonProperty("degrade") Degrade degrade,
             @JsonProperty("timeline") Timeline timeline,
-            @JsonProperty("keyCallback") @JsonAlias({"key_callback", "isKeyCallback"}) boolean keyCallback,
+            @JsonProperty("keyCallback") boolean keyCallback,
             @JsonProperty("keyExp") String keyExp,
             @JsonProperty("parameters") Map<String, Object> parameters,
             @JsonProperty("templateId") String templateId,

diff --git a/...lympicene-core/src/main/java/com/weibo/rill/flow/olympicene/core/model/task/PassTask.java b/...lympicene-core/src/main/java/com/weibo/rill/flow/olympicene/core/model/task/PassTask.java
@@ -51,7 +51,7 @@ public PassTask(@JsonProperty("name") String name,
                     @JsonProperty("progress") Progress progress,
                     @JsonProperty("degrade") Degrade degrade,
                     @JsonProperty("timeline") Timeline timeline,
-                    @JsonProperty("keyCallback") @JsonAlias({"key_callback", "isKeyCallback"}) boolean keyCallback,
+                    @JsonProperty("keyCallback") boolean keyCallback,
                     @JsonProperty("keyExp") String keyExp,
                     @JsonProperty("parameters") Map<String, Object> parameters,
                     @JsonProperty("templateId") String templateId,

diff --git a/...mpicene-core/src/main/java/com/weibo/rill/flow/olympicene/core/model/task/ReturnTask.java b/...mpicene-core/src/main/java/com/weibo/rill/flow/olympicene/core/model/task/ReturnTask.java
@@ -16,7 +16,6 @@
 
 package com.weibo.rill.flow.olympicene.core.model.task;
 
-import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.weibo.rill.flow.interfaces.model.mapping.Mapping;
@@ -50,7 +49,7 @@ public ReturnTask(@JsonProperty("name") String name,
                       @JsonProperty("progress") Progress progress,
                       @JsonProperty("degrade") Degrade degrade,
                       @JsonProperty("timeline") Timeline timeline,
-                      @JsonProperty("keyCallback") @JsonAlias({"key_callback", "isKeyCallback"}) boolean keyCallback,
+                      @JsonProperty("keyCallback") boolean keyCallback,
                       @JsonProperty("keyExp") String keyExp,
                       @JsonProperty("parameters") Map<String, Object> parameters,
                       @JsonProperty("templateId") String templateId,

diff --git a/...icene-core/src/main/java/com/weibo/rill/flow/olympicene/core/model/task/SuspenseTask.java b/...icene-core/src/main/java/com/weibo/rill/flow/olympicene/core/model/task/SuspenseTask.java
@@ -53,7 +53,7 @@ public SuspenseTask(@JsonProperty("name") String name,
                         @JsonProperty("progress") Progress progress,
                         @JsonProperty("degrade") Degrade degrade,
                         @JsonProperty("timeline") Timeline timeline,
-                        @JsonProperty("keyCallback") @JsonAlias({"key_callback", "isKeyCallback"}) boolean keyCallback,
+                        @JsonProperty("keyCallback") boolean keyCallback,
                         @JsonProperty("keyExp") String keyExp,
                         @JsonProperty("parameters") Map<String, Object> parameters,
                         @JsonProperty("templateId") String templateId,

diff --git a/...mpicene-core/src/main/java/com/weibo/rill/flow/olympicene/core/model/task/SwitchTask.java b/...mpicene-core/src/main/java/com/weibo/rill/flow/olympicene/core/model/task/SwitchTask.java
@@ -16,7 +16,6 @@
 
 package com.weibo.rill.flow.olympicene.core.model.task;
 
-import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -28,7 +27,9 @@
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Getter
@@ -49,7 +50,7 @@ public SwitchTask(
             @JsonProperty("progress") Progress progress,
             @JsonProperty("degrade") Degrade degrade,
             @JsonProperty("timeline") Timeline timeline,
-            @JsonProperty("keyCallback") @JsonAlias({"key_callback", "isKeyCallback"}) boolean keyCallback,
+            @JsonProperty("keyCallback") boolean keyCallback,
             @JsonProperty("keyExp") String keyExp,
             @JsonProperty("parameters") Map<String, Object> parameters,
             @JsonProperty("templateId") String templateId,

diff --git a/rill-flow-interfaces/src/main/java/com/weibo/rill/flow/interfaces/model/task/BaseTask.java b/rill-flow-interfaces/src/main/java/com/weibo/rill/flow/interfaces/model/task/BaseTask.java
@@ -48,7 +48,6 @@ public abstract class BaseTask {
     private Progress progress;
     private Degrade degrade;
     private Timeline timeline;
-    @JsonProperty("keyCallback")
     private boolean keyCallback = false;
     private String keyExp;
     private Map<String,Object> parameters;

diff --git a/...flow-interfaces/src/main/java/com/weibo/rill/flow/interfaces/model/task/FunctionTask.java b/...flow-interfaces/src/main/java/com/weibo/rill/flow/interfaces/model/task/FunctionTask.java
@@ -67,7 +67,7 @@ public FunctionTask(@JsonProperty("name") String name,
                         @JsonProperty("degrade") Degrade degrade,
                         @JsonProperty("timeline") Timeline timeline,
                         @JsonProperty("requestType") String requestType,
-                        @JsonProperty("keyCallback") @JsonAlias({"key_callback", "isKeyCallback"}) boolean keyCallback,
+                        @JsonProperty("keyCallback") boolean keyCallback,
                         @JsonProperty("keyExp") String keyExp,
                         @JsonProperty("parameters") Map<String, Object> parameters,
                         @JsonProperty("templateId") String templateId,