Added postgres as a test container (#77)

* Added postgres test container

* Added support for snapshot build

* Removed redundant bits

* Added 21, removed dependency

* Fix Java 21 doc issue

* Tidy up actions

.github/workflows/ci.yaml

@@ -7,16 +7,16 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 11, 17 ]
+        java: [ 11, 17, 21 ]
     name: Java ${{ matrix.java }} build
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
           cache: 'maven'
 
       - name: Build with Maven on JDK ${{ matrix.java }}
-        run: mvn --batch-mode --update-snapshots verify
+        run: mvn --batch-mode --update-snapshots verify

.github/workflows/codeql.yml

@@ -41,7 +41,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/release-build.yaml

@@ -8,15 +8,15 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Install gpg secret key
         run: cat <(echo -e "${{ secrets.GPG_SECRET_KEY }}") | gpg --batch --import
 
       - name: Set up Maven Central Repository
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '11'
           distribution: 'temurin'
@@ -28,18 +28,17 @@ jobs:
           servers: |
             [{
               "id": "ossrh",
-              "username": "${{ secrets.OSSRH_USERNAME }}",
-              "password": "${{ secrets.OSSRH_TOKEN }}"
+              "username": "${{ secrets.OSSRH_USER_V2 }}",
+              "password": "${{ secrets.OSSRH_TOKEN_V2 }}"
             },
             {
               "id": "gpg.passphrase",
               "passphrase": "${{ secrets.GPG_SECRET_KEY_PASSWORD }}",
               "configuration": {}
             }]
 
-          
       - name: Verify package
         run: mvn --batch-mode verify
-        
+
       - name: Release package
         run: mvn --batch-mode -DskipTests=true releaser:release

.github/workflows/snapshot-build.yaml

@@ -0,0 +1,63 @@
+name: "Build - Snapshot"
+on: 
+  push:
+    branches-ignore:
+      - main
+    tags-ignore:
+      - '*'
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  snapshot_build:
+    name: Snapshot build and publish
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Install gpg secret key
+        run: cat <(echo -e "${{ secrets.GPG_SECRET_KEY }}") | gpg --batch --import
+
+      - name: Set up Maven Central Repository
+        uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          cache: 'maven'
+
+      - name: Cache local Maven repository
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+
+      - name: Set up maven settings
+        uses: s4u/[email protected]
+        with:
+          servers: |
+            [{
+              "id": "ossrh",
+              "username": "${{ secrets.OSSRH_USER_V2 }}",
+              "password": "${{ secrets.OSSRH_TOKEN_V2 }}"
+            },
+            {
+              "id": "gpg.passphrase",
+              "passphrase": "${{ secrets.GPG_SECRET_KEY_PASSWORD }}",
+              "configuration": {}
+            }]
+
+      - name: Upload snapshot
+        run: |
+          mvn \
+            --no-transfer-progress \
+            --batch-mode \
+            clean deploy

pom.xml

@@ -52,14 +52,18 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
+    <testcontainers.version>1.20.1</testcontainers.version>
+    <junit.version>5.10.2</junit.version>
+    <h2.version>2.2.224</h2.version>
+    <postgres.version>42.7.3</postgres.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.10.2</version>
+        <version>${junit.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -78,7 +82,25 @@
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
-      <version>2.2.224</version>
+      <version>${h2.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>${testcontainers.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>${testcontainers.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>${postgres.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -306,4 +328,4 @@
       <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
     </repository>
   </distributionManagement>
-</project>
+</project>

src/main/java/com/hsbc/engineering/JDBCInquirer.java

@@ -7,7 +7,6 @@
 import org.junit.platform.launcher.listeners.TestExecutionSummary;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.*;
 import java.util.logging.Logger;
@@ -50,6 +49,12 @@
  *
  */
 public class JDBCInquirer {
+
+    /**
+     * EmptyContructor to fix issue with Java 21 asking for java doc - warning: use of default constructor, which does not provide a comment
+     */
+    public JDBCInquirer() { }
+
     /**
      * Default logger
      */

src/main/java/com/hsbc/engineering/JDBCSpecTest.java

@@ -17,9 +17,16 @@
 /**
  * <p>JDBCSpecTest class.</p>
  *
+ * For running JDBC Spec tests
  */
 public class JDBCSpecTest {
+
+    /**  
+     * EmptyContructor to fix issue with Java 21 asking for java doc - warning: use of default constructor, which does not provide a comment
+     */
+    public JDBCSpecTest() { }
 
+    //Check for tables
     @DisplayName("Checks if tables can be extracted via jdbc")
     @ParameterizedTest
     @ArgumentsSource(ConnectionProvider.class)

src/test/java/com/hsbc/engineering/PostgresConnectionTest.java

@@ -0,0 +1,50 @@
+package com.hsbc.engineering;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Map;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+@Testcontainers
+public class PostgresConnectionTest {
+    final String user       = "hello";
+    final String password   = "moo";
+    final String database   = "foo";
+
+    private Map<String, String> getConnectionMap() {
+        Map<String, String> args = Map.of(
+        Arguments.CLASS_NAME,   "org.postgresql.Driver",
+        Arguments.USER,         user,
+        Arguments.PWD,          password,
+        Arguments.URL,          pSqlContainer.getJdbcUrl(),
+        Arguments.SQL,          "SELECT 2");
+
+        return args;
+    }
+
+    @Container
+    private PostgreSQLContainer pSqlContainer = new PostgreSQLContainer<>("postgres:16")
+        .withDatabaseName(database)
+        .withUsername(user)
+        .withPassword(password);
+
+    @Test
+    void checkOK() {
+        assertTrue(pSqlContainer.isRunning());
+    }
+
+     @Test
+    void mainFunctionTest() {
+        Assertions.assertDoesNotThrow(() -> JDBCInquirer.runSimpleConnectionTest(getConnectionMap()));
+    }
+
+    @Test
+    void perfFunctionTest() {
+        Assertions.assertDoesNotThrow(() -> JDBCInquirer.timeExtractionTest(getConnectionMap()));
+    }
+}