Merge pull request #1 from nmalygin-com/ci-test

fail test

Author: nmalygin-com

.github/workflows/ci.yml

@@ -20,4 +20,4 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven
-      run: mvn package
+      run: mvn clean package

pmd-ruleset.xml

@@ -8,10 +8,13 @@
     <rule ref="category/java/bestpractices.xml">
         <exclude name="JUnitAssertionsShouldIncludeMessage"/>
     </rule>
-    <rule ref="category/java/codestyle.xml"/>
+    <rule ref="category/java/codestyle.xml">
+        <exclude name="CommentDefaultAccessModifier"/>
+    </rule>
     <rule ref="category/java/design.xml"/>
     <rule ref="category/java/documentation.xml">
         <exclude name="CommentSize"/>
+        <exclude name="CommentRequired"/>
     </rule>
     <rule ref="category/java/errorprone.xml">
         <exclude name="AvoidCatchingThrowable"/>

pom.xml

@@ -82,6 +82,11 @@ SOFTWARE.
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.5.2</version>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -115,6 +120,7 @@ SOFTWARE.
                 <version>3.24.0</version>
                 <executions>
                     <execution>
+                        <phase>package</phase>
                         <goals>
                             <goal>check</goal>
                             <goal>cpd-check</goal>
@@ -125,7 +131,8 @@ SOFTWARE.
                     <rulesets>
                         <ruleset>${basedir}/pmd-ruleset.xml</ruleset>
                     </rulesets>
-                    <includeTests>true</includeTests>
+                    <!-- todo: use different ruleset for tests -->
+                    <includeTests>false</includeTests>
                 </configuration>
             </plugin>
             <plugin>

src/main/java/com/nmalygin/superb/jdbc/api/handlers/ColumnToListRsh.java

@@ -45,7 +45,7 @@ public class ColumnToListRsh<T> implements ResultSetHandler<List<T>> {
      *
      * @param column typed column
      */
-    public ColumnToListRsh(Column<T> column) {
+    public ColumnToListRsh(final Column<T> column) {
         this.column = column;
     }
 

src/main/java/com/nmalygin/superb/jdbc/api/handlers/columns/StringColumn.java

@@ -40,7 +40,7 @@ public class StringColumn implements Column<String> {
      *
      * @param name column name
      */
-    public StringColumn(String name) {
+    public StringColumn(final String name) {
         this.name = name;
     }
 
@@ -51,7 +51,7 @@ public StringColumn(String name) {
      * @throws SQLException SQLException
      */
     @Override
-    public String cellValue(ResultSet resultSet) throws SQLException {
+    public String cellValue(final ResultSet resultSet) throws SQLException {
         return resultSet.getString(name);
     }
 }

src/main/java/com/nmalygin/superb/jdbc/real/ClosingConnectionBatch.java

@@ -55,14 +55,8 @@ public void apply() throws SQLException {
 
     @Override
     public void close() throws SQLException {
-        final Connection connection = preparedStatement.getConnection();
-        try {
+        try (Connection ignored = preparedStatement.getConnection()) {
             preparedStatement.close();
-        } catch (Exception e) {
-            connection.close();
-            throw e;
         }
-
-        connection.close();
     }
 }

src/main/java/com/nmalygin/superb/jdbc/real/ConnectionTransaction.java

@@ -36,10 +36,15 @@
 final class ConnectionTransaction implements Transaction {
 
     private final Connection connection;
-    private final Map<String, Savepoint> savePoints = new HashMap<>();
+    private final Map<String, Savepoint> savePoints;
 
-    ConnectionTransaction(final Connection connection) {
+    ConnectionTransaction(final Connection connection, final Map<String, Savepoint> savePoints) {
         this.connection = connection;
+        this.savePoints = savePoints;
+    }
+
+    ConnectionTransaction(final Connection connection) {
+        this(connection, new HashMap<>());
     }
 
     @Override

src/main/java/com/nmalygin/superb/jdbc/real/NotThreadSafeSql.java

@@ -34,6 +34,7 @@
 
 final class NotThreadSafeSql implements Sql {
 
+    @SuppressWarnings("PMD.AvoidStringBufferField")
     private final StringBuilder stringBuilder;
     private final List<Argument> arguments;
 

src/main/java/com/nmalygin/superb/jdbc/real/RealRdbms.java

@@ -58,6 +58,7 @@ public Change change(final String sql, final Argument... withArguments) {
     }
 
     @Override
+    @SuppressWarnings("PMD.CloseResource")
     public Batch batch(final String sql) throws SQLException {
         final Connection connection = dataSource.getConnection();
         try {

src/main/java/com/nmalygin/superb/jdbc/real/Sql.java

@@ -29,6 +29,7 @@
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
+@SuppressWarnings("PMD.ShortClassName")
 interface Sql {
     void append(String sqlFragment, Argument... withArguments);
     String parameterizedSql();