Typed get/set object column methods

Author: benmccann

core/src/main/java/tech/tablesaw/api/BooleanColumn.java

@@ -54,7 +54,7 @@
 /**
  * A column in a base table that contains float values
  */
-public class BooleanColumn extends AbstractColumn implements BooleanMapUtils, CategoricalColumn,
+public class BooleanColumn extends AbstractColumn<Boolean, BooleanColumn> implements BooleanMapUtils, CategoricalColumn,
         BooleanFillers<BooleanColumn>, Iterable<Boolean> {
 
     public static final byte MISSING_VALUE = (Byte) BOOLEAN.getMissingValue();
@@ -431,6 +431,11 @@ public BooleanColumn set(int i, boolean b) {
         return this;
     }
 
+    @Override
+    public BooleanColumn set(int i, Boolean val) {
+      return set(i, val.booleanValue());
+    }
+
     public BooleanColumn lead(int n) {
         BooleanColumn column = lag(-n);
         column.setName(name() + " lead(" + n + ")");
@@ -726,7 +731,8 @@ public Object[] asObjectArray() {
     }
 
     @Override
-    public Object getObject(int index) {
+    public Boolean getObject(int index) {
         return get(index);
     }
+
 }

core/src/main/java/tech/tablesaw/api/DateColumn.java

@@ -53,7 +53,7 @@
 /**
  * A column in a base table that contains float values
  */
-public class DateColumn extends AbstractColumn implements DateFilters, DateFillers<DateColumn>,
+public class DateColumn extends AbstractColumn<LocalDate, DateColumn> implements DateFilters, DateFillers<DateColumn>,
 DateMapFunctions, CategoricalColumn, Iterable<LocalDate> {
 
     public static final int MISSING_VALUE = (Integer) ColumnType.LOCAL_DATE.getMissingValue();
@@ -657,7 +657,7 @@ public Object[] asObjectArray() {
     }
 
     @Override
-    public Object getObject(int index) {
+    public LocalDate getObject(int index) {
         return get(index);
     }
 }

core/src/main/java/tech/tablesaw/api/DateTimeColumn.java

@@ -52,7 +52,7 @@
 /**
  * A column in a table that contains long-integer encoded (packed) local date-time values
  */
-public class DateTimeColumn extends AbstractColumn
+public class DateTimeColumn extends AbstractColumn<LocalDateTime, DateTimeColumn>
     implements DateTimeMapFunctions, DateTimeFilters, DateTimeFillers<DateTimeColumn>, Iterable<LocalDateTime> {
 
     public static final long MISSING_VALUE = (Long) ColumnType.LOCAL_DATE_TIME.getMissingValue();
@@ -597,7 +597,7 @@ public Object[] asObjectArray() {
     }
 
     @Override
-    public Object getObject(int index) {
+    public LocalDateTime getObject(int index) {
         return get(index);
     }
 }

core/src/main/java/tech/tablesaw/api/DoubleColumn.java

@@ -56,7 +56,7 @@
 /**
  * A column in a base table that contains double precision floating point values
  */
-public class DoubleColumn extends AbstractColumn implements NumberColumn {
+public class DoubleColumn extends AbstractColumn<Double, DoubleColumn> implements NumberColumn {
 
     /**
      * Compares two doubles, such that a sort based on this comparator would sort in descending order
@@ -431,6 +431,11 @@ public DoubleColumn set(final int r, final double value) {
         return this;
     }
 
+    @Override
+    public DoubleColumn set(int i, Double val) {
+        return set(i, val.doubleValue());
+    }
+
     /**
      * Conditionally update this column, replacing current values with newValue for all rows where the current value
      * matches the selection criteria
@@ -679,7 +684,8 @@ public Object[] asObjectArray() {
     }
 
     @Override
-    public Object getObject(int index) {
+    public Double getObject(int index) {
         return getDouble(index);
     }
+
 }

core/src/main/java/tech/tablesaw/api/StringColumn.java

@@ -55,7 +55,7 @@
  * Because the MISSING_VALUE for this column type is an empty string, there is little or no need for special handling
  * of missing values in this class's methods.
  */
-public class StringColumn extends AbstractColumn
+public class StringColumn extends AbstractColumn<String, StringColumn>
         implements CategoricalColumn, StringFilters, StringMapFunctions, StringReduceUtils {
 
     public static final String MISSING_VALUE = (String) STRING.getMissingValue();
@@ -571,11 +571,10 @@ public StringColumn removeMissing() {
     }
 
     @Override
-    public Object getObject(int index) {
+    public String getObject(int index) {
         return get(index);
     }
 
-
     @Override
     public Iterator<String> iterator() {
         return new Iterator<String>() {

core/src/main/java/tech/tablesaw/api/TimeColumn.java

@@ -51,7 +51,7 @@
 /**
  * A column in a base table that contains float values
  */
-public class TimeColumn extends AbstractColumn implements CategoricalColumn, Iterable<LocalTime>, TimeFilters, TimeFillers<TimeColumn>, TimeMapFunctions {
+public class TimeColumn extends AbstractColumn<LocalTime, TimeColumn> implements CategoricalColumn, Iterable<LocalTime>, TimeFilters, TimeFillers<TimeColumn>, TimeMapFunctions {
 
     public static final int MISSING_VALUE = (Integer) LOCAL_TIME.getMissingValue();
 
@@ -595,7 +595,7 @@ public int[] asIntArray() {
     }
 
     @Override
-    public Object getObject(int index) {
+    public LocalTime getObject(int index) {
         return get(index);
     }
 }

core/src/main/java/tech/tablesaw/columns/AbstractColumn.java

@@ -20,7 +20,7 @@
 /**
  * Partial implementation of the {@link Column} interface
  */
-public abstract class AbstractColumn implements Column {
+public abstract class AbstractColumn<T, C extends AbstractColumn<T, C>> implements Column {
 
     public static final int DEFAULT_ARRAY_SIZE = 128;
 
@@ -62,6 +62,10 @@ public ColumnType type() {
         return type;
     }
 
+    public abstract C set(int i, T val);
+
+    public abstract T getObject(int i);
+
     @Override
     public String toString() {
         return type().getPrinterFriendlyName() + " column: " + name();