Merge pull request #116 from domaframework/support-module

Minimal support for module system

Author: backpaper0

.github/workflows/ci.yml

@@ -12,10 +12,39 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
 
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
+        with:
+          distribution: zulu
+          java-version: 8
+          cache: maven
+
+      - name: Grant execute permission for mvnw
+        run: chmod +x mvnw
+
+      - name: Test with Maven
+        run: ./mvnw test -B
+
+      - name: Upload reports
+        if: failure()
+        uses: actions/upload-artifact@v2
+        with:
+          name: reports
+          path: ./**/target/surefire-reports
+
+  test-matrix:
+    if: contains(github.event.head_commit.message, '[skip ci]') == false
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    needs: [ test ]
+
     strategy:
       matrix:
-        java: [ 8, 11, 17 ]
-        spring-boot-version: [ 2.2.13.RELEASE, 2.3.12.RELEASE, 2.4.10, 2.5.4 ]
+        java: [ 11, 17 ]
+        spring-boot-version: [ 2.2.13.RELEASE, 2.3.12.RELEASE, 2.4.12, 2.5.6 ]
 
     steps:
       - uses: actions/checkout@v2
@@ -40,9 +69,10 @@ jobs:
           name: reports
           path: ./**/target/surefire-reports
 
-  deploy:
-    if: github.event_name == 'push' && contains(github.event.head_commit.message, '[skip ci]') == false
+  test-slf4j-backward-compatible:
+    if: contains(github.event.head_commit.message, '[skip ci]') == false
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     needs: [ test ]
 
     steps:
@@ -53,16 +83,38 @@ jobs:
         with:
           distribution: zulu
           java-version: 8
+          cache: maven
 
       - name: Grant execute permission for mvnw
         run: chmod +x mvnw
 
-      - name: Cache Maven packages
-        uses: actions/cache@v2
+      - name: Test with Maven
+        run: ./mvnw -B compile -Pbackward-compatible && ./mvnw -B test -Dmaven.main.skip=true -Ddoma.version=2.49.0
+
+      - name: Upload reports
+        if: failure()
+        uses: actions/upload-artifact@v2
+        with:
+          name: reports
+          path: ./**/target/surefire-reports
+
+  deploy:
+    if: github.event_name == 'push' && contains(github.event.head_commit.message, '[skip ci]') == false
+    runs-on: ubuntu-latest
+    needs: [ test-matrix, test-slf4j-backward-compatible ]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
         with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
+          distribution: zulu
+          java-version: 8
+          cache: maven
+
+      - name: Grant execute permission for mvnw
+        run: chmod +x mvnw
 
       - name: Release Maven package
         uses: samuelmeuli/action-maven-publish@v1

README.md

@@ -71,7 +71,7 @@ Add the following dependencies to `pom.xml` so that we can use Doma with Spring
     <groupId>org.seasar.doma</groupId>
     <artifactId>doma-processor</artifactId>
     <version>2.30.0</version>
