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

Allow private transient Kotlin properties.

Browse Source
This commit is contained in:
Eric Cochran
2018-06-06 17:12:29 -07:00
parent cd9e600955
commit 4666e06910
3 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/TargetProperty.kt
View File

@@ -67,11 +67,6 @@ internal data class TargetProperty(
* cannot be used with code gen, or if no codegen is necessary for this property. * cannot be used with code gen, or if no codegen is necessary for this property.
*/ */
fun generator(messager: Messager): PropertyGenerator? { fun generator(messager: Messager): PropertyGenerator? {
if (!isVisible) {
messager.printMessage(Diagnostic.Kind.ERROR, "property ${this} is not visible", element)
return null
}
if (isTransient) { if (isTransient) {
if (!hasDefault) { if (!hasDefault) {
messager.printMessage( messager.printMessage(
@@ -81,6 +76,11 @@ internal data class TargetProperty(
return null // This property is transient and has a default value. Ignore it. return null // This property is transient and has a default value. Ignore it.
} }
if (!isVisible) {
messager.printMessage(Diagnostic.Kind.ERROR, "property ${this} is not visible", element)
return null
}
if (!isSettable) { if (!isSettable) {
return null // This property is not settable. Ignore it. return null // This property is not settable. Ignore it.
} }

19
kotlin/tests/src/test/kotlin/com/squareup/moshi/kotlin/codgen/GeneratedAdaptersTest.kt
View File

@@ -535,18 +535,27 @@ class GeneratedAdaptersTest {
val encoded = TransientProperty() val encoded = TransientProperty()
encoded.a = 3 encoded.a = 3
encoded.b = 5 encoded.setB(4)
assertThat(jsonAdapter.toJson(encoded)).isEqualTo("""{"b":5}""") encoded.c = 5
assertThat(jsonAdapter.toJson(encoded)).isEqualTo("""{"c":5}""")
val decoded = jsonAdapter.fromJson("""{"a":4,"b":6}""")!! val decoded = jsonAdapter.fromJson("""{"a":4,"b":5,"c":6}""")!!
assertThat(decoded.a).isEqualTo(-1) assertThat(decoded.a).isEqualTo(-1)
assertThat(decoded.b).isEqualTo(6) assertThat(decoded.getB()).isEqualTo(-1)
assertThat(decoded.c).isEqualTo(6)
} }
@JsonClass(generateAdapter = true) @JsonClass(generateAdapter = true)
class TransientProperty { class TransientProperty {
@Transient var a: Int = -1 @Transient var a: Int = -1
var b: Int = -1 @Transient private var b: Int = -1
var c: Int = -1
fun getB() = b
fun setB(b: Int) {
this.b = b
}
} }
@Test fun nonNullPropertySetToNullFailsWithJsonDataException() { @Test fun nonNullPropertySetToNullFailsWithJsonDataException() {

19
kotlin/tests/src/test/kotlin/com/squareup/moshi/kotlin/reflect/KotlinJsonAdapterTest.kt
View File

@@ -363,17 +363,26 @@ class KotlinJsonAdapterTest {
val encoded = TransientProperty() val encoded = TransientProperty()
encoded.a = 3 encoded.a = 3
encoded.b = 5 encoded.setB(4)
assertThat(jsonAdapter.toJson(encoded)).isEqualTo("""{"b":5}""") encoded.c = 5
assertThat(jsonAdapter.toJson(encoded)).isEqualTo("""{"c":5}""")
val decoded = jsonAdapter.fromJson("""{"a":4,"b":6}""")!! val decoded = jsonAdapter.fromJson("""{"a":4,"b":5,"c":6}""")!!
assertThat(decoded.a).isEqualTo(-1) assertThat(decoded.a).isEqualTo(-1)
assertThat(decoded.b).isEqualTo(6) assertThat(decoded.getB()).isEqualTo(-1)
assertThat(decoded.c).isEqualTo(6)
} }
class TransientProperty { class TransientProperty {
@Transient var a: Int = -1 @Transient var a: Int = -1
var b: Int = -1 @Transient private var b: Int = -1
var c: Int = -1
fun getB() = b
fun setB(b: Int) {
this.b = b
}
} }
@Test fun constructorParametersAndPropertiesWithSameNamesMustHaveSameTypes() { @Test fun constructorParametersAndPropertiesWithSameNamesMustHaveSameTypes() {