JDBC examples added

Dependencies updated

Author: GoodforGod

build.gradle

@@ -1,5 +1,6 @@
 plugins {
     id "com.diffplug.spotless" version "6.19.0"
+    id "com.asarkar.gradle.build-time-tracker" version "4.3.0"
 }
 
 group = groupId
@@ -13,6 +14,7 @@ repositories {
 subprojects {
     apply plugin: "java"
     apply plugin: "com.diffplug.spotless"
+    apply plugin: "com.asarkar.gradle.build-time-tracker"
 
     group = groupId
     version = koraVersion

gradle.properties

@@ -1,5 +1,5 @@
 groupId=ru.tinkoff.kora
-koraVersion=1.0.4
+koraVersion=1.0.6
 
 
 ##### GRADLE #####

kora-java-cache-redis/build.gradle

@@ -33,7 +33,7 @@ dependencies {
     implementation "ru.tinkoff.kora:config-hocon"
 
     testImplementation "ru.tinkoff.kora:test-junit5"
-    testImplementation "io.goodforgod:testcontainers-extensions-redis:0.9.4"
+    testImplementation "io.goodforgod:testcontainers-extensions-redis:0.9.6"
     testImplementation "redis.clients:jedis:4.4.3"
 }
 

kora-java-crud/build.gradle

@@ -58,7 +58,7 @@ dependencies {
 
     testImplementation "org.mockito:mockito-core:5.6.0"
     testImplementation "ru.tinkoff.kora:test-junit5"
-    testImplementation "io.goodforgod:testcontainers-extensions-postgres:0.9.4"
+    testImplementation "io.goodforgod:testcontainers-extensions-postgres:0.9.6"
     testImplementation "org.testcontainers:junit-jupiter:1.17.6"
 }
 

kora-java-crud/src/main/resources/application.conf

@@ -35,25 +35,20 @@ openapi {
 
 
 resilient {
-  circuitbreaker {
-    pet {
-      slidingWindowSize = 2
-      minimumRequiredCalls = 2
-      failureRateThreshold = 100
-      permittedCallsInHalfOpenState = 1
-      waitDurationInOpenState = 15s
-    }
+  circuitbreaker.pet {
+    slidingWindowSize = 50
+    minimumRequiredCalls = 25
+    failureRateThreshold = 50
+    waitDurationInOpenState = "25s"
+    permittedCallsInHalfOpenState = 10
   }
-  timeout {
-    pet {
-      duration = 5000ms
-    }
+  timeout.pet {
+    duration = "5000ms"
   }
-  retry {
-    pet {
-      delay = 100ms
-      attempts = 2
-    }
+  retry.pet {
+    delay = "500ms"
+    delayStep = "5s"
+    attempts = 3
   }
 }
 

kora-java-database-cassandra/build.gradle

@@ -34,7 +34,7 @@ dependencies {
     implementation "ru.tinkoff.kora:config-hocon"
 
     testImplementation "ru.tinkoff.kora:test-junit5"
-    testImplementation "io.goodforgod:testcontainers-extensions-cassandra:0.9.4"
+    testImplementation "io.goodforgod:testcontainers-extensions-cassandra:0.9.6"
 }
 
 //noinspection GroovyAssignabilityCheck

kora-java-database-jdbc/build.gradle

@@ -36,7 +36,7 @@ dependencies {
     implementation "ru.tinkoff.kora:config-hocon"
 
     testImplementation "ru.tinkoff.kora:test-junit5"
-    testImplementation "io.goodforgod:testcontainers-extensions-postgres:0.9.4"
+    testImplementation "io.goodforgod:testcontainers-extensions-postgres:0.9.6"
 }
 
 //noinspection GroovyAssignabilityCheck

kora-java-database-jdbc/src/main/java/ru/tinkoff/kora/example/jdbc/JdbcIdRandomCompositeRepository.java

@@ -0,0 +1,38 @@
+package ru.tinkoff.kora.example.jdbc;
+
+import jakarta.annotation.Nullable;
+import java.util.List;
+import java.util.UUID;
+import ru.tinkoff.kora.database.common.UpdateCount;
+import ru.tinkoff.kora.database.common.annotation.*;
+import ru.tinkoff.kora.database.jdbc.JdbcRepository;
+
+@Repository
+public interface JdbcIdRandomCompositeRepository extends JdbcRepository {
+
+    record Entity(@Id @Embedded EntityId id,
+                  @Column("name") String name) {
+
+        public Entity(String name) {
+            this(new EntityId(UUID.randomUUID(), UUID.randomUUID()), name);
+        }
+
+        public record EntityId(UUID a, UUID b) {}
+    }
+
+    @Query("SELECT * FROM entities_composite_uuid WHERE a = :id.a AND b = :id.b")
+    @Nullable
+    Entity findById(Entity.EntityId id);
+
+    @Query("""
+            INSERT INTO entities_composite_uuid(a, b, name)
+            VALUES (:entity.id.a, :entity.id.b, :entity.name)
+            """)
+    UpdateCount insert(Entity entity);
+
+    @Query("""
+            INSERT INTO entities_composite_uuid(a, b, name)
+            VALUES (:entity.id.a, :entity.id.b, :entity.name)
+            """)
+    UpdateCount insert(@Batch List<Entity> entity);
+}

kora-java-database-jdbc/src/main/java/ru/tinkoff/kora/example/jdbc/JdbcIdSequenceCompositeRepository.java

@@ -0,0 +1,45 @@
+package ru.tinkoff.kora.example.jdbc;
+
+import jakarta.annotation.Nullable;
+import java.util.List;
+import ru.tinkoff.kora.database.common.UpdateCount;
+import ru.tinkoff.kora.database.common.annotation.*;
+import ru.tinkoff.kora.database.jdbc.JdbcRepository;
+
+@Repository
+public interface JdbcIdSequenceCompositeRepository extends JdbcRepository {
+
+    record Entity(@Id @Embedded EntityId id,
+                  @Column("name") String name) {
+
+        public Entity(String name) {
+            this(null, name);
+        }
+
+        public record EntityId(Long a, Long b) {}
+    }
+
+    @Query("SELECT * FROM entities_composite WHERE a = :id.a AND b = :id.b")
+    @Nullable
+    Entity findById(Entity.EntityId id);
+
+    @Query("""
+            INSERT INTO entities_composite(name)
+            VALUES (:entity.name)
+            """)
+    UpdateCount insert(Entity entity);
+
+    @Query("""
+            INSERT INTO entities_composite(name)
+            VALUES (:entity.name)
+            """)
+    @Id
+    Entity.EntityId insertGenerated(Entity entity);
+
+    @Query("""
+            INSERT INTO entities_composite(name)
+            VALUES (:entity.name)
+            """)
+    @Id
+    List<Entity.EntityId> insertGenerated(@Batch List<Entity> entity);
+}

kora-java-database-jdbc/src/main/java/ru/tinkoff/kora/example/jdbc/JdbcIdSequenceRepository.java

@@ -8,7 +8,7 @@
 @Repository
 public interface JdbcIdSequenceRepository extends JdbcRepository {
 
-    record Entity(Long id,
+    record Entity(@Id Long id,
                   @Column("name") String name) {
 
         public Entity(String name) {
@@ -32,12 +32,12 @@ INSERT INTO entities_sequence(name)
             VALUES (:entity.name)
             """)
     @Id
-    Long createGenerated(Entity entity);
+    Long insertGenerated(Entity entity);
 
     @Query("""
             INSERT INTO entities_sequence(name)
             VALUES (:entity.name)
             """)
     @Id
-    List<Long> createGenerated(@Batch List<Entity> entity);
+    List<Long> insertGenerated(@Batch List<Entity> entity);
 }

kora-java-database-jdbc/src/main/java/ru/tinkoff/kora/example/jdbc/RootService.java

@@ -15,6 +15,8 @@ public final class RootService {
     private final JdbcMapperParameterRepository jdbcMapperParameterRepository;
     private final JdbcIdSequenceRepository jdbcIdSequenceRepository;
     private final JdbcIdRandomRepository jdbcIdRandomRepository;
+    private final JdbcIdSequenceCompositeRepository jdbcIdSequenceCompositeRepository;
+    private final JdbcIdRandomCompositeRepository jdbcIdRandomCompositeRepository;
     private final JdbcJsonbRepository jdbcJsonbRepository;
     private final JdbcCrudMacrosRepository jdbcCrudMacrosRepository;
 
@@ -26,6 +28,8 @@ public RootService(JdbcCrudSyncRepository jdbcCrudSyncRepository,
                        JdbcMapperParameterRepository jdbcMapperParameterRepository,
                        JdbcIdSequenceRepository jdbcIdSequenceRepository,
                        JdbcIdRandomRepository jdbcIdRandomRepository,
+                       JdbcIdSequenceCompositeRepository jdbcIdSequenceCompositeRepository,
+                       JdbcIdRandomCompositeRepository jdbcIdRandomCompositeRepository,
                        JdbcJsonbRepository jdbcJsonbRepository,
                        JdbcCrudMacrosRepository jdbcCrudMacrosRepository) {
         this.jdbcCrudSyncRepository = jdbcCrudSyncRepository;
@@ -36,6 +40,8 @@ public RootService(JdbcCrudSyncRepository jdbcCrudSyncRepository,
         this.jdbcMapperParameterRepository = jdbcMapperParameterRepository;
         this.jdbcIdSequenceRepository = jdbcIdSequenceRepository;
         this.jdbcIdRandomRepository = jdbcIdRandomRepository;
+        this.jdbcIdSequenceCompositeRepository = jdbcIdSequenceCompositeRepository;
+        this.jdbcIdRandomCompositeRepository = jdbcIdRandomCompositeRepository;
         this.jdbcJsonbRepository = jdbcJsonbRepository;
         this.jdbcCrudMacrosRepository = jdbcCrudMacrosRepository;
     }

kora-java-database-jdbc/src/main/resources/db/migration/V1__setup-tables.sql

@@ -25,6 +25,24 @@ CREATE TABLE IF NOT EXISTS entities_uuid
 );
 
 
+CREATE TABLE IF NOT EXISTS entities_composite
+(
+    a BIGINT    GENERATED ALWAYS AS IDENTITY,
+    b BIGINT    GENERATED ALWAYS AS IDENTITY,
+    name VARCHAR NOT NULL,
+    PRIMARY KEY (a, b)
+);
+
+
+CREATE TABLE IF NOT EXISTS entities_composite_uuid
+(
+    a UUID    NOT NULL,
+    b UUID    NOT NULL,
+    name VARCHAR NOT NULL,
+    PRIMARY KEY (a, b)
+);
+
+
 CREATE TABLE IF NOT EXISTS entities_jsonb
 (
     id    UUID  NOT NULL,

kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcCrudMacrosTests.java

@@ -39,7 +39,7 @@ public KoraConfigModification config() {
     }
 
     @Test
-    void syncSingleSuccess() {
+    void syncSingle() {
         // given
         var entityCreate = new JdbcCrudMacrosRepository.Entity("1", 1, "2", null);
         repository.insert(entityCreate);
@@ -68,7 +68,7 @@ void syncSingleSuccess() {
     }
 
     @Test
-    void syncBatchSuccess() {
+    void syncBatch() {
         // given
         var entityCreate1 = new JdbcCrudMacrosRepository.Entity("1", 1, "2", null);
         var entityCreate2 = new JdbcCrudMacrosRepository.Entity("2", 3, "4", null);

kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcCrudReactorTests.java

@@ -40,7 +40,7 @@ public KoraConfigModification config() {
     }
 
     @Test
-    void monoSingleSuccess() {
+    void monoSingle() {
         // given
         var entityCreate = new JdbcCrudReactorRepository.Entity("1", 1, "2", null);
         repository.insert(entityCreate).block(Duration.ofMinutes(1));
@@ -69,7 +69,7 @@ void monoSingleSuccess() {
     }
 
     @Test
-    void monoBatchSuccess() {
+    void monoBatch() {
         // given
         var entityCreate1 = new JdbcCrudReactorRepository.Entity("1", 1, "2", null);
         var entityCreate2 = new JdbcCrudReactorRepository.Entity("2", 3, "4", null);

kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcCrudSyncTests.java

@@ -39,7 +39,7 @@ public KoraConfigModification config() {
     }
 
     @Test
-    void syncSingleSuccess() {
+    void syncSingle() {
         // given
         var entityCreate = new JdbcCrudSyncRepository.Entity("1", 1, "2", null);
         repository.insert(entityCreate);
@@ -68,7 +68,7 @@ void syncSingleSuccess() {
     }
 
     @Test
-    void syncBatchSuccess() {
+    void syncBatch() {
         // given
         var entityCreate1 = new JdbcCrudSyncRepository.Entity("1", 1, "2", null);
         var entityCreate2 = new JdbcCrudSyncRepository.Entity("2", 3, "4", null);

kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcIdRandomCompositeTests.java

@@ -0,0 +1,72 @@
+package ru.tinkoff.kora.example.jdbc;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import io.goodforgod.testcontainers.extensions.ContainerMode;
+import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection;
+import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection;
+import io.goodforgod.testcontainers.extensions.jdbc.Migration;
+import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres;
+import java.util.List;
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Test;
+import ru.tinkoff.kora.database.common.UpdateCount;
+import ru.tinkoff.kora.example.jdbc.JdbcIdRandomCompositeRepository.Entity;
+import ru.tinkoff.kora.test.extension.junit5.KoraAppTest;
+import ru.tinkoff.kora.test.extension.junit5.KoraAppTestConfigModifier;
+import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification;
+import ru.tinkoff.kora.test.extension.junit5.TestComponent;
+
+@TestcontainersPostgres(
+        mode = ContainerMode.PER_RUN,
+        migration = @Migration(
+                engine = Migration.Engines.FLYWAY,
+                apply = Migration.Mode.PER_METHOD,
+                drop = Migration.Mode.PER_METHOD))
+@KoraAppTest(Application.class)
+class JdbcIdRandomCompositeTests implements KoraAppTestConfigModifier {
+
+    @ContainerPostgresConnection
+    private JdbcConnection connection;
+
+    @TestComponent
+    private JdbcIdRandomCompositeRepository repository;
+
+    @NotNull
+    @Override
+    public KoraConfigModification config() {
+        return KoraConfigModification.ofSystemProperty("POSTGRES_JDBC_URL", connection.params().jdbcUrl())
+                .withSystemProperty("POSTGRES_USER", connection.params().username())
+                .withSystemProperty("POSTGRES_PASS", connection.params().password());
+    }
+
+    @Test
+    void insertOne() {
+        // given
+        var entityCreate = new Entity("Bob");
+
+        // when
+        UpdateCount count = repository.insert(entityCreate);
+        assertEquals(1, count.value());
+
+        var foundCreated = repository.findById(entityCreate.id());
+        assertNotNull(foundCreated);
+        assertEquals(entityCreate.name(), foundCreated.name());
+    }
+
+    @Test
+    void insertMany() {
+        // given
+        var entities = List.of(
+                new Entity("b1"),
+                new Entity("b2"));
+
+        // when
+        var countMany = repository.insert(entities);
+        assertEquals(2, countMany.value());
+
+        var foundCreated = repository.findById(entities.get(0).id());
+        assertNotNull(foundCreated);
+        assertEquals(entities.get(0).name(), foundCreated.name());
+    }
+}