Review responses

devinrsmith · Jul 19, 2023 · 2365372 · 2365372
1 parent 1da2c66
commit 2365372
Show file tree

Hide file tree

Showing 41 changed files with 55 additions and 168 deletions.
diff --git a/engine/vector/src/main/java/io/deephaven/vector/ByteVector.java b/engine/vector/src/main/java/io/deephaven/vector/ByteVector.java
@@ -27,7 +27,7 @@ public interface ByteVector extends Vector<ByteVector>, Iterable<Byte> {
  long serialVersionUID = -1373264425081841175L;
 
  static PrimitiveVectorType<ByteVector, Byte> type() {
- return PrimitiveVectorType.of(ByteVector.class, ByteType.instance());
+ return PrimitiveVectorType.of(ByteVector.class, ByteType.of());
  }
 
  /**

diff --git a/engine/vector/src/main/java/io/deephaven/vector/CharVector.java b/engine/vector/src/main/java/io/deephaven/vector/CharVector.java
@@ -22,7 +22,7 @@ public interface CharVector extends Vector<CharVector>, Iterable<Character> {
  long serialVersionUID = -1373264425081841175L;
 
  static PrimitiveVectorType<CharVector, Character> type() {
- return PrimitiveVectorType.of(CharVector.class, CharType.instance());
+ return PrimitiveVectorType.of(CharVector.class, CharType.of());
  }
 
  /**

diff --git a/engine/vector/src/main/java/io/deephaven/vector/DoubleVector.java b/engine/vector/src/main/java/io/deephaven/vector/DoubleVector.java
@@ -27,7 +27,7 @@ public interface DoubleVector extends Vector<DoubleVector>, Iterable<Double> {
  long serialVersionUID = -1373264425081841175L;
 
  static PrimitiveVectorType<DoubleVector, Double> type() {
- return PrimitiveVectorType.of(DoubleVector.class, DoubleType.instance());
+ return PrimitiveVectorType.of(DoubleVector.class, DoubleType.of());
  }
 
  /**

diff --git a/engine/vector/src/main/java/io/deephaven/vector/FloatVector.java b/engine/vector/src/main/java/io/deephaven/vector/FloatVector.java
@@ -27,7 +27,7 @@ public interface FloatVector extends Vector<FloatVector>, Iterable<Float> {
  long serialVersionUID = -1373264425081841175L;
 
  static PrimitiveVectorType<FloatVector, Float> type() {
- return PrimitiveVectorType.of(FloatVector.class, FloatType.instance());
+ return PrimitiveVectorType.of(FloatVector.class, FloatType.of());
  }
 
  /**

diff --git a/engine/vector/src/main/java/io/deephaven/vector/IntVector.java b/engine/vector/src/main/java/io/deephaven/vector/IntVector.java
@@ -27,7 +27,7 @@ public interface IntVector extends Vector<IntVector>, Iterable<Integer> {
  long serialVersionUID = -1373264425081841175L;
 
  static PrimitiveVectorType<IntVector, Integer> type() {
- return PrimitiveVectorType.of(IntVector.class, IntType.instance());
+ return PrimitiveVectorType.of(IntVector.class, IntType.of());
  }
 
  /**

diff --git a/engine/vector/src/main/java/io/deephaven/vector/LongVector.java b/engine/vector/src/main/java/io/deephaven/vector/LongVector.java
@@ -27,7 +27,7 @@ public interface LongVector extends Vector<LongVector>, Iterable<Long> {
  long serialVersionUID = -1373264425081841175L;
 
  static PrimitiveVectorType<LongVector, Long> type() {
- return PrimitiveVectorType.of(LongVector.class, LongType.instance());
+ return PrimitiveVectorType.of(LongVector.class, LongType.of());
  }
 
  /**

diff --git a/engine/vector/src/main/java/io/deephaven/vector/ShortVector.java b/engine/vector/src/main/java/io/deephaven/vector/ShortVector.java
@@ -27,7 +27,7 @@ public interface ShortVector extends Vector<ShortVector>, Iterable<Short> {
  long serialVersionUID = -1373264425081841175L;
 
  static PrimitiveVectorType<ShortVector, Short> type() {
- return PrimitiveVectorType.of(ShortVector.class, ShortType.instance());
+ return PrimitiveVectorType.of(ShortVector.class, ShortType.of());
  }
 
  /**

diff --git a/engine/vector/src/test/java/io/deephaven/vector/ObjectVectorTest.java b/engine/vector/src/test/java/io/deephaven/vector/ObjectVectorTest.java
@@ -189,7 +189,7 @@ public void testSubVector() {
  @Test
  public void testType() {
  // region TestType
- assertEquals(ObjectVector.type(io.deephaven.qst.type.StringType.instance()).clazz(), ObjectVector.class);
+ assertEquals(ObjectVector.type(io.deephaven.qst.type.StringType.of()).clazz(), ObjectVector.class);
  // endregion TestType
  }
 

diff --git a/qst/src/main/java/io/deephaven/qst/array/BooleanArray.java b/qst/src/main/java/io/deephaven/qst/array/BooleanArray.java
@@ -79,7 +79,7 @@ public final int size() {
 
  @Override
  public final BooleanType componentType() {
- return BooleanType.instance();
+ return BooleanType.of();
  }
 
  @Override

diff --git a/qst/src/main/java/io/deephaven/qst/array/ByteArray.java b/qst/src/main/java/io/deephaven/qst/array/ByteArray.java
@@ -79,7 +79,7 @@ public final int size() {
 
  @Override
  public final ByteType componentType() {
- return ByteType.instance();
+ return ByteType.of();
  }
 
  @Override

diff --git a/qst/src/main/java/io/deephaven/qst/array/CharArray.java b/qst/src/main/java/io/deephaven/qst/array/CharArray.java
@@ -79,7 +79,7 @@ public final int size() {
 
  @Override
  public final CharType componentType() {
- return CharType.instance();
+ return CharType.of();
  }
 
  @Override

diff --git a/qst/src/main/java/io/deephaven/qst/array/DoubleArray.java b/qst/src/main/java/io/deephaven/qst/array/DoubleArray.java
@@ -79,7 +79,7 @@ public final int size() {
 
  @Override
  public final DoubleType componentType() {
- return DoubleType.instance();
+ return DoubleType.of();
  }
 
  @Override

diff --git a/qst/src/main/java/io/deephaven/qst/array/FloatArray.java b/qst/src/main/java/io/deephaven/qst/array/FloatArray.java
@@ -79,7 +79,7 @@ public final int size() {
 
  @Override
  public final FloatType componentType() {
- return FloatType.instance();
+ return FloatType.of();
  }
 
  @Override

diff --git a/qst/src/main/java/io/deephaven/qst/array/IntArray.java b/qst/src/main/java/io/deephaven/qst/array/IntArray.java
@@ -79,7 +79,7 @@ public final int size() {
 
  @Override
  public final IntType componentType() {
- return IntType.instance();
+ return IntType.of();
  }
 
  @Override

diff --git a/qst/src/main/java/io/deephaven/qst/array/LongArray.java b/qst/src/main/java/io/deephaven/qst/array/LongArray.java
@@ -79,7 +79,7 @@ public final int size() {
 
  @Override
  public final LongType componentType() {
- return LongType.instance();
+ return LongType.of();
  }
 
  @Override

diff --git a/qst/src/main/java/io/deephaven/qst/array/ShortArray.java b/qst/src/main/java/io/deephaven/qst/array/ShortArray.java
@@ -79,7 +79,7 @@ public final int size() {
 
  @Override
  public final ShortType componentType() {
- return ShortType.instance();
+ return ShortType.of();
  }
 
  @Override

diff --git a/qst/src/main/java/io/deephaven/qst/type/BooleanType.java b/qst/src/main/java/io/deephaven/qst/type/BooleanType.java
@@ -13,7 +13,7 @@
 @SingletonStyle
 public abstract class BooleanType extends PrimitiveTypeBase<Boolean> {
 
- public static BooleanType instance() {
+ public static BooleanType of() {
  return ImmutableBooleanType.of();
  }
 

diff --git a/qst/src/main/java/io/deephaven/qst/type/BoxedBooleanType.java b/qst/src/main/java/io/deephaven/qst/type/BoxedBooleanType.java
@@ -4,7 +4,6 @@
 package io.deephaven.qst.type;
 
 import io.deephaven.annotations.SingletonStyle;
-import io.deephaven.qst.type.BoxedType.Visitor;
 import org.immutables.value.Value.Immutable;
 
 /**
@@ -25,7 +24,7 @@ public final Class<Boolean> clazz() {
 
  @Override
  public final BooleanType primitiveType() {
- return BooleanType.instance();
+ return BooleanType.of();
  }
 
  @Override

diff --git a/qst/src/main/java/io/deephaven/qst/type/BoxedByteType.java b/qst/src/main/java/io/deephaven/qst/type/BoxedByteType.java
@@ -24,7 +24,7 @@ public final Class<Byte> clazz() {
 
  @Override
  public final ByteType primitiveType() {
- return ByteType.instance();
+ return ByteType.of();
  }
 
  @Override

diff --git a/qst/src/main/java/io/deephaven/qst/type/BoxedCharType.java b/qst/src/main/java/io/deephaven/qst/type/BoxedCharType.java
@@ -24,7 +24,7 @@ public final Class<Character> clazz() {
 
  @Override
  public final CharType primitiveType() {
- return CharType.instance();
+ return CharType.of();
  }
 
  @Override

diff --git a/qst/src/main/java/io/deephaven/qst/type/BoxedDoubleType.java b/qst/src/main/java/io/deephaven/qst/type/BoxedDoubleType.java
@@ -24,7 +24,7 @@ public final Class<Double> clazz() {
 
  @Override
  public final DoubleType primitiveType() {
- return DoubleType.instance();
+ return DoubleType.of();
  }
 
  @Override

diff --git a/qst/src/main/java/io/deephaven/qst/type/BoxedFloatType.java b/qst/src/main/java/io/deephaven/qst/type/BoxedFloatType.java
@@ -24,7 +24,7 @@ public final Class<Float> clazz() {
 
  @Override
  public final FloatType primitiveType() {
- return FloatType.instance();
+ return FloatType.of();
  }
 
  @Override

diff --git a/qst/src/main/java/io/deephaven/qst/type/BoxedIntType.java b/qst/src/main/java/io/deephaven/qst/type/BoxedIntType.java
@@ -24,7 +24,7 @@ public final Class<Integer> clazz() {
 
  @Override
  public final IntType primitiveType() {
- return IntType.instance();
+ return IntType.of();
  }
 
  @Override

diff --git a/qst/src/main/java/io/deephaven/qst/type/BoxedLongType.java b/qst/src/main/java/io/deephaven/qst/type/BoxedLongType.java
@@ -24,7 +24,7 @@ public final Class<Long> clazz() {
 
  @Override
  public final LongType primitiveType() {
- return LongType.instance();
+ return LongType.of();
  }
 
  @Override

diff --git a/qst/src/main/java/io/deephaven/qst/type/BoxedShortType.java b/qst/src/main/java/io/deephaven/qst/type/BoxedShortType.java
@@ -24,7 +24,7 @@ public final Class<Short> clazz() {
 
  @Override
  public final ShortType primitiveType() {
- return ShortType.instance();
+ return ShortType.of();
  }
 
  @Override

diff --git a/qst/src/main/java/io/deephaven/qst/type/BoxedType.java b/qst/src/main/java/io/deephaven/qst/type/BoxedType.java
@@ -37,9 +37,6 @@ static Stream<BoxedType<?>> instances() {
  <R> R walk(Visitor<R> visitor);
 
  interface Visitor<R> {
- static <R> Visitor<R> adapt(PrimitiveType.Visitor<R> visitor) {
- return new BoxedTypeVisitorAdapter<>(visitor);
- }
 
  R visit(BoxedBooleanType booleanType);
 

diff --git a/qst/src/main/java/io/deephaven/qst/type/BoxedTypeVisitorAdapter.java b/qst/src/main/java/io/deephaven/qst/type/BoxedTypeVisitorAdapter.java
diff --git a/qst/src/main/java/io/deephaven/qst/type/ByteType.java b/qst/src/main/java/io/deephaven/qst/type/ByteType.java
@@ -13,7 +13,7 @@
 @SingletonStyle
 public abstract class ByteType extends PrimitiveTypeBase<Byte> {
 
- public static ByteType instance() {
+ public static ByteType of() {
  return ImmutableByteType.of();
  }
 

diff --git a/qst/src/main/java/io/deephaven/qst/type/CharType.java b/qst/src/main/java/io/deephaven/qst/type/CharType.java
@@ -13,7 +13,7 @@
 @SingletonStyle
 public abstract class CharType extends PrimitiveTypeBase<Character> {
 
- public static CharType instance() {
+ public static CharType of() {
  return ImmutableCharType.of();
  }
 

diff --git a/qst/src/main/java/io/deephaven/qst/type/DoubleType.java b/qst/src/main/java/io/deephaven/qst/type/DoubleType.java
@@ -13,7 +13,7 @@
 @SingletonStyle
 public abstract class DoubleType extends PrimitiveTypeBase<Double> {
 
- public static DoubleType instance() {
+ public static DoubleType of() {
  return ImmutableDoubleType.of();
  }
 

diff --git a/qst/src/main/java/io/deephaven/qst/type/FloatType.java b/qst/src/main/java/io/deephaven/qst/type/FloatType.java
@@ -13,7 +13,7 @@
 @SingletonStyle
 public abstract class FloatType extends PrimitiveTypeBase<Float> {
 
- public static FloatType instance() {
+ public static FloatType of() {
  return ImmutableFloatType.of();
  }
 

diff --git a/qst/src/main/java/io/deephaven/qst/type/InstantType.java b/qst/src/main/java/io/deephaven/qst/type/InstantType.java
@@ -15,7 +15,7 @@
 @SingletonStyle
 public abstract class InstantType extends GenericTypeBase<Instant> {
 
- public static InstantType instance() {
+ public static InstantType of() {
  return ImmutableInstantType.of();
  }
 

diff --git a/qst/src/main/java/io/deephaven/qst/type/IntType.java b/qst/src/main/java/io/deephaven/qst/type/IntType.java
@@ -13,7 +13,7 @@
 @SingletonStyle
 public abstract class IntType extends PrimitiveTypeBase<Integer> {
 
- public static IntType instance() {
+ public static IntType of() {
  return ImmutableIntType.of();
  }
 

diff --git a/qst/src/main/java/io/deephaven/qst/type/LongType.java b/qst/src/main/java/io/deephaven/qst/type/LongType.java
@@ -13,7 +13,7 @@
 @SingletonStyle
 public abstract class LongType extends PrimitiveTypeBase<Long> {
 
- public static LongType instance() {
+ public static LongType of() {
  return ImmutableLongType.of();
  }
 

diff --git a/qst/src/main/java/io/deephaven/qst/type/PrimitiveType.java b/qst/src/main/java/io/deephaven/qst/type/PrimitiveType.java
@@ -22,24 +22,21 @@ public interface PrimitiveType<T> extends Type<T> {
 
  static Stream<PrimitiveType<?>> instances() {
  return Stream.of(
- BooleanType.instance(),
- ByteType.instance(),
- CharType.instance(),
- ShortType.instance(),
- IntType.instance(),
- LongType.instance(),
- FloatType.instance(),
- DoubleType.instance());
+ BooleanType.of(),
+ ByteType.of(),
+ CharType.of(),
+ ShortType.of(),
+ IntType.of(),
+ LongType.of(),
+ FloatType.of(),
+ DoubleType.of());
  }
 
  BoxedType<T> boxedType();
 
  <R> R walk(Visitor<R> visitor);
 
  interface Visitor<R> {
- static <R> Visitor<R> adapt(BoxedType.Visitor<R> visitor) {
- return new PrimitiveTypeVisitorAdapter<>(visitor);
- }
 
  R visit(BooleanType booleanType);