upgrade-to-java-21 (#4)

* update to java 21

* change schema

Author: kamalhm

README.md

@@ -3,13 +3,13 @@
 An example implementation of Spring Boot R2DBC REST API with PostgreSQL database.
 
 ## Technology stack
-* Java 17
+* Java 21
 * Maven
-* PostgreSQL 16.1
+* PostgreSQL 17
 * Docker
 
 ## Java Dependencies
-* Spring Boot 3.2.1
+* Spring Boot 3.4.1
 * Spring Data R2DBC
 * R2DBC PostgreSQL Driver
 * JUnit 5
@@ -30,7 +30,7 @@ An example implementation of Spring Boot R2DBC REST API with PostgreSQL database
 
 2. Run generated docker image
 
-`docker run -it -p8080:8080 --network="host" reactive-postgres:0.0.2-SNAPSHOT`
+`docker run -it -p8080:8080 --network="host" reactive-postgres:0.0.3-SNAPSHOT`
 
 
 

docker-compose.yml

@@ -1,8 +1,7 @@
-version: '3.8'
 services:
   postgresql:
     container_name: db-postgres
-    image: postgres:16.1
+    image: postgres:17
     ports:
       - "5432:5432"
     environment:

mvnw

@@ -15,17 +15,17 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.1</version>
+        <version>3.4.1</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>dev.kamalhm</groupId>
     <artifactId>reactive-postgres</artifactId>
-    <version>0.0.2-SNAPSHOT</version>
+    <version>0.0.3-SNAPSHOT</version>
     <name>reactive-postgres</name>
-    <description>Demo project for Spring Boot</description>
+    <description>Example Spring Boot with R2DBC project</description>
 
     <properties>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
     </properties>
 
     <dependencies>
@@ -45,10 +45,9 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>io.r2dbc</groupId>
+            <groupId>org.postgresql</groupId>
             <artifactId>r2dbc-postgresql</artifactId>
-            <version>0.8.6.RELEASE</version>
-            <scope>runtime</scope>
+            <version>1.0.7.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
@@ -80,6 +79,10 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.11</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

pom.xml

@@ -14,17 +14,17 @@
 @EnableR2dbcAuditing
 public class ReactivePostgresApplication {
 
-  public static void main(String[] args) {
-    SpringApplication.run(ReactivePostgresApplication.class, args);
-  }
+    public static void main(String[] args) {
+        SpringApplication.run(ReactivePostgresApplication.class, args);
+    }
 
-  @Bean
-  ConnectionFactoryInitializer initializer(@Qualifier("connectionFactory") ConnectionFactory connectionFactory) {
-    ConnectionFactoryInitializer initializer = new ConnectionFactoryInitializer();
-    initializer.setConnectionFactory(connectionFactory);
-    ResourceDatabasePopulator resource =
-        new ResourceDatabasePopulator(new ClassPathResource("schema.sql"));
-    initializer.setDatabasePopulator(resource);
-    return initializer;
-  }
+    @Bean
+    ConnectionFactoryInitializer initializer(@Qualifier("connectionFactory") ConnectionFactory connectionFactory) {
+        ConnectionFactoryInitializer initializer = new ConnectionFactoryInitializer();
+        initializer.setConnectionFactory(connectionFactory);
+        ResourceDatabasePopulator resource =
+                new ResourceDatabasePopulator(new ClassPathResource("schema.sql"));
+        initializer.setDatabasePopulator(resource);
+        return initializer;
+    }
 }

src/main/java/dev/kamalhm/reactivepostgres/ReactivePostgresApplication.java

@@ -9,9 +9,9 @@
 @Configuration
 public class PostgresAuditorAwareConfiguration {
 
-  @Bean
-  ReactiveAuditorAware<String> auditorAware() {
-    return () -> Mono.just("AUDITOR");
-  }
+    @Bean
+    ReactiveAuditorAware<String> auditorAware() {
+        return () -> Mono.just("AUDITOR");
+    }
 
 }

src/main/java/dev/kamalhm/reactivepostgres/config/PostgresAuditorAwareConfiguration.java

@@ -17,15 +17,12 @@
 @Slf4j
 public class BalanceController {
 
-  private final BalanceRepository balanceRepository;
+    private final BalanceRepository balanceRepository;
 
-  @PostMapping
-  public Mono<Balance> createBalance(@RequestBody CreateBalanceWebRequest request) {
-    final Balance balance = Balance.builder()
-        .balance(request.getBalance())
-        .memberId(request.getMemberId())
-        .build();
-    return balanceRepository.save(balance);
-  }
+    @PostMapping
+    public Mono<Balance> createBalance(@RequestBody CreateBalanceWebRequest request) {
+        final Balance balance = new Balance(request.getMemberId(), request.getBalance());
+        return balanceRepository.save(balance);
+    }
 
 }

src/main/java/dev/kamalhm/reactivepostgres/controller/BalanceController.java

@@ -23,44 +23,44 @@
 @Slf4j
 public class MemberController {
 
-  private final MemberRepository memberRepository;
+    private final MemberRepository memberRepository;
 
-  @GetMapping
-  public Flux<Member> getAll() {
-    return memberRepository.findAll();
-  }
+    @GetMapping
+    public Flux<Member> getAll() {
+        return memberRepository.findAll();
+    }
 
-  @GetMapping(value = "/{name}")
-  public Mono<Member> getOne(@PathVariable String name) {
-    return memberRepository.findByName(name);
-  }
+    @GetMapping(value = "/{name}")
+    public Mono<Member> getOne(@PathVariable String name) {
+        return memberRepository.findByName(name);
+    }
 
-  @PostMapping
-  public Mono<Member> createMember(@RequestBody Member member) {
-    return memberRepository.save(member);
-  }
+    @PostMapping
+    public Mono<Member> createMember(@RequestBody Member member) {
+        return memberRepository.save(member);
+    }
 
-  @PostMapping(value = "/{number}")
-  public Flux<Member> createMembers(@PathVariable int number) {
-    return generateRandomMember(number).subscribeOn(Schedulers.boundedElastic());
-  }
+    @PostMapping(value = "/{number}")
+    public Flux<Member> createMembers(@PathVariable int number) {
+        return generateRandomMember(number).subscribeOn(Schedulers.boundedElastic());
+    }
 
-  private Flux<Member> generateRandomMember(int number) {
-    return Mono.fromSupplier(
-            () -> Member.builder().name(RandomStringUtils.randomAlphabetic(5)).build())
-        .flatMap(memberRepository::save)
-        .repeat(number);
-  }
+    private Flux<Member> generateRandomMember(int number) {
+        return Mono.fromSupplier(
+                        () -> new Member(RandomStringUtils.randomAlphabetic(5)))
+                .flatMap(memberRepository::save)
+                .repeat(number);
+    }
 
-  @PutMapping
-  public Mono<Member> updateMember(@RequestBody Member member) {
-    return memberRepository
-        .findByName(member.getName())
-        .flatMap(memberResult -> memberRepository.save(member));
-  }
+    @PutMapping
+    public Mono<Member> updateMember(@RequestBody Member member) {
+        return memberRepository
+                .findByName(member.name())
+                .flatMap(memberResult -> memberRepository.save(member));
+    }
 
-  @DeleteMapping
-  public Mono<Void> deleteMember(@RequestBody Member member) {
-    return memberRepository.deleteById(member.getId());
-  }
+    @DeleteMapping
+    public Mono<Void> deleteMember(@RequestBody Member member) {
+        return memberRepository.deleteById(member.id());
+    }
 }

src/main/java/dev/kamalhm/reactivepostgres/controller/MemberController.java

@@ -18,11 +18,11 @@
 @Slf4j
 public class TransactionController {
 
-  private final TransactionalService transactionalService;
+    private final TransactionalService transactionalService;
 
-  @PostMapping
-  @Transactional
-  public Mono<Balance> createTransaction(@RequestBody CreateTransactionWebRequest request) {
-    return transactionalService.doTransaction(request);
-  }
+    @PostMapping
+    @Transactional
+    public Mono<Balance> createTransaction(@RequestBody CreateTransactionWebRequest request) {
+        return transactionalService.doTransaction(request);
+    }
 }

src/main/java/dev/kamalhm/reactivepostgres/controller/TransactionController.java

@@ -5,6 +5,6 @@
 @Data
 public class CreateBalanceWebRequest {
 
-  private String memberId;
-  private Long balance;
+    private Long memberId;
+    private Long balance;
 }

src/main/java/dev/kamalhm/reactivepostgres/dto/CreateBalanceWebRequest.java

@@ -5,7 +5,7 @@
 @Data
 public class CreateTransactionWebRequest {
 
-  private String from;
-  private String to;
+  private Long from;
+  private Long to;
   private Long amount;
 }

src/main/java/dev/kamalhm/reactivepostgres/dto/CreateTransactionWebRequest.java

@@ -1,34 +1,23 @@
 package dev.kamalhm.reactivepostgres.entity;
 
-import java.util.UUID;
-import lombok.Builder;
-import lombok.Data;
 import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.LastModifiedBy;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.relational.core.mapping.Column;
 
-@Builder
-@Data
-public class Balance {
-
-  @Id
-  private UUID id;
-  @Column("member_id")
-  private String memberId;
-  private Long balance;
-  @CreatedBy
-  @Column("created_by")
-  private String createdBy;
-  @CreatedDate
-  @Column("created_date")
-  private Long createdDate;
-  @LastModifiedBy
-  @Column("last_modified_by")
-  private String lastModifiedBy;
-  @LastModifiedDate
-  @Column("last_modified_date")
-  private Long lastModifiedDate;
+public record Balance(
+        @Id Long id,
+        @Column("member_id") Long memberId,
+        Long balance,
+        @CreatedBy @Column("created_by") String createdBy,
+        @CreatedDate @Column("created_date") Long createdDate,
+        @LastModifiedBy @Column("last_modified_by") String lastModifiedBy,
+        @LastModifiedDate @Column("last_modified_date") Long lastModifiedDate
+) {
+    public Balance(Long memberId, Long balance) {
+        this(null, memberId, balance, null, null, null, null);
+    }
 }
+

src/main/java/dev/kamalhm/reactivepostgres/entity/Balance.java

@@ -1,15 +1,10 @@
 package dev.kamalhm.reactivepostgres.entity;
 
-import lombok.Builder;
-import lombok.Data;
 import org.springframework.data.annotation.Id;
 
+public record Member(@Id Long id, String name) {
+    public Member(String name) {
+        this(null, name); // `id` is null, it will be auto-generated when persisted
+    }
 
-@Builder
-@Data
-public class Member {
-
-  @Id
-  private Long id;
-  private String name;
 }

src/main/java/dev/kamalhm/reactivepostgres/entity/Member.java

@@ -4,6 +4,6 @@
 import org.springframework.data.r2dbc.repository.R2dbcRepository;
 import reactor.core.publisher.Mono;
 
-public interface BalanceRepository extends R2dbcRepository<Balance, String> {
-  Mono<Balance> findByMemberId(String memberId);
+public interface BalanceRepository extends R2dbcRepository<Balance, Long> {
+    Mono<Balance> findByMemberId(Long memberId);
 }

src/main/java/dev/kamalhm/reactivepostgres/repository/BalanceRepository.java

@@ -5,5 +5,5 @@
 import reactor.core.publisher.Mono;
 
 public interface MemberRepository extends R2dbcRepository<Member, Long> {
-  Mono<Member> findByName(String name);
+    Mono<Member> findByName(String name);
 }