Optimize StringEncoder when globalUseJavaString is set

sksamuel · Apr 28, 2024 · c8170e0 · c8170e0
1 parent b61b1bc
commit c8170e0
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/centurion-avro/src/main/kotlin/com/sksamuel/centurion/avro/encoders/strings.kt b/centurion-avro/src/main/kotlin/com/sksamuel/centurion/avro/encoders/strings.kt
@@ -12,14 +12,11 @@ import java.util.UUID
  */
 object StringEncoder : Encoder<String> {
    override fun encode(schema: Schema): (String) -> Any? {
-      return when (schema.type) {
-         Schema.Type.STRING -> when {
-            Encoder.globalUseJavaString || schema.getProp(GenericData.STRING_PROP) == "String" ->
-               Encoder.identity<String>().encode(schema)
-
-            else -> UTF8StringEncoder.encode(schema)
-         }
+      if (Encoder.globalUseJavaString || schema.getProp(GenericData.STRING_PROP) == "String")
+         return JavaStringEncoder.encode(schema)
 
+      return when (schema.type) {
+         Schema.Type.STRING -> UTF8StringEncoder.encode(schema)
          Schema.Type.BYTES -> ByteStringEncoder.encode(schema)
          Schema.Type.FIXED -> FixedStringEncoder.encode(schema)
          else -> error("Unsupported type for string schema: $schema")