From 2358257c1080b7ce78270535f82f0b960d48261a Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Mon, 6 Jun 2022 16:21:21 +0200
Subject: refactor(trace/api): Introduce type system for trace API

This change updates the trace API by introducing a limited type system
for the table columns. Previously, the table columns could have any
possible type representable by the JVM. With this change, we limit the
available types to a small type system.
---
 .../main/kotlin/org/opendc/trace/TableColumn.kt    | 50 ++++------------------
 1 file changed, 9 insertions(+), 41 deletions(-)

(limited to 'opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/TableColumn.kt')

diff --git a/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/TableColumn.kt b/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/TableColumn.kt
index b77a2982..0f75d890 100644
--- a/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/TableColumn.kt
+++ b/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/TableColumn.kt
@@ -22,47 +22,15 @@
 
 package org.opendc.trace
 
-import java.util.*
-
 /**
- * A column in a trace table.
+ * A column in a [Table].
  *
- * @param name The universal name of this column.
+ * @property name The universal name of this column.
+ * @property type The type of the column.
+ * @property isNullable A flag to indicate that the column is nullable.
  */
-public class TableColumn<out T>(public val name: String, type: Class<T>) {
-    /**
-     * The type of the column.
-     */
-    public val type: Class<*> = type
-
-    /**
-     * Determine whether the type of the column is a subtype of [column].
-     */
-    public fun isAssignableTo(column: TableColumn<*>): Boolean {
-        return name == column.name && type.isAssignableFrom(column.type)
-    }
-
-    /**
-     * Compute a hash code for this column.
-     */
-    public override fun hashCode(): Int = Objects.hash(name, type)
-
-    /**
-     * Determine whether this column is equal to [other].
-     */
-    public override fun equals(other: Any?): Boolean {
-        // Fast-path: reference equality
-        if (this === other) {
-            return true
-        } else if (other == null || other !is TableColumn<*>) {
-            return false
-        }
-
-        return name == other.name && type == other.type
-    }
-
-    /**
-     * Return a string representation of this column.
-     */
-    public override fun toString(): String = "TableColumn[$name,$type]"
-}
+public data class TableColumn(
+    public val name: String,
+    public val type: TableColumnType,
+    public val isNullable: Boolean = false
+)
-- 
cgit v1.2.3