wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-2924) - 移除eventproducer

Browse Source
This commit is contained in:
wangli 2024-09-13 23:21:23 +08:00
parent c4c2114db8
commit dbfc060791
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/ComplexInvokeClient.java
View File

@ -1,6 +1,5 @@
package cn.axzo.workflow.starter.feign.ext; package cn.axzo.workflow.starter.feign.ext;
import cn.axzo.framework.rocketmq.EventProducer;
import cn.axzo.workflow.common.enums.RpcInvokeModeEnum; import cn.axzo.workflow.common.enums.RpcInvokeModeEnum;
import cn.axzo.workflow.common.model.response.mq.WorkflowEngineStarterRpcInvokeDTO; import cn.axzo.workflow.common.model.response.mq.WorkflowEngineStarterRpcInvokeDTO;
import cn.axzo.workflow.starter.WorkflowEngineStarterProperties; import cn.axzo.workflow.starter.WorkflowEngineStarterProperties;
@ -43,6 +42,7 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Optional;
import java.util.Queue; import java.util.Queue;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -64,11 +64,11 @@ public class ComplexInvokeClient implements Client {
private final Logger log = LoggerFactory.getLogger(ComplexInvokeClient.class); private final Logger log = LoggerFactory.getLogger(ComplexInvokeClient.class);
private final WorkflowEngineStarterProperties starterProperties; private final WorkflowEngineStarterProperties starterProperties;
private final ObjectProvider<EventProducer> optEventProducer; private final ObjectProvider<RpcInvokeEventProducer> optEventProducer;
private final Client feignClient; private final Client feignClient;
public ComplexInvokeClient(WorkflowEngineStarterProperties starterProperties, public ComplexInvokeClient(WorkflowEngineStarterProperties starterProperties,
ObjectProvider<EventProducer> optEventProducer, ObjectProvider<RpcInvokeEventProducer> optEventProducer,
Client feignClient) { Client feignClient) {
this.starterProperties = starterProperties; this.starterProperties = starterProperties;
this.optEventProducer = optEventProducer; //(RpcInvokeEventProducer) eventProducer; this.optEventProducer = optEventProducer; //(RpcInvokeEventProducer) eventProducer;
@ -93,13 +93,10 @@ public class ComplexInvokeClient implements Client {
* @param options * @param options
*/ */
private Response asyncInvoke(Request request, Request.Options options) throws IOException { private Response asyncInvoke(Request request, Request.Options options) throws IOException {
EventProducer ifAvailable = optEventProducer.getIfAvailable(() -> null); Optional<RpcInvokeEventProducer> opt = Optional.ofNullable(optEventProducer.getIfAvailable());
if (ifAvailable == null) { if (!opt.isPresent()) {
return feignClient.execute(request, options); return feignClient.execute(request, options);
} }
// if (!optEventProducer.isPresent()) {
// return feignClient.execute(request, options);
// }
optEventProducer.ifAvailable(eventProducer -> { optEventProducer.ifAvailable(eventProducer -> {
WorkflowEngineStarterRpcInvokeDTO event = new WorkflowEngineStarterRpcInvokeDTO(); WorkflowEngineStarterRpcInvokeDTO event = new WorkflowEngineStarterRpcInvokeDTO();
MethodMetadata metadata = request.requestTemplate().methodMetadata(); MethodMetadata metadata = request.requestTemplate().methodMetadata();
@ -110,8 +107,9 @@ public class ComplexInvokeClient implements Client {
event.setParameters(args); event.setParameters(args);
buildArgs(request, metadata, args); buildArgs(request, metadata, args);
log.debug("[async-invoke] sourceEvent: {}", JSON.toJSONString(event)); log.debug("[async-invoke] sourceEvent: {}", JSON.toJSONString(event));
((RpcInvokeEventProducer) eventProducer).send(WORKFLOW_ENGINE_STARTER, event); eventProducer.send(WORKFLOW_ENGINE_STARTER, event);
}); });
Map<String, Collection<String>> headers = request.headers(); Map<String, Collection<String>> headers = request.headers();
headers.forEach((k, v) -> log.debug("ComplexInvokeClient Header: {} = {}", k, v)); headers.forEach((k, v) -> log.debug("ComplexInvokeClient Header: {} = {}", k, v));
return Response.builder() return Response.builder()

4
workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/WorkflowEngineStarterFeignConfiguration.java
View File

@ -1,9 +1,9 @@
package cn.axzo.workflow.starter.feign.ext; package cn.axzo.workflow.starter.feign.ext;
import cn.axzo.framework.rocketmq.EventProducer;
import cn.axzo.workflow.common.enums.RpcInvokeModeEnum; import cn.axzo.workflow.common.enums.RpcInvokeModeEnum;
import cn.axzo.workflow.common.util.ThreadUtil; import cn.axzo.workflow.common.util.ThreadUtil;
import cn.axzo.workflow.starter.WorkflowEngineStarterProperties; import cn.axzo.workflow.starter.WorkflowEngineStarterProperties;
import cn.axzo.workflow.starter.mq.retry.producer.RpcInvokeEventProducer;
import cn.azxo.framework.common.constatns.Constants; import cn.azxo.framework.common.constatns.Constants;
import feign.Client; import feign.Client;
import feign.RequestInterceptor; import feign.RequestInterceptor;
@ -55,7 +55,7 @@ public class WorkflowEngineStarterFeignConfiguration {
@Bean @Bean
public Client complexInvokeClient(WorkflowEngineStarterProperties starterProperties, public Client complexInvokeClient(WorkflowEngineStarterProperties starterProperties,
ObjectProvider<EventProducer> producerObjectProvider, ObjectProvider<RpcInvokeEventProducer> producerObjectProvider,
Client feignClient) { Client feignClient) {
return new ComplexInvokeClient(starterProperties, producerObjectProvider, feignClient); return new ComplexInvokeClient(starterProperties, producerObjectProvider, feignClient);
} }