Upgraded cadc-quality and checkstyle versions.

.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

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;
 
 /**

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;
 

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;

cadc-dali-parquet/src/main/java/ca/nrc/cadc/dali/tables/parquet/readerhelper/ParquetRowIterator.java

@@ -72,25 +72,21 @@
 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;
 import java.time.format.DateTimeFormatter;
 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;

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 {

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;

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;

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;

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);

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;
 
 

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;

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;

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;

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;

cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/binary/BinaryElementWriter.java

@@ -71,15 +71,13 @@
 
 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;
 import java.io.Writer;
 import java.util.Base64;
 import java.util.Iterator;
 import java.util.List;
-
 import org.apache.log4j.Logger;
 import org.jdom2.Element;
 

cadc-dali/src/main/java/ca/nrc/cadc/dali/tables/votable/binary/BinaryIterator.java

@@ -72,15 +72,13 @@
 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;
 import java.io.InputStream;
 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;
 

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;

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;

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;

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;
 

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;

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

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);

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.

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.
  */

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.
  */

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.
  */

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.
  *

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.