Merge pull request #76 from komamitsu/support-spring-boot-4

Support Spring Boot 4

Author: komamitsu

.github/workflows/ci.yml

@@ -57,6 +57,7 @@ jobs:
     strategy:
       matrix:
         java_version: [17, 21]
+        spring_boot_version: [3, 4]
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK ${{ matrix.java_version }}
@@ -70,6 +71,8 @@ jobs:
       run: ./gradlew publishToMavenLocal
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v4
-    - name: Execute the example app using Spring Boot to test spring-data-sqlite
+    - name: Execute the example app using Spring Boot ${{ matrix.spring_boot_version }} to test spring-data-sqlite
       working-directory: example
+      env:
+        EXAMPLE_APP_SPRING_BOOT_VERSION: ${{ matrix.spring_boot_version }}
       run: ./gradlew run

example/build.gradle

@@ -8,6 +8,7 @@ group 'org.komamitsu'
 version '1.0-SNAPSHOT'
 
 def springDataSqliteVersion = getSpringDataSqliteVersion()
+def springBootVersion = System.getenv('EXAMPLE_APP_SPRING_BOOT_VERSION') ?: '4'
 
 repositories {
     mavenCentral()
@@ -16,10 +17,18 @@ repositories {
 
 dependencies {
     implementation "org.komamitsu:spring-data-sqlite:${springDataSqliteVersion}"
-    implementation platform('org.springframework.boot:spring-boot-dependencies:3.3.5')
+    if (springBootVersion == '3') {
+        implementation platform('org.springframework.boot:spring-boot-dependencies:3.3.5')
+        implementation 'org.springframework.boot:spring-boot-starter-aop'
+        implementation 'org.springframework.retry:spring-retry:1.3.4'
+    } else {
+        implementation platform('org.springframework.boot:spring-boot-dependencies:4.0.1')
+        implementation 'org.springframework.boot:spring-boot-starter-jdbc'
+        implementation 'org.springframework:spring-aop'
+        implementation 'org.aspectj:aspectjweaver'
+        implementation 'org.springframework.retry:spring-retry:2.0.11'
+    }
     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'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'

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

@@ -115,17 +115,29 @@
    * namedParameterJdbcTemplate}.
    *
    * @return jdbc operations ref
+   * @deprecated since 4.0, use {@link #jdbcAggregateOperationsRef()} instead.
    */
+  @Deprecated
   String jdbcOperationsRef() default "";
 
+  /**
+   * Configures the name of the {@link org.springframework.data.jdbc.core.JdbcAggregateOperations}
+   * bean definition to be used to create repositories discovered through this annotation.
+   *
+   * @return jdbc aggregate operations ref
+   */
+  String jdbcAggregateOperationsRef() default "";
+
   /**
    * Configures the name of the {@link
    * org.springframework.data.jdbc.core.convert.DataAccessStrategy} bean definition to be used to
    * create repositories discovered through this annotation. Defaults to {@code
    * defaultDataAccessStrategy}.
    *
    * @return data access strategy ref
+   * @deprecated since 4.0, use {@link #jdbcAggregateOperationsRef()} instead.
    */
+  @Deprecated
   String dataAccessStrategyRef() default "";
 
   /**
@@ -143,4 +155,14 @@
    * @return query lookup strategy
    */
   QueryLookupStrategy.Key queryLookupStrategy() default QueryLookupStrategy.Key.CREATE_IF_NOT_FOUND;
+
+  /**
+   * Configures whether to enable default transactions for Spring Data JDBC repositories. If
+   * disabled, repositories must be used behind a facade that's configuring transactions (e.g. using
+   * Spring's annotation driven transaction facilities) or repository methods have to be used to
+   * demarcate transactions.
+   *
+   * @return whether to enable default transactions
+   */
+  boolean enableDefaultTransactions() default true;
 }

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

@@ -4,8 +4,6 @@
 import org.springframework.data.relational.core.dialect.LimitClause;
 import org.springframework.data.relational.core.dialect.LockClause;
 import org.springframework.data.relational.core.sql.IdentifierProcessing;
-import org.springframework.data.relational.core.sql.IdentifierProcessing.LetterCasing;
-import org.springframework.data.relational.core.sql.IdentifierProcessing.Quoting;
 import org.springframework.data.relational.core.sql.LockOptions;
 
 /**
@@ -63,8 +61,25 @@ public LockClause lock() {
     return LOCK_CLAUSE;
   }
 
+  // Custom implementation to avoid binary incompatibility between Spring Data 3.x and 4.x.
+  // The return type of IdentifierProcessing.create() changed from DefaultIdentifierProcessing to
+  // IdentifierProcessing, which causes NoSuchMethodError when compiled against one version and
+  // run against the other.
+  private static final IdentifierProcessing IDENTIFIER_PROCESSING =
+      new IdentifierProcessing() {
+        @Override
+        public String quote(String identifier) {
+          return "\"" + identifier + "\"";
+        }
+
+        @Override
+        public String standardizeLetterCase(String identifier) {
+          return identifier.toLowerCase();
+        }
+      };
+
   @Override
   public IdentifierProcessing getIdentifierProcessing() {
-    return IdentifierProcessing.create(Quoting.ANSI, LetterCasing.LOWER_CASE);
+    return IDENTIFIER_PROCESSING;
   }
 }