test jap worker id complete

Author: cooperlyt

.idea/encodings.xml

@@ -43,12 +43,12 @@
 
     <modules>
         <module>uid-generator</module>
-        <module>uid-worker-mybatis-jdbc-spring-boot-starter</module>
+        <module>uid-generator-mybatis-jdbc-spring-boot-starter</module>
         <module>uid-generator-api</module>
         <module>uid-generator-spring-boot-starter</module>
-        <module>uid-worker-mybatis-r2dbc-spring-boot-starter</module>
-        <module>uid-worker-jpa-r2dbc-spring-boot-starter</module>
-        <module>uid-worker-jap-jdbc-spring-boot-starter</module>
+        <module>uid-generator-mybatis-r2dbc-spring-boot-starter</module>
+        <module>uid-generator-jpa-r2dbc-spring-boot-starter</module>
+        <module>uid-generator-jap-jdbc-spring-boot-starter</module>
     </modules>
 
     <properties>

pom.xml

@@ -29,11 +29,5 @@
             <artifactId>reactor-core</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>io.projectreactor</groupId>
-            <artifactId>reactor-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 </project>

uid-generator-api/pom.xml

@@ -9,7 +9,7 @@
         <version>1.0.5-SNAPSHOT</version>
     </parent>
 
-    <artifactId>uid-worker-jap-jdbc-spring-boot-starter</artifactId>
+    <artifactId>uid-generator-jap-jdbc-spring-boot-starter</artifactId>
 
     <properties>
         <maven.compiler.source>15</maven.compiler.source>
@@ -20,7 +20,7 @@
     <dependencies>
         <dependency>
             <groupId>io.github.cooperlyt</groupId>
-            <artifactId>uid-worker-id-db-provider</artifactId>
+            <artifactId>uid-generator-spring-boot-starter</artifactId>
             <version>1.0.5-SNAPSHOT</version>
         </dependency>
 
@@ -40,7 +40,11 @@
             <scope>test</scope>
         </dependency>
 
-
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 

uid-worker-jap-jdbc-spring-boot-starter/pom.xml renamed to uid-generator-jap-jdbc-spring-boot-starter/pom.xml

@@ -6,6 +6,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import reactor.core.publisher.Mono;
 
+import java.util.Date;
 import java.util.concurrent.CompletableFuture;
 
 
@@ -28,6 +29,9 @@ protected Mono<Long> assignWorkerId(WorkerNodeType type, String host, String por
                 .type(type.value())
                 .hostName(host)
                 .port(port)
+                .launchDate(new Date())
+                .created(new Date())
+                .modified(new Date())
                 .build()
         ).getId())));
   }

uid-worker-jap-jdbc-spring-boot-starter/src/main/java/io/github/cooperlyt/cloud/uid/worker/jpa/jdbc/WorkerIdAssigner.java renamed to uid-generator-jap-jdbc-spring-boot-starter/src/main/java/io/github/cooperlyt/cloud/uid/worker/jpa/jdbc/WorkerIdAssigner.java

@@ -14,9 +14,9 @@
 import java.util.Map;
 //extends HibernateJpaConfiguration
 @Configuration
-@EnableJpaRepositories
+@EnableJpaRepositories("io.github.cooperlyt.cloud.uid.worker.jpa.jdbc.repositories")
 @EntityScan("io.github.cooperlyt.cloud.uid.worker.jpa.jdbc.entities")
