Support test using Spring Boot 3

Author: komamitsu

.github/workflows/ci.yml

@@ -10,16 +10,13 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java_version: [11, 17]
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK ${{ matrix.java_version }}
+    - name: Set up JDK 11
       uses: actions/setup-java@v3
       with:
         distribution: temurin
-        java-version: ${{ matrix.java_version }}
+        java-version: 11
     - name: Setup and execute Gradle 'check' task
       uses: gradle/gradle-build-action@v2
       with:
@@ -32,16 +29,13 @@ jobs:
 
   integration-test:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java_version: [11, 17]
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK ${{ matrix.java_version }}
+    - name: Set up JDK 11
       uses: actions/setup-java@v3
       with:
         distribution: temurin
-        java-version: ${{ matrix.java_version }}
+        java-version: 11
     - name: Setup and execute Gradle 'integrationTest' task
       uses: gradle/gradle-build-action@v2
       with:
@@ -52,25 +46,52 @@ jobs:
         name: gradle_integration_test_reports
         path: build/reports/tests/integrationTest
 
-  test-on-example-app:
+  test-on-example-app-with-spring-boot-2:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        distribution: temurin
+        java-version: 11
+    - name: Install spring-data-sqlite to Maven local
+      uses: gradle/gradle-build-action@v2
+      with:
+        arguments: publishToMavenLocal
+    - name: Execute the example app using Spring Boot 2 to test spring-data-sqlite
+      uses: gradle/gradle-build-action@v2
+      with:
+        build-root-directory: example
+        arguments: run
+      env:
+        WITH_SPRING_BOOT_2: true
+
+  test-on-example-app-with-spring-boot-3:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java_version: [11, 17]
+        java_version: [17, 21]
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK ${{ matrix.java_version }}
+    - name: Set up JDK 11 to install spring-data-sqlite for `publishToMavenLocal`
       uses: actions/setup-java@v3
       with:
         distribution: temurin
-        java-version: ${{ matrix.java_version }}
+        java-version: 11
     - name: Install spring-data-sqlite to Maven local
       uses: gradle/gradle-build-action@v2
       with:
         arguments: publishToMavenLocal
-    - name: Execute the example app to test spring-data-sqlite
+    - name: Set up JDK ${{ matrix.java_version }} for testing
+      uses: actions/setup-java@v3
+      with:
+        distribution: temurin
+        java-version: ${{ matrix.java_version }}
+    - name: Execute the example app using Spring Boot 3 to test spring-data-sqlite
       uses: gradle/gradle-build-action@v2
       with:
         build-root-directory: example
         arguments: run
-
+      env:
+        WITH_SPRING_BOOT_2: false

build.gradle

@@ -5,7 +5,7 @@ plugins {
     id "com.diffplug.spotless" version "6.25.0"
 }
 
-project.version = '1.2.0'
+project.version = '1.3.0'
 group = "org.komamitsu"
 
 repositories {
@@ -120,7 +120,7 @@ spotless {
   java {
     importOrder()
     removeUnusedImports()
-    googleJavaFormat('1.19.1')
+    googleJavaFormat()
     formatAnnotations()
   }
 }

example/build.gradle

@@ -1,13 +1,20 @@
 plugins {
     id 'java-library'
     id 'application'
-    id "com.diffplug.spotless" version "6.12.1"
+    id "com.diffplug.spotless" version "6.25.0"
 }
 
 group 'org.komamitsu'
 version '1.0-SNAPSHOT'
 
 def springDataSqliteVersion = getSpringDataSqliteVersion()
+def withSpringBoot2 = System.getenv('WITH_SPRING_BOOT_2')?.toBoolean() ?: false
+if (withSpringBoot2) {
+    println("Testing with Spring Boot 2")
+}
+else {
+    println("Testing with Spring Boot 3")
+}
 
 repositories {
     mavenCentral()
@@ -16,14 +23,37 @@ repositories {
 
 dependencies {
     implementation "org.komamitsu:spring-data-sqlite:${springDataSqliteVersion}"
-    implementation 'org.springframework.boot:spring-boot-starter:2.7.6'
-    implementation 'org.springframework.boot:spring-boot-starter-aop:2.7.6'
+    if (withSpringBoot2) {
+        implementation platform('org.springframework.boot:spring-boot-dependencies:2.7.18')
+    } else {
+        implementation platform('org.springframework.boot:spring-boot-dependencies:3.3.5')
+    }
+    implementation 'org.springframework.boot:spring-boot-starter'
+    implementation 'org.springframework.boot:spring-boot-starter-aop'
     implementation 'org.springframework.retry:spring-retry:1.3.4'
     implementation 'com.zaxxer:HikariCP:4.0.3'
+    implementation('org.slf4j:slf4j-api') {
+        if (withSpringBoot2) {
+            version {
+                // This version of spring-boot-starter-logging uses logback-classic:1.2.x.
+                // But Spring Data JDBC for SQLite uses slf4j-api:2.x and Spring logging doesn't work.
+                // So we specify a proper version here.
+                strictly '1.7.36'
+            }
+        }
+    }
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
 }
 
+compileJava {
+    if (!withSpringBoot2) {
+        // This is needed only for Spring Boot 3.
+        // It will be not needed later https://stackoverflow.com/questions/78374721/spring-data-jdbc-repository-bean-creation-error/78376635#comment138178415_78376635.
+        options.compilerArgs << '-parameters'
+    }
+}
+
 test {
     useJUnitPlatform()
 }
@@ -36,7 +66,7 @@ spotless {
   java {
     importOrder()
     removeUnusedImports()
-    googleJavaFormat('1.7')
+    googleJavaFormat()
     formatAnnotations()
   }
 }

src/main/java/org/komamitsu/spring/data/sqlite/SqliteRepository.java

@@ -18,7 +18,8 @@
  * @param <ID> an identifier class
  */
 @NoRepositoryBean
-public interface SqliteRepository<T, ID> extends PagingAndSortingRepository<T, ID> {
+public interface SqliteRepository<T, ID>
+    extends PagingAndSortingRepository<T, ID>, CrudRepository<T, ID> {
   T insert(T instance);
 
   T update(T instance);