Merge pull request #244 from domaframework/bump-doma-to-3

Bump doma to 3

Author: backpaper0

.github/workflows/ci.yml

@@ -18,11 +18,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: liberica
-          java-version: 8
+          java-version: 17
           cache: maven
 
       - name: Grant execute permission for mvnw
@@ -46,42 +46,8 @@ jobs:
 
     strategy:
       matrix:
-        java: [ 11, 17, 21 ]
-        spring-boot-version: [ 2.7.18 ]
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v4
-        with:
-          distribution: liberica
-          java-version: ${{ matrix.java }}
-          cache: maven
-
-      - name: Grant execute permission for mvnw
-        run: chmod +x mvnw
-
-      - name: Test with Maven
-        run: ./mvnw $MAVEN_CLI_OPTS -pl :doma-spring-boot-core,:doma-spring-boot-autoconfigure,:doma-spring-boot-starter test -Dspring-boot.version=${{ matrix.spring-boot-version }}
-
-      - name: Upload reports
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: reports
-          path: ./**/target/surefire-reports
-
-  test-spring-boot-3:
-    if: contains(github.event.head_commit.message, '[skip ci]') == false
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    needs: [ test ]
-
-    strategy:
-      matrix:
-        java: [ 17, 21 ]
-        spring-boot-version: [ 3.0.13, 3.1.12, 3.2.6, 3.3.0 ]
+        java: [ 21, 22 ]
+        spring-boot-version: [ 3.2.9, 3.3.3, 3.4.0-M2 ]
 
     steps:
       - uses: actions/checkout@v4
@@ -114,11 +80,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: liberica
-          java-version: 8
+          java-version: 17
           cache: maven
 
       - name: Grant execute permission for mvnw

doma-spring-boot-autoconfigure/src/main/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfiguration.java

@@ -171,9 +171,6 @@ public DomaConfig config(DataSource dataSource, Dialect dialect,
 		if (domaConfigBuilder.entityListenerProvider() == null) {
 			domaConfigBuilder.entityListenerProvider(entityListenerProvider);
 		}
-		if (domaConfigBuilder.domaProperties() == null) {
-			return domaConfigBuilder.build(domaProperties);
-		}
 		return domaConfigBuilder.build();
 	}
 

doma-spring-boot-autoconfigure/src/main/java/org/seasar/doma/boot/autoconfigure/DomaConfigBuilder.java

@@ -1,5 +1,7 @@
 package org.seasar.doma.boot.autoconfigure;
 
+import java.util.Objects;
+
 import javax.sql.DataSource;
 
 import org.seasar.doma.jdbc.*;
@@ -39,16 +41,8 @@ public class DomaConfigBuilder {
 	private Commenter commenter = ConfigSupport.defaultCommenter;
 	private EntityListenerProvider entityListenerProvider;
 
-	@Deprecated
-	public DomaConfigBuilder() {
-	}
-
 	public DomaConfigBuilder(DomaProperties domaProperties) {
-		this.domaProperties = domaProperties;
-	}
-
-	DomaProperties domaProperties() {
-		return domaProperties;
+		this.domaProperties = Objects.requireNonNull(domaProperties);
 	}
 
 	public DataSource dataSource() {
@@ -180,12 +174,6 @@ public DomaConfigBuilder entityListenerProvider(
 		return this;
 	}
 
-	@Deprecated
-	public DomaConfig build(DomaProperties domaProperties) {
-		this.domaProperties = domaProperties;
-		return build();
-	}
-
 	public DomaConfig build() {
 		return new DomaConfig(this, domaProperties);
 	}

doma-spring-boot-autoconfigure/src/main/java/org/seasar/doma/boot/autoconfigure/DomaProperties.java

@@ -239,10 +239,6 @@ public enum NamingType {
 		UPPER_CASE(Naming.UPPER_CASE),
 		SNAKE_LOWER_CASE(Naming.SNAKE_LOWER_CASE),
 		SNAKE_UPPER_CASE(Naming.SNAKE_UPPER_CASE),
-		@Deprecated
-		LENIENT_SNAKE_LOWER_CASE(Naming.LENIENT_SNAKE_LOWER_CASE),
-		@Deprecated
-		LENIENT_SNAKE_UPPER_CASE(Naming.LENIENT_SNAKE_UPPER_CASE),
 		DEFAULT(Naming.DEFAULT);
 
 		private final Naming naming;

pom.xml

@@ -45,10 +45,10 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <doma.version>2.62.1</doma.version>
-        <spring-boot.version>2.7.16</spring-boot.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <doma.version>3.0.0</doma.version>
+        <spring-boot.version>3.2.9</spring-boot.version>
         <source-plugin.version>3.3.1</source-plugin.version>
         <javadoc-plugin.version>3.10.0</javadoc-plugin.version>
         <nexus-staging-plugin.version>1.7.0</nexus-staging-plugin.version>