Skip to content

Commit 34c3f50

Browse files
committed
Correct & shorten class names
1 parent b5285aa commit 34c3f50

File tree

1 file changed

+29
-34
lines changed
  • src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github

1 file changed

+29
-34
lines changed

src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github145.kt

Lines changed: 29 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ class TestGithub145 {
3030
}
3131

3232
@Test
33-
fun testPersonGood2() {
34-
class PersonGood1(
33+
fun testPerson2() {
34+
class Person2(
3535
@JsonProperty("preName") val preName: String,
3636
@JsonProperty("lastName") val lastName: String
3737
) {
@@ -42,29 +42,27 @@ class TestGithub145 {
4242
)
4343
}
4444

45-
val personGood1String = objectMapper.readValue<PersonGood1>(""""TestPreName,TestLastname"""")
46-
val personGood1Json =
47-
objectMapper.readValue<PersonGood1>("""{"preName":"TestPreName","lastName":"TestLastname"}""")
45+
val person1String = objectMapper.readValue<Person2>(""""TestPreName,TestLastname"""")
46+
val person1Json = objectMapper.readValue<Person2>("""{"preName":"TestPreName","lastName":"TestLastname"}""")
4847
}
4948

5049
@Test
51-
fun testPersonGood3() {
52-
class PersonGood2(val preName: String, val lastName: String) {
50+
fun testPerson3() {
51+
class Person3(val preName: String, val lastName: String) {
5352
@JsonCreator
5453
constructor(preNameAndLastName: String) : this(
5554
preNameAndLastName.substringBefore(","),
5655
preNameAndLastName.substringAfter(",")
5756
)
5857
}
5958

60-
val personGood2String = objectMapper.readValue<PersonGood2>(""""TestPreName,TestLastname"""")
61-
val personGood2Json =
62-
objectMapper.readValue<PersonGood2>("""{"preName":"TestPreName","lastName":"TestLastname"}""")
59+
val person2String = objectMapper.readValue<Person3>(""""TestPreName,TestLastname"""")
60+
val person2Json = objectMapper.readValue<Person3>("""{"preName":"TestPreName","lastName":"TestLastname"}""")
6361
}
6462

6563
@Test
66-
fun testPersonGood4() {
67-
class PersonGood4(preNameAndLastName: String) {
64+
fun testPerson4() {
65+
class Person4(preNameAndLastName: String) {
6866
val preName: String
6967
val lastName: String
7068

@@ -74,13 +72,13 @@ class TestGithub145 {
7472
}
7573
}
7674

77-
val personGood4String = objectMapper.readValue<PersonGood4>(""""TestPreName,TestLastname"""")
75+
val person4String = objectMapper.readValue<Person4>(""""TestPreName,TestLastname"""")
7876
// person4 does not have parameter bound constructor, only string
7977
}
8078

8179
@Test
82-
fun testPersonGood5() {
83-
class PersonGood5 @JsonCreator constructor(
80+
fun testPerson5() {
81+
class Person5 @JsonCreator constructor(
8482
@JsonProperty("preName") val preName: String,
8583
@JsonProperty("lastName") val lastName: String
8684
) {
@@ -89,13 +87,12 @@ class TestGithub145 {
8987
this(preNameAndLastName.substringBefore(","), preNameAndLastName.substringAfter(","))
9088
}
9189

92-
val personGood5String = objectMapper.readValue<PersonGood5>(""""TestPreName,TestLastname"""")
93-
val personGood5Json =
94-
objectMapper.readValue<PersonGood5>("""{"preName":"TestPreName","lastName":"TestLastname"}""")
90+
val person5String = objectMapper.readValue<Person5>(""""TestPreName,TestLastname"""")
91+
val person5Json = objectMapper.readValue<Person5>("""{"preName":"TestPreName","lastName":"TestLastname"}""")
9592
}
9693

9794
// Cannot have companion object in class declared within function
98-
class PersonGood6 private constructor(val preName: String, val lastName: String) {
95+
class Person6 private constructor(val preName: String, val lastName: String) {
9996
private constructor(preNameAndLastName: String) : this(
10097
preNameAndLastName.substringBefore(","),
10198
preNameAndLastName.substringAfter(",")
@@ -104,27 +101,26 @@ class TestGithub145 {
104101
companion object {
105102
@JsonCreator
106103
@JvmStatic
107-
fun createFromJson(preNameAndLastName: String): PersonGood6 {
108-
return PersonGood6(preNameAndLastName)
104+
fun createFromJson(preNameAndLastName: String): Person6 {
105+
return Person6(preNameAndLastName)
109106
}
110107

111108
@JsonCreator
112109
@JvmStatic
113-
fun createFromData(preName: String, lastName: String): PersonGood6 {
114-
return PersonGood6(preName, lastName)
110+
fun createFromData(preName: String, lastName: String): Person6 {
111+
return Person6(preName, lastName)
115112
}
116113
}
117114
}
118115

119116
@Test
120-
fun testPersonGood6() {
121-
val personGood6String = objectMapper.readValue<PersonGood6>(""""TestPreName,TestLastname"""")
122-
val personGood6Json =
123-
objectMapper.readValue<PersonGood6>("""{"preName":"TestPreName","lastName":"TestLastname"}""")
117+
fun testPerson6() {
118+
val person6String = objectMapper.readValue<Person6>(""""TestPreName,TestLastname"""")
119+
val person6Json = objectMapper.readValue<Person6>("""{"preName":"TestPreName","lastName":"TestLastname"}""")
124120
}
125121

126122
// Cannot have companion object in class declared within function
127-
class PersonGood7 constructor(val preName: String, val lastName: String) {
123+
class Person7 constructor(val preName: String, val lastName: String) {
128124
private constructor(preNameAndLastName: String) : this(
129125
preNameAndLastName.substringBefore(","),
130126
preNameAndLastName.substringAfter(",")
@@ -133,16 +129,15 @@ class TestGithub145 {
133129
companion object {
134130
@JsonCreator
135131
@JvmStatic
136-
fun createFromJson(preNameAndLastName: String): PersonGood7 {
137-
return PersonGood7(preNameAndLastName)
132+
fun createFromJson(preNameAndLastName: String): Person7 {
133+
return Person7(preNameAndLastName)
138134
}
139135
}
140136
}
141137

142138
@Test
143-
fun testPersonGood7() {
144-
val personGood7String = objectMapper.readValue<PersonGood7>(""""TestPreName,TestLastname"""")
145-
val personGood7Json =
146-
objectMapper.readValue<PersonGood7>("""{"preName":"TestPreName","lastName":"TestLastname"}""")
139+
fun testPerson7() {
140+
val person7String = objectMapper.readValue<Person7>(""""TestPreName,TestLastname"""")
141+
val person7Json = objectMapper.readValue<Person7>("""{"preName":"TestPreName","lastName":"TestLastname"}""")
147142
}
148143
}

0 commit comments

Comments
 (0)