lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BootModule

Browse Source
This commit is contained in:
redkale
2023-12-25 19:09:13 +08:00
parent 710f8fc632
commit 498b2ff70f
26 changed files with 256 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/module-info.java
View File

@@ -26,7 +26,9 @@ module org.redkale {
exports org.redkale.convert.ext;
exports org.redkale.convert.json;
exports org.redkale.convert.proto;
exports org.redkale.convert.spi;
exports org.redkale.inject;
exports org.redkale.inject.spi;
exports org.redkale.lock;
exports org.redkale.lock.spi;
exports org.redkale.mq;
@@ -36,22 +38,24 @@ module org.redkale {
exports org.redkale.net.http;
exports org.redkale.net.sncp;
exports org.redkale.persistence;
exports org.redkale.props.spi;
exports org.redkale.schedule;
exports org.redkale.schedule.spi;
exports org.redkale.service;
exports org.redkale.source;
exports org.redkale.source.spi;
exports org.redkale.util;
exports org.redkale.watch;
uses org.redkale.boot.PropertiesAgentProvider;
uses org.redkale.props.spi.PropertiesAgentProvider;
uses org.redkale.cache.spi.CacheManagerProvider;
uses org.redkale.cluster.spi.ClusterAgentProvider;
uses org.redkale.convert.ConvertProvider;
uses org.redkale.inject.ResourceAnnotationProvider;
uses org.redkale.convert.spi.ConvertProvider;
uses org.redkale.inject.spi.ResourceAnnotationProvider;
uses org.redkale.mq.spi.MessageAgentProvider;
uses org.redkale.schedule.spi.ScheduleManagerProvider;
uses org.redkale.source.CacheSourceProvider;
uses org.redkale.source.DataSourceProvider;
uses org.redkale.source.DataNativeSqlParserProvider;
uses org.redkale.source.spi.CacheSourceProvider;
uses org.redkale.source.spi.DataSourceProvider;
uses org.redkale.source.spi.DataNativeSqlParserProvider;
}

2
src/main/java/org/redkale/boot/Application.java
View File

@@ -42,9 +42,11 @@ import org.redkale.mq.spi.MessageModuleEngine;
import org.redkale.net.*;
import org.redkale.net.http.*;
import org.redkale.net.sncp.*;
import org.redkale.props.spi.PropertiesModule;
import org.redkale.schedule.spi.ScheduleModuleEngine;
import org.redkale.service.Service;
import org.redkale.source.*;
import org.redkale.source.spi.SourceModuleEngine;
import org.redkale.util.*;
import org.redkale.watch.WatchServlet;

55
src/main/java/org/redkale/boot/BootModule.java Normal file
View File

@@ -0,0 +1,55 @@
/*
*
*/
package org.redkale.boot;
import java.util.List;
import java.util.Objects;
import java.util.Properties;
import org.redkale.inject.ResourceEvent;
import org.redkale.inject.ResourceFactory;
import org.redkale.util.Environment;
/**
*
* @author zhangjx
*/
public abstract class BootModule {
protected final Application application;
protected final ResourceFactory resourceFactory;
protected final Environment environment;
protected BootModule(Application application) {
this.application = application;
this.resourceFactory = Objects.requireNonNull(application.resourceFactory);
this.environment = Objects.requireNonNull(application.getEnvironment());
}
protected void removeEnvValue(String name) {
application.envProperties.remove(name);
}
protected void putEnvValue(Object name, Object value) {
application.envProperties.put(name, value);
}
protected List<ModuleEngine> getModuleEngines() {
return application.getModuleEngines();
}
protected void reconfigLogging(boolean first, Properties allProps) {
application.loggingModule.reconfigLogging(first, allProps);
}
protected void onEnvironmentChanged(String namespace, List<ResourceEvent> events) {
if (namespace != null && namespace.contains("logging")) {
//日志配置单独处理
application.loggingModule.onEnvironmentUpdated(events);
} else {
application.onEnvironmentChanged(namespace, events);
}
}
}

10
src/main/java/org/redkale/boot/LoggingModule.java
View File

@@ -32,15 +32,13 @@ import org.redkale.util.Environment;
*
* @since 2.8.0
*/
class LoggingModule {
private final Application application;
class LoggingModule extends BootModule {
//日志配置资源
private final Properties loggingProperties = new Properties();
LoggingModule(Application application) {
this.application = application;
super(application);
}
/**
@@ -78,11 +76,11 @@ class LoggingModule {
String searchRawHandler = "java.util.logging.SearchHandler";
String searchReadHandler = LoggingSearchHandler.class.getName();
Properties onlyLogProps = new Properties();
Environment environment = application.getEnvironment();
Environment envs = this.environment;
allProps.entrySet().forEach(x -> {
String key = x.getKey().toString();
if (key.startsWith("java.util.logging.") || key.contains(".level") || key.equals("handlers")) {
String val = environment.getPropertyValue(x.getValue().toString()
String val = envs.getPropertyValue(x.getValue().toString()
.replace("%m", "%tY%tm").replace("%d", "%tY%tm%td") //兼容旧时间格式
.replace(searchRawHandler, searchReadHandler));
onlyLogProps.put(key.replace(searchRawHandler, searchReadHandler), val);

1
src/main/java/org/redkale/convert/ConvertFactory.java
View File

@@ -22,6 +22,7 @@ import org.redkale.convert.bson.BsonConvert;
import org.redkale.convert.ext.*;
import org.redkale.convert.json.JsonConvert;
import org.redkale.convert.proto.ProtobufConvert;
import org.redkale.convert.spi.ConvertProvider;
import org.redkale.util.*;
/**

5
src/main/java/org/redkale/convert/ConvertProvider.java → src/main/java/org/redkale/convert/spi/ConvertProvider.java
View File

@@ -3,7 +3,10 @@
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package org.redkale.convert;
package org.redkale.convert.spi;
import org.redkale.convert.Convert;
import org.redkale.convert.ConvertType;
/**
* Convert的扩展实现类加载器, 通过此类可以创建自定义的序列化格式，例如：protobuf、xmlbean

1
src/main/java/org/redkale/inject/ResourceFactory.java
View File

@@ -17,6 +17,7 @@ import java.util.function.*;
import java.util.logging.*;
import org.redkale.annotation.*;
import org.redkale.convert.*;
import org.redkale.inject.spi.ResourceAnnotationProvider;
import org.redkale.util.Creator;
import org.redkale.util.RedkaleClassLoader;
import org.redkale.util.RedkaleException;

3
src/main/java/org/redkale/inject/ResourceAnnotationProvider.java → src/main/java/org/redkale/inject/spi/ResourceAnnotationProvider.java
View File

@@ -3,10 +3,11 @@
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package org.redkale.inject;
package org.redkale.inject.spi;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import org.redkale.inject.ResourceFactory;
/**
* 自定义注入加载器

2
src/main/java/org/redkale/mq/spi/MessageModuleEngine.java
View File

@@ -22,10 +22,10 @@ import org.redkale.boot.ClassFilter;
import org.redkale.boot.ModuleEngine;
import org.redkale.boot.NodeServer;
import org.redkale.convert.json.JsonConvert;
import org.redkale.inject.ResourceAnnotationProvider;
import org.redkale.inject.ResourceEvent;
import org.redkale.inject.ResourceFactory;
import org.redkale.inject.ResourceTypeLoader;
import org.redkale.inject.spi.ResourceAnnotationProvider;
import org.redkale.mq.MessageConsumer;
import org.redkale.mq.MessageManager;
import org.redkale.mq.MessageProducer;

8
src/main/java/org/redkale/boot/PropertiesAgent.java → src/main/java/org/redkale/props/spi/PropertiesAgent.java
View File

@@ -1,10 +1,12 @@
/*
*/
package org.redkale.boot;
package org.redkale.props.spi;
import java.util.*;
import java.util.logging.Logger;
import org.redkale.boot.Application;
import org.redkale.inject.ResourceEvent;
import org.redkale.props.spi.PropertiesModule;
import org.redkale.util.*;
/**
@@ -23,6 +25,8 @@ public abstract class PropertiesAgent {
protected final Logger logger = Logger.getLogger(this.getClass().getSimpleName());
PropertiesModule bootModule;
/**
* 编译时进行的操作
*
@@ -65,7 +69,7 @@ public abstract class PropertiesAgent {
* @param events 变更项集合
*/
protected final void onEnvironmentUpdated(Application application, String namespace, List<ResourceEvent> events) {
application.propertiesModule.onEnvironmentUpdated(namespace, events);
bootModule.onEnvironmentUpdated(namespace, events);
}
}

2
src/main/java/org/redkale/boot/PropertiesAgentProvider.java → src/main/java/org/redkale/props/spi/PropertiesAgentProvider.java
View File

@@ -1,6 +1,6 @@
/*
*/
package org.redkale.boot;
package org.redkale.props.spi;
import org.redkale.util.*;

48
src/main/java/org/redkale/boot/PropertiesModule.java → src/main/java/org/redkale/props/spi/PropertiesModule.java
View File

@@ -1,7 +1,7 @@
/*
*
*/
package org.redkale.boot;
package org.redkale.props.spi;
import java.util.ArrayList;
import java.util.HashSet;
@@ -16,6 +16,9 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantLock;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.redkale.boot.Application;
import org.redkale.boot.BootModule;
import org.redkale.boot.ModuleEngine;
import org.redkale.inject.ResourceEvent;
import org.redkale.util.AnyValue;
import org.redkale.util.Environment;
@@ -34,12 +37,10 @@ import org.redkale.util.Utility;
*
* @since 2.8.0
*/
class PropertiesModule {
public class PropertiesModule extends BootModule {
private final Logger logger = Logger.getLogger(this.getClass().getSimpleName());
private final Application application;
//配置源管理接口
//@since 2.7.0
private PropertiesAgent propertiesAgent;
@@ -47,14 +48,14 @@ class PropertiesModule {
//envProperties更新锁
private final ReentrantLock updateLock = new ReentrantLock();
PropertiesModule(Application application) {
this.application = application;
public PropertiesModule(Application application) {
super(application);
}
public void destroy() {
if (this.propertiesAgent != null) {
long s = System.currentTimeMillis();
this.propertiesAgent.destroy(application.config.getAnyValue("properties"));
this.propertiesAgent.destroy(application.getAppConfig().getAnyValue("properties"));
logger.info(this.propertiesAgent.getClass().getSimpleName() + " destroy in " + (System.currentTimeMillis() - s) + " ms");
}
}
@@ -92,7 +93,8 @@ class PropertiesModule {
for (PropertiesAgentProvider provider : InstanceProvider.sort(providers)) {
long s = System.currentTimeMillis();
this.propertiesAgent = provider.createInstance();
application.resourceFactory.inject(this.propertiesAgent);
this.propertiesAgent.bootModule = this;
application.getResourceFactory().inject(this.propertiesAgent);
if (application.isCompileMode()) {
this.propertiesAgent.compile(propsConf);
} else {
@@ -121,7 +123,7 @@ class PropertiesModule {
//重置远程日志配置
if (Utility.isNotEmpty(logProps)) {
application.loggingModule.reconfigLogging(false, logProps);
reconfigLogging(false, logProps);
}
if (!remoteEnvs.isEmpty()) {
@@ -138,11 +140,11 @@ class PropertiesModule {
try {
if (namespace != null && namespace.contains("logging")) {
//日志配置单独处理
application.loggingModule.onEnvironmentUpdated(events);
onEnvironmentUpdated(namespace, events);
return;
}
Set<String> removedKeys = new HashSet<>();
Properties newEnvs = new Properties(application.envProperties);
Properties newEnvs = environment.newProperties();
for (ResourceEvent<String> event : events) {
if (event.newValue() != null) {
newEnvs.put(event.name(), event.newValue());
@@ -152,7 +154,7 @@ class PropertiesModule {
}
}
mergeEnvProperties(newEnvs, removedKeys);
application.onEnvironmentChanged(namespace, events);
onEnvironmentChanged(namespace, events);
} finally {
updateLock.unlock();
}
@@ -186,49 +188,49 @@ class PropertiesModule {
newMergeProps.put(k, v);
} else { //其他视为普通配置项
if (key.startsWith("system.property.")) {
application.envProperties.put(k, v);
putEnvValue(k, v);
} else if (key.startsWith("mimetype.property.")) {
application.envProperties.put(k, v);
putEnvValue(k, v);
} else if (key.startsWith("redkale.properties.property.")) {
newMergeProps.put(k, v);
String name = key.substring("redkale.properties.".length());
application.envProperties.put(name, v);
putEnvValue(name, v);
} else if (key.startsWith("redkale.properties.property[")) {
newMergeProps.put(k, v);
String name = key.substring("redkale.properties[".length());
name = name.substring(0, name.indexOf(']'));
application.envProperties.put(name, v);
putEnvValue(name, v);
} else if (key.startsWith("redkale.properties.")) { //支持 -Dredkale.properties.mykey = myvalue
String prefix = "redkale.properties.property[" + propertyIndex.getAndIncrement() + "]";
String name = key.substring("redkale.properties.".length());
newMergeProps.put(prefix + ".name", name);
newMergeProps.put(prefix + ".value", v);
application.envProperties.put(name, v);
putEnvValue(name, v);
} else { //独立的普通配置项文件，比如：config.properties文件中的配置项
String prefix = "redkale.properties.property[" + propertyIndex.getAndIncrement() + "]";
newMergeProps.put(prefix + ".name", k);
newMergeProps.put(prefix + ".value", v);
application.envProperties.put(k, v);
putEnvValue(k, v);
}
}
});
if (Utility.isNotEmpty(removedKeys)) {
removedKeys.forEach(application.envProperties::remove);
if (removedKeys != null && !removedKeys.isEmpty()) {
removedKeys.forEach(this::removeEnvValue);
}
if (!newMergeProps.isEmpty()) {
Properties newDyncProps = new Properties();
newMergeProps.forEach((k, v) -> newDyncProps.put(k.toString(), application.getEnvironment().getPropertyValue(v.toString(), newMergeProps)));
//合并配置
application.getAppConfig().merge(AnyValue.loadFromProperties(newDyncProps).getAnyValue("redkale"), createMergeStrategy(application));
application.getAppConfig().merge(AnyValue.loadFromProperties(newDyncProps).getAnyValue("redkale"), createMergeStrategy());
}
}
/**
* 合并系统配置项的策略
*/
static final AnyValue.MergeStrategy createMergeStrategy(final Application application) {
AnyValue.MergeStrategy createMergeStrategy() {
return (path, key, val1, val2) -> {
for (ModuleEngine m : application.getModuleEngines()) {
for (ModuleEngine m : getModuleEngines()) {
AnyValue.MergeEnum rs = m.mergeAppConfigStrategy(path, key, val1, val2);
if (rs != null) {
return rs;

3
src/main/java/org/redkale/source/AbstractCacheSource.java
View File

@@ -4,13 +4,14 @@ package org.redkale.source;
import java.util.*;
import org.redkale.annotation.AutoLoad;
import org.redkale.annotation.ResourceChanged;
import org.redkale.annotation.ResourceType;
import org.redkale.inject.Resourcable;
import org.redkale.inject.ResourceEvent;
import org.redkale.inject.ResourceFactory;
import org.redkale.service.*;
import org.redkale.source.spi.CacheSourceProvider;
import org.redkale.util.*;
import org.redkale.annotation.ResourceChanged;
/**
* CacheSource的S抽象实现类 <br>

1
src/main/java/org/redkale/source/DataNativeSqlParser.java
View File

@@ -5,6 +5,7 @@ package org.redkale.source;
import java.util.*;
import java.util.function.IntFunction;
import org.redkale.source.spi.DataNativeSqlParserProvider;
import org.redkale.util.RedkaleClassLoader;
/**

1
src/main/java/org/redkale/source/DataSources.java
View File

@@ -10,6 +10,7 @@ import java.net.*;
import java.util.*;
import org.redkale.inject.ResourceFactory;
import org.redkale.service.Service;
import org.redkale.source.spi.DataSourceProvider;
import org.redkale.util.*;
import static org.redkale.util.Utility.isEmpty;

71
src/main/java/org/redkale/source/SourceManager.java Normal file
View File

@@ -0,0 +1,71 @@
/*
*
*/
package org.redkale.source;
import java.util.Map;
/**
* source组件的基本管理器
*
* <p>
* 详情见: https://redkale.org
*
* @author zhangjx
* @since 2.8.0
*/
public interface SourceManager {
/**
*
* @param sourceName 资源名
*
* @return CacheSource
*/
default CacheSource loadCacheSource(final String sourceName) {
return loadCacheSource(sourceName, false);
}
/**
*
* @param sourceName 资源名
* @param autoMemory 不存在是否自动创建内存版CacheSource
*
* @return CacheSource
*/
public CacheSource loadCacheSource(final String sourceName, boolean autoMemory);
/**
* 获取所有CacheSource, 不同资源名可能指向同一个CacheSource
*
* @return CacheSource集合
*/
public Map<String, CacheSource> getCacheSources();
/**
*
* @param sourceName 资源名
*
* @return DataSource
*/
default DataSource loadDataSource(final String sourceName) {
return loadDataSource(sourceName, false);
}
/**
* 加载DataSource
*
* @param sourceName 资源名
* @param autoMemory 不存在是否自动创建内存版DataSource
*
* @return DataSource
*/
public DataSource loadDataSource(final String sourceName, boolean autoMemory);
/**
* 获取所有DataSource, 不同资源名可能指向同一个DataSource
*
* @return DataSource集合
*/
public Map<String, DataSource> getDataSources();
}

3
src/main/java/org/redkale/source/CacheSourceProvider.java → src/main/java/org/redkale/source/spi/CacheSourceProvider.java
View File

@@ -3,8 +3,9 @@
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package org.redkale.source;
package org.redkale.source.spi;
import org.redkale.source.CacheSource;
import org.redkale.util.*;
/**

3
src/main/java/org/redkale/source/DataNativeSqlParserProvider.java → src/main/java/org/redkale/source/spi/DataNativeSqlParserProvider.java
View File

@@ -1,8 +1,9 @@
/*
*
*/
package org.redkale.source;
package org.redkale.source.spi;
import org.redkale.source.DataNativeSqlParser;
import org.redkale.util.InstanceProvider;
/**

3
src/main/java/org/redkale/source/DataSourceProvider.java → src/main/java/org/redkale/source/spi/DataSourceProvider.java
View File

@@ -3,8 +3,9 @@
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package org.redkale.source;
package org.redkale.source.spi;
import org.redkale.source.DataSource;
import org.redkale.util.*;
/**

42
src/main/java/org/redkale/source/SourceModuleEngine.java → src/main/java/org/redkale/source/spi/SourceModuleEngine.java
View File

@@ -1,14 +1,16 @@
/*
*
*/
package org.redkale.source;
package org.redkale.source.spi;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Properties;
import java.util.ServiceLoader;
@@ -25,6 +27,18 @@ import org.redkale.inject.ResourceTypeLoader;
import org.redkale.net.Servlet;
import org.redkale.net.sncp.Sncp;
import org.redkale.service.Service;
import org.redkale.source.AbstractCacheSource;
import org.redkale.source.AbstractDataSource;
import org.redkale.source.CacheMemorySource;
import org.redkale.source.CacheSource;
import org.redkale.source.DataJdbcSource;
import org.redkale.source.DataMemorySource;
import org.redkale.source.DataNativeSqlParser;
import org.redkale.source.DataSource;
import org.redkale.source.DataSources;
import org.redkale.source.DataSqlSource;
import org.redkale.source.SearchSource;
import org.redkale.source.SourceManager;
import org.redkale.util.AnyValue;
import org.redkale.util.AnyValueWriter;
import org.redkale.util.InstanceProvider;
@@ -36,7 +50,7 @@ import org.redkale.util.Utility;
*
* @author zhangjx
*/
public class SourceModuleEngine extends ModuleEngine {
public class SourceModuleEngine extends ModuleEngine implements SourceManager {
//Source 原始的配置资源, 只会存在redkale.datasource(.|[) redkale.cachesource(.|[)开头的配置项
private final Properties sourceProperties = new Properties();
@@ -117,7 +131,7 @@ public class SourceModuleEngine extends ModuleEngine {
this.resourceFactory.register(DataNativeSqlParser.class, this.nativeSqlParser);
break; //only first provider
}
resourceFactory.register(SourceManager.class, this);
//--------------------------------- 注册 DataSource、CacheSource ---------------------------------
resourceFactory.register(new DataSourceLoader(), DataSource.class);
resourceFactory.register(new CacheSourceLoader(), CacheSource.class);
@@ -330,6 +344,17 @@ public class SourceModuleEngine extends ModuleEngine {
}
}
/**
* 获取所有CacheSource, 不同资源名可能指向同一个CacheSource
*
* @return CacheSource集合
*/
public Map<String, CacheSource> getCacheSources() {
Map<String, CacheSource> sources = new HashMap<>();
cacheSources.forEach(v -> sources.put(v.resourceName(), v));
return sources;
}
public CacheSource loadCacheSource(final String sourceName, boolean autoMemory) {
cacheSourceLock.lock();
try {
@@ -378,6 +403,17 @@ public class SourceModuleEngine extends ModuleEngine {
}
}
/**
* 获取所有DataSource, 不同资源名可能指向同一个DataSource
*
* @return DataSource集合
*/
public Map<String, DataSource> getDataSources() {
Map<String, DataSource> sources = new HashMap<>();
dataSources.forEach(v -> sources.put(v.resourceName(), v));
return sources;
}
public DataSource loadDataSource(final String sourceName, boolean autoMemory) {
dataSourceLock.lock();
try {

4
src/main/java/org/redkale/util/Environment.java
View File

@@ -27,6 +27,10 @@ public class Environment implements java.io.Serializable {
this.properties = properties;
}
public Properties newProperties() {
return new Properties(properties);
}
public Set<String> keySet() {
return (Set) properties.keySet();
}

2
src/main/java/org/redkale/util/RedkaleClassLoader.java
View File

@@ -56,6 +56,7 @@ public class RedkaleClassLoader extends URLClassLoader {
"org.redkale.convert.ext",
"org.redkale.convert.json",
"org.redkale.convert.proto",
"org.redkale.convert.spi",
"org.redkale.inject",
"org.redkale.lock",
"org.redkale.lock.spi",
@@ -70,6 +71,7 @@ public class RedkaleClassLoader extends URLClassLoader {
"org.redkale.schedule.spi",
"org.redkale.service",
"org.redkale.source",
"org.redkale.source.spi",
"org.redkale.util",
"org.redkale.watch"
};

2
src/test/java/org/redkale/test/inject/ResourceAnnotationTest.java
View File

@@ -12,8 +12,8 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.reflect.Field;
import org.junit.jupiter.api.*;
import org.redkale.convert.json.JsonConvert;
import org.redkale.inject.ResourceAnnotationProvider;
import org.redkale.inject.ResourceFactory;
import org.redkale.inject.spi.ResourceAnnotationProvider;
/**
*