Run spotless, fix some stuff

deephaven · Dec 16, 2021 · 34978ac · 34978ac
1 parent 75fae21
commit 34978ac
Show file tree

Hide file tree

Showing 38 changed files with 449 additions and 475 deletions.
diff --git a/ClientSupport/src/test/java/io/deephaven/treetable/SnapshotStateTest.java b/ClientSupport/src/test/java/io/deephaven/treetable/SnapshotStateTest.java
@@ -1,6 +1,7 @@
 package io.deephaven.treetable;
 
 import io.deephaven.csv.CsvTools;
+import io.deephaven.csv.util.CsvReaderException;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.lang.QueryLibrary;
 import io.deephaven.engine.util.TableTools;
@@ -9,7 +10,6 @@
 import io.deephaven.engine.table.impl.QueryTableTestBase;
 import org.junit.Test;
 
-import java.io.IOException;
 import java.util.BitSet;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -18,7 +18,7 @@
 import static io.deephaven.treetable.TreeTableConstants.ROOT_TABLE_KEY;
 
 public class SnapshotStateTest extends QueryTableTestBase {
-    private static Table getRawNyMunis() throws IOException {
+    private static Table getRawNyMunis() throws CsvReaderException {
         QueryLibrary.importStatic(TreeSnapshotQueryTest.StaticHolder.class);
 
         final BaseTable base =
@@ -33,12 +33,12 @@ private static Table makeNyMunisTreeTableFrom(Table t) {
         return t.treeTable("Path", "Direct");
     }
 
-    private static Table makeNyMunisTreeTable() throws IOException {
+    private static Table makeNyMunisTreeTable() throws CsvReaderException {
         return makeNyMunisTreeTableFrom(getRawNyMunis());
     }
 
     @Test
-    public void testBounds() throws IOException {
+    public void testBounds() throws CsvReaderException {
         final HierarchicalTable treeTable = (HierarchicalTable) makeNyMunisTreeTable();
         final Map<Object, TableDetails> details = new HashMap<>();
 

diff --git a/ClientSupport/src/test/java/io/deephaven/treetable/TreeSnapshotQueryTest.java b/ClientSupport/src/test/java/io/deephaven/treetable/TreeSnapshotQueryTest.java
@@ -2,6 +2,7 @@
 
 import io.deephaven.base.Pair;
 import io.deephaven.csv.CsvTools;
+import io.deephaven.csv.util.CsvReaderException;
 import io.deephaven.datastructures.util.SmartKey;
 import io.deephaven.engine.table.ColumnDefinition;
 import io.deephaven.engine.table.Table;
@@ -21,7 +22,6 @@
 import gnu.trove.map.hash.TIntObjectHashMap;
 import gnu.trove.map.hash.TObjectIntHashMap;
 
-import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -183,7 +183,7 @@ public static List<String> removeEmpty(String... components) {
         }
     }
 
-    private static Table getRawNyMunis() throws IOException {
+    private static Table getRawNyMunis() throws CsvReaderException {
         QueryLibrary.importStatic(StaticHolder.class);
 
         final BaseTable base =
@@ -202,7 +202,7 @@ private static Table getRawNyMunis() throws IOException {
                 .lastBy("Path");
     }
 
-    private static Table makeNyMunisTreeTable() throws IOException {
+    private static Table makeNyMunisTreeTable() throws CsvReaderException {
         return makeNyMunisTreeTableFrom(getRawNyMunis());
     }
 
@@ -218,7 +218,7 @@ private static List<String> munisKey(String... path) {
 
     // region Actual Tests
 
-    public void testTsq() throws IOException {
+    public void testTsq() throws CsvReaderException {
         final Table t = makeNyMunisTreeTable();
         final TTState state = new TTState(t);
         final BitSet allColumns = new BitSet(t.getColumns().length);
@@ -456,7 +456,7 @@ public void testTsq() throws IOException {
         assertFalse(state.expansionMap.containsKey(mayfieldKey));
     }
 
-    public void testSortandFilter() throws IOException {
+    public void testSortandFilter() throws CsvReaderException {
         final Table t = makeNyMunisTreeTable();
         final TTState state = new TTState(t);
         final BitSet allColumns = new BitSet(t.getColumns().length);

diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/InMemoryTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/InMemoryTable.java
@@ -41,7 +41,7 @@ public static InMemoryTable from(NewTable table) {
 
     // TODO(kosak): this may not be what we want.
     public static InMemoryTable from(TableDefinition definition, TrackingRowSet rowSet,
-                                     Map<String, ? extends ColumnSource<?>> columns) {
+            Map<String, ? extends ColumnSource<?>> columns) {
         return new InMemoryTable(definition, rowSet, columns);
     }
 

diff --git a/extensions/csv/src/main/java/io/deephaven/csv/CsvSpecs.java b/extensions/csv/src/main/java/io/deephaven/csv/CsvSpecs.java
@@ -144,8 +144,7 @@ public static CsvSpecs fromLegacyFormat(String format) {
      * A header, when specified, hints at the parser to use.
      *
      * <p>
-     * To be even more explicit, callers may also use {@link #parserForName()} or
-     * {@link #parserForIndex()}.
+     * To be even more explicit, callers may also use {@link #parserForName()} or {@link #parserForIndex()}.
      *
      * @return the table header
      */
@@ -159,7 +158,8 @@ public static CsvSpecs fromLegacyFormat(String format) {
     public abstract Map<String, ParserBase<?>> parserForName();
 
     /**
-     * The parsers, where the keys are 1-based column indices. Specifying a parser for a column forgoes inference for that column.
+     * The parsers, where the keys are 1-based column indices. Specifying a parser for a column forgoes inference for
+     * that column.
      *
      * @return the parsers
      */
@@ -264,6 +264,7 @@ public Charset charset() {
 
     /**
      * Should the CSVReader run its processing steps on multiple threads for better performance.
+     * 
      * @return the async flag
      */
     @Default
@@ -367,7 +368,7 @@ private static abstract class MySinkBase<TYPE, TARRAY> implements Sink<TARRAY> {
         private long resultSize = 0;
 
         public MySinkBase(ArrayBackedColumnSource<TYPE> result, Class<?> interpClass,
-                          ChunkWrapInvoker<TARRAY> chunkWrapInvoker) {
+                ChunkWrapInvoker<TARRAY> chunkWrapInvoker) {
             this.result = result;
             if (interpClass != null) {
                 reinterpreted = (WritableColumnSource<?>) result.reinterpret(interpClass);
@@ -386,7 +387,7 @@ public final void write(TARRAY src, int srcOffset, long destOffset, int size) {
             reinterpreted.ensureCapacity(requiredCapacity);
             resultSize = Math.max(resultSize, requiredCapacity);
             try (final ChunkSink.FillFromContext context = reinterpreted.makeFillFromContext(size);
-                 final RowSequence range = RowSequenceFactory.forRange(destOffset, destOffset + size - 1)) {
+                    final RowSequence range = RowSequenceFactory.forRange(destOffset, destOffset + size - 1)) {
                 Chunk<? extends Values> chunk = chunkWrapInvoker.apply(src, srcOffset, size);
                 reinterpreted.fillFromChunk(context, chunk, range);
             }

diff --git a/extensions/csv/src/main/java/io/deephaven/csv/InferenceSpecs.java b/extensions/csv/src/main/java/io/deephaven/csv/InferenceSpecs.java
@@ -46,11 +46,11 @@ public static InferenceSpecs strings() {
      */
     public static InferenceSpecs minimal() {
         return builder().addParsers(
-                        Parsers.DATETIME,
-                        Parsers.LONG,
-                        Parsers.DOUBLE,
-                        Parsers.BOOLEAN,
-                        Parsers.STRING)
+                Parsers.DATETIME,
+                Parsers.LONG,
+                Parsers.DOUBLE,
+                Parsers.BOOLEAN,
+                Parsers.STRING)
                 .build();
     }
 
@@ -59,14 +59,14 @@ public static InferenceSpecs minimal() {
      */
     public static InferenceSpecs standard() {
         return builder().addParsers(
-                        Parsers.DATETIME,
-                        Parsers.SHORT,
-                        Parsers.INT,
-                        Parsers.LONG,
-                        Parsers.DOUBLE,
-                        Parsers.BOOLEAN,
-                        Parsers.CHAR,
-                        Parsers.STRING)
+                Parsers.DATETIME,
+                Parsers.SHORT,
+                Parsers.INT,
+                Parsers.LONG,
+                Parsers.DOUBLE,
+                Parsers.BOOLEAN,
+                Parsers.CHAR,
+                Parsers.STRING)
                 .build();
     }
 
@@ -77,45 +77,45 @@ public static InferenceSpecs standard() {
      */
     public static InferenceSpecs standardTimes() {
         return builder().addParsers(
-                        Parsers.TIMESTAMP,
-                        Parsers.FLOAT,
-                        Parsers.DOUBLE,
-                        Parsers.BOOLEAN,
-                        Parsers.CHAR,
-                        Parsers.STRING)
+                Parsers.TIMESTAMP,
+                Parsers.FLOAT,
+                Parsers.DOUBLE,
+                Parsers.BOOLEAN,
+                Parsers.CHAR,
+                Parsers.STRING)
                 .build();
     }
 
     public static InferenceSpecs milliTimes() {
         return builder().addParsers(
-                        Parsers.TIMESTAMP_MILLIS,
-                        Parsers.FLOAT,
-                        Parsers.DOUBLE,
-                        Parsers.BOOLEAN,
-                        Parsers.CHAR,
-                        Parsers.STRING)
+                Parsers.TIMESTAMP_MILLIS,
+                Parsers.FLOAT,
+                Parsers.DOUBLE,
+                Parsers.BOOLEAN,
+                Parsers.CHAR,
+                Parsers.STRING)
                 .build();
     }
 
     public static InferenceSpecs microTimes() {
         return builder().addParsers(
-                        Parsers.TIMESTAMP_MICROS,
-                        Parsers.FLOAT,
-                        Parsers.DOUBLE,
-                        Parsers.BOOLEAN,
-                        Parsers.CHAR,
-                        Parsers.STRING)
+                Parsers.TIMESTAMP_MICROS,
+                Parsers.FLOAT,
+                Parsers.DOUBLE,
+                Parsers.BOOLEAN,
+                Parsers.CHAR,
+                Parsers.STRING)
                 .build();
     }
 
     public static InferenceSpecs nanoTimes() {
         return builder().addParsers(
-                        Parsers.TIMESTAMP_NANOS,
-                        Parsers.FLOAT,
-                        Parsers.DOUBLE,
-                        Parsers.BOOLEAN,
-                        Parsers.CHAR,
-                        Parsers.STRING)
+                Parsers.TIMESTAMP_NANOS,
+                Parsers.FLOAT,
+                Parsers.DOUBLE,
+                Parsers.BOOLEAN,
+                Parsers.CHAR,
+                Parsers.STRING)
                 .build();
     }
 

diff --git a/extensions/csv/src/main/java/io/deephaven/csv/containers/ByteSlice.java b/extensions/csv/src/main/java/io/deephaven/csv/containers/ByteSlice.java
@@ -5,8 +5,7 @@ public final class ByteSlice {
     private int begin;
     private int end;
 
-    public ByteSlice() {
-    }
+    public ByteSlice() {}
 
     public ByteSlice(byte[] data, int begin, int end) {
         reset(data, begin, end);
@@ -34,9 +33,18 @@ public byte back() {
         return data[end - 1];
     }
 
-    public byte[] data() { return data; }
-    public int begin() { return begin; }
-    public int end() { return end; }
+    public byte[] data() {
+        return data;
+    }
+
+    public int begin() {
+        return begin;
+    }
+
+    public int end() {
+        return end;
+    }
+
     public int size() {
         return end - begin;
     }

diff --git a/extensions/csv/src/main/java/io/deephaven/csv/containers/CharSlice.java b/extensions/csv/src/main/java/io/deephaven/csv/containers/CharSlice.java
@@ -27,7 +27,7 @@ public char back() {
 
     public void copyTo(byte[] dest, int destOffset) {
         for (int cur = begin; cur != end; ++cur) {
-            dest[destOffset++] = (byte)data[cur];
+            dest[destOffset++] = (byte) data[cur];
         }
     }
 
@@ -41,12 +41,21 @@ public void setEnd(int end) {
         this.end = end;
     }
 
-    public char[] data() { return data; }
+    public char[] data() {
+        return data;
+    }
+
     public int begin() {
         return begin;
     }
-    public int end() { return end; }
-    public int size() { return end - begin; }
+
+    public int end() {
+        return end;
+    }
+
+    public int size() {
+        return end - begin;
+    }
 
     @Override
     public String toString() {

diff --git a/extensions/csv/src/main/java/io/deephaven/csv/densestorage/DenseStorageReader.java b/extensions/csv/src/main/java/io/deephaven/csv/densestorage/DenseStorageReader.java
@@ -35,10 +35,10 @@ public final class DenseStorageReader {
     private final int[] intHolder = new int[1];
 
     public DenseStorageReader(final QueueReader.IntReader controlReader,
-                              final QueueReader.ByteReader byteReader,
-                              final QueueReader.CharReader charReader,
-                              final QueueReader.ByteArrayReader largeByteArrayReader,
-                              final QueueReader.CharArrayReader largeCharArrayReader) {
+            final QueueReader.ByteReader byteReader,
+            final QueueReader.CharReader charReader,
+            final QueueReader.ByteArrayReader largeByteArrayReader,
+            final QueueReader.CharArrayReader largeCharArrayReader) {
         this.controlReader = controlReader;
         this.byteReader = byteReader;
         this.charReader = charReader;