bulk code format fix (#8707)

kotlin/benchmark/build.gradle.kts

@@ -8,6 +8,7 @@ plugins {
 }
 
 group = "com.google.flatbuffers.jmh"
+
 version = "2.0.0-SNAPSHOT"
 
 // Reads latest version from Java's runtime pom.xml,
@@ -15,10 +16,11 @@ version = "2.0.0-SNAPSHOT"
 // runtime
 fun readJavaFlatBufferVersion(): String {
   val pom = XmlParser().parse(File("../java/pom.xml"))
-  val versionTag = pom.children().find {
-    val node = it as groovy.util.Node
-    node.name().toString().contains("version")
-  } as groovy.util.Node
+  val versionTag =
+    pom.children().find {
+      val node = it as groovy.util.Node
+      node.name().toString().contains("version")
+    } as groovy.util.Node
   return versionTag.value().toString()
 }
 
@@ -39,27 +41,26 @@ benchmark {
       iterationTime = 300
       iterationTimeUnit = "ms"
       // uncomment for benchmarking JSON op only
-       include(".*FlatbufferBenchmark.*")
+      include(".*FlatbufferBenchmark.*")
     }
   }
-  targets {
-    register("jvm")
-  }
+  targets { register("jvm") }
 }
 
 kotlin {
   jvm {
     compilations {
-      val main by getting { }
+      val main by getting {}
       // custom benchmark compilation
-      val benchmarks by compilations.creating {
-        defaultSourceSet {
-          dependencies {
-            // Compile against the main compilation's compile classpath and outputs:
-            implementation(main.compileDependencyFiles + main.output.classesDirs)
+      val benchmarks by
+        compilations.creating {
+          defaultSourceSet {
+            dependencies {
+              // Compile against the main compilation's compile classpath and outputs:
+              implementation(main.compileDependencyFiles + main.output.classesDirs)
+            }
           }
         }
-      }
     }
   }
 
@@ -91,17 +92,13 @@ tasks.register<de.undercouch.gradle.tasks.download.Download>("downloadMultipleFi
 }
 
 abstract class GenerateFBTestClasses : DefaultTask() {
-  @get:InputFiles
-  abstract val inputFiles: ConfigurableFileCollection
+  @get:InputFiles abstract val inputFiles: ConfigurableFileCollection
 
-  @get:Input
-  abstract val includeFolder: Property<String>
+  @get:Input abstract val includeFolder: Property<String>
 
-  @get:Input
-  abstract val outputFolder: Property<String>
+  @get:Input abstract val outputFolder: Property<String>
 
-  @get:Input
-  abstract val variants: ListProperty<String>
+  @get:Input abstract val variants: ListProperty<String>
 
   @Inject
   protected open fun getExecActionFactory(): org.gradle.process.internal.ExecActionFactory? {
@@ -117,7 +114,7 @@ abstract class GenerateFBTestClasses : DefaultTask() {
     val execAction = getExecActionFactory()!!.newExecAction()
     val sources = inputFiles.asPath.split(":")
     val langs = variants.get().map { "--$it" }
-    val args = mutableListOf("flatc","-o", outputFolder.get(), *langs.toTypedArray())
+    val args = mutableListOf("flatc", "-o", outputFolder.get(), *langs.toTypedArray())
     if (includeFolder.get().isNotEmpty()) {
       args.add("-I")
       args.add(includeFolder.get())

kotlin/benchmark/src/jvmMain/kotlin/com/google/flatbuffers/kotlin/benchmark/FlatbufferBenchmark.kt

@@ -2,8 +2,8 @@
 
 package com.google.flatbuffers.kotlin.benchmark
 
-
 import com.google.flatbuffers.kotlin.FlatBufferBuilder
+import java.util.concurrent.TimeUnit
 import jmonster.JAllMonsters
 import jmonster.JColor
 import jmonster.JMonster
@@ -17,7 +17,6 @@ import monster.MonsterOffsetArray
 import monster.Vec3
 import org.openjdk.jmh.annotations.*
 import org.openjdk.jmh.infra.Blackhole
-import java.util.concurrent.TimeUnit
 
 @State(Scope.Benchmark)
 @BenchmarkMode(Mode.AverageTime)
@@ -32,48 +31,55 @@ open class FlatbufferBenchmark {
   val fbDeserializationJava = com.google.flatbuffers.FlatBufferBuilder(1024 * repetition)
 
   init {
-      populateMosterKotlin(fbDeserializationKotlin)
-      populateMosterJava(fbDeserializationJava)
+    populateMosterKotlin(fbDeserializationKotlin)
+    populateMosterJava(fbDeserializationJava)
   }
+
   @OptIn(ExperimentalUnsignedTypes::class)
   private fun populateMosterKotlin(fb: FlatBufferBuilder) {
     fb.clear()
-    val monsterName = fb.createString("MonsterName");
+    val monsterName = fb.createString("MonsterName")
     val items = ubyteArrayOf(0u, 1u, 2u, 3u, 4u)
     val inv = createInventoryVector(fb, items)
-    val monsterOffsets: MonsterOffsetArray = MonsterOffsetArray(repetition) {
-      Monster.startMonster(fb)
-      Monster.addName(fb, monsterName)
-      Monster.addPos(fb, Vec3.createVec3(fb, 1.0f, 2.0f, 3.0f))
-      Monster.addHp(fb, 80)
-      Monster.addMana(fb, 150)
-      Monster.addInventory(fb, inv)
-      Monster.addColor(fb, monster.Color.Red)
-      Monster.endMonster(fb)
-    }
+    val monsterOffsets: MonsterOffsetArray =
+      MonsterOffsetArray(repetition) {
+        Monster.startMonster(fb)
+        Monster.addName(fb, monsterName)
+        Monster.addPos(fb, Vec3.createVec3(fb, 1.0f, 2.0f, 3.0f))
+        Monster.addHp(fb, 80)
+        Monster.addMana(fb, 150)
+        Monster.addInventory(fb, inv)
+        Monster.addColor(fb, monster.Color.Red)
+        Monster.endMonster(fb)
+      }
     val monsters = createMonstersVector(fb, monsterOffsets)
     val allMonsters = createAllMonsters(fb, monsters)
     fb.finish(allMonsters)
   }
 
   @OptIn(ExperimentalUnsignedTypes::class)
-  private fun populateMosterJava(fb: com.google.flatbuffers.FlatBufferBuilder){
+  private fun populateMosterJava(fb: com.google.flatbuffers.FlatBufferBuilder) {
     fb.clear()
-    val monsterName = fb.createString("MonsterName");
+    val monsterName = fb.createString("MonsterName")
     val inv = JMonster.createInventoryVector(fb, ubyteArrayOf(0u, 1u, 2u, 3u, 4u))
-    val monsters = JAllMonsters.createMonstersVector(fb, IntArray(repetition) {
-      JMonster.startJMonster(fb)
-      JMonster.addName(fb, monsterName)
-      JMonster.addPos(fb, JVec3.createJVec3(fb, 1.0f, 2.0f, 3.0f))
-      JMonster.addHp(fb, 80)
-      JMonster.addMana(fb, 150)
-      JMonster.addInventory(fb, inv)
-      JMonster.addColor(fb, JColor.Red)
-      JMonster.endJMonster(fb)
-    })
+    val monsters =
+      JAllMonsters.createMonstersVector(
+        fb,
+        IntArray(repetition) {
+          JMonster.startJMonster(fb)
+          JMonster.addName(fb, monsterName)
+          JMonster.addPos(fb, JVec3.createJVec3(fb, 1.0f, 2.0f, 3.0f))
+          JMonster.addHp(fb, 80)
+          JMonster.addMana(fb, 150)
+          JMonster.addInventory(fb, inv)
+          JMonster.addColor(fb, JColor.Red)
+          JMonster.endJMonster(fb)
+        },
+      )
     val allMonsters = JAllMonsters.createJAllMonsters(fb, monsters)
     fb.finish(allMonsters)
   }
+
   @Benchmark
   fun monstersSerializationKotlin() {
     populateMosterKotlin(fbKotlin)
@@ -100,6 +106,7 @@ open class FlatbufferBenchmark {
       hole.consume(monster.inventory(3))
     }
   }
+
   @Benchmark
   fun monstersSerializationJava() {
     populateMosterJava(fbJava)
@@ -125,5 +132,4 @@ open class FlatbufferBenchmark {
       hole.consume(monster.inventory(3))
     }
   }
-
 }

kotlin/benchmark/src/jvmMain/kotlin/com/google/flatbuffers/kotlin/benchmark/FlexBuffersBenchmark.kt

@@ -16,11 +16,13 @@
 @file:OptIn(ExperimentalUnsignedTypes::class)
 
 package com.google.flatbuffers.kotlin.benchmark
+
 import com.google.flatbuffers.ArrayReadWriteBuf
 import com.google.flatbuffers.FlexBuffers
 import com.google.flatbuffers.FlexBuffersBuilder.BUILDER_FLAG_SHARE_ALL
 import com.google.flatbuffers.kotlin.FlexBuffersBuilder
 import com.google.flatbuffers.kotlin.getRoot
+import java.util.concurrent.TimeUnit
 import kotlinx.benchmark.Blackhole
 import org.openjdk.jmh.annotations.Benchmark
 import org.openjdk.jmh.annotations.BenchmarkMode
@@ -30,7 +32,6 @@ import org.openjdk.jmh.annotations.OutputTimeUnit
 import org.openjdk.jmh.annotations.Scope
 import org.openjdk.jmh.annotations.Setup
 import org.openjdk.jmh.annotations.State
-import java.util.concurrent.TimeUnit
 
 @State(Scope.Benchmark)
 @BenchmarkMode(Mode.AverageTime)
@@ -57,9 +58,7 @@ open class FlexBuffersBenchmark {
       this["int"] = 10
       this["float"] = 12.3
       this["intarray"] = bigIntArray
-      this.putMap("myMap") {
-        this["cool"] = "beans"
-      }
+      this.putMap("myMap") { this["cool"] = "beans" }
     }
     val ref = getRoot(kBuilder.finish())
     val map = ref.toMap()
@@ -74,7 +73,11 @@ open class FlexBuffersBenchmark {
 
   @Benchmark
   open fun mapJava(blackhole: Blackhole) {
-    val jBuilder = com.google.flatbuffers.FlexBuffersBuilder(ArrayReadWriteBuf(initialCapacity), BUILDER_FLAG_SHARE_ALL)
+    val jBuilder =
+      com.google.flatbuffers.FlexBuffersBuilder(
+        ArrayReadWriteBuf(initialCapacity),
+        BUILDER_FLAG_SHARE_ALL,
+      )
     val startMap = jBuilder.startMap()
     jBuilder.putString("hello", "world")
     jBuilder.putInt("int", 10)
@@ -112,18 +115,18 @@ open class FlexBuffersBenchmark {
 
   @Benchmark
   open fun intArrayJava(blackhole: Blackhole) {
-    val jBuilder = com.google.flatbuffers.FlexBuffersBuilder(ArrayReadWriteBuf(initialCapacity), BUILDER_FLAG_SHARE_ALL)
+    val jBuilder =
+      com.google.flatbuffers.FlexBuffersBuilder(
+        ArrayReadWriteBuf(initialCapacity),
+        BUILDER_FLAG_SHARE_ALL,
+      )
     val v = jBuilder.startVector()
     bigIntArray.forEach { jBuilder.putInt(it) }
     jBuilder.endVector(null, v, true, false)
     jBuilder.finish()
     val root = FlexBuffers.getRoot(jBuilder.buffer)
     val vec = root.asVector()
-    blackhole.consume(
-      IntArray(vec.size()) {
-        vec[it].asInt()
-      }
-    )
+    blackhole.consume(IntArray(vec.size()) { vec[it].asInt() })
   }
 
   @Benchmark
@@ -138,7 +141,11 @@ open class FlexBuffersBenchmark {
 
   @Benchmark
   open fun stringArrayJava(blackhole: Blackhole) {
-    val jBuilder = com.google.flatbuffers.FlexBuffersBuilder(ArrayReadWriteBuf(initialCapacity), BUILDER_FLAG_SHARE_ALL)
+    val jBuilder =
+      com.google.flatbuffers.FlexBuffersBuilder(
+        ArrayReadWriteBuf(initialCapacity),
+        BUILDER_FLAG_SHARE_ALL,
+      )
     val v = jBuilder.startVector()
     stringValue.forEach { jBuilder.putString(it) }
     jBuilder.endVector(null, v, false, false)
@@ -182,7 +189,11 @@ open class FlexBuffersBenchmark {
 
   @Benchmark
   open fun stringMapJava(blackhole: Blackhole) {
-    val jBuilder = com.google.flatbuffers.FlexBuffersBuilder(ArrayReadWriteBuf(initialCapacity), BUILDER_FLAG_SHARE_ALL)
+    val jBuilder =
+      com.google.flatbuffers.FlexBuffersBuilder(
+        ArrayReadWriteBuf(initialCapacity),
+        BUILDER_FLAG_SHARE_ALL,
+      )
     val v = jBuilder.startMap()
     for (i in stringKey.indices) {
       jBuilder.putString(stringKey[i], stringValue[i])

kotlin/benchmark/src/jvmMain/kotlin/com/google/flatbuffers/kotlin/benchmark/JsonBenchmark.kt

@@ -24,6 +24,9 @@ import com.google.gson.JsonObject
 import com.google.gson.JsonParser
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import java.io.ByteArrayInputStream
+import java.io.InputStreamReader
+import java.util.concurrent.TimeUnit
 import kotlinx.benchmark.Blackhole
 import okio.Buffer
 import org.openjdk.jmh.annotations.Benchmark
@@ -33,9 +36,6 @@ import org.openjdk.jmh.annotations.Mode
 import org.openjdk.jmh.annotations.OutputTimeUnit
 import org.openjdk.jmh.annotations.Scope
 import org.openjdk.jmh.annotations.State
-import java.io.ByteArrayInputStream
-import java.io.InputStreamReader
-import java.util.concurrent.TimeUnit
 
 @State(Scope.Benchmark)
 @BenchmarkMode(Mode.AverageTime)
@@ -43,9 +43,7 @@ import java.util.concurrent.TimeUnit
 @Measurement(iterations = 100, time = 1, timeUnit = TimeUnit.MICROSECONDS)
 open class JsonBenchmark {
 
-  final val moshi = Moshi.Builder()
-    .addLast(KotlinJsonAdapterFactory())
-    .build()
+  final val moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
   final val moshiAdapter = moshi.adapter(Map::class.java)
 
   final val gson = Gson()
@@ -77,46 +75,60 @@ open class JsonBenchmark {
 
   // TWITTER
   @Benchmark
-  open fun readTwitterFlexBuffers(hole: Blackhole? = null) = hole?.consume(readFlexBuffers(twitterData))
-  @Benchmark
-  open fun readTwitterMoshi(hole: Blackhole?) = hole?.consume(readMoshi(twitterData))
-  @Benchmark
-  open fun readTwitterGson(hole: Blackhole?) = hole?.consume(readGson(twitterData))
+  open fun readTwitterFlexBuffers(hole: Blackhole? = null) =
+    hole?.consume(readFlexBuffers(twitterData))
+
+  @Benchmark open fun readTwitterMoshi(hole: Blackhole?) = hole?.consume(readMoshi(twitterData))
+
+  @Benchmark open fun readTwitterGson(hole: Blackhole?) = hole?.consume(readGson(twitterData))
 
   @Benchmark
-  open fun roundTripTwitterFlexBuffers(hole: Blackhole? = null) = hole?.consume(readFlexBuffers(twitterData).toJson())
+  open fun roundTripTwitterFlexBuffers(hole: Blackhole? = null) =
+    hole?.consume(readFlexBuffers(twitterData).toJson())
+
   @Benchmark
-  open fun roundTripTwitterMoshi(hole: Blackhole?) = hole?.consume(moshiAdapter.toJson(readMoshi(twitterData)))
+  open fun roundTripTwitterMoshi(hole: Blackhole?) =
+    hole?.consume(moshiAdapter.toJson(readMoshi(twitterData)))
+
   @Benchmark
-  open fun roundTripTwitterGson(hole: Blackhole?) = hole?.consume(gson.toJson(readGson(twitterData)))
+  open fun roundTripTwitterGson(hole: Blackhole?) =
+    hole?.consume(gson.toJson(readGson(twitterData)))
 
   // CITM
   @Benchmark
   open fun readCITMFlexBuffers(hole: Blackhole? = null) = hole?.consume(readFlexBuffers(citmData))
+
   @Benchmark
   open fun readCITMMoshi(hole: Blackhole?) = hole?.consume(moshiAdapter.toJson(readMoshi(citmData)))
+
   @Benchmark
   open fun readCITMGson(hole: Blackhole?) = hole?.consume(gson.toJson(readGson(citmData)))
 
   @Benchmark
-  open fun roundTripCITMFlexBuffers(hole: Blackhole? = null) = hole?.consume(readFlexBuffers(citmData).toJson())
+  open fun roundTripCITMFlexBuffers(hole: Blackhole? = null) =
+    hole?.consume(readFlexBuffers(citmData).toJson())
+
   @Benchmark
-  open fun roundTripCITMMoshi(hole: Blackhole?) = hole?.consume(moshiAdapter.toJson(readMoshi(citmData)))
+  open fun roundTripCITMMoshi(hole: Blackhole?) =
+    hole?.consume(moshiAdapter.toJson(readMoshi(citmData)))
+
   @Benchmark
   open fun roundTripCITMGson(hole: Blackhole?) = hole?.consume(gson.toJson(readGson(citmData)))
 
   @Benchmark
   open fun writeCITMFlexBuffers(hole: Blackhole? = null) = hole?.consume(fbCitmRef.toJson())
+
   @Benchmark
   open fun writeCITMMoshi(hole: Blackhole?) = hole?.consume(moshiAdapter.toJson(moshiCitmRef))
-  @Benchmark
-  open fun writeCITMGson(hole: Blackhole?) = hole?.consume(gson.toJson(gsonCitmRef))
+
+  @Benchmark open fun writeCITMGson(hole: Blackhole?) = hole?.consume(gson.toJson(gsonCitmRef))
 
   // CANADA
   @Benchmark
-  open fun readCanadaFlexBuffers(hole: Blackhole? = null) = hole?.consume(readFlexBuffers(canadaData))
-  @Benchmark
-  open fun readCanadaMoshi(hole: Blackhole?) = hole?.consume(readMoshi(canadaData))
-  @Benchmark
-  open fun readCanadaGson(hole: Blackhole?) = hole?.consume(readGson(canadaData))
+  open fun readCanadaFlexBuffers(hole: Blackhole? = null) =
+    hole?.consume(readFlexBuffers(canadaData))
+
+  @Benchmark open fun readCanadaMoshi(hole: Blackhole?) = hole?.consume(readMoshi(canadaData))
+
+  @Benchmark open fun readCanadaGson(hole: Blackhole?) = hole?.consume(readGson(canadaData))
 }

kotlin/benchmark/src/jvmMain/kotlin/com/google/flatbuffers/kotlin/benchmark/UTF8Benchmark.kt

@@ -18,6 +18,9 @@ package com.google.flatbuffers.kotlin.benchmark
 import com.google.flatbuffers.kotlin.ArrayReadWriteBuffer
 import com.google.flatbuffers.kotlin.Key
 import com.google.flatbuffers.kotlin.Utf8
+import java.nio.ByteBuffer
+import java.util.concurrent.TimeUnit
+import kotlin.random.Random
 import kotlinx.benchmark.Blackhole
 import org.openjdk.jmh.annotations.Benchmark
 import org.openjdk.jmh.annotations.BenchmarkMode
@@ -27,9 +30,6 @@ import org.openjdk.jmh.annotations.OutputTimeUnit
 import org.openjdk.jmh.annotations.Scope
 import org.openjdk.jmh.annotations.Setup
 import org.openjdk.jmh.annotations.State
-import java.nio.ByteBuffer
-import java.util.concurrent.TimeUnit
-import kotlin.random.Random
 
 @State(Scope.Benchmark)
 @BenchmarkMode(Mode.AverageTime)
@@ -44,9 +44,7 @@ open class UTF8Benchmark {
   private var sampleSmallAscii = (0..sampleSize).map { populateAscii(stringSize) }.toList()
   private var sampleSmallAsciiDecoded = sampleSmallAscii.map { it.encodeToByteArray() }.toList()
 
-  @Setup
-  fun setUp() {
-  }
+  @Setup fun setUp() {}
 
   @Benchmark
   fun encodeUtf8KotlinStandard(blackhole: Blackhole) {
@@ -54,6 +52,7 @@ open class UTF8Benchmark {
       blackhole.consume(i.encodeToByteArray())
     }
   }
+
   @Benchmark
   fun encodeUtf8KotlinFlatbuffers(blackhole: Blackhole) {
     for (i in sampleSmallUtf8) {
@@ -61,6 +60,7 @@ open class UTF8Benchmark {
       blackhole.consume(Utf8.encodeUtf8Array(i, byteArray, 0, byteArray.size))
     }
   }
+
   @Benchmark
   fun encodeUtf8JavaFlatbuffers(blackhole: Blackhole) {
     val javaUtf8 = com.google.flatbuffers.Utf8.getDefault()
@@ -101,6 +101,7 @@ open class UTF8Benchmark {
       blackhole.consume(i.encodeToByteArray())
     }
   }
+
   @Benchmark
   fun encodeAsciiKotlinFlatbuffers(blackhole: Blackhole) {
     for (i in sampleSmallAscii) {
@@ -108,6 +109,7 @@ open class UTF8Benchmark {
       blackhole.consume(Utf8.encodeUtf8Array(i, byteArray, 0, byteArray.size))
     }
   }
+
   @Benchmark
   fun encodeAsciiJavaFlatbuffers(blackhole: Blackhole) {
     val javaUtf8 = com.google.flatbuffers.Utf8.getDefault()
@@ -179,7 +181,8 @@ open class UTF8Benchmark {
     while (i < size) {
       val w = Random.nextInt() and 0xFF
       when {
-        w < 0x80 -> data[i++] = 0x20; // w;
+        w < 0x80 -> data[i++] = 0x20
+        // w;
         w < 0xE0 -> {
           data[i++] = (0xC2 + Random.nextInt() % (0xDF - 0xC2 + 1)).toByte()
           data[i++] = (0x80 + Random.nextInt() % (0xBF - 0x80 + 1)).toByte()