Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix checkstyle and javadoc issues #2434

Merged
merged 5 commits into from Feb 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/main.yml
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions certdir/server/pg_hba.conf
Expand Up @@ -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
2 changes: 1 addition & 1 deletion docker/docker-compose.yml
Expand Up @@ -3,7 +3,7 @@ services:
pgdb:
image: postgres:${PGV:-latest}
ports:
- 5432:5432
- 127.0.0.1:5432:5432
security_opt:
- seccomp:unconfined
volumes:
Expand Down
3 changes: 3 additions & 0 deletions pgjdbc/src/main/java/org/postgresql/util/ObjectFactory.java
Expand Up @@ -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
Expand Down
Expand Up @@ -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;
Expand Down