diff --git a/cadc-quality/build.gradle b/cadc-quality/build.gradle index 68a76958..9edd2879 100644 --- a/cadc-quality/build.gradle +++ b/cadc-quality/build.gradle @@ -11,11 +11,11 @@ repositories { apply from: '../opencadc.gradle' -sourceCompatibility = 1.8 +sourceCompatibility = 11 group = 'org.opencadc' -version = '1.0.1' +version = '1.1.0' description = 'OpenCADC Checkstyle Code Quality Rules' def git_url = 'https://github.com/opencadc/core' @@ -23,7 +23,7 @@ def git_url = 'https://github.com/opencadc/core' checkstyle { ignoreFailures = false configFile = file("${projectDir}/src/main/resources/cadc_checkstyle.xml") - toolVersion = '8.2' + toolVersion = '10.12.5' sourceSets = [project.sourceSets.test] } diff --git a/cadc-quality/src/main/resources/cadc_checkstyle.xml b/cadc-quality/src/main/resources/cadc_checkstyle.xml index 7f4d448b..a7cd8bf5 100644 --- a/cadc-quality/src/main/resources/cadc_checkstyle.xml +++ b/cadc-quality/src/main/resources/cadc_checkstyle.xml @@ -33,7 +33,10 @@ - + + + + @@ -46,10 +49,6 @@ - - - - diff --git a/cadc-quality/src/main/resources/cadc_quality.gradle b/cadc-quality/src/main/resources/cadc_quality.gradle index af0ca825..453f1544 100644 --- a/cadc-quality/src/main/resources/cadc_quality.gradle +++ b/cadc-quality/src/main/resources/cadc_quality.gradle @@ -8,7 +8,7 @@ configurations { } dependencies { - compile 'com.puppycrawl.tools:checkstyle:8.2' + compile 'com.puppycrawl.tools:checkstyle:10.12.5' checkstyleDep 'org.opencadc:cadc-quality:1.+' } @@ -16,6 +16,6 @@ dependencies { checkstyle { ignoreFailures = false config = resources.text.fromArchiveEntry(configurations.checkstyleDep, 'cadc_checkstyle.xml') - toolVersion = '8.2' + toolVersion = '10.12.5' sourceSets = [] } diff --git a/cadc-rest/src/main/java/ca/nrc/cadc/rest/InitAction.java b/cadc-rest/src/main/java/ca/nrc/cadc/rest/InitAction.java index 4a0b98d1..d0cee295 100644 --- a/cadc-rest/src/main/java/ca/nrc/cadc/rest/InitAction.java +++ b/cadc-rest/src/main/java/ca/nrc/cadc/rest/InitAction.java @@ -216,6 +216,7 @@ protected static Version getLibraryVersion(Class probe) { /** * Called during shutdown by the RestServlet destroy() method. */ - public void doShutdown() {} + public void doShutdown() { + } } diff --git a/cadc-rest/src/main/java/ca/nrc/cadc/rest/SyncOutput.java b/cadc-rest/src/main/java/ca/nrc/cadc/rest/SyncOutput.java index 8ed949d0..8ab39c24 100644 --- a/cadc-rest/src/main/java/ca/nrc/cadc/rest/SyncOutput.java +++ b/cadc-rest/src/main/java/ca/nrc/cadc/rest/SyncOutput.java @@ -74,12 +74,10 @@ import java.io.FilterOutputStream; import java.io.IOException; import java.io.OutputStream; - import java.net.URI; import java.text.DateFormat; import java.util.Date; import javax.servlet.http.HttpServletResponse; - import org.apache.log4j.Logger; /** diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/Asn1Object.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/Asn1Object.java index fc929ec1..bab5f85a 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/auth/Asn1Object.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/auth/Asn1Object.java @@ -32,8 +32,8 @@ ************************************************************************ */ -/************************************************************************ - * +/* + * * This class has been extracted from the PrivtKeyReader class at: * http://www.androidadb.com/source/oauth-read-only/java/jmeter/jmeter/ * src/main/java/org/apache/jmeter/protocol/oauth/ @@ -41,16 +41,16 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * - ************************************************************************/ + * + */ package ca.nrc.cadc.auth; diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/Authorizer.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/Authorizer.java index eb5c7063..2256dbed 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/auth/Authorizer.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/auth/Authorizer.java @@ -70,7 +70,6 @@ package ca.nrc.cadc.auth; import ca.nrc.cadc.net.TransientException; - import java.io.FileNotFoundException; import java.net.URI; import java.security.AccessControlException; diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/BasicX509KeyManager.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/BasicX509KeyManager.java index 6cebcc3c..42dadc4f 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/auth/BasicX509KeyManager.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/auth/BasicX509KeyManager.java @@ -74,7 +74,6 @@ import java.security.PrivateKey; import java.security.cert.X509Certificate; import javax.net.ssl.X509KeyManager; - import org.apache.log4j.Logger; /** diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/BearerTokenPrincipal.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/BearerTokenPrincipal.java index 35dbc7fa..b6424c46 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/auth/BearerTokenPrincipal.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/auth/BearerTokenPrincipal.java @@ -70,7 +70,6 @@ package ca.nrc.cadc.auth; import ca.nrc.cadc.util.StringUtil; - import java.io.Serializable; import java.security.Principal; diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/CertCmdArgUtil.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/CertCmdArgUtil.java index b8979fec..cf630f8e 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/auth/CertCmdArgUtil.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/auth/CertCmdArgUtil.java @@ -70,11 +70,8 @@ package ca.nrc.cadc.auth; import ca.nrc.cadc.util.ArgumentMap; - import java.io.File; - import javax.security.auth.Subject; - import org.apache.log4j.Logger; /** diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/DerParser.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/DerParser.java index 5bd93595..671f2ac0 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/auth/DerParser.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/auth/DerParser.java @@ -32,24 +32,24 @@ ************************************************************************ */ -/************************************************************************ - * - * This class has been extracted from the PrivtKeyReader class at: +/* + * + * This class has been extracted from the PrivateKeyReader class at: * http://www.androidadb.com/source/oauth-read-only/java/jmeter/jmeter/ * src/main/java/org/apache/jmeter/protocol/oauth/ * sampler/PrivateKeyReader.java.html * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * ************************************************************************/ package ca.nrc.cadc.auth; @@ -63,15 +63,15 @@ * A bare-minimum ASN.1 DER decoder, just having enough functions to decode * PKCS#1 private keys. Especially, it doesn't handle explicitly tagged types * with an outer tag. - * + * *

* This parser can only handle one layer. To parse nested constructs, get a new * parser for each layer using Asn1Object.getParser(). - * + * *

* There are many DER decoders in JRE but using them will tie this program to a * specific JCE/JVM. - * + * * @author zhang * */ diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/HttpPrincipal.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/HttpPrincipal.java index 71aa55e5..0ca2f6dd 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/auth/HttpPrincipal.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/auth/HttpPrincipal.java @@ -70,7 +70,6 @@ package ca.nrc.cadc.auth; import ca.nrc.cadc.util.StringUtil; - import java.io.Serializable; import java.security.Principal; diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/NoOpAuthenticator.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/NoOpAuthenticator.java index da5e81e2..d175e60b 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/auth/NoOpAuthenticator.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/auth/NoOpAuthenticator.java @@ -68,7 +68,6 @@ package ca.nrc.cadc.auth; import javax.security.auth.Subject; - import org.apache.log4j.Logger; /** diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/SSOCookieManager.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/SSOCookieManager.java index 6a5f25bc..a1d2eb8e 100755 --- a/cadc-util/src/main/java/ca/nrc/cadc/auth/SSOCookieManager.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/auth/SSOCookieManager.java @@ -70,7 +70,6 @@ package ca.nrc.cadc.auth; import ca.nrc.cadc.date.DateUtil; - import ca.nrc.cadc.util.PropertiesReader; import java.io.IOException; import java.net.URI; diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/ServletPrincipalExtractor.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/ServletPrincipalExtractor.java index f0747a0a..2fe357b9 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/auth/ServletPrincipalExtractor.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/auth/ServletPrincipalExtractor.java @@ -71,7 +71,6 @@ import ca.nrc.cadc.util.ArrayUtil; import ca.nrc.cadc.util.StringUtil; - import java.security.AccessControlException; import java.security.Principal; import java.security.cert.X509Certificate; @@ -79,10 +78,8 @@ import java.util.Enumeration; import java.util.HashSet; import java.util.Set; - import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; - import org.apache.log4j.Logger; /** diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/SignedToken.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/SignedToken.java index 1b7df99d..23e82aa4 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/auth/SignedToken.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/auth/SignedToken.java @@ -73,7 +73,6 @@ import ca.nrc.cadc.util.RsaSignatureGenerator; import ca.nrc.cadc.util.RsaSignatureVerifier; import ca.nrc.cadc.util.StringUtil; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.Serializable; @@ -87,9 +86,7 @@ import java.util.List; import java.util.Set; import java.util.UUID; - import javax.security.auth.x500.X500Principal; - import org.apache.log4j.Logger; /** diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/TokenValidator.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/TokenValidator.java index 37da422c..389d1cd9 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/auth/TokenValidator.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/auth/TokenValidator.java @@ -68,13 +68,10 @@ package ca.nrc.cadc.auth; import ca.nrc.cadc.auth.NotAuthenticatedException.AuthError; - import java.security.AccessControlException; import java.util.List; import java.util.Set; - import javax.security.auth.Subject; - import org.apache.log4j.Logger; /** diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/X509CertificateChain.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/X509CertificateChain.java index c6577b7a..9337e56b 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/auth/X509CertificateChain.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/auth/X509CertificateChain.java @@ -70,16 +70,13 @@ package ca.nrc.cadc.auth; import ca.nrc.cadc.util.Base64; - import java.security.PrivateKey; import java.security.cert.CertificateEncodingException; import java.security.cert.X509Certificate; import java.util.Collection; import java.util.Date; import java.util.Set; - import javax.security.auth.x500.X500Principal; - import org.apache.log4j.Logger; /** diff --git a/cadc-util/src/main/java/ca/nrc/cadc/db/DBConfig.java b/cadc-util/src/main/java/ca/nrc/cadc/db/DBConfig.java index c2433dc0..0580a24e 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/db/DBConfig.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/db/DBConfig.java @@ -70,7 +70,6 @@ package ca.nrc.cadc.db; import ca.nrc.cadc.util.StringUtil; - import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; diff --git a/cadc-util/src/main/java/ca/nrc/cadc/db/StandaloneContext.java b/cadc-util/src/main/java/ca/nrc/cadc/db/StandaloneContext.java index 400252d9..8f796537 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/db/StandaloneContext.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/db/StandaloneContext.java @@ -72,7 +72,6 @@ import java.util.HashMap; import java.util.Hashtable; import java.util.Map; - import javax.naming.Binding; import javax.naming.Context; import javax.naming.Name; diff --git a/cadc-util/src/main/java/ca/nrc/cadc/db/StandaloneContextFactory.java b/cadc-util/src/main/java/ca/nrc/cadc/db/StandaloneContextFactory.java index bf3467b8..9385e4bf 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/db/StandaloneContextFactory.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/db/StandaloneContextFactory.java @@ -70,7 +70,6 @@ package ca.nrc.cadc.db; import java.util.Hashtable; - import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; diff --git a/cadc-util/src/main/java/ca/nrc/cadc/exec/BuilderOutputGrabber.java b/cadc-util/src/main/java/ca/nrc/cadc/exec/BuilderOutputGrabber.java index def3077e..831651ec 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/exec/BuilderOutputGrabber.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/exec/BuilderOutputGrabber.java @@ -34,7 +34,6 @@ package ca.nrc.cadc.exec; import ca.nrc.cadc.util.ArrayUtil; - import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -45,7 +44,6 @@ import java.util.Arrays; import java.util.List; import java.util.Map; - import org.apache.log4j.Logger; /** diff --git a/cadc-util/src/main/java/ca/nrc/cadc/log/ServletLogInfo.java b/cadc-util/src/main/java/ca/nrc/cadc/log/ServletLogInfo.java index cd718bdd..2ba2ec78 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/log/ServletLogInfo.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/log/ServletLogInfo.java @@ -70,11 +70,9 @@ package ca.nrc.cadc.log; import ca.nrc.cadc.net.NetUtil; - import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; - import org.apache.log4j.Logger; diff --git a/cadc-util/src/main/java/ca/nrc/cadc/log/WebServiceLogInfo.java b/cadc-util/src/main/java/ca/nrc/cadc/log/WebServiceLogInfo.java index d90098be..d3b9b714 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/log/WebServiceLogInfo.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/log/WebServiceLogInfo.java @@ -83,7 +83,6 @@ import java.util.List; import java.util.Set; import java.util.UUID; - import javax.security.auth.Subject; import org.apache.log4j.Logger; @@ -120,7 +119,9 @@ public abstract class WebServiceLogInfo { public String user; - protected WebServiceLogInfo() { } + protected WebServiceLogInfo() { + + } /** * Generates the log.info message for the start of the request. diff --git a/cadc-util/src/main/java/ca/nrc/cadc/net/AuthChallenge.java b/cadc-util/src/main/java/ca/nrc/cadc/net/AuthChallenge.java index 8303e122..c644e508 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/net/AuthChallenge.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/net/AuthChallenge.java @@ -69,7 +69,6 @@ import java.util.Map; import java.util.TreeMap; - import org.apache.log4j.Logger; /** diff --git a/cadc-util/src/main/java/ca/nrc/cadc/net/HttpPost.java b/cadc-util/src/main/java/ca/nrc/cadc/net/HttpPost.java index 27454c55..affe6ea9 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/net/HttpPost.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/net/HttpPost.java @@ -71,14 +71,9 @@ import ca.nrc.cadc.auth.NotAuthenticatedException; import ca.nrc.cadc.io.ByteLimitExceededException; -import ca.nrc.cadc.net.event.TransferEvent; - -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.IOException; -import java.io.InputStream; import java.io.OutputStream; import java.net.HttpURLConnection; import java.net.URL; @@ -92,7 +87,6 @@ import java.util.TreeMap; import java.util.UUID; import javax.net.ssl.HttpsURLConnection; - import org.apache.log4j.Logger; /** diff --git a/cadc-util/src/main/java/ca/nrc/cadc/net/NetUtil.java b/cadc-util/src/main/java/ca/nrc/cadc/net/NetUtil.java index 955a8618..9ea79fa5 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/net/NetUtil.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/net/NetUtil.java @@ -73,7 +73,6 @@ package ca.nrc.cadc.net; import ca.nrc.cadc.util.StringUtil; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -85,9 +84,7 @@ import java.net.URLDecoder; import java.net.URLEncoder; import java.net.UnknownHostException; - import javax.servlet.http.HttpServletRequest; - import org.apache.log4j.Logger; diff --git a/cadc-util/src/main/java/ca/nrc/cadc/net/RandomAccessURL.java b/cadc-util/src/main/java/ca/nrc/cadc/net/RandomAccessURL.java index 7970dc40..1a6b3874 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/net/RandomAccessURL.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/net/RandomAccessURL.java @@ -75,13 +75,11 @@ import static ca.nrc.cadc.net.HttpConstants.RANGE_BYTES; import ca.nrc.cadc.io.RandomAccessSource; - import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; - import org.apache.log4j.Logger; /** diff --git a/cadc-util/src/main/java/ca/nrc/cadc/net/SchemeHandler.java b/cadc-util/src/main/java/ca/nrc/cadc/net/SchemeHandler.java index d0ba3e5b..65c42d35 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/net/SchemeHandler.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/net/SchemeHandler.java @@ -76,7 +76,7 @@ /** * @deprecated - * Replaced by StorageResolver. + * Replaced by StorageResolver. * Interface for handlers that convert a URI to a URL that allows retrieval. * * @author pdowler diff --git a/cadc-util/src/main/java/ca/nrc/cadc/util/Base64.java b/cadc-util/src/main/java/ca/nrc/cadc/util/Base64.java index f5313f11..1f5911c4 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/util/Base64.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/util/Base64.java @@ -297,6 +297,7 @@ public static byte[] decode(char[] in, int inOff, int inLen) { // Dummy constructor. //private Base64Coder() {} - private Base64() { } + private Base64() { + } } // end class Base64Coder diff --git a/cadc-util/src/main/java/ca/nrc/cadc/util/FileMetadata.java b/cadc-util/src/main/java/ca/nrc/cadc/util/FileMetadata.java index de1083d8..ba42e139 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/util/FileMetadata.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/util/FileMetadata.java @@ -88,7 +88,9 @@ public class FileMetadata { private String fileCRC; private String uncompressedFileCRC; - public FileMetadata() { } + public FileMetadata() { + + } @Override public String toString() { diff --git a/cadc-util/src/main/java/ca/nrc/cadc/util/FileMetadataSource.java b/cadc-util/src/main/java/ca/nrc/cadc/util/FileMetadataSource.java index 8ca908fa..91d7d31f 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/util/FileMetadataSource.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/util/FileMetadataSource.java @@ -70,7 +70,6 @@ package ca.nrc.cadc.util; import ca.nrc.cadc.net.TransientException; - import java.io.FileNotFoundException; import java.net.URI; diff --git a/cadc-util/src/main/java/ca/nrc/cadc/util/FileUtil.java b/cadc-util/src/main/java/ca/nrc/cadc/util/FileUtil.java index e3e4df48..72908d47 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/util/FileUtil.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/util/FileUtil.java @@ -70,7 +70,6 @@ package ca.nrc.cadc.util; import ca.nrc.cadc.net.NetUtil; - import java.io.BufferedInputStream; import java.io.DataInputStream; import java.io.File; diff --git a/cadc-util/src/main/java/ca/nrc/cadc/util/MultiValuedProperties.java b/cadc-util/src/main/java/ca/nrc/cadc/util/MultiValuedProperties.java index fa10ee42..31a3b7bf 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/util/MultiValuedProperties.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/util/MultiValuedProperties.java @@ -91,7 +91,9 @@ public class MultiValuedProperties { private final Map> props = new HashMap>(); - public MultiValuedProperties() { } + public MultiValuedProperties() { + + } public boolean isEmpty() { return props.isEmpty(); diff --git a/cadc-util/src/main/java/ca/nrc/cadc/util/PropertiesReader.java b/cadc-util/src/main/java/ca/nrc/cadc/util/PropertiesReader.java index 274e1be3..8741f70d 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/util/PropertiesReader.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/util/PropertiesReader.java @@ -30,14 +30,12 @@ import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; - import org.apache.log4j.Logger; diff --git a/cadc-util/src/main/java/ca/nrc/cadc/util/RsaSignatureGenerator.java b/cadc-util/src/main/java/ca/nrc/cadc/util/RsaSignatureGenerator.java index ede57642..142494bc 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/util/RsaSignatureGenerator.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/util/RsaSignatureGenerator.java @@ -89,7 +89,6 @@ import java.security.spec.InvalidKeySpecException; import java.security.spec.PKCS8EncodedKeySpec; import java.security.spec.RSAPublicKeySpec; - import org.apache.log4j.Logger; /** diff --git a/cadc-util/src/main/java/ca/nrc/cadc/util/RsaSignatureVerifier.java b/cadc-util/src/main/java/ca/nrc/cadc/util/RsaSignatureVerifier.java index 69f1c026..e4210dc0 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/util/RsaSignatureVerifier.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/util/RsaSignatureVerifier.java @@ -85,7 +85,6 @@ import java.util.HashSet; import java.util.MissingResourceException; import java.util.Set; - import org.apache.log4j.Logger; /** diff --git a/cadc-util/src/main/java/ca/nrc/cadc/util/StringBuilderWriter.java b/cadc-util/src/main/java/ca/nrc/cadc/util/StringBuilderWriter.java index 73262289..05a2034d 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/util/StringBuilderWriter.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/util/StringBuilderWriter.java @@ -112,8 +112,9 @@ public void flush() throws IOException { } @Override - public void close() throws IOException - {} + public void close() throws IOException { + + } public void reset() { sb.setLength(0); diff --git a/cadc-util/src/main/java/ca/nrc/cadc/xml/IterableContent.java b/cadc-util/src/main/java/ca/nrc/cadc/xml/IterableContent.java index 58e0a5d0..103e6938 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/xml/IterableContent.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/xml/IterableContent.java @@ -75,7 +75,6 @@ import java.util.List; import java.util.ListIterator; import java.util.NoSuchElementException; - import org.apache.log4j.Logger; import org.jdom2.Content; import org.jdom2.Element; diff --git a/cadc-util/src/main/java/ca/nrc/cadc/xml/JsonInputter.java b/cadc-util/src/main/java/ca/nrc/cadc/xml/JsonInputter.java index 82830e43..f5bfaa35 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/xml/JsonInputter.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/xml/JsonInputter.java @@ -72,7 +72,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; - import org.jdom2.Attribute; import org.jdom2.Document; import org.jdom2.Element; diff --git a/cadc-util/src/main/java/ca/nrc/cadc/xml/JsonOutputter.java b/cadc-util/src/main/java/ca/nrc/cadc/xml/JsonOutputter.java index 9d3977cd..fb527cb4 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/xml/JsonOutputter.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/xml/JsonOutputter.java @@ -109,8 +109,10 @@ public class JsonOutputter implements Serializable { private final List listElementNames = new ArrayList(); private final List stringElementNames = new ArrayList(); - - public JsonOutputter() { } + + public JsonOutputter() { + + } /** * List of element names that are always written as list (array using [ ]) diff --git a/opencadc.gradle b/opencadc.gradle index a2ea6557..fb80d562 100644 --- a/opencadc.gradle +++ b/opencadc.gradle @@ -7,14 +7,14 @@ configurations { } dependencies { - testImplementation 'com.puppycrawl.tools:checkstyle:8.2' - checkstyleDep 'org.opencadc:cadc-quality:[1.0,1.1)' + testImplementation 'com.puppycrawl.tools:checkstyle:10.12.5' + checkstyleDep 'org.opencadc:cadc-quality:[1.1,1.2)' } checkstyle { ignoreFailures = false config = resources.text.fromArchiveEntry(configurations.checkstyleDep, 'cadc_checkstyle.xml') - toolVersion = '8.2' + toolVersion = '10.12.5' sourceSets = [] } @@ -46,7 +46,7 @@ tasks.withType(Test) { // reset the report destinations so that intTests go to their own page //reports.html.destination = file("${reporting.baseDir}/${name}") reports.html.destination = file(reporting.baseDir.getAbsolutePath() + '/' + name) - + // Assign all Java system properties from // the command line to the tests systemProperties System.properties