-public class WorkerIdAutoConfigure extends HibernateJpaAutoConfiguration {
+public class WorkerIdAutoConfigure {
 
 
   private final WorkerNodeRepository workerNodeRepository;

uid-worker-jap-jdbc-spring-boot-starter/src/main/java/io/github/cooperlyt/cloud/uid/worker/jpa/jdbc/WorkerIdAutoConfigure.java renamed to uid-generator-jap-jdbc-spring-boot-starter/src/main/java/io/github/cooperlyt/cloud/uid/worker/jpa/jdbc/WorkerIdAutoConfigure.java

@@ -20,13 +20,16 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.*;
 import java.util.Date;
 
 /**
  * Entity for M_WORKER_NODE
  *
  * @author yutianbao
  */
+@Table(name = "WORKER_NODE")
+@Entity
 @Data
 @Builder
 @NoArgsConstructor
@@ -36,6 +39,8 @@ public class WorkerNodeEntity {
     /**
      * Entity unique id (table unique)
      */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private long id;
 
     /**
@@ -67,5 +72,4 @@ public class WorkerNodeEntity {
      * Last modified
      */
     private Date modified;
-
 }

uid-worker-jap-jdbc-spring-boot-starter/src/main/java/io/github/cooperlyt/cloud/uid/worker/jpa/jdbc/entities/WorkerNodeEntity.java renamed to uid-generator-jap-jdbc-spring-boot-starter/src/main/java/io/github/cooperlyt/cloud/uid/worker/jpa/jdbc/entities/WorkerNodeEntity.java

@@ -5,8 +5,12 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
+import reactor.test.StepVerifier;
+
+import javax.persistence.EntityManager;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -17,19 +21,17 @@
 class WorkerIdAssignerTest {
 
 
+  @Autowired
+  private EntityManager entityManager;
   @Autowired
   private HostWorkerIdAssigner workerIdAssigner;
 
   @Test
   public void testWorkerId(){
-    assertTrue(workerIdAssigner.assignWorkerId() > 1L);
 
+    workerIdAssigner.assignWorkerId().as(StepVerifier::create)
+            .assertNext(id -> {assertTrue(id > 1); System.out.println("id is:" + id);})
+        .verifyComplete();
   }
 
-  @Test
-  public void test(){
-    long a = 4L;
-    a = a % 3L;
-    log.debug("return" + a);
-  }
 }

uid-worker-jap-jdbc-spring-boot-starter/src/main/java/io/github/cooperlyt/cloud/uid/worker/jpa/jdbc/repositories/WorkerNodeRepository.java renamed to uid-generator-jap-jdbc-spring-boot-starter/src/main/java/io/github/cooperlyt/cloud/uid/worker/jpa/jdbc/repositories/WorkerNodeRepository.java

@@ -0,0 +1,31 @@
+
+spring:
+  datasource:
+    driver-class-name: org.mariadb.jdbc.Driver
+    url: jdbc:mariadb://127.0.0.1:3306/corp?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&allowMultiQueries=true
+    username: root
+    password: 5257mq
+  jpa:
+    show-sql: true
+    database: mysql
+
+
+# 以下为可选配置, 如未指定将采用默认值
+uid:
+  timeBits: 30             # 时间位, 默认:30
+  workerBits: 16           # 机器位, 默认:16
+  seqBits: 7               # 序列号, 默认:7
+  epochStr: "2023-02-10"   # 初始时间, 默认:"2019-02-20"
+  maxBackwardSeconds: 1   # 时钟回拨最长容忍时间（秒）, 默认:1
+  enableFutureTime: false # 允许使用未来时间生成ID, 默认: false
+  CachedUidGenerator:     # CachedUidGenerator相关参数
+    boostPower: 3          # RingBuffer size扩容参数, 可提高UID生成的吞吐量, 默认:3
+    paddingFactor: 50      # 指定何时向RingBuffer中填充UID, 取值为百分比(0, 100), 默认为50
+    #scheduleInterval: 60    # 默认:不配置此项, 即不实用Schedule线程. 如需使用, 请指定Schedule线程时间间隔, 单位:秒
+
+
+logging:
+  level:
+    pro.chenggang: DEBUG
+    org.springframework.r2dbc: DEBUG
+    io.github.cooperlyt: DEBUG

uid-worker-jap-jdbc-spring-boot-starter/src/main/resources/META-INF/spring.factories renamed to uid-generator-jap-jdbc-spring-boot-starter/src/main/resources/META-INF/spring.factories

@@ -9,7 +9,7 @@
         <version>1.0.5-SNAPSHOT</version>
     </parent>
 
-    <artifactId>uid-worker-jpa-r2dbc-spring-boot-starter</artifactId>
+    <artifactId>uid-generator-jpa-r2dbc-spring-boot-starter</artifactId>
 
     <properties>
         <maven.compiler.source>15</maven.compiler.source>
@@ -20,7 +20,7 @@
     <dependencies>
         <dependency>
             <groupId>io.github.cooperlyt</groupId>
-            <artifactId>uid-worker-id-db-provider</artifactId>
+            <artifactId>uid-generator-spring-boot-starter</artifactId>
             <version>1.0.5-SNAPSHOT</version>
         </dependency>
 
@@ -41,6 +41,14 @@
             <scope>test</scope>
             <version>1.1.3</version>
         </dependency>
+
+
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
 </project>

uid-worker-jap-jdbc-spring-boot-starter/src/test/java/io/github/cooperlyt/cloud/uid/worker/jpa/jdbc/UidTestApplication.java renamed to uid-generator-jap-jdbc-spring-boot-starter/src/test/java/io/github/cooperlyt/cloud/uid/worker/jpa/jdbc/UidTestApplication.java

@@ -6,7 +6,8 @@
 import org.springframework.transaction.annotation.Transactional;
 import reactor.core.publisher.Mono;
 
-import java.util.Date;
+import java.time.LocalDateTime;
+import java.util.Optional;
 
 
 public class WorkerIdAssigner extends HostWorkerIdAssigner {
@@ -22,15 +23,21 @@ public WorkerIdAssigner(WorkerNodeRepository workerNodeRepository) {
   protected Mono<Long> assignWorkerId(WorkerNodeType type, String host, String port) {
     return workerNodeRepository
         .getWorkerNodeByHostNameAndPort(host,port)
-        .switchIfEmpty(workerNodeRepository.save(
-            WorkerNodeEntity
-            .builder()
-                .launchDate(new Date())
-                .type(type.value())
-                .hostName(host)
-                .port(port)
-                .build()
-        ))
+        .map(Optional::of)
+        .defaultIfEmpty(Optional.empty())
+        .flatMap(entity -> entity.map(Mono::just).orElse(
+            workerNodeRepository.save(
+                WorkerNodeEntity
+                    .builder()
+                    .launchDate(LocalDateTime.now())
+                    .created(LocalDateTime.now())
+                    .modified(LocalDateTime.now())
+                    .type(type.value())
+                    .hostName(host)
+                    .port(port)
+                    .build()
+            ))
+        )
         .map(WorkerNodeEntity::getId);
   }
 }

uid-worker-jap-jdbc-spring-boot-starter/src/test/java/io/github/cooperlyt/cloud/uid/worker/jpa/jdbc/WorkerIdAssignerTest.java renamed to uid-generator-jap-jdbc-spring-boot-starter/src/test/java/io/github/cooperlyt/cloud/uid/worker/jpa/jdbc/WorkerIdAssignerTest.java

@@ -11,7 +11,7 @@
 import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories;
 
 @ConditionalOnClass(R2dbcEntityOperations.class)
-@EnableR2dbcRepositories
+@EnableR2dbcRepositories("io.github.cooperlyt.cloud.uid.worker.jpa.r2dbc.repositories")
 @EntityScan("io.github.cooperlyt.cloud.uid.worker.jpa.r2dbc.entities")
 @Configuration
 public class WorkerIdAutoConfigure {

uid-generator-jap-jdbc-spring-boot-starter/src/test/resources/application.yml

@@ -19,14 +19,18 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.relational.core.mapping.Table;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
  * Entity for M_WORKER_NODE
  *
  * @author yutianbao
  */
+@Table("WORKER_NODE")
 @Data
 @Builder
 @NoArgsConstructor
@@ -36,6 +40,7 @@ public class WorkerNodeEntity {
     /**
      * Entity unique id (table unique)
      */
+    @Id
     private long id;
 
     /**
@@ -56,16 +61,16 @@ public class WorkerNodeEntity {
     /**
      * Worker launch date, default now
      */
-    private Date launchDate = new Date();
+    private LocalDateTime launchDate = LocalDateTime.now();
 
     /**
      * Created time
      */
-    private Date created;
+    private LocalDateTime created = LocalDateTime.now();
 
     /**
      * Last modified
      */
-    private Date modified;
+    private LocalDateTime modified = LocalDateTime.now();
 
 }

uid-worker-jpa-r2dbc-spring-boot-starter/pom.xml renamed to uid-generator-jpa-r2dbc-spring-boot-starter/pom.xml

@@ -5,6 +5,8 @@
 import org.springframework.stereotype.Repository;
 import reactor.core.publisher.Mono;
 
+import java.util.Optional;
+
 @Repository
 public interface WorkerNodeRepository extends ReactiveCrudRepository<WorkerNodeEntity,Long> {
 

uid-worker-jpa-r2dbc-spring-boot-starter/src/main/java/io/github/cooperlyt/cloud/uid/worker/jpa/r2dbc/WorkerIdAssigner.java renamed to uid-generator-jpa-r2dbc-spring-boot-starter/src/main/java/io/github/cooperlyt/cloud/uid/worker/jpa/r2dbc/WorkerIdAssigner.java

@@ -7,6 +7,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
+import reactor.test.StepVerifier;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -21,7 +22,10 @@ class WorkerIdAssignerTest {
 
   @Test
   public void testWorkerId(){
-    assertTrue(workerIdAssigner.assignWorkerId() > 1L);
+    workerIdAssigner.assignWorkerId().as(StepVerifier::create)
+        .assertNext(id -> {assertTrue(id > 0); System.out.println("id is:" + id);})
+            .verifyComplete();
+
 
   }