Skip to content
Permalink
Browse files
style: prepare for upcoming Checkstyle release 8.28 (#1654)
  • Loading branch information
gmshake authored and vlsi committed Dec 19, 2019
1 parent f7a55cf commit 0b60c62672eac051f2d2696b96de028623afe69c
@@ -165,10 +165,11 @@
<module name="OverloadMethodsDeclarationOrder"/>
<module name="VariableDeclarationUsageDistance"/>-->
<module name="CustomImportOrder">
<property name="specialImportsRegExp" value="org.postgresql"/>
<property name="standardPackageRegExp" value="^java\."/>
<property name="specialImportsRegExp" value="^javax\."/>
<property name="sortImportsInGroupAlphabetically" value="true"/>
<property name="customImportOrderRules"
value="STATIC###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/>
value="STATIC###SAME_PACKAGE(2)###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS"/>
</module>

<!-- Import should be explicit, and only from pure java packages.
@@ -16,7 +16,6 @@
import java.sql.Array;
import java.sql.SQLException;
import java.sql.Statement;

import java.util.Map;

/**
@@ -23,6 +23,7 @@
import java.net.Socket;
import java.net.SocketTimeoutException;
import java.sql.SQLException;

import javax.net.SocketFactory;

/**
@@ -43,6 +43,7 @@
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;

import javax.net.SocketFactory;

/**
@@ -26,7 +26,6 @@
import java.sql.Types;
import java.util.ArrayList;
import java.util.Arrays;

import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
@@ -6,6 +6,7 @@
package org.postgresql.ssl;

import java.util.Properties;

import javax.net.ssl.SSLSocketFactory;

/**
@@ -25,6 +25,7 @@
import java.security.cert.Certificate;
import java.security.cert.CertificateFactory;
import java.util.Properties;

import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
@@ -18,6 +18,7 @@
import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;

import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
@@ -17,6 +17,7 @@
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;

import javax.naming.InvalidNameException;
import javax.naming.ldap.LdapName;
import javax.naming.ldap.Rdn;
@@ -11,6 +11,7 @@

import java.net.IDN;
import java.util.Properties;

import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLSession;

@@ -20,7 +20,6 @@
package org.postgresql.util;

import java.io.Writer;

import java.util.logging.ErrorManager;
import java.util.logging.Formatter;
import java.util.logging.Handler;
@@ -10,7 +10,6 @@
import org.postgresql.test.TestUtil;

import org.hamcrest.core.StringStartsWith;

import org.junit.Assert;
import org.junit.Test;

@@ -12,6 +12,7 @@
import org.junit.Test;

import java.io.IOException;

import javax.naming.NamingException;

/**
@@ -9,7 +9,6 @@
import static org.junit.Assert.assertTrue;

import org.postgresql.core.ServerVersion;

import org.postgresql.test.TestUtil;
import org.postgresql.test.jdbc2.BaseTest4;

@@ -15,7 +15,6 @@
import org.postgresql.test.jdbc2.BaseTest4;

import org.junit.Test;

import org.w3c.dom.Node;

import java.io.IOException;
@@ -27,6 +27,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Properties;

import javax.net.ssl.SSLHandshakeException;

@RunWith(Parameterized.class)

0 comments on commit 0b60c62

Please sign in to comment.