From 7a4f3513a17055f5093affb9314aa931e391d7d2 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Thu, 12 Sep 2019 16:29:53 -0400 Subject: [PATCH] Don't generate generic type information in adapter lookup (#919) This is redundant since the property it's being assigned to already defines it, so we can omit this and save some generated code bloat --- .../java/com/squareup/moshi/kotlin/codegen/api/DelegateKey.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/api/DelegateKey.kt b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/api/DelegateKey.kt index 410bc65..bbbe697 100644 --- a/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/api/DelegateKey.kt +++ b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/api/DelegateKey.kt @@ -17,7 +17,6 @@ package com.squareup.moshi.kotlin.codegen.api import com.squareup.kotlinpoet.AnnotationSpec import com.squareup.kotlinpoet.ClassName -import com.squareup.kotlinpoet.CodeBlock import com.squareup.kotlinpoet.KModifier import com.squareup.kotlinpoet.MemberName import com.squareup.kotlinpoet.NameAllocator @@ -55,7 +54,6 @@ internal data class DelegateKey( val adapterTypeName = JsonAdapter::class.asClassName().parameterizedBy(type) val standardArgs = arrayOf(moshiParameter, - CodeBlock.of("<%T>", type), typeRenderer.render(type)) val (initializerString, args) = when { jsonQualifiers.isEmpty() -> ", %M()" to arrayOf(MemberName("kotlin.collections", "emptySet")) @@ -68,7 +66,7 @@ internal data class DelegateKey( return PropertySpec.builder(adapterName, adapterTypeName, KModifier.PRIVATE) .addAnnotations(jsonQualifiers) - .initializer("%N.adapter%L(%L$initializerString, %S)", *finalArgs) + .initializer("%N.adapter(%L$initializerString, %S)", *finalArgs) .build() } }