0.5.3 pre release

TruthBean · Nov 14, 2021 · f63dba7 · f63dba7
1 parent a024359
commit f63dba7
Show file tree

Hide file tree

Showing 45 changed files with 127 additions and 41 deletions.
diff --git a/boot/cron/pom.xml b/boot/cron/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>debbie-boot</artifactId>
         <groupId>com.truthbean</groupId>
-        <version>0.5.2-RELEASE</version>
+        <version>0.5.3-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/boot/cron/src/main/java/com/truthbean/debbie/cron/SchedulerBeanFactory.java b/boot/cron/src/main/java/com/truthbean/debbie/cron/SchedulerBeanFactory.java
@@ -16,6 +16,7 @@
 import com.truthbean.debbie.env.EnvContentAware;
 import com.truthbean.debbie.env.EnvironmentContent;
 import com.truthbean.LoggerFactory;
+import com.truthbean.debbie.env.EnvironmentContentHolder;
 import org.quartz.Scheduler;
 import org.quartz.SchedulerException;
 import org.quartz.impl.StdSchedulerFactory;
@@ -40,7 +41,9 @@ public Scheduler getBean() {
         if (scheduler == null) {
             synchronized (SchedulerBeanFactory.class) {
                 if (scheduler == null) {
-                    envContent.addProperty("org.quartz.threadPool.threadCount", "10");
+                    if (envContent instanceof EnvironmentContentHolder) {
+                        ((EnvironmentContentHolder)envContent).addProperty("org.quartz.threadPool.threadCount", "10");
+                    }
                     try {
                         StdSchedulerFactory factory = new StdSchedulerFactory(envContent.getProperties());
                         this.scheduler = factory.getScheduler();

diff --git a/boot/freemarker/pom.xml b/boot/freemarker/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>debbie-boot</artifactId>
         <groupId>com.truthbean</groupId>
-        <version>0.5.2-RELEASE</version>
+        <version>0.5.3-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/boot/freemarker/src/test/java/com/truthbean/debbie/freemarker/test/FreemarkerTest.java b/boot/freemarker/src/test/java/com/truthbean/debbie/freemarker/test/FreemarkerTest.java
@@ -16,7 +16,7 @@
 public class FreemarkerTest {
 
     public static void main(String[] args) {
-        var application = ApplicationFactory.create(FreemarkerTest.class, args);
+        var application = ApplicationFactory.factory(FreemarkerTest.class, args);
         application.start();
     }
 }
diff --git a/boot/hikari/pom.xml b/boot/hikari/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>debbie-boot</artifactId>
         <groupId>com.truthbean</groupId>
-        <version>0.5.2-RELEASE</version>
+        <version>0.5.3-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/boot/javafx/pom.xml b/boot/javafx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>debbie-boot</artifactId>
         <groupId>com.truthbean</groupId>
-        <version>0.5.2-RELEASE</version>
+        <version>0.5.3-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/boot/javafx/src/main/java/com/truthbean/debbie/javafx/DebbieJavaFxApplication.java b/boot/javafx/src/main/java/com/truthbean/debbie/javafx/DebbieJavaFxApplication.java
@@ -10,6 +10,7 @@
 package com.truthbean.debbie.javafx;
 
 import com.truthbean.LoggerFactory;
+import com.truthbean.logger.LoggerConfig;
 import javafx.application.Application;
 import javafx.stage.Stage;
 
@@ -22,7 +23,7 @@ public class DebbieJavaFxApplication extends Application {
 
     static {
         System.setProperty("javafx.sg.warn", "true");
-        System.setProperty(LoggerFactory.NO_LOGGER, "true");
+        System.setProperty(LoggerConfig.NO_LOGGER, "true");
     }
 
     @Override

diff --git a/boot/javafx/src/test/java/com/truthbean/debbie/javafx/check/DemoApplication.java b/boot/javafx/src/test/java/com/truthbean/debbie/javafx/check/DemoApplication.java
@@ -12,6 +12,7 @@
 import com.truthbean.LoggerFactory;
 import com.truthbean.debbie.boot.DebbieApplication;
 import com.truthbean.debbie.boot.DebbieBootApplication;
+import com.truthbean.logger.LoggerConfig;
 
 /**
  * @author TruthBean/Rogar·Q
@@ -22,7 +23,7 @@
 public class DemoApplication {
 
     static {
-        System.setProperty(LoggerFactory.NO_LOGGER, "true");
+        System.setProperty(LoggerConfig.NO_LOGGER, "true");
     }
 
     public static void main(String[] args) {

diff --git a/boot/kafka/pom.xml b/boot/kafka/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>debbie-boot</artifactId>
         <groupId>com.truthbean</groupId>
-        <version>0.5.2-RELEASE</version>
+        <version>0.5.3-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/boot/kafka/src/main/java/com/truthbean/debbie/kafka/KafkaConfiguration.java b/boot/kafka/src/main/java/com/truthbean/debbie/kafka/KafkaConfiguration.java
@@ -30,6 +30,8 @@
 @PropertiesConfiguration(keyPrefix = "debbie.kafka")
 public class KafkaConfiguration implements DebbieConfiguration {
 
+    private String name = "default";
+
     private boolean enable = true;
 
     @PropertyInject(value = "bootstrap-servers", transformer = ListStringTransformer.class)
@@ -190,6 +192,15 @@ public Properties toConsumerProperties() {
         }
     }
 
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public boolean isEnable() {
         return enable;
     }

diff --git a/boot/lucene/pom.xml b/boot/lucene/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>debbie-boot</artifactId>
         <groupId>com.truthbean</groupId>
-        <version>0.5.2-RELEASE</version>
+        <version>0.5.3-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/boot/lucene/src/main/java/com/truthbean/debbie/lucene/LuceneConfiguration.java b/boot/lucene/src/main/java/com/truthbean/debbie/lucene/LuceneConfiguration.java
@@ -18,6 +18,8 @@
  */
 public class LuceneConfiguration implements DebbieConfiguration {
 
+    private String name = "default";
+
     private String dataPath;
 
     public String getDataPath() {
@@ -28,6 +30,15 @@ public void setDataPath(String dataPath) {
         this.dataPath = dataPath;
     }
 
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
     @Override
     public void reset() {
 

diff --git a/boot/metrics/pom.xml b/boot/metrics/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>debbie-boot</artifactId>
         <groupId>com.truthbean</groupId>
-        <version>0.5.2-RELEASE</version>
+        <version>0.5.3-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/boot/mybatis/pom.xml b/boot/mybatis/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>debbie-boot</artifactId>
         <groupId>com.truthbean</groupId>
-        <version>0.5.2-RELEASE</version>
+        <version>0.5.3-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...ybatis/src/main/java/com/truthbean/debbie/mybatis/configuration/MybatisConfiguration.java b/...ybatis/src/main/java/com/truthbean/debbie/mybatis/configuration/MybatisConfiguration.java
@@ -26,6 +26,7 @@
  * @since 0.0.2
  */
 public class MybatisConfiguration implements DebbieConfiguration {
+    private String name = "default";
     private String mybatisConfigXmlLocation;
 
     private List<String> mapperLocations;
@@ -45,6 +46,15 @@ public class MybatisConfiguration implements DebbieConfiguration {
     private DatabaseIdProvider databaseIdProvider;
     private Cache cache;
 
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public String getMybatisConfigXmlLocation() {
         return mybatisConfigXmlLocation;
     }

diff --git a/boot/pom.xml b/boot/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>debbie-cloud</artifactId>
         <groupId>com.truthbean</groupId>
-        <version>0.5.2-RELEASE</version>
+        <version>0.5.3-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/boot/servlet/pom.xml b/boot/servlet/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>debbie-boot</artifactId>
         <groupId>com.truthbean</groupId>
-        <version>0.5.2-RELEASE</version>
+        <version>0.5.3-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/boot/servlet/src/main/java/com/truthbean/debbie/servlet/ServletApplicationInitializer.java b/boot/servlet/src/main/java/com/truthbean/debbie/servlet/ServletApplicationInitializer.java
@@ -40,7 +40,7 @@ public ServletApplicationInitializer() {
             super.config(ServletApplicationInitializer.class);
             super.callStarter();
         } else {
-            applicationContext = debbieApplicationFactory.getApplicationContext();
+            applicationContext = super.getApplicationContext();
         }
     }
 

diff --git a/boot/spring/pom.xml b/boot/spring/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>debbie-boot</artifactId>
         <groupId>com.truthbean</groupId>
-        <version>0.5.2-RELEASE</version>
+        <version>0.5.3-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/boot/spring/src/main/java/com/truthbean/debbie/spring/DebbieBeanRegistrar.java b/boot/spring/src/main/java/com/truthbean/debbie/spring/DebbieBeanRegistrar.java
@@ -12,6 +12,8 @@
 import com.truthbean.Logger;
 import com.truthbean.debbie.bean.BeanInfo;
 import com.truthbean.debbie.bean.BeanInfoFactory;
+import com.truthbean.debbie.bean.BeanScanConfiguration;
+import com.truthbean.debbie.boot.DebbieApplication;
 import com.truthbean.debbie.core.ApplicationContext;
 import com.truthbean.debbie.core.ApplicationFactory;
 import com.truthbean.LoggerFactory;
@@ -43,8 +45,11 @@ public class DebbieBeanRegistrar implements ImportBeanDefinitionRegistrar, BeanC
 
     private ClassLoader classLoader;
 
+    private final ApplicationFactory applicationFactory;
+
     public DebbieBeanRegistrar() {
         LOGGER.debug(() -> "enable debbie bean by spring");
+        applicationFactory = ApplicationFactory.newEmpty();
     }
 
     @Override
@@ -65,12 +70,15 @@ public void registerBeanDefinitions(@NonNull AnnotationMetadata importingClassMe
             String[] excludePackages = (String[]) mapperScanAttrs.get("excludePackages");
             Class<?>[] excludeClasses = (Class<?>[]) mapperScanAttrs.get("excludeClasses");
 
-            ApplicationFactory applicationFactory = ApplicationFactory.configure(classLoader, configuration -> {
-                configuration.addScanBasePackages(basePackages);
-                configuration.addScanClasses(classes);
-                configuration.addScanExcludeClasses(excludeClasses);
-                configuration.addScanExcludePackages(excludePackages);
-            });
+            applicationFactory.init(classLoader);
+
+            BeanScanConfiguration configuration = new BeanScanConfiguration();
+            configuration.addScanBasePackages(basePackages);
+            configuration.addScanClasses(classes);
+            configuration.addScanExcludeClasses(excludeClasses);
+            configuration.addScanExcludePackages(excludePackages);
+
+            applicationFactory.config(configuration);
             ApplicationContext applicationContext = applicationFactory.getApplicationContext();
             BeanInfoFactory debbieBeanInfoFactory = applicationContext.getBeanInfoFactory();
             Set<BeanInfo<?>> allDebbieBeanInfo = debbieBeanInfoFactory.getAllDebbieBeanInfo();

diff --git a/boot/spring/src/test/java/com/truthbean/debbie/spring/check/DebbieApplicationTest.java b/boot/spring/src/test/java/com/truthbean/debbie/spring/check/DebbieApplicationTest.java
@@ -0,0 +1,22 @@
+package com.truthbean.debbie.spring.check;
+
+import com.truthbean.debbie.boot.DebbieApplication;
+import com.truthbean.debbie.boot.DebbieBootApplication;
+
+/**
+ * @author TruthBean
+ * @since 0.5.3
+ */
+@DebbieBootApplication
+public class DebbieApplicationTest {
+
+    static {
+        System.setProperty(DebbieApplication.DISABLE_DEBBIE, "true");
+        System.setProperty("logging.level.com.truthbean", "debug");
+        System.setProperty("logging.level.org.springframework", "debug");
+    }
+
+    public static void main(String[] args) {
+        DebbieApplication.run(DebbieApplicationTest.class, args);
+    }
+}
diff --git a/boot/spring/src/test/java/com/truthbean/debbie/spring/check/DebbieSpringTest.java b/boot/spring/src/test/java/com/truthbean/debbie/spring/check/DebbieSpringTest.java
@@ -9,6 +9,7 @@
  */
 package com.truthbean.debbie.spring.check;
 
+import com.truthbean.debbie.boot.DebbieApplication;
 import com.truthbean.debbie.spring.EnableDebbieApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -23,9 +24,10 @@
 @ComponentScan(basePackages = "com.truthbean", includeFilters = {
         @ComponentScan.Filter(type = FilterType.CUSTOM, classes = TruthBeanTypeFilter.class)
 })
-// @EnableDebbieApplication
+@EnableDebbieApplication
 public class DebbieSpringTest {
     static {
+        System.setProperty(DebbieApplication.DISABLE_DEBBIE, "false");
         System.setProperty("logging.level.com.truthbean", "debug");
         System.setProperty("logging.level.org.springframework", "debug");
     }

diff --git a/boot/swagger/pom.xml b/boot/swagger/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>debbie-boot</artifactId>
         <groupId>com.truthbean</groupId>
-        <version>0.5.2-RELEASE</version>
+        <version>0.5.3-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/boot/swagger/src/test/java/com/truthbean/debbie/swagger/test/SwaggerApplication.java b/boot/swagger/src/test/java/com/truthbean/debbie/swagger/test/SwaggerApplication.java
@@ -15,6 +15,6 @@
 public class SwaggerApplication {
     public static void main(String[] args) {
         var application = ApplicationFactory.create(SwaggerApplication.class, args);
-        application.start();
+        application.factory().start();
     }
 }
diff --git a/boot/swagger/src/test/java/com/truthbean/debbie/swagger/test/SwaggerTestConfiguration.java b/boot/swagger/src/test/java/com/truthbean/debbie/swagger/test/SwaggerTestConfiguration.java
@@ -33,6 +33,6 @@ public Info openAPI() {
                 .license(new License()
                         .name("Apache 2.0")
                         .url("http://www.apache.org/licenses/LICENSE-2.0.html"))
-                .version("0.5.2-RELEASE");
+                .version("0.5.3-RELEASE");
     }
 }
diff --git a/boot/swagger/src/test/resources/application.properties b/boot/swagger/src/test/resources/application.properties
@@ -27,7 +27,7 @@ debbie.swagger.info.title=Debbie Swagger Example
 debbie.swagger.info.description=This is a sample of the debbie framework using swagger.  \
   You can find out more about Swagger at [http://swagger.io](http://swagger.io) .
 debbie.swagger.info.terms-of-service=http://swagger.io/terms
-debbie.swagger.info.version=0.5.2-RELEASE
+debbie.swagger.info.version=0.5.3-RELEASE
 debbie.swagger.info.contact.name=debbie-swagger
 debbie.swagger.info.contact.email=[email protected]
 debbie.swagger.info.contact.url=http://www.truthbean.com/debbie-swagger

diff --git a/boot/tomcat/pom.xml b/boot/tomcat/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>debbie-boot</artifactId>
         <groupId>com.truthbean</groupId>
-        <version>0.5.2-RELEASE</version>
+        <version>0.5.3-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>