From 2d45c5d61ed488dc19638ee131371debc0bd2f81 Mon Sep 17 00:00:00 2001 From: Francis Dong Date: Tue, 22 Nov 2022 11:07:38 +0800 Subject: [PATCH] Rename --- fizz-core/src/main/java/we/fizz/Pipeline.java | 4 ++-- fizz-core/src/main/java/we/fizz/Step.java | 6 +++--- .../{ComponentHelper.java => ComponentExecutor.java} | 4 ++-- .../src/main/java/we/fizz/component/circle/Circle.java | 6 +++--- fizz-core/src/main/java/we/fizz/input/InputFactory.java | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) rename fizz-core/src/main/java/we/fizz/component/{ComponentHelper.java => ComponentExecutor.java} (95%) diff --git a/fizz-core/src/main/java/we/fizz/Pipeline.java b/fizz-core/src/main/java/we/fizz/Pipeline.java index 9a504ee..fbe1399 100644 --- a/fizz-core/src/main/java/we/fizz/Pipeline.java +++ b/fizz-core/src/main/java/we/fizz/Pipeline.java @@ -34,7 +34,7 @@ import we.constants.CommonConstants; import we.exception.ExecuteScriptException; import we.exception.RedirectException; import we.exception.StopAndResponseException; -import we.fizz.component.ComponentHelper; +import we.fizz.component.ComponentExecutor; import we.fizz.component.ComponentResult; import we.fizz.component.IComponent; import we.fizz.component.StepContextPosition; @@ -164,7 +164,7 @@ public class Pipeline { List components = step.getComponents(); if (components != null && components.size() > 0) { StepContextPosition stepCtxPos = new StepContextPosition(step.getName()); - return ComponentHelper.run(components, stepContext, stepCtxPos, (ctx, pos) -> { + return ComponentExecutor.exec(components, stepContext, stepCtxPos, (ctx, pos) -> { step.beforeRun(stepContext, null); return createStep(step); }).flatMap(sr -> { diff --git a/fizz-core/src/main/java/we/fizz/Step.java b/fizz-core/src/main/java/we/fizz/Step.java index 1cb8305..a3daadd 100644 --- a/fizz-core/src/main/java/we/fizz/Step.java +++ b/fizz-core/src/main/java/we/fizz/Step.java @@ -27,7 +27,7 @@ import org.apache.commons.collections.CollectionUtils; import org.springframework.context.ConfigurableApplicationContext; import reactor.core.publisher.Mono; -import we.fizz.component.ComponentHelper; +import we.fizz.component.ComponentExecutor; import we.fizz.component.ComponentResult; import we.fizz.component.IComponent; import we.fizz.component.StepContextPosition; @@ -88,7 +88,7 @@ public class Step { step.addRequestConfig((String) requestConfig.get("name"), inputConfig); } } - step.setComponents(ComponentHelper.buildComponents((List>) config.get("components"))); + step.setComponents(ComponentExecutor.buildComponents((List>) config.get("components"))); return step; } } @@ -128,7 +128,7 @@ public class Step { List components = input.getConfig().getComponents(); if (components != null && components.size() > 0) { StepContextPosition stepCtxPos = new StepContextPosition(name, requestName); - Mono result = ComponentHelper.run(components, stepContext, stepCtxPos, (ctx, pos) -> { + Mono result = ComponentExecutor.exec(components, stepContext, stepCtxPos, (ctx, pos) -> { if (input.needRun(ctx)) { return input.run(); } diff --git a/fizz-core/src/main/java/we/fizz/component/ComponentHelper.java b/fizz-core/src/main/java/we/fizz/component/ComponentExecutor.java similarity index 95% rename from fizz-core/src/main/java/we/fizz/component/ComponentHelper.java rename to fizz-core/src/main/java/we/fizz/component/ComponentExecutor.java index 360647d..80e2389 100644 --- a/fizz-core/src/main/java/we/fizz/component/ComponentHelper.java +++ b/fizz-core/src/main/java/we/fizz/component/ComponentExecutor.java @@ -36,7 +36,7 @@ import we.fizz.component.condition.Condition; * @author Francis Dong * */ -public class ComponentHelper { +public class ComponentExecutor { /** * Converts step context to ONode @@ -80,7 +80,7 @@ public class ComponentHelper { * @param stepContext * @param f */ - public static Mono run(List components, StepContext stepContext, + public static Mono exec(List components, StepContext stepContext, StepContextPosition stepCtxPos, BiFunction f) { if (components != null && components.size() > 0) { // conditions before circle component diff --git a/fizz-core/src/main/java/we/fizz/component/circle/Circle.java b/fizz-core/src/main/java/we/fizz/component/circle/Circle.java index c99027c..308ee74 100644 --- a/fizz-core/src/main/java/we/fizz/component/circle/Circle.java +++ b/fizz-core/src/main/java/we/fizz/component/circle/Circle.java @@ -28,7 +28,7 @@ import lombok.Data; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import we.fizz.StepContext; -import we.fizz.component.ComponentHelper; +import we.fizz.component.ComponentExecutor; import we.fizz.component.ComponentResult; import we.fizz.component.ComponentTypeEnum; import we.fizz.component.IComponent; @@ -264,7 +264,7 @@ public class Circle implements IComponent { @SuppressWarnings({ "unchecked", "rawtypes" }) public Mono exec(StepContext stepContext, StepContextPosition stepCtxPos, BiFunction f) { - ONode ctxNode1 = ComponentHelper.toONode(stepContext); + ONode ctxNode1 = ComponentExecutor.toONode(stepContext); CircleItem nextItem = this.next(ctxNode1); if (nextItem != null) { return Mono.just(new CircleItemResult(ctxNode1, nextItem, null)).expand(circleItemResult -> { @@ -293,7 +293,7 @@ public class Circle implements IComponent { } else { stepContext.addStepCircleResult(stepCtxPos.getStepName()); } - ONode ctxNode2 = ComponentHelper.toONode(stepContext); + ONode ctxNode2 = ComponentExecutor.toONode(stepContext); if (this.breakCircle(cItem.getIndex(), ctxNode2, stepContext, stepCtxPos)) { return Mono.empty(); } diff --git a/fizz-core/src/main/java/we/fizz/input/InputFactory.java b/fizz-core/src/main/java/we/fizz/input/InputFactory.java index fa657c7..798379f 100644 --- a/fizz-core/src/main/java/we/fizz/input/InputFactory.java +++ b/fizz-core/src/main/java/we/fizz/input/InputFactory.java @@ -17,7 +17,7 @@ package we.fizz.input; -import we.fizz.component.ComponentHelper; +import we.fizz.component.ComponentExecutor; import org.reflections.Reflections; import we.fizz.exception.FizzRuntimeException; import we.fizz.input.extension.request.RequestInput; @@ -67,7 +67,7 @@ public class InputFactory { } inputConfig.setType(typeEnum); inputConfig.setDataMapping((Map) config.get("dataMapping")); - inputConfig.setComponents(ComponentHelper.buildComponents((List>) config.get("components"))); + inputConfig.setComponents(ComponentExecutor.buildComponents((List>) config.get("components"))); inputConfig.parse(); return inputConfig; } else {