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
This commit is contained in:
Zac Sweers
2019-09-12 16:29:53 -04:00
committed by GitHub
parent 489b178a9b
commit 7a4f3513a1

View File

@@ -17,7 +17,6 @@ package com.squareup.moshi.kotlin.codegen.api
import com.squareup.kotlinpoet.AnnotationSpec import com.squareup.kotlinpoet.AnnotationSpec
import com.squareup.kotlinpoet.ClassName import com.squareup.kotlinpoet.ClassName
import com.squareup.kotlinpoet.CodeBlock
import com.squareup.kotlinpoet.KModifier import com.squareup.kotlinpoet.KModifier
import com.squareup.kotlinpoet.MemberName import com.squareup.kotlinpoet.MemberName
import com.squareup.kotlinpoet.NameAllocator import com.squareup.kotlinpoet.NameAllocator
@@ -55,7 +54,6 @@ internal data class DelegateKey(
val adapterTypeName = JsonAdapter::class.asClassName().parameterizedBy(type) val adapterTypeName = JsonAdapter::class.asClassName().parameterizedBy(type)
val standardArgs = arrayOf(moshiParameter, val standardArgs = arrayOf(moshiParameter,
CodeBlock.of("<%T>", type),
typeRenderer.render(type)) typeRenderer.render(type))
val (initializerString, args) = when { val (initializerString, args) = when {
jsonQualifiers.isEmpty() -> ", %M()" to arrayOf(MemberName("kotlin.collections", "emptySet")) jsonQualifiers.isEmpty() -> ", %M()" to arrayOf(MemberName("kotlin.collections", "emptySet"))
@@ -68,7 +66,7 @@ internal data class DelegateKey(
return PropertySpec.builder(adapterName, adapterTypeName, KModifier.PRIVATE) return PropertySpec.builder(adapterName, adapterTypeName, KModifier.PRIVATE)
.addAnnotations(jsonQualifiers) .addAnnotations(jsonQualifiers)
.initializer("%N.adapter%L(%L$initializerString, %S)", *finalArgs) .initializer("%N.adapter(%L$initializerString, %S)", *finalArgs)
.build() .build()
} }
} }