add id generator & remove leaf

Author: xlorne

README.md

@@ -12,18 +12,28 @@
 ## maven install
 
 ```
+    <!-- Springboot领域驱动框架 -->
     <dependency>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-starter</artifactId>
         <version>${last.version}</version>
     </dependency>
     
+     <!-- 快速数据呈现框架 -->
      <dependency>
         <groupId>com.codingapi.springboot</groupId>
-        <artifactId>springboot-starter-leaf</artifactId>
+        <artifactId>springboot-starter-data-fast</artifactId>
         <version>${last.version}</version>
     </dependency>
     
+     <!-- Id自增策略框架 -->
+    <dependency>
+        <groupId>com.codingapi.springboot</groupId>
+        <artifactId>springboot-starter-id-generator</artifactId>
+        <version>${last.version}</version>
+    </dependency>
+    
+     <!-- security&jwt权限框架 -->
      <dependency>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-starter-security-jwt</artifactId>

pom.xml

@@ -137,12 +137,6 @@
                 <version>${codingapi.framework.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.codingapi.springboot</groupId>
-                <artifactId>springboot-starter-leaf</artifactId>
-                <version>${codingapi.framework.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>com.codingapi.springboot</groupId>
                 <artifactId>springboot-starter-id-generator</artifactId>
@@ -222,7 +216,6 @@
                 <module>springboot-starter</module>
                 <module>springboot-example</module>
                 <module>springboot-starter-security-jwt</module>
-                <module>springboot-starter-leaf</module>
                 <module>springboot-starter-data-fast</module>
                 <module>springboot-starter-id-generator</module>
             </modules>
@@ -236,7 +229,6 @@
                 <module>springboot-starter</module>
                 <module>springboot-example</module>
                 <module>springboot-starter-security-jwt</module>
-                <module>springboot-starter-leaf</module>
                 <module>springboot-starter-data-fast</module>
                 <module>springboot-starter-id-generator</module>
             </modules>
@@ -284,7 +276,6 @@
             <modules>
                 <module>springboot-starter</module>
                 <module>springboot-starter-security-jwt</module>
-                <module>springboot-starter-leaf</module>
                 <module>springboot-starter-data-fast</module>
                 <module>springboot-starter-id-generator</module>
             </modules>

springboot-example/pom.xml

@@ -36,11 +36,6 @@
             <artifactId>springboot-starter-security-jwt</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.codingapi.springboot</groupId>
-            <artifactId>springboot-starter-leaf</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.codingapi.springboot</groupId>
             <artifactId>springboot-starter-data-fast</artifactId>

springboot-example/src/main/java/com/codingapi/springboot/example/ExampleApplication.java

@@ -1,6 +1,5 @@
 package com.codingapi.springboot.example;
 
-import com.codingapi.springboot.leaf.EnableLeaf;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
@@ -10,7 +9,6 @@
 import java.util.Locale;
 
 @SpringBootApplication
-@EnableLeaf
 public class ExampleApplication {
 
     public static void main(String[] args) {

springboot-example/src/main/java/com/codingapi/springboot/example/domain/entity/Demo.java

@@ -2,14 +2,14 @@
 
 import com.codingapi.springboot.example.domain.event.DemoNameChangeEvent;
 import com.codingapi.springboot.framework.event.EventPusher;
-import com.codingapi.springboot.leaf.LeafIdGenerate;
+import com.codingapi.springboot.generator.IdGenerate;
 import lombok.Getter;
 
 /**
  * @author lorne
  * @since 1.0.0
  */
-public class Demo implements LeafIdGenerate {
+public class Demo implements IdGenerate {
 
     @Getter
     private Integer id;

springboot-example/src/main/java/com/codingapi/springboot/example/ui/controller/OpenController.java

@@ -6,16 +6,15 @@
 import com.codingapi.springboot.framework.dto.request.PageRequest;
 import com.codingapi.springboot.framework.dto.response.MultiResponse;
 import com.codingapi.springboot.framework.dto.response.Response;
-import com.codingapi.springboot.generator.dao.IdGeneratorDao;
-import com.codingapi.springboot.generator.domain.IdGenerator;
+import com.codingapi.springboot.generator.dao.IdKeyDao;
+import com.codingapi.springboot.generator.domain.IdKey;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.sql.SQLException;
-import java.util.Date;
 import java.util.List;
 
 @RestController
@@ -27,7 +26,7 @@ public class OpenController {
 
     private final DemoEntityRepository demoEntityRepository;
 
-    private final IdGeneratorDao idGeneratorDao;
+    private final IdKeyDao idKeyDao;
 
     @GetMapping("/save")
     public Response save(@RequestParam("name") String name) {
@@ -43,17 +42,14 @@ public MultiResponse<DemoEntity> findAll(PageRequest pageRequest) {
 
 
     @GetMapping("/test-list")
-    public List<IdGenerator> test1() throws SQLException{
-        return idGeneratorDao.findAll();
+    public List<IdKey> test1() throws SQLException{
+        return idKeyDao.findAll();
     }
 
     @GetMapping("/test-save")
     public Response test2() throws SQLException {
-        IdGenerator generator = new IdGenerator();
-        generator.setKey("xxxx");
-        generator.setId(1L);
-        generator.setUpdateTime(new Date());
-        idGeneratorDao.save(generator);
+        IdKey generator = new IdKey("xxx");
+        idKeyDao.save(generator);
         return Response.buildSuccess();
     }
 

springboot-example/src/main/resources/application.properties

@@ -4,4 +4,4 @@ spring.datasource.url=jdbc:h2:file:./demo.db
 spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
 spring.jpa.hibernate.ddl-auto=create-drop
 spring.jpa.show-sql=true
-codingapi.leaf.jdbc-url=jdbc:h2:mem:leaf;DB_CLOSE_DELAY=-1
+codingapi.id.generator.jdbc-url=jdbc:h2:mem:generator;DB_CLOSE_DELAY=-1

springboot-starter-id-generator/src/main/java/com/codingapi/springboot/generator/AutoConfiguration.java

@@ -1,6 +1,6 @@
 package com.codingapi.springboot.generator;
 
-import com.codingapi.springboot.generator.dao.IdGeneratorDao;
+import com.codingapi.springboot.generator.dao.IdKeyDao;
 import com.codingapi.springboot.generator.properties.GeneratorProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -11,16 +11,17 @@
 public class AutoConfiguration {
 
     @Bean
-    @ConfigurationProperties(prefix = "codingapi.generator")
+    @ConfigurationProperties(prefix = "codingapi.id.generator")
     public GeneratorProperties generatorProperties() {
         return new GeneratorProperties();
     }
 
     @Bean(initMethod = "init")
     @ConditionalOnMissingBean
-    public IdGeneratorDao idGeneratorDao(GeneratorProperties generatorProperties){
-        return new IdGeneratorDao(generatorProperties.getJdbcUrl());
+    public IdKeyDao idKeyDao(GeneratorProperties generatorProperties){
+        IdKeyDao keyDao =  new IdKeyDao(generatorProperties.getJdbcUrl());
+        GeneratorContext.getInstance().init(keyDao);
+        return keyDao;
     }
 
-
 }

springboot-starter-id-generator/src/main/java/com/codingapi/springboot/generator/GeneratorContext.java

@@ -1,6 +1,33 @@
 package com.codingapi.springboot.generator;
 
+import com.codingapi.springboot.generator.dao.IdKeyDao;
+
 public class GeneratorContext {
 
+    private GeneratorContext() {
+    }
+
+    private static GeneratorContext instance;
+
+    public static GeneratorContext getInstance() {
+        if (instance == null) {
+            synchronized (GeneratorContext.class) {
+                if (instance == null) {
+                    instance = new GeneratorContext();
+                }
+            }
+        }
+        return instance;
+    }
+
+    private IdGenerateContext idGenerateContext;
+
+    long generateId(Class<?> clazz) {
+        return idGenerateContext.generateId(clazz);
+    }
+
+    void init(IdKeyDao idKeyDao){
+        idGenerateContext = new IdGenerateContext(idKeyDao);
+    }
 
 }

springboot-starter-id-generator/src/main/java/com/codingapi/springboot/generator/IdGenerate.java

@@ -0,0 +1,17 @@
+package com.codingapi.springboot.generator;
+
+public interface IdGenerate {
+
+    default long generateLongId() {
+        return GeneratorContext.getInstance().generateId(getClass());
+    }
+
+    default int generateIntId() {
+        return (int) GeneratorContext.getInstance().generateId(getClass());
+    }
+
+    default String generateStringId() {
+        return String.valueOf(GeneratorContext.getInstance().generateId(getClass()));
+    }
+
+}

springboot-starter-id-generator/src/main/java/com/codingapi/springboot/generator/IdGenerateContext.java

@@ -0,0 +1,24 @@
+package com.codingapi.springboot.generator;
+
+import com.codingapi.springboot.generator.dao.IdKeyDao;
+import com.codingapi.springboot.generator.domain.IdKey;
+
+public class IdGenerateContext {
+
+    private final IdKeyDao keyDao;
+
+    public IdGenerateContext(IdKeyDao keyDao) {
+        this.keyDao = keyDao;
+    }
+
+    public synchronized long generateId(Class<?> clazz)  {
+        IdKey idKey =  keyDao.getByKey(clazz.getName());
+        if(idKey==null){
+            idKey = new IdKey(clazz.getName());
+            keyDao.save(idKey);
+        }else{
+            keyDao.updateMaxId(idKey);
+        }
+        return idKey.getId();
+    }
+}

springboot-starter-id-generator/src/main/java/com/codingapi/springboot/generator/dao/IdGeneratorDao.java springboot-starter-id-generator/src/main/java/com/codingapi/springboot/generator/dao/IdKeyDao.java

@@ -1,6 +1,7 @@
 package com.codingapi.springboot.generator.dao;
 
-import com.codingapi.springboot.generator.domain.IdGenerator;
+import com.codingapi.springboot.generator.domain.IdKey;
+import lombok.SneakyThrows;
 import org.apache.commons.dbutils.QueryRunner;
 import org.apache.commons.dbutils.ResultSetHandler;
 
@@ -9,32 +10,33 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class IdGeneratorDao {
+public class IdKeyDao {
 
-    private final DbHelper<List<IdGenerator>> dbHelper;
+    private final DbHelper<List<IdKey>> dbHelper;
 
-    private final ResultSetHandler<List<IdGenerator>> handler;
+    private final ResultSetHandler<List<IdKey>> handler;
 
-    public IdGeneratorDao(String jdbcUrl) {
+    public IdKeyDao(String jdbcUrl) {
         this.dbHelper = new DbHelper<>(jdbcUrl);
         this.handler = rs -> {
-            List<IdGenerator> list = new ArrayList<>();
+            List<IdKey> list = new ArrayList<>();
             while (rs.next()) {
-                IdGenerator generator = new IdGenerator();
+                IdKey generator = new IdKey();
                 generator.setKey(rs.getString("TAG"));
                 generator.setId(rs.getInt("ID"));
-                generator.setUpdateTime(rs.getDate("UPDATE_TIME"));
+                generator.setUpdateTime(rs.getLong("UPDATE_TIME"));
                 list.add(generator);
             }
             return list;
         };
     }
 
-    public boolean save(IdGenerator generator) throws SQLException{
+    @SneakyThrows
+    public boolean save(IdKey generator) {
         return dbHelper.update(new DbHelper.IUpdate() {
             @Override
             public int update(Connection connection, QueryRunner queryRunner) throws SQLException {
-                List<IdGenerator> list = queryRunner.query(connection, "SELECT * FROM ID_GENERATOR WHERE TAG = ?", handler, generator.getKey());
+                List<IdKey> list = queryRunner.query(connection, "SELECT * FROM ID_GENERATOR WHERE TAG = ?", handler, generator.getKey());
                 if (list != null && list.size() > 0) {
                     return 0;
                 }
@@ -46,22 +48,36 @@ public int update(Connection connection, QueryRunner queryRunner) throws SQLExce
     }
 
 
-    public IdGenerator updateMaxId(IdGenerator generator) throws SQLException {
-        return dbHelper.updateAndQuery(new DbHelper.IUpdateAndQuery<List<IdGenerator>>() {
+
+    @SneakyThrows
+    public IdKey getByKey(String key) {
+        return dbHelper.query(new DbHelper.IQuery<List<IdKey>>() {
             @Override
-            public List<IdGenerator> updateAndQuery(Connection connection, QueryRunner queryRunner) throws SQLException {
+            public List<IdKey> query(Connection connection, QueryRunner queryRunner) throws SQLException {
+                return queryRunner.query(connection, "SELECT * FROM ID_GENERATOR WHERE TAG = ?", handler,key);
+            }
+        }).stream().findFirst().orElse(null);
+    }
+
+
+
+    @SneakyThrows
+    public IdKey updateMaxId(IdKey generator) {
+        return dbHelper.updateAndQuery(new DbHelper.IUpdateAndQuery<List<IdKey>>() {
+            @Override
+            public List<IdKey> updateAndQuery(Connection connection, QueryRunner queryRunner) throws SQLException {
                 queryRunner.update(connection, "UPDATE ID_GENERATOR SET ID = ID + 1 WHERE TAG = ?", generator.getKey());
                 return queryRunner.query(connection, "SELECT * FROM ID_GENERATOR WHERE TAG = ?", handler, generator.getKey());
             }
         }).stream().findFirst().orElse(null);
     }
 
 
-
-    public List<IdGenerator> findAll() throws SQLException {
-        return dbHelper.query(new DbHelper.IQuery<List<IdGenerator>>() {
+    @SneakyThrows
+    public List<IdKey> findAll() throws SQLException {
+        return dbHelper.query(new DbHelper.IQuery<List<IdKey>>() {
             @Override
-            public List<IdGenerator> query(Connection connection, QueryRunner queryRunner) throws SQLException {
+            public List<IdKey> query(Connection connection, QueryRunner queryRunner) throws SQLException {
                 return queryRunner.query(connection, "SELECT * FROM ID_GENERATOR", handler);
             }
         });
@@ -71,7 +87,7 @@ private void init() throws SQLException {
         dbHelper.execute(new DbHelper.IExecute() {
             @Override
             public void execute(Connection connection, QueryRunner queryRunner) throws SQLException {
-                String sql = "CREATE TABLE IF NOT EXISTS ID_GENERATOR (TAG VARCHAR(128) NOT NULL, ID BIGINT NOT NULL, UPDATE_TIME TIMESTAMP NOT NULL, PRIMARY KEY (TAG))";
+                String sql = "CREATE TABLE IF NOT EXISTS ID_GENERATOR (TAG VARCHAR(128) NOT NULL, ID BIGINT NOT NULL, UPDATE_TIME BIGINT NOT NULL, PRIMARY KEY (TAG))";
                 queryRunner.execute(connection, sql);
             }
         });