diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2022-10-06 13:13:10 +0200 |
|---|---|---|
| committer | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2022-10-06 14:46:56 +0200 |
| commit | 47357afd16f928260db34d4dd3e686fb9ee7c5ff (patch) | |
| tree | 950ba678869ec868c26ab3b95b57e4cabadb23c7 /opendc-trace/opendc-trace-opendc | |
| parent | 402a8f55342c4565431c2a2e7287a70592f3fe33 (diff) | |
build: Switch to Spotless for formatting
This change updates the build configuration to use Spotless for code
formating of both Kotlin and Java.
Diffstat (limited to 'opendc-trace/opendc-trace-opendc')
5 files changed, 14 insertions, 13 deletions
diff --git a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmTraceFormat.kt b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmTraceFormat.kt index 07a26fb5..c4790538 100644 --- a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmTraceFormat.kt +++ b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmTraceFormat.kt @@ -95,7 +95,7 @@ public class OdcVmTraceFormat : TraceFormat { TableColumn(RESOURCE_STOP_TIME, TableColumnType.Instant), TableColumn(RESOURCE_CPU_COUNT, TableColumnType.Int), TableColumn(RESOURCE_CPU_CAPACITY, TableColumnType.Double), - TableColumn(RESOURCE_MEM_CAPACITY, TableColumnType.Double), + TableColumn(RESOURCE_MEM_CAPACITY, TableColumnType.Double) ) ) TABLE_RESOURCE_STATES -> TableDetails( @@ -104,14 +104,14 @@ public class OdcVmTraceFormat : TraceFormat { TableColumn(RESOURCE_STATE_TIMESTAMP, TableColumnType.Instant), TableColumn(RESOURCE_STATE_DURATION, TableColumnType.Duration), TableColumn(RESOURCE_CPU_COUNT, TableColumnType.Int), - TableColumn(RESOURCE_STATE_CPU_USAGE, TableColumnType.Double), + TableColumn(RESOURCE_STATE_CPU_USAGE, TableColumnType.Double) ) ) TABLE_INTERFERENCE_GROUPS -> TableDetails( listOf( TableColumn(INTERFERENCE_GROUP_MEMBERS, TableColumnType.Set(TableColumnType.String)), TableColumn(INTERFERENCE_GROUP_TARGET, TableColumnType.Double), - TableColumn(INTERFERENCE_GROUP_SCORE, TableColumnType.Double), + TableColumn(INTERFERENCE_GROUP_SCORE, TableColumnType.Double) ) ) else -> throw IllegalArgumentException("Table $table not supported") @@ -130,10 +130,11 @@ public class OdcVmTraceFormat : TraceFormat { } TABLE_INTERFERENCE_GROUPS -> { val modelPath = path.resolve("interference-model.json") - val parser = if (modelPath.exists()) + val parser = if (modelPath.exists()) { jsonFactory.createParser(modelPath.toFile()) - else + } else { jsonFactory.createParser("[]") // If model does not exist, return empty model + } OdcVmInterferenceJsonTableReader(parser) } diff --git a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/parquet/ResourceReadSupport.kt b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/parquet/ResourceReadSupport.kt index aafa23a4..52911d5f 100644 --- a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/parquet/ResourceReadSupport.kt +++ b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/parquet/ResourceReadSupport.kt @@ -55,7 +55,7 @@ internal class ResourceReadSupport(private val projection: List<String>?) : Read "cpu_count" to RESOURCE_CPU_COUNT, "cpu_capacity" to RESOURCE_CPU_CAPACITY, "requiredMemory" to RESOURCE_MEM_CAPACITY, - "mem_capacity" to RESOURCE_MEM_CAPACITY, + "mem_capacity" to RESOURCE_MEM_CAPACITY ) override fun init(context: InitContext): ReadContext { @@ -111,7 +111,7 @@ internal class ResourceReadSupport(private val projection: List<String>?) : Read .named("maxCores"), Types .required(PrimitiveType.PrimitiveTypeName.INT64) - .named("requiredMemory"), + .named("requiredMemory") ) .named("resource") @@ -141,7 +141,7 @@ internal class ResourceReadSupport(private val projection: List<String>?) : Read .named("cpu_capacity"), Types .required(PrimitiveType.PrimitiveTypeName.INT64) - .named("mem_capacity"), + .named("mem_capacity") ) .named("resource") diff --git a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/parquet/ResourceStateReadSupport.kt b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/parquet/ResourceStateReadSupport.kt index 282501f3..56366cd8 100644 --- a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/parquet/ResourceStateReadSupport.kt +++ b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/parquet/ResourceStateReadSupport.kt @@ -52,7 +52,7 @@ internal class ResourceStateReadSupport(private val projection: List<String>?) : "cores" to RESOURCE_CPU_COUNT, "cpu_count" to RESOURCE_CPU_COUNT, "cpuUsage" to RESOURCE_STATE_CPU_USAGE, - "cpu_usage" to RESOURCE_STATE_CPU_USAGE, + "cpu_usage" to RESOURCE_STATE_CPU_USAGE ) override fun init(context: InitContext): ReadContext { diff --git a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/parquet/ResourceWriteSupport.kt b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/parquet/ResourceWriteSupport.kt index 790ff4e8..cd428754 100644 --- a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/parquet/ResourceWriteSupport.kt +++ b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/parquet/ResourceWriteSupport.kt @@ -110,7 +110,7 @@ internal class ResourceWriteSupport : WriteSupport<Resource>() { .named("cpu_capacity"), Types .required(PrimitiveType.PrimitiveTypeName.INT64) - .named("mem_capacity"), + .named("mem_capacity") ) .named("resource") } diff --git a/opendc-trace/opendc-trace-opendc/src/test/kotlin/org/opendc/trace/opendc/OdcVmTraceFormatTest.kt b/opendc-trace/opendc-trace-opendc/src/test/kotlin/org/opendc/trace/opendc/OdcVmTraceFormatTest.kt index ad87b085..d3c3b35b 100644 --- a/opendc-trace/opendc-trace-opendc/src/test/kotlin/org/opendc/trace/opendc/OdcVmTraceFormatTest.kt +++ b/opendc-trace/opendc-trace-opendc/src/test/kotlin/org/opendc/trace/opendc/OdcVmTraceFormatTest.kt @@ -131,7 +131,7 @@ internal class OdcVmTraceFormatTest { { assertEquals(1, reader.getInt(RESOURCE_CPU_COUNT)) }, { assertEquals(1024.0, reader.getDouble(RESOURCE_CPU_CAPACITY)) }, { assertEquals(1024.0, reader.getDouble(RESOURCE_MEM_CAPACITY)) }, - { assertFalse(reader.nextRow()) }, + { assertFalse(reader.nextRow()) } ) reader.close() @@ -178,7 +178,7 @@ internal class OdcVmTraceFormatTest { { assertEquals(Instant.EPOCH, reader.getInstant(RESOURCE_STATE_TIMESTAMP)) }, { assertEquals(1, reader.getInt(RESOURCE_CPU_COUNT)) }, { assertEquals(23.0, reader.getDouble(RESOURCE_STATE_CPU_USAGE)) }, - { assertFalse(reader.nextRow()) }, + { assertFalse(reader.nextRow()) } ) reader.close() @@ -247,7 +247,7 @@ internal class OdcVmTraceFormatTest { { assertEquals(setOf("a", "b", "d"), reader.getSet(INTERFERENCE_GROUP_MEMBERS, String::class.java)) }, { assertEquals(0.5, reader.getDouble(INTERFERENCE_GROUP_TARGET)) }, { assertEquals(0.9, reader.getDouble(INTERFERENCE_GROUP_SCORE)) }, - { assertFalse(reader.nextRow()) }, + { assertFalse(reader.nextRow()) } ) reader.close() |
