Use indexing syntax with FieldBinding

Faire · Apr 22, 2019 · efe3d1d · efe3d1d
1 parent 6b7ab72
commit efe3d1d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/wire-gson-support/src/main/java/com/squareup/wire/MessageTypeAdapter.kt b/wire-gson-support/src/main/java/com/squareup/wire/MessageTypeAdapter.kt
@@ -49,7 +49,7 @@ internal class MessageTypeAdapter<M : Message<M, B>, B : Message.Builder<M, B>>(
 
     out.beginObject()
     for (tagBinding in messageAdapter.fieldBindings.values) {
-      val value = tagBinding.get(message) ?: continue
+      val value = tagBinding[message] ?: continue
       out.name(tagBinding.name)
       emitJson(out, value, tagBinding.singleAdapter(), tagBinding.label)
     }
@@ -102,7 +102,7 @@ internal class MessageTypeAdapter<M : Message<M, B>, B : Message.Builder<M, B>>(
       } else {
         val element = elementAdapter.read(input)
         val value = parseValue(fieldBinding, element)
-        fieldBinding.set(builder, value)
+        fieldBinding[builder] = value
       }
     }
 

diff --git a/wire-moshi-adapter/src/main/java/com/squareup/wire/MessageJsonAdapter.kt b/wire-moshi-adapter/src/main/java/com/squareup/wire/MessageJsonAdapter.kt
@@ -56,7 +56,7 @@ internal class MessageJsonAdapter<M : Message<M, B>, B : Message.Builder<M, B>>(
     out.beginObject()
     fieldBindings.forEachIndexed { index, fieldBinding ->
       out.name(fieldBinding.name)
-      val value = fieldBinding.get(message)
+      val value = fieldBinding[message]
       jsonAdapters[index]?.toJson(out, value)
     }
     out.endObject()
@@ -87,7 +87,7 @@ internal class MessageJsonAdapter<M : Message<M, B>, B : Message.Builder<M, B>>(
       // If the value was explicitly null we ignore it rather than forcing null into the field.
       // Otherwise malformed JSON that sets a list to null will create a malformed message, and
       // we'd rather just ignore that problem.
-      fieldBinding.set(builder, value)
+      fieldBinding[builder] = value
     }
     input.endObject()
     return builder.build()

diff --git a/wire-runtime/src/main/java/com/squareup/wire/internal/RuntimeMessageAdapter.kt b/wire-runtime/src/main/java/com/squareup/wire/internal/RuntimeMessageAdapter.kt
@@ -39,7 +39,7 @@ class RuntimeMessageAdapter<M : Message<M, B>, B : Builder<M, B>>(
 
     var size = 0
     for (fieldBinding in fieldBindings.values) {
-      val binding = fieldBinding.get(value) ?: continue
+      val binding = fieldBinding[value] ?: continue
       size += fieldBinding.adapter().encodedSizeWithTag(fieldBinding.tag, binding)
     }
     size += value.unknownFields().size
@@ -51,7 +51,7 @@ class RuntimeMessageAdapter<M : Message<M, B>, B : Builder<M, B>>(
   @Throws(IOException::class)
   override fun encode(writer: ProtoWriter, value: M) {
     for (fieldBinding in fieldBindings.values) {
-      val binding = fieldBinding.get(value) ?: continue
+      val binding = fieldBinding[value] ?: continue
       fieldBinding.adapter().encodeWithTag(writer, fieldBinding.tag, binding)
     }
     writer.writeBytes(value.unknownFields())
@@ -69,7 +69,7 @@ class RuntimeMessageAdapter<M : Message<M, B>, B : Builder<M, B>>(
         val builderValue = fieldBinding.getFromBuilder(builder)
         if (builderValue != null) {
           val redactedValue = fieldBinding.adapter().redact(builderValue)
-          fieldBinding.set(builder, redactedValue!!)
+          fieldBinding[builder] = redactedValue!!
         }
       } else if (isMessage && fieldBinding.label.isRepeated) {
         @Suppress("UNCHECKED_CAST")
@@ -91,7 +91,7 @@ class RuntimeMessageAdapter<M : Message<M, B>, B : Builder<M, B>>(
 
   override fun toString(value: M): String = buildString {
     for (fieldBinding in fieldBindings.values) {
-      val binding = fieldBinding.get(value)
+      val binding = fieldBinding[value]
       if (binding != null) {
         append(", ")
         append(fieldBinding.name)