fix checkstyle and javadoc issues (#2434)

davecramer · web-flow · commit bafcb324dff6 · 2022-02-01T14:25:40.000-05:00
* fix checkstyle and javadoc issues

* add additional logging

* fix pg_hba.conf due to clientcert change in postgres
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -73,6 +73,9 @@ jobs:
         java-version: ${{ matrix.jdk }}
     - name: Prepare ssltest.local.properties
       run: echo enable_ssl_tests=true > ssltest.local.properties
+    - name: Get Docker logs
+      working-directory: docker
+      run: docker-compose logs
     - uses: burrunan/gradle-cache-action@v1
       name: Test
       env:
diff --git a/certdir/server/pg_hba.conf b/certdir/server/pg_hba.conf
@@ -77,6 +77,6 @@ host    all         postgres    127.0.0.1/32          trust
 host    test	all         127.0.0.1/32          md5
 host    hostdb         all         127.0.0.1/32          md5
 hostnossl    hostnossldb         all         127.0.0.1/32          md5
-hostssl    hostssldb         all         127.0.0.1/32          md5    clientcert=0
-hostssl    hostsslcertdb         all         127.0.0.1/32          md5    clientcert=1
+hostssl    hostssldb         all         127.0.0.1/32              md5
+hostssl    hostsslcertdb         all         127.0.0.1/32          md5    clientcert=verify-full
 hostssl    certdb         all         127.0.0.1/32          cert
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -3,7 +3,7 @@ services:
   pgdb:
     image: postgres:${PGV:-latest}
     ports:
-      - 5432:5432
+      - 127.0.0.1:5432:5432
     security_opt:
       - seccomp:unconfined
     volumes:
diff --git a/pgjdbc/src/main/java/org/postgresql/util/ObjectFactory.java b/pgjdbc/src/main/java/org/postgresql/util/ObjectFactory.java
@@ -23,6 +23,9 @@ public class ObjectFactory {
    * single String argument is searched if it fails, or tryString is true a no argument constructor
    * is tried.
    *
+   * @param <T> type of expected class
+   * @param expectedClass expected class of type T, if the classname instantiated doesn't match
+   *                     the expected type of this class this method will fail
    * @param classname name of the class to instantiate
    * @param info parameter to pass as Properties
    * @param tryString whether to look for a single String argument constructor
diff --git a/pgjdbc/src/test/java/org/postgresql/test/util/ObjectFactoryTest.java b/pgjdbc/src/test/java/org/postgresql/test/util/ObjectFactoryTest.java
@@ -5,18 +5,18 @@
 
 package org.postgresql.test.util;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.postgresql.PGProperty;
 import org.postgresql.jdbc.SslMode;
 import org.postgresql.test.TestUtil;
 import org.postgresql.util.ObjectFactory;
 import org.postgresql.util.PSQLState;
 
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.opentest4j.MultipleFailuresError;
 
 import java.sql.SQLException;
