From 742073d1e2c4a69390222bc358d6e883398bc215 Mon Sep 17 00:00:00 2001 From: aratikakadiya Date: Tue, 28 Apr 2026 14:37:36 -0700 Subject: [PATCH] Upgraded cadc-quality and checkstyle versions. Checkstyle Fixes. --- .../src/main/java/ca/nrc/cadc/reg/CapabilitiesWriter.java | 2 -- cadc-registry/src/main/java/ca/nrc/cadc/reg/Capability.java | 2 -- .../src/main/java/ca/nrc/cadc/vosi/CapabilitiesTest.java | 3 --- cadc-vosi/src/main/java/ca/nrc/cadc/vosi/CapInitAction.java | 3 --- .../src/main/java/ca/nrc/cadc/vosi/CapabilitiesServlet.java | 3 --- opencadc.gradle | 6 +++--- .../main/java/org/opencadc/reg/CannedQueryGetAction.java | 3 --- reg/src/main/java/org/opencadc/reg/oai/OAIReader.java | 3 --- reg/src/main/java/org/opencadc/reg/oai/OAIWriter.java | 3 --- 9 files changed, 3 insertions(+), 25 deletions(-) diff --git a/cadc-registry/src/main/java/ca/nrc/cadc/reg/CapabilitiesWriter.java b/cadc-registry/src/main/java/ca/nrc/cadc/reg/CapabilitiesWriter.java index d64094e2..80856016 100644 --- a/cadc-registry/src/main/java/ca/nrc/cadc/reg/CapabilitiesWriter.java +++ b/cadc-registry/src/main/java/ca/nrc/cadc/reg/CapabilitiesWriter.java @@ -68,7 +68,6 @@ package ca.nrc.cadc.reg; import ca.nrc.cadc.xml.W3CConstants; - import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; @@ -78,7 +77,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; - import org.apache.log4j.Logger; import org.jdom2.Attribute; import org.jdom2.Document; diff --git a/cadc-registry/src/main/java/ca/nrc/cadc/reg/Capability.java b/cadc-registry/src/main/java/ca/nrc/cadc/reg/Capability.java index ccce7f03..2b143fa9 100644 --- a/cadc-registry/src/main/java/ca/nrc/cadc/reg/Capability.java +++ b/cadc-registry/src/main/java/ca/nrc/cadc/reg/Capability.java @@ -70,11 +70,9 @@ package ca.nrc.cadc.reg; import ca.nrc.cadc.auth.AuthMethod; - import java.net.URI; import java.util.ArrayList; import java.util.List; - import org.apache.log4j.Logger; import org.jdom2.Attribute; import org.jdom2.Element; diff --git a/cadc-test-vosi/src/main/java/ca/nrc/cadc/vosi/CapabilitiesTest.java b/cadc-test-vosi/src/main/java/ca/nrc/cadc/vosi/CapabilitiesTest.java index 34b538c0..2b6abd6a 100644 --- a/cadc-test-vosi/src/main/java/ca/nrc/cadc/vosi/CapabilitiesTest.java +++ b/cadc-test-vosi/src/main/java/ca/nrc/cadc/vosi/CapabilitiesTest.java @@ -85,7 +85,6 @@ import ca.nrc.cadc.reg.client.RegistryClient; import ca.nrc.cadc.util.Log4jInit; import ca.nrc.cadc.xml.XmlUtil; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -99,9 +98,7 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; - import javax.security.auth.Subject; - import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.jdom2.Document; diff --git a/cadc-vosi/src/main/java/ca/nrc/cadc/vosi/CapInitAction.java b/cadc-vosi/src/main/java/ca/nrc/cadc/vosi/CapInitAction.java index 766b21be..43cd4bf0 100644 --- a/cadc-vosi/src/main/java/ca/nrc/cadc/vosi/CapInitAction.java +++ b/cadc-vosi/src/main/java/ca/nrc/cadc/vosi/CapInitAction.java @@ -72,14 +72,11 @@ import ca.nrc.cadc.rest.InitAction; import ca.nrc.cadc.rest.Version; import ca.nrc.cadc.util.StringUtil; - import java.io.StringReader; import java.net.URL; - import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; - import org.apache.log4j.Logger; /** diff --git a/cadc-vosi/src/main/java/ca/nrc/cadc/vosi/CapabilitiesServlet.java b/cadc-vosi/src/main/java/ca/nrc/cadc/vosi/CapabilitiesServlet.java index 81cc1aa3..a5e184e8 100644 --- a/cadc-vosi/src/main/java/ca/nrc/cadc/vosi/CapabilitiesServlet.java +++ b/cadc-vosi/src/main/java/ca/nrc/cadc/vosi/CapabilitiesServlet.java @@ -73,7 +73,6 @@ import ca.nrc.cadc.log.ServletLogInfo; import ca.nrc.cadc.log.WebServiceLogInfo; import ca.nrc.cadc.reg.CapabilitiesReader; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -82,14 +81,12 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; - import javax.security.auth.Subject; import javax.servlet.ServletConfig; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import org.apache.log4j.Logger; import org.jdom2.Document; import org.jdom2.Element; diff --git a/opencadc.gradle b/opencadc.gradle index a2ea6557..c89620f1 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 = [] } diff --git a/reg/src/main/java/org/opencadc/reg/CannedQueryGetAction.java b/reg/src/main/java/org/opencadc/reg/CannedQueryGetAction.java index bc3eda54..9a11783d 100644 --- a/reg/src/main/java/org/opencadc/reg/CannedQueryGetAction.java +++ b/reg/src/main/java/org/opencadc/reg/CannedQueryGetAction.java @@ -72,7 +72,6 @@ import ca.nrc.cadc.rest.InlineContentHandler; import ca.nrc.cadc.rest.RestAction; import ca.nrc.cadc.util.FileUtil; - import java.io.File; import java.io.IOException; import java.io.OutputStream; @@ -80,10 +79,8 @@ import java.io.Writer; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import org.apache.log4j.Logger; - /** * Simple servlet that performs a canned query to the registry and returns a * list of resourceID(s) and the accessURL of the associated VOSI-capabilities diff --git a/reg/src/main/java/org/opencadc/reg/oai/OAIReader.java b/reg/src/main/java/org/opencadc/reg/oai/OAIReader.java index afc1cdac..917583cb 100644 --- a/reg/src/main/java/org/opencadc/reg/oai/OAIReader.java +++ b/reg/src/main/java/org/opencadc/reg/oai/OAIReader.java @@ -68,19 +68,16 @@ package org.opencadc.reg.oai; import ca.nrc.cadc.xml.XmlUtil; - import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; import java.util.Map; import java.util.TreeMap; - import org.apache.log4j.Logger; import org.jdom2.Document; import org.jdom2.JDOMException; - /** * @author pdowler */ diff --git a/reg/src/main/java/org/opencadc/reg/oai/OAIWriter.java b/reg/src/main/java/org/opencadc/reg/oai/OAIWriter.java index 8d7e016a..6fc5d429 100644 --- a/reg/src/main/java/org/opencadc/reg/oai/OAIWriter.java +++ b/reg/src/main/java/org/opencadc/reg/oai/OAIWriter.java @@ -69,7 +69,6 @@ import ca.nrc.cadc.date.DateUtil; import ca.nrc.cadc.xml.XmlUtil; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -80,14 +79,12 @@ import java.util.Date; import java.util.List; import java.util.ListIterator; - import org.apache.log4j.Logger; import org.jdom2.Document; import org.jdom2.Element; import org.jdom2.Namespace; import org.jdom2.output.XMLOutputter; - /** * Write a VOResource record wrapped in an OAI-PMH document. *