build: spotless, google java-format, github-actions (#6)

* Version 0.6.0-SNAPSHOT

* Adding spotless-plugin and google java-format

* License-header fix

* CI fix

* CI fix

* CI fix

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [kagkarlsson]

.github/workflows/ci.yml

@@ -0,0 +1,23 @@
+name: build
+on: [push,pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ '11', '17' ]
+    name: Temurin ${{ matrix.java }}
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Java ${{ matrix.java }}
+      uses: actions/setup-java@v3
+      with:
+        java-version: ${{ matrix.java }}
+        distribution: 'temurin'
+        cache: 'maven'
+
+    - name: Run all tests
+      run: mvn -B clean test --file pom.xml
+      env:
+        TZ: UTC

.github/workflows/pr-lint.yml

@@ -0,0 +1,17 @@
+name: "Validate PR title"
+
+on:
+  pull_request:
+    types:
+      - opened
+      - edited
+      - synchronize
+
+jobs:
+  main:
+    name: Validate PR title
+    runs-on: ubuntu-latest
+    steps:
+      - uses: amannn/action-semantic-pull-request@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pr.yml

@@ -0,0 +1,23 @@
+name: pull-request-check
+on: [pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ '17' ]
+    name: Temurin ${{ matrix.java }}
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Java ${{ matrix.java }}
+      uses: actions/setup-java@v3
+      with:
+        java-version: ${{ matrix.java }}
+        distribution: 'temurin'
+        cache: 'maven'
+
+    - name: Run all tests
+      run: mvn -B spotless:check
+      env:
+        TZ: UTC

.license/license-header.txt

@@ -0,0 +1,11 @@
+Copyright (C) Gustav Karlsson
+
+<p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+except in compliance with the License. You may obtain a copy of the License at
+
+<p>http://www.apache.org/licenses/LICENSE-2.0
+
+<p>Unless required by applicable law or agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+express or implied. See the License for the specific language governing permissions and
+limitations under the License.

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.github.kagkarlsson</groupId>
 	<artifactId>micro-jdbc</artifactId>
-	<version>0.5.0-SNAPSHOT</version>
+	<version>0.6.0-SNAPSHOT</version>
 
 	<name>Micro JDBC</name>
 	<description>Simple low-level helpers for jdbc-access</description>
@@ -31,6 +31,7 @@
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<skipChecks>false</skipChecks>
 		<failOnMissingHeader>true</failOnMissingHeader>
+		<license.dir>${project.basedir}/.license</license.dir>
 	</properties>
 
 	<dependencyManagement>
@@ -107,7 +108,7 @@
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>2.7.1</version>
+			<version>2.7.2</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -140,13 +141,14 @@
 					<artifactId>license-maven-plugin</artifactId>
 					<version>2.11</version>
 					<configuration>
-						<header>src/main/license-header.txt</header>
+						<header>${license.dir}/license-header.txt</header>
 						<strictCheck>true</strictCheck>
 						<excludes>
 							<exclude>pom.xml</exclude>
 							<exclude>LICENSE*</exclude>
 							<exclude>.java-version</exclude>
 							<exclude>src/test/**</exclude>
+							<exclude>.github/**</exclude>
 						</excludes>
 						<failIfMissing>${failOnMissingHeader}</failIfMissing>
 					</configuration>
@@ -160,6 +162,28 @@
 						</execution>
 					</executions>
 				</plugin>
+				<plugin>
+					<groupId>com.diffplug.spotless</groupId>
+					<artifactId>spotless-maven-plugin</artifactId>
+					<version>2.39.0</version>
+					<configuration>
+						<java>
+							<includes>
+								<include>src/main/java/**/*.java</include> <!-- Check application code -->
+								<include>src/test/java/**/*.java</include> <!-- Check application tests code -->
+							</includes>
+							<googleJavaFormat>
+								<version>1.16.0</version>
+								<style>GOOGLE</style>
+							</googleJavaFormat>
+							<importOrder />
+							<removeUnusedImports />
+							<toggleOffOn/>
+							<trimTrailingWhitespace/>
+							<endWithNewline/>
+						</java>
+					</configuration>
+				</plugin>
 
 				<!-- Release plugins -->
 				<plugin>

src/main/java/com/github/kagkarlsson/jdbc/BatchPreparedStatementSetter.java

@@ -1,16 +1,14 @@
 /**
  * Copyright (C) Gustav Karlsson
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
  *
- *         http://www.apache.org/licenses/LICENSE-2.0
+ * <p>http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * <p>Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package com.github.kagkarlsson.jdbc;
@@ -20,6 +18,5 @@
 
 public interface BatchPreparedStatementSetter<U> {
 
-	void setParametersForRow(U value, PreparedStatement preparedStatement) throws SQLException;
-
+  void setParametersForRow(U value, PreparedStatement preparedStatement) throws SQLException;
 }

src/main/java/com/github/kagkarlsson/jdbc/ConnectionSupplier.java

@@ -1,16 +1,14 @@
 /**
  * Copyright (C) Gustav Karlsson
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
  *
- *         http://www.apache.org/licenses/LICENSE-2.0
+ * <p>http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * <p>Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package com.github.kagkarlsson.jdbc;
@@ -19,8 +17,9 @@
 import java.sql.SQLException;
 
 public interface ConnectionSupplier {
-    Connection getConnection() throws SQLException;
-    boolean commitWhenAutocommitDisabled();
-    boolean isExternallyManagedConnection();
+  Connection getConnection() throws SQLException;
 
+  boolean commitWhenAutocommitDisabled();
+
+  boolean isExternallyManagedConnection();
 }

src/main/java/com/github/kagkarlsson/jdbc/DataSourceConnectionSupplier.java

@@ -1,45 +1,43 @@
 /**
  * Copyright (C) Gustav Karlsson
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
  *
- *         http://www.apache.org/licenses/LICENSE-2.0
+ * <p>http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * <p>Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package com.github.kagkarlsson.jdbc;
 
-import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.SQLException;
+import javax.sql.DataSource;
 
 public class DataSourceConnectionSupplier implements ConnectionSupplier {
-    private DataSource dataSource;
-    private boolean commitWhenAutocommitDisabled;
+  private DataSource dataSource;
+  private boolean commitWhenAutocommitDisabled;
 
-    public DataSourceConnectionSupplier(DataSource dataSource, boolean commitWhenAutocommitDisabled) {
-        this.dataSource = dataSource;
-        this.commitWhenAutocommitDisabled = commitWhenAutocommitDisabled;
-    }
+  public DataSourceConnectionSupplier(DataSource dataSource, boolean commitWhenAutocommitDisabled) {
+    this.dataSource = dataSource;
+    this.commitWhenAutocommitDisabled = commitWhenAutocommitDisabled;
+  }
 
-    @Override
-    public Connection getConnection() throws SQLException {
-        return dataSource.getConnection();
-    }
+  @Override
+  public Connection getConnection() throws SQLException {
+    return dataSource.getConnection();
+  }
 
-    @Override
-    public boolean commitWhenAutocommitDisabled() {
-        return commitWhenAutocommitDisabled;
-    }
+  @Override
+  public boolean commitWhenAutocommitDisabled() {
+    return commitWhenAutocommitDisabled;
+  }
 
-    @Override
-    public boolean isExternallyManagedConnection() {
-        return false;
-    }
+  @Override
+  public boolean isExternallyManagedConnection() {
+    return false;
+  }
 }

src/main/java/com/github/kagkarlsson/jdbc/DoInTransaction.java

@@ -1,22 +1,20 @@
 /**
  * Copyright (C) Gustav Karlsson
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
  *
- *         http://www.apache.org/licenses/LICENSE-2.0
+ * <p>http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * <p>Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package com.github.kagkarlsson.jdbc;
 
 import java.sql.Connection;
 
 public interface DoInTransaction<T> {
-    T doInTransaction(Connection c);
+  T doInTransaction(Connection c);
 }

src/main/java/com/github/kagkarlsson/jdbc/ExternallyManagedConnection.java

@@ -1,16 +1,14 @@
 /**
  * Copyright (C) Gustav Karlsson
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
  *
- *         http://www.apache.org/licenses/LICENSE-2.0
+ * <p>http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * <p>Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package com.github.kagkarlsson.jdbc;
@@ -19,24 +17,24 @@
 
 public class ExternallyManagedConnection implements ConnectionSupplier {
 
-    private final Connection externallyManagedConnection;
+  private final Connection externallyManagedConnection;
 
-    public ExternallyManagedConnection(Connection externallyManagedConnection) {
-        this.externallyManagedConnection = externallyManagedConnection;
-    }
+  public ExternallyManagedConnection(Connection externallyManagedConnection) {
+    this.externallyManagedConnection = externallyManagedConnection;
+  }
 
-    @Override
-    public Connection getConnection() {
-        return externallyManagedConnection;
-    }
+  @Override
+  public Connection getConnection() {
+    return externallyManagedConnection;
+  }
 
-    @Override
-    public boolean commitWhenAutocommitDisabled() {
-        return false;
-    }
+  @Override
+  public boolean commitWhenAutocommitDisabled() {
+    return false;
+  }
 
-    @Override
-    public boolean isExternallyManagedConnection() {
-        return true;
-    }
+  @Override
+  public boolean isExternallyManagedConnection() {
+    return true;
+  }
 }