v2

Author: eugene-khyst

.vscode/settings.json

@@ -1,47 +1,59 @@
 plugins {
-    id 'org.springframework.boot' version "${spring_boot_version}"
-    id 'io.spring.dependency-management' version "${spring_dependency_management_version}"
-    id 'com.google.cloud.tools.jib' version "${jib_version}"
     id 'java'
+    id 'org.springframework.boot' version '3.0.4'
+    id 'io.spring.dependency-management' version '1.1.0'
 }
 
 group = 'com.example'
+version = '2.0.0'
 sourceCompatibility = '17'
 
+repositories {
+    mavenCentral()
+}
+
 configurations {
     compileOnly {
         extendsFrom annotationProcessor
     }
 }
 
-repositories {
-    mavenCentral()
-}
-
-jib {
-    to {
-        image = "evgeniy-khyst/${project.name}:${project.version}"
-    }
+ext {
+    set('postgresql_version', '42.5.4')
+    set('mapstruct_version', '1.5.3.Final')
+    set('lombok_mapstruct_binding_version', '0.2.0')
+    set('testcontainers_version', '1.17.6')
 }
 
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.kafka:spring-kafka'
 
     implementation "org.postgresql:postgresql:${postgresql_version}"
     implementation "org.mapstruct:mapstruct:${mapstruct_version}"
 
-    runtimeOnly 'org.flywaydb:flyway-core'
+    implementation 'org.flywaydb:flyway-core'
 
     compileOnly 'org.projectlombok:lombok'
+    annotationProcessor 'org.projectlombok:lombok'
     annotationProcessor "org.projectlombok:lombok-mapstruct-binding:${lombok_mapstruct_binding_version}"
     annotationProcessor "org.mapstruct:mapstruct-processor:${mapstruct_version}"
-    annotationProcessor 'org.projectlombok:lombok'
 
+    testCompileOnly 'org.projectlombok:lombok'
+    testAnnotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.kafka:spring-kafka-test'
-    testRuntimeOnly 'com.h2database:h2'
+    testImplementation 'org.testcontainers:junit-jupiter'
+    testImplementation 'org.testcontainers:postgresql'
+    testImplementation 'org.testcontainers:kafka'
+}
+
+dependencyManagement {
+    imports {
+        mavenBom "org.testcontainers:testcontainers-bom:${testcontainers_version}"
+    }
 }
 
 test {

README.md

@@ -1,61 +1,89 @@
-version: '2'
+version: '3'
 
 services:
   postgres:
-    image: postgres:14-alpine
+    image: postgres:15-alpine
     environment:
       POSTGRES_DB: postgres
       POSTGRES_USER: admin
       POSTGRES_PASSWORD: s3cr3t
     ports:
       - "5432:5432"
-    restart: unless-stopped
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+    healthcheck:
+      test: [ "CMD", "pg_isready", "-q", "-d", "postgres", "-U", "admin" ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
-  zookeeper:
-    image: confluentinc/cp-zookeeper:7.1.1
-    ports:
-      - "2181:2181"
+  adminer:
+    image: adminer
     environment:
-      ZOOKEEPER_CLIENT_PORT: 2181
-      ZOOKEEPER_TICK_TIME: 2000
-    restart: unless-stopped
+      ADMINER_DEFAULT_SERVER: postgres
+      ADMINER_DESIGN: nette
+      ADMINER_PLUGINS: tables-filter edit-calendar edit-foreign json-column sql-log
+    ports:
+      - 8181:8080
+    depends_on:
+      postgres:
+        condition: service_healthy
 
   kafka:
-    image: confluentinc/cp-kafka:7.1.1
-    hostname: kafka
-    depends_on:
-      - zookeeper
-    ports:
-      - "29092:29092"
+    image: confluentinc/cp-kafka:7.3.2
     environment:
       KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: 'zookeeper:2181'
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,PLAINTEXT_HOST://localhost:29092
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT'
+      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092'
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
       KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
       KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
-      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
-      KAFKA_LOG_RETENTION_MS: -1
-      KAFKA_LOG_RETENTION_BYTES: -1
-    restart: unless-stopped
+      KAFKA_JMX_PORT: 9101
+      KAFKA_JMX_HOSTNAME: localhost
+      KAFKA_PROCESS_ROLES: 'broker,controller'
+      KAFKA_NODE_ID: 1
+      KAFKA_CONTROLLER_QUORUM_VOTERS: '1@kafka:29093'
+      KAFKA_LISTENERS: 'PLAINTEXT://kafka:29092,CONTROLLER://kafka:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+      KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
+      KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
+      KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
+    ports:
+      - "9092:9092"
+      - "9101:9101"
+    volumes:
+      - kafka-data:/var/lib/kafka/data
+      - ./kafka/update_run.sh:/tmp/update_run.sh
+    command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
+    healthcheck:
+      test: [ "CMD", "nc", "-z", "localhost", "9092" ]
+      start_period: 15s
+      interval: 10s
+      timeout: 10s
+      retries: 5
 
-  event-sourcing-app:
-    image: evgeniy-khyst/postgresql-event-sourcing:${version:-latest}
+  nginx:
+    image: nginx:1.23-alpine
     ports:
-      - "8080"
+      - "8080:80"
+    volumes:
+      - ./nginx/default.conf:/etc/nginx/conf.d/default.conf:ro
+
+  event-sourcing-app:
+    image: evgeniy-khyst/postgresql-event-sourcing:2.0.0
     environment:
       SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/postgres
       SPRING_DATASOURCE_USERNAME: admin
       SPRING_DATASOURCE_PASSWORD: s3cr3t
-      SPRING_KAFKA_BOOTSTRAPSERVERS: kafka:9092
-      LOGGING_LEVEL_COM_EXAMPLE_EVENTSOURCING: DEBUG
-    restart: unless-stopped
-
-  nginx:
-    image: nginx:1.21-alpine
+      SPRING_KAFKA_BOOTSTRAPSERVERS: kafka:29092
     ports:
-      - "8080:8080"
-    volumes:
-      - ./default.conf:/etc/nginx/conf.d/default.conf:ro
-    restart: unless-stopped
+      - "8080"
+    depends_on:
+      postgres:
+        condition: service_healthy
+      kafka:
+        condition: service_healthy
+
+volumes:
+  pgdata:
+  kafka-data:

build.gradle

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists