add generateId

Author: xlorne

leaf-demo/src/main/java/com/example/demo/DemoApplication.java

@@ -8,8 +8,8 @@
  * @author lorne
  * @since 1.0.0
  */
-@SpringBootApplication
 @LeafScanner
+@SpringBootApplication
 public class DemoApplication {
 
     public static void main(String[] args) {

leaf-demo/src/main/java/com/example/demo/domain/Demo.java

@@ -1,6 +1,6 @@
 package com.example.demo.domain;
 
-import com.codingapi.leaf.framework.LeafUtils;
+import com.codingapi.leaf.framework.LeafIdGenerate;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,19 +10,14 @@
  */
 @Setter
 @Getter
-public class Demo {
+public class Demo implements LeafIdGenerate {
 
     private long id;
 
     private String name;
 
-
     public Demo() {
-        this.generatedId();
+        id = generateId();
     }
 
-
-    private void generatedId(){
-        this.id = LeafUtils.getInstance().generateId(Demo.class);
-    }
 }

leaf-demo/src/main/java/com/example/demo/domain/Example.java

@@ -1,6 +1,6 @@
 package com.example.demo.domain;
 
-import com.codingapi.leaf.framework.LeafUtils;
+import com.codingapi.leaf.framework.LeafIdGenerate;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,19 +10,14 @@
  */
 @Setter
 @Getter
-public class Example {
+public class Example  implements LeafIdGenerate {
 
     private long id;
 
     private String name;
 
-
     public Example() {
-        this.generatedId();
+        id = generateId();
     }
 
-
-    private void generatedId(){
-        this.id = LeafUtils.getInstance().generateId(Example.class);
-    }
 }

leaf-demo/src/test/java/com/example/demo/domain/DemoTest.java

@@ -4,7 +4,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author lorne

leaf-server/src/main/resources/application.properties

@@ -9,7 +9,7 @@ spring.freemarker.template-loader-path=classpath:/templates/
 spring.freemarker.suffix=.ftl
 
 leaf.segment.enable=true
-spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/leaf
+spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/leaf?serverTimezone=Asia/Shanghai
 spring.datasource.username=root
 spring.datasource.password=12345678
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver

springboot-starter-leaf/pom.xml

@@ -18,6 +18,12 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+            <version>0.10.2</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>

springboot-starter-leaf/src/main/java/com/codingapi/leaf/framework/AutoConfigurationImportSelector.java

@@ -1,21 +1,44 @@
 package com.codingapi.leaf.framework;
 
 import lombok.extern.slf4j.Slf4j;
+import org.reflections.Reflections;
+import org.reflections.scanners.Scanners;
+import org.reflections.util.ConfigurationBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
 import org.springframework.core.type.AnnotationMetadata;
 
+import java.util.*;
+
 @Slf4j
-@Configuration
 public class AutoConfigurationImportSelector implements ImportBeanDefinitionRegistrar {
 
+    private Set<Class<? extends LeafIdGenerate>> classes;
+
     @Override
     public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
-        log.info("importingClassMetadata:{}",importingClassMetadata);
+        String className = importingClassMetadata.getClassName();
+        List<String> packageNames = new ArrayList<>();
+        try {
+            packageNames.add(Class.forName(className).getPackage().getName());
+
+            Map<String,Object> annotations =  importingClassMetadata.getAnnotationAttributes(LeafScanner.class.getName());
+            assert annotations != null;
+            String[] packages = (String[])annotations.get("scanBasePackages");
+            packageNames.addAll(Arrays.asList(packages));
+
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        Reflections reflections =  new Reflections(new ConfigurationBuilder()
+                .forPackages(packageNames.toArray(new String[]{}))
+                .addScanners(Scanners.TypesAnnotated,Scanners.SubTypes));
+
+        this.classes = reflections.getSubTypesOf(LeafIdGenerate.class);
+        log.debug("classes:{}",classes);
 
-        //todo scanner classes
-        LeafUtils.getInstance().initClass(null);
+        LeafUtils.getInstance().setClasses(classes);
     }
 
 }

springboot-starter-leaf/src/main/java/com/codingapi/leaf/framework/LeafIdGenerate.java

@@ -3,7 +3,6 @@
 public interface LeafIdGenerate {
 
     default long generateId(){
-        Class<?> clazz = getClass();
-        return LeafUtils.getInstance().generateId(clazz);
+        return LeafUtils.getInstance().generateId(getClass());
     }
 }

springboot-starter-leaf/src/main/java/com/codingapi/leaf/framework/LeafUtils.java

@@ -1,5 +1,6 @@
 package com.codingapi.leaf.framework;
 
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Set;
@@ -13,6 +14,8 @@ public class LeafUtils {
 
     private LeafClient leafClient;
     private String type;
+    @Setter
+    private Set<Class<? extends LeafIdGenerate>> classes;
 
     private LeafUtils(){
     }
@@ -33,6 +36,7 @@ public static LeafUtils getInstance() {
     protected void setLeafClient(LeafClient leafClient){
         this.leafClient = leafClient;
         this.type = leafClient.type();
+        this.initClass();
     }
 
     boolean isSegment(){
@@ -76,7 +80,7 @@ boolean push(String key,int step,int maxId){
     }
 
 
-    void initClass(Set<Class> classes){
+    private void initClass(){
         if(LeafUtils.getInstance().isSegment()) {
             if(classes!=null&&classes.size()>0) {
                 for (Class<?> clazz : classes) {