From 2fce2277511ad4614508d761916e03f498902399 Mon Sep 17 00:00:00 2001 From: --system Date: Fri, 23 Jan 2026 10:17:40 +0800 Subject: [PATCH] =?UTF-8?q?EventManagerData=E6=90=9C=E9=9B=86=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=B9=B6=E8=A1=8C=E5=90=AF=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../caf/commons/event/CafEventListener.java | 10 ---- .../event/config/EventManagerData.java | 2 + .../event/entity/EventListenerData.java | 40 --------------- .../event/entity/EventListenerSettings.java | 48 ------------------ .../event/entity/EventManagerData.java | 33 ------------ .../CompositePropertySourceFactory.java | 50 ------------------- 6 files changed, 2 insertions(+), 181 deletions(-) delete mode 100644 caf-event/src/main/java/io/iec/edp/caf/commons/event/CafEventListener.java delete mode 100644 caf-event/src/main/java/io/iec/edp/caf/commons/event/entity/EventListenerData.java delete mode 100644 caf-event/src/main/java/io/iec/edp/caf/commons/event/entity/EventListenerSettings.java delete mode 100644 caf-event/src/main/java/io/iec/edp/caf/commons/event/entity/EventManagerData.java delete mode 100644 caf-event/src/main/java/io/iec/edp/caf/commons/event/properties/CompositePropertySourceFactory.java diff --git a/caf-event/src/main/java/io/iec/edp/caf/commons/event/CafEventListener.java b/caf-event/src/main/java/io/iec/edp/caf/commons/event/CafEventListener.java deleted file mode 100644 index ceede2f2e..000000000 --- a/caf-event/src/main/java/io/iec/edp/caf/commons/event/CafEventListener.java +++ /dev/null @@ -1,10 +0,0 @@ -//package io.iec.edp.caf.commons.event; -// -//import java.util.EventListener; -// -///** -// * @author Leon Huo -// * @Date: 2021/5/2 -// */ -//public interface CafEventListener extends EventListener { -//} diff --git a/caf-event/src/main/java/io/iec/edp/caf/commons/event/config/EventManagerData.java b/caf-event/src/main/java/io/iec/edp/caf/commons/event/config/EventManagerData.java index bb4183b6c..0062bb760 100644 --- a/caf-event/src/main/java/io/iec/edp/caf/commons/event/config/EventManagerData.java +++ b/caf-event/src/main/java/io/iec/edp/caf/commons/event/config/EventManagerData.java @@ -16,6 +16,7 @@ package io.iec.edp.caf.commons.event.config; +import io.iec.edp.caf.multicontext.annotation.Collect; import lombok.Data; import java.util.List; @@ -26,6 +27,7 @@ import java.util.List; * */ @Data +@Collect public class EventManagerData { private String name; diff --git a/caf-event/src/main/java/io/iec/edp/caf/commons/event/entity/EventListenerData.java b/caf-event/src/main/java/io/iec/edp/caf/commons/event/entity/EventListenerData.java deleted file mode 100644 index 3e7f0b309..000000000 --- a/caf-event/src/main/java/io/iec/edp/caf/commons/event/entity/EventListenerData.java +++ /dev/null @@ -1,40 +0,0 @@ -//package io.iec.edp.caf.commons.event.entity; -// -//import lombok.Data; -// -///** -// * @author Leon Huo -// * @Date: 2021/5/2 -// */ -//@Data -//public class EventListenerData implements Cloneable{ -// -// /** -// * 事件监听者对象名称 -// */ -// private String name; -// -// /** -// * 事件监听者对象的实现类 -// */ -// private String implClassName; -// /** -// * 无参构造函数 -// */ -// public EventListenerData(){ -// -// } -// @Override -// public Object clone(){ -// EventListenerData data= null; -// try { -// data = (EventListenerData) super.clone(); -// } catch (CloneNotSupportedException e) { -// e.printStackTrace(); -// } -// -// data.setName(this.getName()); -// data.setImplClassName(this.getImplClassName()); -// return data; -// } -//} diff --git a/caf-event/src/main/java/io/iec/edp/caf/commons/event/entity/EventListenerSettings.java b/caf-event/src/main/java/io/iec/edp/caf/commons/event/entity/EventListenerSettings.java deleted file mode 100644 index 69954c6f9..000000000 --- a/caf-event/src/main/java/io/iec/edp/caf/commons/event/entity/EventListenerSettings.java +++ /dev/null @@ -1,48 +0,0 @@ -//package io.iec.edp.caf.commons.event.entity; -// -//import java.util.ArrayList; -//import java.util.List; -// -///** -// * EventListenerSettings 合并后配置 -// * -// * @author Leon Huo -// */ -//public class EventListenerSettings { -// private List eventManagers = new ArrayList<>(); -// -// public List getEventManagers() { -// return this.eventManagers; -// } -// -// public void setEventListenerConfigurations(List eventManagers) { -// this.eventManagers = eventManagers; -// } -// -// public EventListenerSettings(EventManagerProperties properties, List eventManagerDatas) { -// if (properties != null && properties.getEventManagers() != null) -// this.eventManagers.addAll(properties.getEventManagers()); -// if (eventManagerDatas != null) { -// for (EventManagerData data : eventManagerDatas) { -// EventManagerData existeData = this.get(data.getName()); -// if (existeData == null) -// this.eventManagers.add(data); -// else { -// for (EventListenerData listenerData : data.getListeners()) { -// existeData.getListeners().removeIf(s -> s.getName() == listenerData.getName()); -// existeData.getListeners().add(listenerData); -// } -// } -// } -// } -// } -// -// private EventManagerData get(String name) { -// for (EventManagerData data : this.eventManagers) { -// if (data.getName().equals(name)) { -// return data; -// } -// } -// return null; -// } -//} diff --git a/caf-event/src/main/java/io/iec/edp/caf/commons/event/entity/EventManagerData.java b/caf-event/src/main/java/io/iec/edp/caf/commons/event/entity/EventManagerData.java deleted file mode 100644 index 7933b46bb..000000000 --- a/caf-event/src/main/java/io/iec/edp/caf/commons/event/entity/EventManagerData.java +++ /dev/null @@ -1,33 +0,0 @@ -//package io.iec.edp.caf.commons.event.entity; -// -//import lombok.Data; -// -//import java.util.List; -// -///** -// * @author Leon Huo -// * @Date: 2021/5/6 -// */ -//@Data -//public class EventManagerData { -// private String name; -// /** -// * 事件监听者对象名称 -// */ -// private List listeners; -// -// /** -// * 无参构造函数 -// */ -// public EventManagerData() { -// -// } -// -// /** -// * 构造函数 -// */ -// public EventManagerData(String name, List listeners) { -// this.name = name; -// this.listeners = listeners; -// } -//} diff --git a/caf-event/src/main/java/io/iec/edp/caf/commons/event/properties/CompositePropertySourceFactory.java b/caf-event/src/main/java/io/iec/edp/caf/commons/event/properties/CompositePropertySourceFactory.java deleted file mode 100644 index 683308660..000000000 --- a/caf-event/src/main/java/io/iec/edp/caf/commons/event/properties/CompositePropertySourceFactory.java +++ /dev/null @@ -1,50 +0,0 @@ -//package io.iec.edp.caf.commons.event.properties; -// -// -//import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; -//import org.springframework.core.env.PropertiesPropertySource; -//import org.springframework.core.env.PropertySource; -//import org.springframework.core.io.support.DefaultPropertySourceFactory; -//import org.springframework.core.io.support.EncodedResource; -// -//import java.io.IOException; -//import java.util.Properties; -// -///** -// * CompositePropertySourceFactory 既支持加载yml文件又支持加载propertites文件 -// * @author lijing -// * @data 2019/8/16 16:39 -// */ -//public class CompositePropertySourceFactory extends DefaultPropertySourceFactory -//{ -// @Override -// public PropertySource createPropertySource(String name, EncodedResource resource)throws IOException -// { -// String sourceName = name != null ? name : resource.getResource().getFilename(); -// if (!resource.getResource().exists()) { -// return new PropertiesPropertySource(sourceName, new Properties()); -// } else if (sourceName.endsWith(".yml") || sourceName.endsWith(".yaml")) { -// Properties propertiesFromYaml = loadYml(resource); -// return new PropertiesPropertySource(sourceName, propertiesFromYaml); -// } else { -// return super.createPropertySource(name, resource); -// } -// } -// /** -// * load yaml file to properties -// * -// * @param resource -// * @return -// * @throws IOException -// */ -// private Properties loadYml(EncodedResource resource) throws IOException { -// YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean(); -// factory.setResources(resource.getResource()); -// factory.afterPropertiesSet(); -// return factory.getObject(); -// } -// -// -// -//} -// -- Gitee