fix properties

Author: xlorne

springboot-starter-leaf/src/main/java/com/codingapi/springboot/leaf/AutoConfiguration.java

@@ -30,8 +30,8 @@ public IDGen idGen(IDAllocDao allocDao){
     }
 
     @Bean(initMethod = "init")
-    public Leaf leafClient(IDGen idGen, IDAllocDao allocDao){
-        return new Leaf(idGen,allocDao);
+    public Leaf leafClient(IDGen idGen, IDAllocDao allocDao,LeafProperties leafProperties){
+        return new Leaf(idGen,allocDao,leafProperties);
     }
 
 }

springboot-starter-leaf/src/main/java/com/codingapi/springboot/leaf/Leaf.java

@@ -3,6 +3,7 @@
 
 import com.codingapi.springboot.leaf.exception.LeafServerException;
 import com.codingapi.springboot.leaf.exception.NoKeyException;
+import com.codingapi.springboot.leaf.properties.LeafProperties;
 import com.sankuai.inf.leaf.IDGen;
 import com.sankuai.inf.leaf.common.Result;
 import com.sankuai.inf.leaf.common.Status;
@@ -23,7 +24,7 @@ class Leaf {
 
     private final IDGen idGen;
     private final IDAllocDao idAllocDao;
-
+    private final LeafProperties leafProperties;
 
     long segmentGetId(String key){
         Result result =  idGen.get(key);
@@ -58,7 +59,7 @@ void initIdGen(){
     }
 
      void init(){
-        LeafContext.getInstance().setLeaf(this);
+        LeafContext.getInstance().setLeaf(this,leafProperties);
     }
 
 }

springboot-starter-leaf/src/main/java/com/codingapi/springboot/leaf/LeafContext.java

@@ -1,6 +1,7 @@
 package com.codingapi.springboot.leaf;
 
 import com.codingapi.springboot.leaf.exception.LeafServerException;
+import com.codingapi.springboot.leaf.properties.LeafProperties;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
@@ -14,6 +15,9 @@
 class LeafContext {
 
     private Leaf leaf;
+    private int defaultStep;
+    private int defaultMaxId;
+
     @Setter
     private Set<Class<? extends LeafIdGenerate>> classes;
 
@@ -33,8 +37,10 @@ public static LeafContext getInstance() {
         return instance;
     }
 
-    protected void setLeaf(Leaf leaf){
+    protected void setLeaf(Leaf leaf, LeafProperties leafProperties){
         this.leaf = leaf;
+        this.defaultMaxId = leafProperties.getDefaultMaxId();
+        this.defaultStep = leafProperties.getDefaultStep();
         this.initClass();
     }
 
@@ -43,21 +49,21 @@ long generateId(Class<?> clazz){
         return segmentGetId(clazz);
     }
 
-    private long segmentGetId(Class<?> clazz){
+    long segmentGetId(Class<?> clazz){
         return leaf.segmentGetId(clazz.getName());
     }
 
 
-    boolean push(String key, int step, int maxId){
-        return leaf.segmentPush(key,step,maxId);
+    public void push(String key, int step, int maxId){
+        leaf.segmentPush(key, step, maxId);
     }
 
 
     private void initClass(){
         if(classes!=null&&classes.size()>0) {
             for (Class<?> clazz : classes) {
                 try {
-                    LeafContext.getInstance().push(clazz.getName(), 2000, 1);
+                    LeafContext.getInstance().push(clazz.getName(), defaultStep, defaultMaxId);
                 } catch (Exception e) {
                     throw new LeafServerException(e);
                 }

springboot-starter-leaf/src/main/java/com/codingapi/springboot/leaf/properties/LeafProperties.java

@@ -9,4 +9,8 @@ public class LeafProperties {
 
     private String jdbcUrl = "jdbc:h2:file:./leaf.db";
 
+    private int defaultStep = 100;
+
+    private int defaultMaxId = 1;
+
 }

springboot-starter-leaf/src/main/java/com/sankuai/inf/leaf/segment/SegmentIDGenImpl.java

@@ -37,9 +37,9 @@ public class SegmentIDGenImpl implements IDGen {
      * 一个Segment维持时间为15分钟
      */
     private static final long SEGMENT_DURATION = 15 * 60 * 1000L;
-    private ExecutorService service = new ThreadPoolExecutor(5, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue<Runnable>(), new UpdateThreadFactory());
+    private final ExecutorService service = new ThreadPoolExecutor(5, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue<Runnable>(), new UpdateThreadFactory());
     private volatile boolean initOK = false;
-    private Map<String, SegmentBuffer> cache = new ConcurrentHashMap<String, SegmentBuffer>();
+    private final Map<String, SegmentBuffer> cache = new ConcurrentHashMap<String, SegmentBuffer>();
     private IDAllocDao dao;
 
     public SegmentIDGenImpl(IDAllocDao dao) {
@@ -96,7 +96,7 @@ private void updateCacheFromDb() {
             if (dbTags == null || dbTags.isEmpty()) {
                 return;
             }
-            List<String> cacheTags = new ArrayList<String>(cache.keySet());
+            List<String> cacheTags = new ArrayList<>(cache.keySet());
             Set<String> insertTagsSet = new HashSet<>(dbTags);
             Set<String> removeTagsSet = new HashSet<>(cacheTags);
             //db中新加的tags灌进cache