diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 2cde66e4..d0ce2ddb 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -23,9 +23,8 @@ jobs: - name: build and test cadc-dali-parquet run: cd cadc-dali-parquet && ../gradlew --info clean build javadoc checkstyleMain install -# cadc-dali-pg is not yet cleanup to pass checkstyleMain - name: build and test cadc-dali-pg - run: cd cadc-dali-pg && ../gradlew --info clean build javadoc install + run: cd cadc-dali-pg && ../gradlew --info clean build javadoc checkstyleMain install - name: build and test cadc-sia run: cd cadc-sia && ../gradlew --info clean build javadoc checkstyleMain install diff --git a/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/io/RandomAccessSeekableInputStream.java b/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/io/RandomAccessSeekableInputStream.java index 1c1d31f8..1b29abfa 100644 --- a/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/io/RandomAccessSeekableInputStream.java +++ b/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/io/RandomAccessSeekableInputStream.java @@ -70,10 +70,8 @@ package ca.nrc.cadc.dali.tables.parquet.io; import ca.nrc.cadc.io.RandomAccessSource; - import java.io.IOException; import java.nio.ByteBuffer; - import org.apache.parquet.io.SeekableInputStream; /** diff --git a/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/io/RandomSeekableInputFile.java b/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/io/RandomSeekableInputFile.java index 15d24b3f..43ed7b03 100644 --- a/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/io/RandomSeekableInputFile.java +++ b/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/io/RandomSeekableInputFile.java @@ -70,9 +70,7 @@ package ca.nrc.cadc.dali.tables.parquet.io; import ca.nrc.cadc.io.RandomAccessSource; - import java.io.IOException; - import org.apache.parquet.io.InputFile; import org.apache.parquet.io.SeekableInputStream; diff --git a/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/readerhelper/DynamicListConverter.java b/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/readerhelper/DynamicListConverter.java index 2cc43707..1ec8ad17 100644 --- a/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/readerhelper/DynamicListConverter.java +++ b/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/readerhelper/DynamicListConverter.java @@ -71,7 +71,6 @@ import java.util.ArrayList; import java.util.List; - import org.apache.parquet.io.api.Binary; import org.apache.parquet.io.api.Converter; import org.apache.parquet.io.api.GroupConverter; diff --git a/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/readerhelper/ParquetRowIterator.java b/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/readerhelper/ParquetRowIterator.java index cb295432..e43f52d3 100644 --- a/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/readerhelper/ParquetRowIterator.java +++ b/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/readerhelper/ParquetRowIterator.java @@ -72,10 +72,8 @@ import ca.nrc.cadc.dali.tables.parquet.io.RandomSeekableInputFile; import ca.nrc.cadc.dali.tables.votable.VOTableField; import ca.nrc.cadc.dali.util.Format; -import ca.nrc.cadc.dali.util.FormatFactory; import ca.nrc.cadc.io.RandomAccessSource; import ca.nrc.cadc.io.ResourceIterator; - import java.io.IOException; import java.time.Instant; import java.time.ZoneId; @@ -83,14 +81,12 @@ import java.util.ArrayList; import java.util.List; import java.util.NoSuchElementException; - import org.apache.parquet.column.page.PageReadStore; import org.apache.parquet.hadoop.ParquetFileReader; import org.apache.parquet.io.ColumnIOFactory; import org.apache.parquet.io.MessageColumnIO; import org.apache.parquet.io.RecordReader; import org.apache.parquet.io.api.RecordMaterializer; - import org.apache.parquet.schema.LogicalTypeAnnotation; import org.apache.parquet.schema.MessageType; import org.apache.parquet.schema.Type; diff --git a/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/readerhelper/ParquetTableData.java b/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/readerhelper/ParquetTableData.java index 26364908..c62441f2 100644 --- a/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/readerhelper/ParquetTableData.java +++ b/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/readerhelper/ParquetTableData.java @@ -72,14 +72,11 @@ import ca.nrc.cadc.dali.tables.TableData; import ca.nrc.cadc.dali.tables.votable.VOTableField; import ca.nrc.cadc.dali.util.Format; -import ca.nrc.cadc.dali.util.FormatFactory; import ca.nrc.cadc.io.RandomAccessSource; import ca.nrc.cadc.io.ResourceIterator; - import java.io.File; import java.io.IOException; import java.util.List; - import org.apache.parquet.schema.MessageType; public class ParquetTableData implements TableData { diff --git a/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/writerhelper/CustomWriteSupport.java b/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/writerhelper/CustomWriteSupport.java index fd0affcf..656f4087 100644 --- a/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/writerhelper/CustomWriteSupport.java +++ b/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/writerhelper/CustomWriteSupport.java @@ -70,10 +70,8 @@ package ca.nrc.cadc.dali.tables.parquet.writerhelper; import ca.nrc.cadc.dali.tables.votable.VOTableField; - import java.util.List; import java.util.Map; - import org.apache.hadoop.conf.Configuration; import org.apache.log4j.Logger; import org.apache.parquet.hadoop.api.WriteSupport; diff --git a/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/writerhelper/DynamicParquetWriterBuilder.java b/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/writerhelper/DynamicParquetWriterBuilder.java index faa4c31f..58deec65 100644 --- a/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/writerhelper/DynamicParquetWriterBuilder.java +++ b/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/writerhelper/DynamicParquetWriterBuilder.java @@ -70,10 +70,8 @@ package ca.nrc.cadc.dali.tables.parquet.writerhelper; import ca.nrc.cadc.dali.tables.votable.VOTableField; - import java.util.List; import java.util.Map; - import org.apache.hadoop.conf.Configuration; import org.apache.parquet.hadoop.ParquetWriter; import org.apache.parquet.hadoop.api.WriteSupport; diff --git a/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/writerhelper/DynamicSchemaGenerator.java b/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/writerhelper/DynamicSchemaGenerator.java index 1d128aa3..d84f1152 100644 --- a/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/writerhelper/DynamicSchemaGenerator.java +++ b/cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/writerhelper/DynamicSchemaGenerator.java @@ -70,9 +70,7 @@ package ca.nrc.cadc.dali.tables.parquet.writerhelper; import ca.nrc.cadc.dali.tables.votable.VOTableField; - import java.util.List; - import org.apache.log4j.Logger; import org.apache.parquet.schema.GroupType; import org.apache.parquet.schema.LogicalTypeAnnotation; diff --git a/cadc-dali-pg/src/main/java/ca/nrc/cadc/dali/postgresql/PgScircle.java b/cadc-dali-pg/src/main/java/ca/nrc/cadc/dali/postgresql/PgScircle.java index 1b6d608b..4581ab20 100644 --- a/cadc-dali-pg/src/main/java/ca/nrc/cadc/dali/postgresql/PgScircle.java +++ b/cadc-dali-pg/src/main/java/ca/nrc/cadc/dali/postgresql/PgScircle.java @@ -137,7 +137,7 @@ public Circle getCircle(String s) { s = s.substring(open + 1, close); String[] values = s.split(","); - double r = Double.parseDouble(values[2]); + final String radius = values[2]; open = s.indexOf("("); close = s.lastIndexOf(")"); @@ -154,6 +154,7 @@ public Circle getCircle(String s) { double x = Double.parseDouble(values[0]); double y = Double.parseDouble(values[1]); + double r = Double.parseDouble(radius); x = Math.toDegrees(x); y = Math.toDegrees(y); diff --git a/cadc-dali/src/main/java/ca/nrc/cadc/dali/EnergyConverter.java b/cadc-dali/src/main/java/ca/nrc/cadc/dali/EnergyConverter.java index ad5ba8a5..69a75822 100644 --- a/cadc-dali/src/main/java/ca/nrc/cadc/dali/EnergyConverter.java +++ b/cadc-dali/src/main/java/ca/nrc/cadc/dali/EnergyConverter.java @@ -70,12 +70,10 @@ package ca.nrc.cadc.dali; import ca.nrc.cadc.util.ArrayUtil; - import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; - import org.apache.log4j.Logger; diff --git a/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/BinaryTableData.java b/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/BinaryTableData.java index 2978ef90..a6c52114 100644 --- a/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/BinaryTableData.java +++ b/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/BinaryTableData.java @@ -73,7 +73,6 @@ import ca.nrc.cadc.dali.tables.votable.binary.BinaryIterator; import ca.nrc.cadc.dali.util.FormatFactory; import ca.nrc.cadc.io.ResourceIterator; - import java.io.IOException; import java.io.InputStream; import java.util.List; diff --git a/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/ListTableData.java b/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/ListTableData.java index 58cce803..414b9c77 100644 --- a/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/ListTableData.java +++ b/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/ListTableData.java @@ -70,7 +70,6 @@ package ca.nrc.cadc.dali.tables; import ca.nrc.cadc.io.ResourceIterator; - import java.io.IOException; import java.io.Reader; import java.util.ArrayList; diff --git a/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/TableData.java b/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/TableData.java index 0e93673c..f9495ac6 100644 --- a/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/TableData.java +++ b/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/TableData.java @@ -70,7 +70,6 @@ package ca.nrc.cadc.dali.tables; import ca.nrc.cadc.io.ResourceIterator; - import java.io.Closeable; import java.io.IOException; import java.util.List; diff --git a/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/XMLOutputProcessor.java b/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/XMLOutputProcessor.java index 6126ba7d..b355d013 100644 --- a/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/XMLOutputProcessor.java +++ b/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/XMLOutputProcessor.java @@ -73,12 +73,10 @@ import ca.nrc.cadc.dali.tables.votable.tabledata.TableDataElementWriter; import ca.nrc.cadc.dali.util.FormatFactory; import ca.nrc.cadc.xml.MaxIterations; - import java.io.IOException; import java.io.Writer; import java.util.Iterator; import java.util.List; - import org.apache.log4j.Logger; import org.jdom2.Element; import org.jdom2.output.support.AbstractXMLOutputProcessor; diff --git a/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/binary/BinaryElementWriter.java b/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/binary/BinaryElementWriter.java index 689d6417..69c8c49e 100644 --- a/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/binary/BinaryElementWriter.java +++ b/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/binary/BinaryElementWriter.java @@ -71,7 +71,6 @@ import ca.nrc.cadc.dali.tables.votable.VOTableField; import ca.nrc.cadc.xml.MaxIterations; - import java.io.DataOutputStream; import java.io.IOException; import java.io.OutputStream; @@ -79,7 +78,6 @@ import java.util.Base64; import java.util.Iterator; import java.util.List; - import org.apache.log4j.Logger; import org.jdom2.Element; diff --git a/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/binary/BinaryIterator.java b/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/binary/BinaryIterator.java index 549241fe..fa17c9ec 100644 --- a/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/binary/BinaryIterator.java +++ b/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/binary/BinaryIterator.java @@ -72,7 +72,6 @@ import ca.nrc.cadc.dali.tables.votable.VOTableField; import ca.nrc.cadc.dali.util.FormatFactory; import ca.nrc.cadc.io.ResourceIterator; - import java.io.DataInputStream; import java.io.EOFException; import java.io.IOException; @@ -80,7 +79,6 @@ import java.util.List; import java.util.NoSuchElementException; import java.util.zip.GZIPInputStream; - import org.apache.commons.codec.binary.Base64InputStream; import org.apache.log4j.Logger; diff --git a/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/binary/BinaryRowReader.java b/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/binary/BinaryRowReader.java index adcd3bf2..ede968ba 100644 --- a/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/binary/BinaryRowReader.java +++ b/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/binary/BinaryRowReader.java @@ -72,7 +72,6 @@ import ca.nrc.cadc.dali.tables.votable.VOTableField; import ca.nrc.cadc.dali.tables.votable.VOTableUtil; import ca.nrc.cadc.dali.util.FormatFactory; - import java.io.DataInputStream; import java.io.IOException; import java.util.ArrayList; diff --git a/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/binary/FieldProcessor.java b/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/binary/FieldProcessor.java index 13f149c2..760746fa 100644 --- a/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/binary/FieldProcessor.java +++ b/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/binary/FieldProcessor.java @@ -70,7 +70,6 @@ package ca.nrc.cadc.dali.tables.votable.binary; import ca.nrc.cadc.dali.tables.votable.VOTableField; - import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; diff --git a/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/binary/FieldProcessorFactory.java b/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/binary/FieldProcessorFactory.java index 8e5aa6bf..9751d334 100644 --- a/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/binary/FieldProcessorFactory.java +++ b/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/binary/FieldProcessorFactory.java @@ -77,7 +77,6 @@ import ca.nrc.cadc.dali.tables.votable.VOTableUtil; import ca.nrc.cadc.dali.util.FormatFactory; import ca.nrc.cadc.dali.util.UTCTimestampFormat; - import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; diff --git a/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/tabledata/TableDataElementWriter.java b/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/tabledata/TableDataElementWriter.java index c240f30d..ff280e51 100644 --- a/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/tabledata/TableDataElementWriter.java +++ b/cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/tabledata/TableDataElementWriter.java @@ -73,12 +73,10 @@ import ca.nrc.cadc.dali.util.Format; import ca.nrc.cadc.dali.util.FormatFactory; import ca.nrc.cadc.xml.MaxIterations; - import java.io.IOException; import java.io.Writer; import java.util.Iterator; import java.util.List; - import org.apache.log4j.Logger; import org.jdom2.Element; diff --git a/cadc-data-ops-fits/src/main/java/org/opencadc/fits/FitsOperations.java b/cadc-data-ops-fits/src/main/java/org/opencadc/fits/FitsOperations.java index 15485c5a..1b4a1d88 100644 --- a/cadc-data-ops-fits/src/main/java/org/opencadc/fits/FitsOperations.java +++ b/cadc-data-ops-fits/src/main/java/org/opencadc/fits/FitsOperations.java @@ -69,14 +69,12 @@ import ca.nrc.cadc.io.ReadException; import ca.nrc.cadc.wcs.exceptions.NoSuchKeywordException; - import java.io.BufferedWriter; import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.util.ArrayList; import java.util.List; - import nom.tam.fits.BasicHDU; import nom.tam.fits.Fits; import nom.tam.fits.FitsException; diff --git a/cadc-data-ops-fits/src/main/java/org/opencadc/fits/HDUIterator.java b/cadc-data-ops-fits/src/main/java/org/opencadc/fits/HDUIterator.java index c5e8017f..5fddf7e5 100644 --- a/cadc-data-ops-fits/src/main/java/org/opencadc/fits/HDUIterator.java +++ b/cadc-data-ops-fits/src/main/java/org/opencadc/fits/HDUIterator.java @@ -71,12 +71,10 @@ import java.io.IOException; import java.util.Iterator; import java.util.NoSuchElementException; - import nom.tam.fits.BasicHDU; import nom.tam.fits.Fits; import nom.tam.fits.FitsException; - /** * Iterate over HDUs of a nom.tam.fits.Fits object. The Fits object essentially contains two lists of HDUs; one is the * cache of HDUs that have been iterated over, and the second is the list of HDUs that have yet to be read. This diff --git a/cadc-data-ops-fits/src/main/java/org/opencadc/fits/RandomAccessStorageObject.java b/cadc-data-ops-fits/src/main/java/org/opencadc/fits/RandomAccessStorageObject.java index 84b291fc..be58c564 100644 --- a/cadc-data-ops-fits/src/main/java/org/opencadc/fits/RandomAccessStorageObject.java +++ b/cadc-data-ops-fits/src/main/java/org/opencadc/fits/RandomAccessStorageObject.java @@ -72,10 +72,8 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.RandomAccessFile; - import nom.tam.util.RandomAccessFileIO; - public class RandomAccessStorageObject extends RandomAccessFile implements RandomAccessFileIO { public RandomAccessStorageObject(File file, String mode) throws FileNotFoundException { super(file, mode); diff --git a/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/EnergyCutout.java b/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/EnergyCutout.java index 909917b3..ba07d1d5 100644 --- a/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/EnergyCutout.java +++ b/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/EnergyCutout.java @@ -73,16 +73,13 @@ import ca.nrc.cadc.wcs.Transform; import ca.nrc.cadc.wcs.exceptions.NoSuchKeywordException; import ca.nrc.cadc.wcs.exceptions.WCSLibRuntimeException; - import java.util.Arrays; - import nom.tam.fits.Header; import nom.tam.fits.HeaderCardException; import nom.tam.fits.header.Standard; import org.apache.log4j.Logger; import org.opencadc.fits.CADCExt; - /** * Provide the cutout bounds for the given Header. This class is executed after the inputs are parsed into a * representative Interval object that can be used to obtain an array of bounding pixels. diff --git a/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/PixelCutout.java b/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/PixelCutout.java index 3eb13fce..d0ddeb79 100644 --- a/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/PixelCutout.java +++ b/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/PixelCutout.java @@ -69,14 +69,12 @@ package org.opencadc.fits.slice; import ca.nrc.cadc.dali.DaliUtil; - import java.util.ArrayList; import java.util.List; import org.apache.log4j.Logger; import org.opencadc.soda.ExtensionSlice; import org.opencadc.soda.PixelRange; - /** * Simple class to cut pixels out. Exists to maintain the same format as the WCS cutouts. */ diff --git a/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/PolarizationCutout.java b/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/PolarizationCutout.java index 2bc5f312..1f0c5cd8 100644 --- a/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/PolarizationCutout.java +++ b/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/PolarizationCutout.java @@ -69,17 +69,14 @@ package org.opencadc.fits.slice; import ca.nrc.cadc.dali.PolarizationState; - import java.util.ArrayList; import java.util.List; import java.util.stream.IntStream; - import nom.tam.fits.Header; import nom.tam.fits.HeaderCardException; import nom.tam.fits.header.Standard; import org.apache.log4j.Logger; - /** * Provide the cutout bounds for the given Header. */ diff --git a/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/PolygonCutout.java b/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/PolygonCutout.java index d2a123b9..44953c79 100644 --- a/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/PolygonCutout.java +++ b/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/PolygonCutout.java @@ -77,15 +77,12 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; - import jsky.coords.wcscon; - import nom.tam.fits.Header; import nom.tam.fits.HeaderCardException; import nom.tam.fits.header.Compression; import org.apache.log4j.Logger; - /** * A Spatial Polygon cutout. This class is executed after the inputs are parsed into an appropriate Polygon shape. */ diff --git a/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/ShapeCutout.java b/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/ShapeCutout.java index 205a86cd..adfa5b0a 100644 --- a/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/ShapeCutout.java +++ b/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/ShapeCutout.java @@ -69,16 +69,13 @@ package org.opencadc.fits.slice; import ca.nrc.cadc.dali.Shape; - import java.io.Serializable; - import nom.tam.fits.Header; import nom.tam.fits.HeaderCardException; import nom.tam.fits.header.Compression; import nom.tam.fits.header.Standard; import org.apache.log4j.Logger; - /** * Base class for Shapes (Spatial cutouts). It mainly contains a convenience method that can be shared. * diff --git a/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/TimeCutout.java b/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/TimeCutout.java index 92fcda0a..e65c9925 100644 --- a/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/TimeCutout.java +++ b/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/TimeCutout.java @@ -71,16 +71,12 @@ import ca.nrc.cadc.dali.Interval; import ca.nrc.cadc.date.DateUtil; import ca.nrc.cadc.wcs.exceptions.WCSLibRuntimeException; - import java.text.ParseException; - import nom.tam.fits.Header; import nom.tam.fits.HeaderCardException; import nom.tam.fits.header.Standard; import org.apache.log4j.Logger; - - /** * Time cutout. The Temporal Axis is determined from the WCSKeywords, and CRPIXn, CRVALn, and CDELTn are required * for that axis. diff --git a/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/TimeHeaderWCSKeywords.java b/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/TimeHeaderWCSKeywords.java index 16d99c79..4a708f69 100644 --- a/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/TimeHeaderWCSKeywords.java +++ b/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/TimeHeaderWCSKeywords.java @@ -69,19 +69,16 @@ package org.opencadc.fits.slice; import ca.nrc.cadc.date.DateUtil; - import java.text.ParseException; import java.util.Calendar; import java.util.Date; import java.util.TimeZone; - import nom.tam.fits.Header; import nom.tam.fits.HeaderCardException; import nom.tam.fits.header.DateTime; import org.apache.log4j.Logger; import org.opencadc.fits.CADCExt; - /** * Class to sanitize and obtain time specific values. */ diff --git a/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/WCSCutoutUtil.java b/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/WCSCutoutUtil.java index 31557e05..ac0f6ce9 100644 --- a/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/WCSCutoutUtil.java +++ b/cadc-data-ops-fits/src/main/java/org/opencadc/fits/slice/WCSCutoutUtil.java @@ -75,11 +75,9 @@ import ca.nrc.cadc.dali.Range; import ca.nrc.cadc.dali.Shape; import ca.nrc.cadc.wcs.exceptions.NoSuchKeywordException; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; - import nom.tam.fits.Header; import nom.tam.fits.HeaderCard; import nom.tam.fits.HeaderCardException; @@ -88,7 +86,6 @@ import org.opencadc.soda.PixelRange; import org.opencadc.soda.server.Cutout; - /** * Utility class to provide bounds for the given WCS Cutout. In the unlikely event that multiple cutouts are specified, * only one will be honoured, with priority given to POSITION, then BAND, then TIME, and finally POLARIZATION. diff --git a/cadc-datalink-server/src/main/java/org/opencadc/datalink/server/DataLinkUtil.java b/cadc-datalink-server/src/main/java/org/opencadc/datalink/server/DataLinkUtil.java index ed07b69e..8a14bc40 100644 --- a/cadc-datalink-server/src/main/java/org/opencadc/datalink/server/DataLinkUtil.java +++ b/cadc-datalink-server/src/main/java/org/opencadc/datalink/server/DataLinkUtil.java @@ -77,7 +77,6 @@ import ca.nrc.cadc.dali.tables.votable.VOTableTable; import ca.nrc.cadc.io.ResourceIterator; import ca.nrc.cadc.reg.Standards; - import java.io.IOException; import java.net.URI; import java.net.URL; diff --git a/cadc-pkg-server/src/main/java/org/opencadc/pkg/server/PackageRunner.java b/cadc-pkg-server/src/main/java/org/opencadc/pkg/server/PackageRunner.java index 9a922ae1..dc2a079f 100644 --- a/cadc-pkg-server/src/main/java/org/opencadc/pkg/server/PackageRunner.java +++ b/cadc-pkg-server/src/main/java/org/opencadc/pkg/server/PackageRunner.java @@ -85,7 +85,6 @@ import java.io.IOException; import java.util.Date; import java.util.Iterator; - import org.apache.log4j.Logger; /** @@ -106,7 +105,8 @@ public abstract class PackageRunner implements JobRunner { protected Job job; protected String packageName; - public PackageRunner() {} + public PackageRunner() { + } /** * Perform any functions needed to initialize the Package. (Setting the diff --git a/cadc-soda-server/build.gradle b/cadc-soda-server/build.gradle index c64d2148..f027a3b3 100644 --- a/cadc-soda-server/build.gradle +++ b/cadc-soda-server/build.gradle @@ -25,6 +25,6 @@ dependencies { api 'org.opencadc:cadc-rest:[1.4.2,)' api 'org.opencadc:cadc-uws-server:[1.2,1.3)' - testCompile 'junit:junit:[4.0,5.0)' + testImplementation 'junit:junit:[4.0,5.0)' } diff --git a/cadc-soda-server/src/main/java/org/opencadc/soda/server/Cutout.java b/cadc-soda-server/src/main/java/org/opencadc/soda/server/Cutout.java index 3721519c..4dca32e9 100644 --- a/cadc-soda-server/src/main/java/org/opencadc/soda/server/Cutout.java +++ b/cadc-soda-server/src/main/java/org/opencadc/soda/server/Cutout.java @@ -70,9 +70,7 @@ import ca.nrc.cadc.dali.Interval; import ca.nrc.cadc.dali.PolarizationState; import ca.nrc.cadc.dali.Shape; - import java.util.List; - import org.opencadc.soda.ExtensionSlice; diff --git a/cadc-soda-server/src/main/java/org/opencadc/soda/server/StreamingSodaPlugin.java b/cadc-soda-server/src/main/java/org/opencadc/soda/server/StreamingSodaPlugin.java index 7f3af140..c9050be9 100644 --- a/cadc-soda-server/src/main/java/org/opencadc/soda/server/StreamingSodaPlugin.java +++ b/cadc-soda-server/src/main/java/org/opencadc/soda/server/StreamingSodaPlugin.java @@ -70,7 +70,6 @@ import ca.nrc.cadc.dali.Interval; import ca.nrc.cadc.dali.Shape; import ca.nrc.cadc.rest.SyncOutput; - import java.io.IOException; import java.net.URI; import java.util.List; 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 = [] }