todo add beanDefinitionRegistrar to scanner Leaf GenerateId

xlorne · xlorne · commit 8f7bea4c954f · 2022-06-29T19:28:49.000+08:00
diff --git a/leaf-demo/src/main/java/com/example/demo/domain/Demo.java b/leaf-demo/src/main/java/com/example/demo/domain/Demo.java
@@ -1,6 +1,5 @@
 package com.example.demo.domain;
 
-import com.codingapi.leaf.framework.Leaf;
 import com.codingapi.leaf.framework.LeafUtils;
 import lombok.Getter;
 import lombok.Setter;
@@ -11,7 +10,6 @@
  */
 @Setter
 @Getter
-@Leaf
 public class Demo {
 
     private long id;
@@ -25,6 +23,6 @@ public Demo() {
 
 
     private void generatedId(){
-        this.id = LeafUtils.getInstance().segmentGetId(Demo.class);
+        this.id = LeafUtils.getInstance().generateId(Demo.class);
     }
 }
diff --git a/leaf-demo/src/main/java/com/example/demo/domain/Example.java b/leaf-demo/src/main/java/com/example/demo/domain/Example.java
@@ -1,6 +1,5 @@
 package com.example.demo.domain;
 
-import com.codingapi.leaf.framework.Leaf;
 import com.codingapi.leaf.framework.LeafUtils;
 import lombok.Getter;
 import lombok.Setter;
@@ -11,7 +10,6 @@
  */
 @Setter
 @Getter
-@Leaf
 public class Example {
 
     private long id;
@@ -25,6 +23,6 @@ public Example() {
 
 
     private void generatedId(){
-        this.id = LeafUtils.getInstance().segmentGetId(Example.class);
+        this.id = LeafUtils.getInstance().generateId(Example.class);
     }
 }
diff --git a/leaf-demo/src/main/resources/application.properties b/leaf-demo/src/main/resources/application.properties
@@ -1,3 +1 @@
-laiease.leaf-properties.leaf-url=http://127.0.0.1:8080/
-
-laiease.leaf-properties.classes=com.example.demo.domain.Demo,com.example.demo.domain.Example
+codingapi.leaf-properties.leaf-url=http://127.0.0.1:8080/
diff --git a/leaf-server/src/main/java/com/sankuai/inf/leaf/server/controller/LeafController.java b/leaf-server/src/main/java/com/sankuai/inf/leaf/server/controller/LeafController.java
@@ -0,0 +1,33 @@
+package com.sankuai.inf.leaf.server.controller;
+
+import com.sankuai.inf.leaf.server.Constants;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Configuration
+public class LeafController {
+
+    @ConditionalOnProperty(name = Constants.LEAF_SEGMENT_ENABLE,havingValue = "true")
+    @RestController
+    static class SegmentController{
+
+        @GetMapping("api/type")
+        public String type(){
+            return "SEGMENT";
+        }
+    }
+
+
+    @ConditionalOnProperty(name = Constants.LEAF_SNOWFLAKE_ENABLE,havingValue = "true")
+    @RestController
+    static class SnowflakeController{
+
+        @GetMapping("api/type")
+        public String type(){
+            return "SNOWFLAKE";
+        }
+    }
+
+}
diff --git a/leaf-server/src/main/java/com/sankuai/inf/leaf/server/controller/LeafSegmentController.java b/leaf-server/src/main/java/com/sankuai/inf/leaf/server/controller/LeafSegmentController.java
@@ -8,7 +8,6 @@
 import com.sankuai.inf.leaf.server.exception.NoKeyException;
 import com.sankuai.inf.leaf.server.segment.model.LeafAlloc;
 import com.sankuai.inf.leaf.server.service.SegmentService;
-import com.sankuai.inf.leaf.server.service.SnowflakeService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
diff --git a/springboot-starter-leaf/src/main/java/com/codingapi/leaf/framework/AutoConfigurationImportSelector.java b/springboot-starter-leaf/src/main/java/com/codingapi/leaf/framework/AutoConfigurationImportSelector.java
@@ -2,15 +2,20 @@
 
 import lombok.extern.slf4j.Slf4j;
 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;
 
 @Slf4j
+@Configuration
 public class AutoConfigurationImportSelector implements ImportBeanDefinitionRegistrar {
 
-
     @Override
     public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
-       log.info("importingClassMetadata:{}",importingClassMetadata);
+        log.info("importingClassMetadata:{}",importingClassMetadata);
+
+        //todo scanner classes
+        LeafUtils.getInstance().initClass(null);
     }
+
 }
diff --git a/springboot-starter-leaf/src/main/java/com/codingapi/leaf/framework/GeneratedValue.java b/springboot-starter-leaf/src/main/java/com/codingapi/leaf/framework/GeneratedValue.java
diff --git a/springboot-starter-leaf/src/main/java/com/codingapi/leaf/framework/Leaf.java b/springboot-starter-leaf/src/main/java/com/codingapi/leaf/framework/Leaf.java
diff --git a/springboot-starter-leaf/src/main/java/com/codingapi/leaf/framework/LeafClient.java b/springboot-starter-leaf/src/main/java/com/codingapi/leaf/framework/LeafClient.java
@@ -10,6 +10,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * @author lorne
@@ -41,6 +42,13 @@ public long snowflakeGetId(String key){
         return Long.parseLong(res);
     }
 
+    public String type(){
+        String url = String.format("%s%s",leafProperty.getUrl(),"api/type");
+        String res = restTemplate.getForObject(url,String.class);
+        assert res != null;
+        return res;
+    }
+
     /**
      * 数据库模式添加 数据
      * @param key   key 关键字
@@ -64,37 +72,6 @@ public boolean segmentPush(String key, int step, int maxId){
 
     public void init(){
         LeafUtils.getInstance().setLeafClient(this);
-        this.initKeys();
-        this.initClasses();
-
-        log.info("leaf init finish.");
     }
 
-    private void initKeys(){
-        String[] keys =  leafProperty.getKeys();
-        if(keys!=null&&keys.length>0) {
-            for (String key : keys) {
-                try {
-                    LeafUtils.getInstance().push(key, 2000, 1);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    private void initClasses(){
-        Class<?>[] classes =  leafProperty.getClasses();
-        if(classes!=null&&classes.length>0) {
-            for (Class<?> clazz : classes) {
-                try {
-                    LeafUtils.getInstance().push(clazz.getName(), 2000, 1);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-
 }
diff --git a/springboot-starter-leaf/src/main/java/com/codingapi/leaf/framework/LeafConfiguration.java b/springboot-starter-leaf/src/main/java/com/codingapi/leaf/framework/LeafConfiguration.java
@@ -13,7 +13,7 @@
 public class LeafConfiguration {
 
     @Bean
-    @ConfigurationProperties(prefix = "laiease.leaf-properties")
+    @ConfigurationProperties(prefix = "codingapi.leaf-properties")
     public LeafProperty leafProperty(){
         return new LeafProperty();
     }
diff --git a/springboot-starter-leaf/src/main/java/com/codingapi/leaf/framework/LeafIdGenerate.java b/springboot-starter-leaf/src/main/java/com/codingapi/leaf/framework/LeafIdGenerate.java
@@ -0,0 +1,9 @@
+package com.codingapi.leaf.framework;
+
+public interface LeafIdGenerate {
+
+    default long generateId(){
+        Class<?> clazz = getClass();
+        return LeafUtils.getInstance().generateId(clazz);
+    }
+}
diff --git a/springboot-starter-leaf/src/main/java/com/codingapi/leaf/framework/LeafUtils.java b/springboot-starter-leaf/src/main/java/com/codingapi/leaf/framework/LeafUtils.java
@@ -2,6 +2,8 @@
 
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.Set;
+
 /**
  * @author lorne
  * @since 1.0.0
@@ -10,6 +12,7 @@
 public class LeafUtils {
 
     private LeafClient leafClient;
+    private String type;
 
     private LeafUtils(){
     }
@@ -29,40 +32,64 @@ public static LeafUtils getInstance() {
 
     protected void setLeafClient(LeafClient leafClient){
         this.leafClient = leafClient;
+        this.type = leafClient.type();
     }
 
-    public long segmentGetId(Class<?> clazz){
-        if(leafClient==null){
-            throw new RuntimeException("springboot init finish then to running.");
-        }
-        return leafClient.segmentGetId(clazz.getName());
+    boolean isSegment(){
+        return "SEGMENT".equalsIgnoreCase(type);
     }
 
-    public long snowflakeGetId(Class<?> clazz){
-        if(leafClient==null){
-            throw new RuntimeException("springboot init finish then to running.");
+    boolean isSnowflake(){
+        return "SNOWFLAKE".equalsIgnoreCase(type);
+    }
+
+    public long generateId(Class<?> clazz){
+        if(isSegment()){
+            return segmentGetId(clazz);
         }
-        return leafClient.snowflakeGetId(clazz.getName());
+        if(isSnowflake()){
+            return snowflakeGetId(clazz);
+        }
+        throw new RuntimeException("springboot init finish then to running.");
     }
 
-    public long segmentGetId(String key){
+    private long segmentGetId(Class<?> clazz){
         if(leafClient==null){
             throw new RuntimeException("springboot init finish then to running.");
         }
-        return leafClient.segmentGetId(key);
+        return leafClient.segmentGetId(clazz.getName());
     }
 
-    public long snowflakeGetId(String key){
+    private long snowflakeGetId(Class<?> clazz){
         if(leafClient==null){
             throw new RuntimeException("springboot init finish then to running.");
         }
-        return leafClient.snowflakeGetId(key);
+        return leafClient.snowflakeGetId(clazz.getName());
     }
 
-    public boolean push(String key,int step,int maxId){
+
+     boolean push(String key,int step,int maxId){
         if(leafClient==null){
             throw new RuntimeException("springboot init finish then to running.");
         }
         return leafClient.segmentPush(key,step,maxId);
     }
+
+
+    void initClass(Set<Class> classes){
+        if(LeafUtils.getInstance().isSegment()) {
+            if(classes!=null&&classes.size()>0) {
+                for (Class<?> clazz : classes) {
+                    try {
+                        LeafUtils.getInstance().push(clazz.getName(), 2000, 1);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+
+        log.info("leaf init finish.");
+    }
+
 }
diff --git a/springboot-starter-leaf/src/main/java/com/codingapi/leaf/framework/properties/LeafProperty.java b/springboot-starter-leaf/src/main/java/com/codingapi/leaf/framework/properties/LeafProperty.java
@@ -11,36 +11,11 @@
 @Getter
 public class LeafProperty {
 
-    public enum Type{
-        /**
-         * 数据库自增模式
-         */
-        SEGMENT,
-        /**
-         * 雪花算法
-         */
-        SNOWFLAKE
-    }
-
     /**
      * leaf server 地址
      */
     private String leafUrl;
 
-    /**
-     * 请求模式
-     */
-    private Type type = Type.SEGMENT;
-
-    /**
-     * 注册leaf key Class 格式
-     */
-    private Class<?>[] classes;
-
-    /**
-     * 注册leaf key str 格式
-     */
-    private String[] keys;
 
     public String getUrl(){
         if(leafUrl==null){

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`public class LeafConfiguration {`
`14`	`14`
`15`	`15`	`@Bean`
`16`		`- @ConfigurationProperties(prefix = "laiease.leaf-properties")`
	`16`	`+ @ConfigurationProperties(prefix = "codingapi.leaf-properties")`
`17`	`17`	`public LeafProperty leafProperty(){`
`18`	`18`	`return new LeafProperty();`
`19`	`19`	`}`