fankes/moshi
2
0
Fork 0
mirror of https://github.com/fankes/moshi.git synced 2025-10-19 16:09:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Suppress common warnings in generated classes (#1028)

Browse Source 
* Suppress common warnings in generated classes

Followup from #1023 (Resolves #1023 too). Since we can't do targeted deprecation suppressions, we can just stick with blanket deprecations suppressions for now. This also suppresses a couple other common issues with all our generated adapters.

Have just eyeballed the results for now, can add a proper test as a followup once #1014 is in

* Add redundant projection and re-enable -Werror

* Add tests for deprecation suppression

With -Werror enabled now we can actually check this
This commit is contained in:
Zac Sweers
2019-11-17 09:40:49 -05:00
committed by Jesse Wilson
parent f7dbde2114
commit f49f677bfc
4 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/api/AdapterGenerator.kt
View File

@@ -57,7 +57,22 @@ internal class AdapterGenerator(
companion object {
private val INT_TYPE_BLOCK = CodeBlock.of("%T::class.javaPrimitiveType", INT)
private val DEFAULT_CONSTRUCTOR_MARKER_TYPE_BLOCK = CodeBlock.of("%T.DEFAULT_CONSTRUCTOR_MARKER", Util::class)
private val DEFAULT_CONSTRUCTOR_MARKER_TYPE_BLOCK = CodeBlock.of(
"%T.DEFAULT_CONSTRUCTOR_MARKER", Util::class)
private val COMMON_SUPPRESS = AnnotationSpec.builder(Suppress::class)
.addMember("%S, %S, %S, %S",
// https://github.com/square/moshi/issues/1023
"DEPRECATION",
// Because we look it up reflectively
"unused",
// Because we include underscores
"ClassName",
// Because we generate redundant `out` variance for some generics and there's no way
// for us to know when it's redundant.
"REDUNDANT_PROJECTION"
)
.build()
}
private val nonTransientProperties = propertyList.filterNot { it.isTransient }
@@ -126,6 +141,7 @@ internal class AdapterGenerator(
private fun generateType(): TypeSpec {
val result = TypeSpec.classBuilder(adapterName)
.addAnnotation(COMMON_SUPPRESS)
result.superclass(jsonAdapterTypeName)
@@ -304,7 +320,8 @@ internal class AdapterGenerator(
if (property.hasConstructorDefault) {
val inverted = (1 shl maskIndex).inv()
result.addComment("\$mask = \$mask and (1 shl %L).inv()", maskIndex)
result.addStatement("%1L = %1L and 0x%2L.toInt()", maskNames[maskNameIndex], Integer.toHexString(inverted))
result.addStatement("%1L = %1L and 0x%2L.toInt()", maskNames[maskNameIndex],
Integer.toHexString(inverted))
} else {
// Presence tracker for a mutable property
result.addStatement("%N = true", property.localIsPresentName)
@@ -477,6 +494,7 @@ private interface PropertyComponent {
val property: PropertyGenerator
val type: TypeName
}
private interface ParameterComponent {
val parameter: TargetParameter
val type: TypeName
@@ -503,8 +521,8 @@ private sealed class FromJsonComponent {
}
data class ParameterProperty(
override val parameter: TargetParameter,
override val property: PropertyGenerator
override val parameter: TargetParameter,
override val property: PropertyGenerator
) : FromJsonComponent(), ParameterComponent, PropertyComponent {
override val type: TypeName = parameter.type
}