-    <scope>provided</scope>
+    <optional>true</optional>
 </dependency>
 ```
 

doma-spring-boot-autoconfigure/pom.xml

@@ -16,12 +16,6 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
-        <rootDir>${project.basedir}/..</rootDir>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.seasar.doma.boot</groupId>
@@ -32,6 +26,7 @@
             <groupId>org.seasar.doma</groupId>
             <artifactId>doma-slf4j</artifactId>
             <version>${doma.version}</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -73,4 +68,19 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>doma.spring.boot.autoconfigure</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

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

@@ -4,8 +4,11 @@
 
 import java.util.function.Supplier;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.seasar.doma.jdbc.*;
 import org.seasar.doma.jdbc.dialect.*;
+import org.seasar.doma.slf4j.Slf4jJdbcLogger;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
@@ -227,7 +230,24 @@ public Naming naming() {
 
 	public static enum JdbcLoggerType {
 		JUL(UtilLoggingJdbcLogger::new),
-		SLF4J(Slf4jJdbcLogger::new);
+		SLF4J(JdbcLoggerType::slf4jJdbcLogger);
+
+		private static JdbcLogger slf4jJdbcLogger() {
+			try {
+				return new Slf4jJdbcLogger();
+			} catch (NoClassDefFoundError e) {
+				Log logger = LogFactory.getLog(JdbcLoggerType.class);
+				logger.info(
+						"org.seasar.doma.slf4j.Slf4jJdbcLogger is not found, fallback to org.seasar.doma.jdbc.Slf4jJdbcLogger");
+				try {
+					return (JdbcLogger) Class.forName("org.seasar.doma.jdbc.Slf4jJdbcLogger")
+							.getConstructor().newInstance();
+				} catch (ReflectiveOperationException roe) {
+					logger.warn("org.seasar.doma.jdbc.Slf4jJdbcLogger could not be instantiated either.", roe);
+				}
+				throw e;
+			}
+		}
 
 		private final Supplier<JdbcLogger> constructor;
 

doma-spring-boot-autoconfigure/src/test/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfigurationTest.java

@@ -24,7 +24,6 @@
 import org.seasar.doma.jdbc.NoCacheSqlFileRepository;
 import org.seasar.doma.jdbc.UtilLoggingJdbcLogger;
 import org.seasar.doma.jdbc.SqlFileRepository;
-import org.seasar.doma.jdbc.UtilLoggingJdbcLogger;
 import org.seasar.doma.jdbc.criteria.Entityql;
 import org.seasar.doma.jdbc.criteria.NativeSql;
 import org.seasar.doma.jdbc.dialect.Dialect;
@@ -242,6 +241,19 @@ public void testDialectByDomaPropertiesIgnoreDataSourceUrl() {
 		assertThat(dialect, is(instanceOf(PostgresDialect.class)));
 	}
 
+	@Test
+	public void testJdbcLoggerSlf4J() {
+		MutablePropertySources sources = context.getEnvironment()
+				.getPropertySources();
+		Map<String, Object> source = new HashMap<>();
+		source.put("doma.jdbcLogger", "SLF4J");
+		sources.addFirst(new MapPropertySource("test", source));
+		this.context.register(DomaAutoConfiguration.class, DataSourceAutoConfiguration.class);
+		this.context.refresh();
+		JdbcLogger jdbcLogger = this.context.getBean(JdbcLogger.class);
+		assertThat(jdbcLogger.getClass().getSimpleName(), is("Slf4jJdbcLogger"));
+	}
+	
 	@After
 	public void tearDown() {
 		if (this.context != null) {

doma-spring-boot-core/pom.xml

@@ -16,12 +16,6 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
-        <rootDir>${project.basedir}/..</rootDir>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.seasar.doma</groupId>
@@ -72,4 +66,19 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>doma.spring.boot.core</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

doma-spring-boot-samples/doma-spring-boot-sample-entity-listener/pom.xml

@@ -16,18 +16,12 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
-        <rootDir>${project.basedir}/../..</rootDir>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.seasar.doma</groupId>
             <artifactId>doma-processor</artifactId>
             <version>${doma.version}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.seasar.doma.boot</groupId>
@@ -74,5 +68,4 @@
         </plugins>
     </build>
 
-
 </project>

doma-spring-boot-samples/doma-spring-boot-sample-event-handler/pom.xml

@@ -16,18 +16,12 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
-        <rootDir>${project.basedir}/../..</rootDir>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.seasar.doma</groupId>
             <artifactId>doma-processor</artifactId>
             <version>${doma.version}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.seasar.doma.boot</groupId>
@@ -74,5 +68,4 @@
         </plugins>
     </build>
 
-
 </project>

doma-spring-boot-samples/doma-spring-boot-sample-simple/pom.xml

@@ -16,18 +16,12 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
-        <rootDir>${project.basedir}/../..</rootDir>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.seasar.doma</groupId>
             <artifactId>doma-processor</artifactId>
             <version>${doma.version}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.seasar.doma.boot</groupId>
@@ -70,5 +64,4 @@
         </plugins>
     </build>
 
-
 </project>

doma-spring-boot-samples/doma-spring-boot-sample-two-datasource/pom.xml

@@ -16,18 +16,11 @@
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.8</java.version>
-		<rootDir>${project.basedir}/../..</rootDir>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.seasar.doma</groupId>
 			<artifactId>doma-processor</artifactId>
 			<version>${doma.version}</version>
-			<scope>compile</scope>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -57,5 +50,4 @@
 		</plugins>
 	</build>
 
-
 </project>