Date: Wed, 7 Dec 2022 20:19:50 +0800
Subject: [PATCH 19/54] support adapter component
---
.../java/org/smartboot/flow/core/Adapter.java | 34 ++++++++
.../smartboot/flow/core/EngineContext.java | 18 ++++-
.../flow/core/builder/AdapterBuilder.java | 31 +++++++
.../flow/core/builder/PipelineBuilder.java | 5 ++
.../flow/core/component/AdapterComponent.java | 80 +++++++++++++++++++
.../smartboot/flow/example/AdapterTest.java | 28 +++++++
.../org/smartboot/flow/example/NewStep1.java | 16 ++++
.../smartboot/flow/example/EngineTest.java | 34 ++++++++
8 files changed, 244 insertions(+), 2 deletions(-)
create mode 100644 smart-flow-core/src/main/java/org/smartboot/flow/core/Adapter.java
create mode 100644 smart-flow-core/src/main/java/org/smartboot/flow/core/builder/AdapterBuilder.java
create mode 100644 smart-flow-core/src/main/java/org/smartboot/flow/core/component/AdapterComponent.java
create mode 100644 smart-flow-example/src/main/java/org/smartboot/flow/example/AdapterTest.java
create mode 100644 smart-flow-example/src/main/java/org/smartboot/flow/example/NewStep1.java
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/Adapter.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/Adapter.java
new file mode 100644
index 0000000..9009d7a
--- /dev/null
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/Adapter.java
@@ -0,0 +1,34 @@
+package org.smartboot.flow.core;
+
+import com.sun.tools.javac.util.Pair;
+
+/**
+ * 适配器组件
+ *
+ * 应用场景：将两个参数类型不同的业务组件适配成统一的类型
+ *
+ *
+ *
+ * @author huqiang
+ * @since 2022/12/7 14:35
+ */
+public interface Adapter extends Describable {
+
+
+ /**
+ * 适配前处理
+ *
+ * @param context 流程上下文
+ * @return 返回需要适配的组件的入参和出参
+ */
+ Pair before(EngineContext context);
+
+ /**
+ * 适配后置处理
+ *
+ * @param origin 原流程上下文
+ * @param newContext 适配的组件返回的上下文
+ */
+ void after(EngineContext origin, EngineContext newContext);
+
+}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/EngineContext.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/EngineContext.java
index abff39a..69e1e92 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/EngineContext.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/EngineContext.java
@@ -18,7 +18,7 @@ import java.util.concurrent.Future;
* @date 2022-11-12 21:00:58
* @since 1.0.0
*/
-public class EngineContext {
+public class EngineContext implements Cloneable{
public static final int DISABLED = -1;
public static final int EXECUTING = 1;
@@ -34,7 +34,7 @@ public class EngineContext {
private Throwable fatal;
private ExceptionHandler handler;
private boolean rollback;
- private final Map> asyncInvokes = new ConcurrentHashMap<>();
+ private final Map asyncInvokes = new ConcurrentHashMap<>();
private String engineName;
ExecutionListener listener;
/**
@@ -42,6 +42,20 @@ public class EngineContext {
*/
private int executing;
+ public EngineContext newContext(Object req, Object result) {
+ EngineContext newContext = new EngineContext<>();
+ try {
+ newContext = (EngineContext)this.clone();
+ newContext.extensions.putAll(this.extensions);
+ newContext.asyncInvokes.putAll(this.asyncInvokes);
+ newContext.setReq(req);
+ newContext.setResult(result);
+ } catch (CloneNotSupportedException e) {
+ e.printStackTrace();
+ }
+ return newContext;
+ }
+
/**
* Returns current invoked trace.
*
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/builder/AdapterBuilder.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/builder/AdapterBuilder.java
new file mode 100644
index 0000000..9b3c08b
--- /dev/null
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/builder/AdapterBuilder.java
@@ -0,0 +1,31 @@
+package org.smartboot.flow.core.builder;
+
+import org.smartboot.flow.core.Adapter;
+import org.smartboot.flow.core.component.AdapterComponent;
+import org.smartboot.flow.core.component.Component;
+
+/**
+ * @author huqiang
+ * @since 2022/12/7 19:36
+ */
+public class AdapterBuilder extends ExecutableBuilder {
+
+ private Adapter adapter;
+
+ private Component component;
+
+ private AdapterComponent adapterComponent;
+
+ public AdapterBuilder(Adapter adapter, Component component) {
+ adapterComponent = new AdapterComponent();
+ adapterComponent.setAdapter(adapter);
+ adapterComponent.setComponent(component);
+ applyValues(adapterComponent);
+ }
+
+ public AdapterComponent build() {
+ return adapterComponent;
+ }
+
+
+}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/builder/PipelineBuilder.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/builder/PipelineBuilder.java
index 4b5adff..2fc6a76 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/builder/PipelineBuilder.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/builder/PipelineBuilder.java
@@ -1,6 +1,7 @@
package org.smartboot.flow.core.builder;
+import org.smartboot.flow.core.Adapter;
import org.smartboot.flow.core.Condition;
import org.smartboot.flow.core.Pipeline;
import org.smartboot.flow.core.component.Component;
@@ -59,6 +60,10 @@ public class PipelineBuilder {
return new IfComponentBuilder<>(this, condition);
}
+ public PipelineBuilder adapter(Adapter adapter, Component component) {
+ return this.next(new AdapterBuilder(adapter, component).build());
+ }
+
public ChooseBuilder choose(Condition condition) {
AssertUtil.notNull(condition, "must not be null");
return new ChooseBuilder<>(this, condition);
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/component/AdapterComponent.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/component/AdapterComponent.java
new file mode 100644
index 0000000..e2c1b70
--- /dev/null
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/component/AdapterComponent.java
@@ -0,0 +1,80 @@
+package org.smartboot.flow.core.component;
+
+import com.sun.tools.javac.util.Pair;
+import org.smartboot.flow.core.Adapter;
+import org.smartboot.flow.core.EngineContext;
+import org.smartboot.flow.core.util.AssertUtil;
+import org.smartboot.flow.core.visitor.ComponentVisitor;
+
+/**
+ * 适配器组件
+ *
+ * @author huqiang
+ * @since 2022/12/7 19:01
+ */
+public class AdapterComponent extends Component {
+
+ /**
+ * 业务适配器接口定义
+ */
+ private Adapter adapter;
+
+ /**
+ * 待执行的适配流程组件
+ */
+ private Component component;
+
+ public Adapter getAdapter() {
+ return this.adapter;
+ }
+
+ public Component getComponent() {
+ return this.component;
+ }
+
+ public void setAdapter(Adapter adapter) {
+ this.adapter = adapter;
+ }
+
+ public void setComponent(Component component) {
+ this.component = component;
+ }
+
+ @Override
+ public String describe() {
+ return "adapter@" + adapter.describe();
+ }
+
+ @Override
+ public void rollback(EngineContext context) {
+ component.rollback(context);
+ }
+
+ @Override
+ public void validate() {
+ AssertUtil.notNull(adapter, "adapter[" + getName() + "] adapter must not be null");
+ AssertUtil.notNull(component, "component[" + getName() + "] component must not be null");
+ }
+
+ @Override
+ public int invoke(EngineContext context) throws Exception {
+ Pair pair = adapter.before(context);
+ AssertUtil.notNull(pair, "adapter[" + getName() + "] result must not be null");
+ EngineContext newContext = context.newContext(pair.fst, pair.snd);
+ int invoke = 1;
+ try {
+ invoke = component.invoke(newContext);
+ } finally {
+ context.setFatal(newContext.getFatal());
+ context.setRollback(newContext.getRollback());
+ context.broken(newContext.isBroken());
+ }
+ adapter.after(context, newContext);
+ return invoke;
+ }
+
+ @Override
+ public void visit(ComponentVisitor visitor) {
+ visitor.visitComponent(this);
+ }
+}
diff --git a/smart-flow-example/src/main/java/org/smartboot/flow/example/AdapterTest.java b/smart-flow-example/src/main/java/org/smartboot/flow/example/AdapterTest.java
new file mode 100644
index 0000000..bd5e9cf
--- /dev/null
+++ b/smart-flow-example/src/main/java/org/smartboot/flow/example/AdapterTest.java
@@ -0,0 +1,28 @@
+package org.smartboot.flow.example;
+
+import com.sun.tools.javac.util.Pair;
+import org.smartboot.flow.core.Adapter;
+import org.smartboot.flow.core.EngineContext;
+
+/**
+ * @author huqiang
+ * @since 2022/12/7 19:54
+ */
+public class AdapterTest implements Adapter {
+
+ @Override
+ public Pair before(EngineContext context) {
+ return Pair.of("req", "response");
+ }
+
+ @Override
+ public void after(EngineContext origin, EngineContext newContext) {
+ System.out.println("origin req = " + origin.getReq() + ", origin response = " + origin.getResult());
+ System.out.println("req=" + newContext.getReq() + ", response=" + newContext.getResult());
+ }
+
+ @Override
+ public String describe() {
+ return this.getClass().getName();
+ }
+}
diff --git a/smart-flow-example/src/main/java/org/smartboot/flow/example/NewStep1.java b/smart-flow-example/src/main/java/org/smartboot/flow/example/NewStep1.java
new file mode 100644
index 0000000..a62f1fe
--- /dev/null
+++ b/smart-flow-example/src/main/java/org/smartboot/flow/example/NewStep1.java
@@ -0,0 +1,16 @@
+package org.smartboot.flow.example;
+
+import org.smartboot.flow.core.executable.AbstractExecutable;
+
+/**
+ * @author huqiang
+ * @since 2022/12/7 19:57
+ */
+public class NewStep1 extends AbstractExecutable {
+
+ @Override
+ public void execute(String s, String s2) {
+ System.out.println("new step" + " req=" + s + ", response=" + s2);
+
+ }
+}
diff --git a/smart-flow-example/src/test/java/org/smartboot/flow/example/EngineTest.java b/smart-flow-example/src/test/java/org/smartboot/flow/example/EngineTest.java
index f81f0e3..f9c86be 100644
--- a/smart-flow-example/src/test/java/org/smartboot/flow/example/EngineTest.java
+++ b/smart-flow-example/src/test/java/org/smartboot/flow/example/EngineTest.java
@@ -13,6 +13,7 @@ import org.smartboot.flow.core.builder.PipelineBuilder;
import org.smartboot.flow.core.attribute.Attributes;
import org.smartboot.flow.core.component.Component;
import org.smartboot.flow.core.component.IfComponent;
+import org.smartboot.flow.core.component.PipelineComponent;
import org.smartboot.flow.core.executable.AbstractExecutable;
import org.smartboot.flow.core.executable.ExecutableAdapter;
@@ -168,6 +169,39 @@ public class EngineTest {
engine.execute(context);
}
+
+ @Test
+ public void testAdapterPipeline(){
+ EngineBuilder builder = new EngineBuilder<>("defaultEngine");
+
+
+
+
+ PipelineBuilder pipelineBuilder = new PipelineBuilder<>("main process");
+
+ PipelineBuilder adapterPipelineBuilder = new PipelineBuilder(pipelineBuilder, "adapter process");
+ adapterPipelineBuilder.next(new NewStep1()).next(new NewStep1());
+
+ ExecutableBuilder execBuilder = ExecutableBuilder.newBuilder();
+ execBuilder.apply(Attributes.ROLLBACK, true);
+ Component nested = execBuilder.newAdapter(new Step5());
+
+
+ pipelineBuilder.next(new Step1()).next(new Step2())
+ .next(new IfCondition()).apply(Attributes.ROLLBACK, true).then(new Step3(), new ElseStep())
+ .next(new IfCondition2()).then(new IfComponent<>(new IfCondition3(), nested))
+ .adapter(new AdapterTest(), new PipelineComponent(adapterPipelineBuilder.build()));
+
+
+ EngineContext context = new EngineContext<>();
+ context.setReq(1);
+ context.setResult("hello");
+
+ builder.pipeline(pipelineBuilder.build()).build().execute(context);
+
+ LOGGER.info("trace {}", context.getTrace());
+ }
+
@Test
public void testBuildPipeline() {
EngineBuilder builder = new EngineBuilder<>("defaultEngine");
--
Gitee
From c7d8e8187d9556ac6f420d1696c084244a3e3e02 Mon Sep 17 00:00:00 2001
From: qinluo <1558642210@qq.com>
Date: Wed, 7 Dec 2022 21:43:54 +0800
Subject: [PATCH 20/54] =?UTF-8?q?qinluo:=20=20=20=20=20=20-=20=E6=B3=9B?=
=?UTF-8?q?=E5=9E=8B=E4=BC=98=E5=8C=96=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/org/smartboot/flow/core/Adapter.java | 9 +++--
.../flow/core/builder/AdapterBuilder.java | 14 +++----
.../flow/core/builder/ChooseBuilder.java | 6 +--
.../flow/core/builder/ExecutableBuilder.java | 8 ++++
.../flow/core/builder/IfComponentBuilder.java | 10 ++---
.../flow/core/builder/PipelineBuilder.java | 4 +-
.../org/smartboot/flow/core/common/Pair.java | 39 +++++++++++++++++++
.../flow/core/component/AdapterComponent.java | 33 +++++++---------
.../core/parser/BuilderDefinitionVisitor.java | 2 +-
.../smartboot/flow/example/AdapterTest.java | 8 ++--
.../smartboot/flow/example/EngineTest.java | 4 +-
11 files changed, 90 insertions(+), 47 deletions(-)
create mode 100644 smart-flow-core/src/main/java/org/smartboot/flow/core/common/Pair.java
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/Adapter.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/Adapter.java
index 9009d7a..c08960b 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/Adapter.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/Adapter.java
@@ -1,6 +1,7 @@
package org.smartboot.flow.core;
-import com.sun.tools.javac.util.Pair;
+
+import org.smartboot.flow.core.common.Pair;
/**
* 适配器组件
@@ -12,7 +13,7 @@ import com.sun.tools.javac.util.Pair;
* @author huqiang
* @since 2022/12/7 14:35
*/
-public interface Adapter extends Describable {
+public interface Adapter extends Describable {
/**
@@ -21,7 +22,7 @@ public interface Adapter extends Describable {
* @param context 流程上下文
* @return 返回需要适配的组件的入参和出参
*/
- Pair before(EngineContext context);
+ Pair before(EngineContext context);
/**
* 适配后置处理
@@ -29,6 +30,6 @@ public interface Adapter extends Describable {
* @param origin 原流程上下文
* @param newContext 适配的组件返回的上下文
*/
- void after(EngineContext origin, EngineContext newContext);
+ void after(EngineContext origin, EngineContext newContext);
}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/builder/AdapterBuilder.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/builder/AdapterBuilder.java
index 9b3c08b..816021d 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/builder/AdapterBuilder.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/builder/AdapterBuilder.java
@@ -8,22 +8,22 @@ import org.smartboot.flow.core.component.Component;
* @author huqiang
* @since 2022/12/7 19:36
*/
-public class AdapterBuilder extends ExecutableBuilder {
+public class AdapterBuilder extends ExecutableBuilder {
- private Adapter adapter;
+ private Adapter adapter;
- private Component component;
+ private Component component;
- private AdapterComponent adapterComponent;
+ private AdapterComponent adapterComponent;
- public AdapterBuilder(Adapter adapter, Component component) {
- adapterComponent = new AdapterComponent();
+ public AdapterBuilder(Adapter adapter, Component component) {
+ adapterComponent = new AdapterComponent<>();
adapterComponent.setAdapter(adapter);
adapterComponent.setComponent(component);
applyValues(adapterComponent);
}
- public AdapterComponent build() {
+ public AdapterComponent build() {
return adapterComponent;
}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/builder/ChooseBuilder.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/builder/ChooseBuilder.java
index 8c52802..b2b3447 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/builder/ChooseBuilder.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/builder/ChooseBuilder.java
@@ -44,7 +44,7 @@ public class ChooseBuilder extends ExecutableBuilder {
public ChooseBuilder newBranch(Object branch, Executable