summaryrefslogtreecommitdiff
path: root/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/util
diff options
context:
space:
mode:
authorDante Niewenhuis <d.niewenhuis@hotmail.com>2024-03-05 13:23:57 +0100
committerGitHub <noreply@github.com>2024-03-05 13:23:57 +0100
commit5864cbcbfe2eb8c36ca05c3a39c7e5916aeecaec (patch)
tree5b2773b8dc21c2e1b526fb70f829c376dd80532a /opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/util
parentd28002a3c151d198298574312f32f1cb43f3a660 (diff)
Updated package versions, updated web server tests. (#207)
* Updated all package versions including kotlin. Updated all web-server tests to run. * Changed the java version of the tests. OpenDC now only supports java 19. * small update * test update * new update * updated docker version to 19 * updated docker version to 19
Diffstat (limited to 'opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/util')
-rw-r--r--opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/util/CompositeTableReader.kt16
-rw-r--r--opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/util/TableColumnConversion.kt16
2 files changed, 26 insertions, 6 deletions
diff --git a/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/util/CompositeTableReader.kt b/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/util/CompositeTableReader.kt
index 2fe820c4..4b9a0d95 100644
--- a/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/util/CompositeTableReader.kt
+++ b/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/util/CompositeTableReader.kt
@@ -122,17 +122,27 @@ public abstract class CompositeTableReader : TableReader {
return delegate.getDuration(index)
}
- override fun <T> getList(index: Int, elementType: Class<T>): List<T>? {
+ override fun <T> getList(
+ index: Int,
+ elementType: Class<T>,
+ ): List<T>? {
val delegate = checkNotNull(delegate) { "Invalid reader state" }
return delegate.getList(index, elementType)
}
- override fun <T> getSet(index: Int, elementType: Class<T>): Set<T>? {
+ override fun <T> getSet(
+ index: Int,
+ elementType: Class<T>,
+ ): Set<T>? {
val delegate = checkNotNull(delegate) { "Invalid reader state" }
return delegate.getSet(index, elementType)
}
- override fun <K, V> getMap(index: Int, keyType: Class<K>, valueType: Class<V>): Map<K, V>? {
+ override fun <K, V> getMap(
+ index: Int,
+ keyType: Class<K>,
+ valueType: Class<V>,
+ ): Map<K, V>? {
val delegate = checkNotNull(delegate) { "Invalid reader state" }
return delegate.getMap(index, keyType, valueType)
}
diff --git a/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/util/TableColumnConversion.kt b/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/util/TableColumnConversion.kt
index 26739e34..fda2bc54 100644
--- a/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/util/TableColumnConversion.kt
+++ b/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/util/TableColumnConversion.kt
@@ -32,7 +32,10 @@ import java.util.UUID
/**
* Helper method to convert a [List] into a [List] with elements of [targetElementType].
*/
-public fun <T> TableColumnType.List.convertTo(value: List<*>?, targetElementType: Class<T>): List<T>? {
+public fun <T> TableColumnType.List.convertTo(
+ value: List<*>?,
+ targetElementType: Class<T>,
+): List<T>? {
require(elementType.isCompatible(targetElementType)) { "Target element type is not compatible with $elementType" }
@Suppress("UNCHECKED_CAST")
return value as List<T>?
@@ -41,7 +44,10 @@ public fun <T> TableColumnType.List.convertTo(value: List<*>?, targetElementType
/**
* Helper method to convert a [Set] into a [Set] with elements of [targetElementType].
*/
-public fun <T> TableColumnType.Set.convertTo(value: Set<*>?, targetElementType: Class<T>): Set<T>? {
+public fun <T> TableColumnType.Set.convertTo(
+ value: Set<*>?,
+ targetElementType: Class<T>,
+): Set<T>? {
require(elementType.isCompatible(targetElementType)) { "Target element type is not compatible with $elementType" }
@Suppress("UNCHECKED_CAST")
return value as Set<T>?
@@ -50,7 +56,11 @@ public fun <T> TableColumnType.Set.convertTo(value: Set<*>?, targetElementType:
/**
* Helper method to convert a [Map] into a [Map] with [targetKeyType] keys and [targetValueType] values.
*/
-public fun <K, V> TableColumnType.Map.convertTo(value: Map<*, *>?, targetKeyType: Class<K>, targetValueType: Class<V>): Map<K, V>? {
+public fun <K, V> TableColumnType.Map.convertTo(
+ value: Map<*, *>?,
+ targetKeyType: Class<K>,
+ targetValueType: Class<V>,
+): Map<K, V>? {
require(keyType.isCompatible(targetKeyType)) { "Target key type $targetKeyType is not compatible with $keyType" }
require(valueType.isCompatible(targetValueType)) { "Target value type $targetValueType is not compatible with $valueType" }
@Suppress("UNCHECKED_CAST")