Merge pull request #13 from ProjectMapK/ci

k163377 · web-flow · commit d37f28c5df07 · 2022-08-07T01:04:18.000+09:00
Add ci workflow and fixes
diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml
@@ -0,0 +1,32 @@
+name: lint-and-test
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+jobs:
+  lint-and-test:
+    name: lint-and-test
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up java
+        uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: 'adopt'
+          cache: 'gradle'
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Lint
+        run: ./gradlew lintKotlin
+      - name: Test
+        run: ./gradlew test
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -39,6 +39,14 @@ java {
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
+kotlinter {
+    // see https://github.com/pinterest/ktlint/blob/master/docs/rules/standard.md
+    this.disabledRules = arrayOf(
+        "package-name", // This project allows for the inclusion of _ to represent the package name in the snake case.
+        "filename" // For clarity in future extensions, this rule is disabled.
+    )
+}
+
 tasks {
     test {
         useJUnitPlatform()
diff --git a/src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinAnnotationIntrospector.kt b/src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinAnnotationIntrospector.kt
@@ -5,7 +5,12 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.Module
 import com.fasterxml.jackson.databind.cfg.MapperConfig
-import com.fasterxml.jackson.databind.introspect.*
+import com.fasterxml.jackson.databind.introspect.Annotated
+import com.fasterxml.jackson.databind.introspect.AnnotatedField
+import com.fasterxml.jackson.databind.introspect.AnnotatedMember
+import com.fasterxml.jackson.databind.introspect.AnnotatedMethod
+import com.fasterxml.jackson.databind.introspect.AnnotatedParameter
+import com.fasterxml.jackson.databind.introspect.NopAnnotationIntrospector
 import com.fasterxml.jackson.databind.jsontype.NamedType
 import com.fasterxml.jackson.databind.ser.std.StdSerializer
 import com.fasterxml.jackson.module.kotlin.ser.serializers.ValueClassBoxSerializer
@@ -22,7 +27,11 @@ import kotlin.reflect.KType
 import kotlin.reflect.full.createType
 import kotlin.reflect.full.declaredMemberProperties
 import kotlin.reflect.full.memberProperties
-import kotlin.reflect.jvm.*
+import kotlin.reflect.jvm.javaGetter
+import kotlin.reflect.jvm.javaSetter
+import kotlin.reflect.jvm.javaType
+import kotlin.reflect.jvm.kotlinFunction
+import kotlin.reflect.jvm.kotlinProperty
 
 internal class KotlinAnnotationIntrospector(
     private val context: Module.SetupContext,
diff --git a/src/main/kotlin/com/fasterxml/jackson/module/kotlin/deser/deserializers/KotlinKeyDeserializers.kt b/src/main/kotlin/com/fasterxml/jackson/module/kotlin/deser/deserializers/KotlinKeyDeserializers.kt
@@ -1,6 +1,10 @@
 package com.fasterxml.jackson.module.kotlin.deser.deserializers
 
-import com.fasterxml.jackson.databind.*
+import com.fasterxml.jackson.databind.BeanDescription
+import com.fasterxml.jackson.databind.DeserializationConfig
+import com.fasterxml.jackson.databind.DeserializationContext
+import com.fasterxml.jackson.databind.JavaType
+import com.fasterxml.jackson.databind.KeyDeserializer
 import com.fasterxml.jackson.databind.deser.std.StdKeyDeserializer
 import com.fasterxml.jackson.databind.deser.std.StdKeyDeserializers
 import java.math.BigInteger
diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/KotlinFeatures.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/KotlinFeatures.kt
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.SerializationFeature
-import com.fasterxml.jackson.module.kotlin.*
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNull
diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/ParameterNameTests.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/ParameterNameTests.kt
@@ -5,7 +5,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.SerializationFeature
-import com.fasterxml.jackson.module.kotlin.*
+import com.fasterxml.jackson.module.kotlin.isKotlinClass
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.readValue
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertFalse
 import org.junit.jupiter.api.Assertions.assertTrue
diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/github/Github120.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/github/Github120.kt
@@ -7,7 +7,9 @@ import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
 class TestGithub120 {
-    data class Foo @JsonCreator(mode = JsonCreator.Mode.DELEGATING) constructor(
+    data class Foo
+    @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
+    constructor(
         @JsonValue
         val value: Long
     )
diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/github/Github15.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/github/Github15.kt
@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.module.kotlin._ported.test.github
 
-import com.fasterxml.jackson.module.kotlin.*
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.readValue
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/github/Github179.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/github/Github179.kt
@@ -38,9 +38,13 @@ class TestGithub179 {
 
     private class MyEnumsContainer(@JsonProperty("myEnums") val myEnums: MyEnums)
 
-    private class Strings @JsonCreator(mode = JsonCreator.Mode.DELEGATING) constructor(val values: List<String>)
+    private class Strings
+    @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
+    constructor(val values: List<String>)
 
-    private class MyEnums @JsonCreator(mode = JsonCreator.Mode.DELEGATING) constructor(val values: List<MyEnum>)
+    private class MyEnums
+    @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
+    constructor(val values: List<MyEnum>)
 
     private enum class MyEnum {
         @JsonProperty("first")
diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/github/Github181.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/github/Github181.kt
@@ -12,7 +12,9 @@ class TestGithub181 {
         OK
     }
 
-    data class HealthStatusMap @JsonCreator(mode = JsonCreator.Mode.DELEGATING) constructor(val statuses: Map<String, HealthStatus>) :
+    data class HealthStatusMap
+    @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
+    constructor(val statuses: Map<String, HealthStatus>) :
         Map<String, HealthStatus> by statuses {
 
         fun isPassing() = statuses.all { (_, v) -> v == HealthStatus.OK }
diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/github/Github25.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/github/Github25.kt
@@ -2,7 +2,8 @@ package com.fasterxml.jackson.module.kotlin._ported.test.github
 
 import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonPropertyOrder
-import com.fasterxml.jackson.module.kotlin.*
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.readValue
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import kotlin.properties.Delegates
diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/github/Github46.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/github/Github46.kt
@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.module.kotlin._ported.test.github
 
-import com.fasterxml.jackson.module.kotlin.*
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.readValue
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import kotlin.reflect.full.primaryConstructor
diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/github/Github56.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/github/Github56.kt
@@ -4,7 +4,8 @@ import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.annotation.JsonUnwrapped
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.exc.InvalidDefinitionException
-import com.fasterxml.jackson.module.kotlin.*
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.readValue
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/github/Github57.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/github/Github57.kt
@@ -3,7 +3,8 @@ package com.fasterxml.jackson.module.kotlin._ported.test.github
 import com.fasterxml.jackson.databind.DeserializationContext
 import com.fasterxml.jackson.databind.KeyDeserializer
 import com.fasterxml.jackson.databind.module.SimpleModule
-import com.fasterxml.jackson.module.kotlin.*
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.readValue
 import org.junit.jupiter.api.Test
 
 private class TestGithub57 {
diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/github/Github91.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/github/Github91.kt
@@ -10,7 +10,9 @@ import org.junit.jupiter.api.Test
 class TestGithub91 {
     data class DataClass1(val name: String, val content: DataClass2)
 
-    data class DataClass2 @JsonCreator(mode = JsonCreator.Mode.DELEGATING) constructor(@JsonValue val content: String)
+    data class DataClass2
+    @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
+    constructor(@JsonValue val content: String)
 
     private val jsonData = """
         {
diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/github/TestCasesFromSlack.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/github/TestCasesFromSlack.kt
@@ -3,7 +3,8 @@ package com.fasterxml.jackson.module.kotlin._ported.test.github
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.module.kotlin.*
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.readValue
 import org.junit.jupiter.api.Test
 
 class TestCasesFromSlack1 {
@@ -33,20 +34,20 @@ class TestCasesFromSlack1 {
     )
 
     enum class RSVP(val nameKey: String) {
-        going("rsvp.going"), maybe("rsvp.maybe"), interested("rsvp.interested")
+        Going("rsvp.going"), Maybe("rsvp.maybe"), Interested("rsvp.interested")
     }
 
     @Test
     fun testCzarSpringThing1() {
         ObjectMapper().readValue<Event>(
             """
-           {"host":{"id":"host123","name":"A Czar"},"activity":"Kotlin Programming","invited":[{"id":"Guest1","name":"Mr Kotlin","rsvp": "going"}]}
+           {"host":{"id":"host123","name":"A Czar"},"activity":"Kotlin Programming","invited":[{"id":"Guest1","name":"Mr Kotlin","rsvp": "Going"}]}
         """
         )
 
         jacksonObjectMapper().readValue<Event>(
             """
-           {"host":{"id":"host123","name":"A Czar"},"activity":"Kotlin Programming","invited":[{"id":"Guest1","name":"Mr Kotlin","rsvp": "going"}]}
+           {"host":{"id":"host123","name":"A Czar"},"activity":"Kotlin Programming","invited":[{"id":"Guest1","name":"Mr Kotlin","rsvp": "Going"}]}
         """
         )
     }
@@ -67,17 +68,17 @@ class TestCasesFromSlack2 {
     data class Guest constructor(
         val id: String,
         val name: String,
-        var rsvp: RSVP = RSVP.going
+        var rsvp: RSVP = RSVP.Going
     )
 
     enum class RSVP(val nameKey: String) {
-        going("rsvp.going"), maybe("rsvp.maybe"), interested("rsvp.interested")
+        Going("rsvp.going"), Maybe("rsvp.maybe"), Interested("rsvp.interested")
     }
 
     @Test fun testCzarSpringThing2() {
         jacksonObjectMapper().readValue<Event>(
             """
-           {"host":{"id":"host123","name":"A Czar"},"activity":"Kotlin Programming","invited":[{"id":"Guest1","name":"Mr Kotlin","rsvp": "going"}]}
+           {"host":{"id":"host123","name":"A Czar"},"activity":"Kotlin Programming","invited":[{"id":"Guest1","name":"Mr Kotlin","rsvp": "Going"}]}
         """
         )
     }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,9 @@ class TestGithub181 {`
`12`	`12`	`OK`
`13`	`13`	`}`
`14`	`14`
`15`		`- data class HealthStatusMap @JsonCreator(mode = JsonCreator.Mode.DELEGATING) constructor(val statuses: Map<String, HealthStatus>) :`
	`15`	`+ data class HealthStatusMap`
	`16`	`+ @JsonCreator(mode = JsonCreator.Mode.DELEGATING)`
	`17`	`+ constructor(val statuses: Map<String, HealthStatus>) :`
`16`	`18`	`Map<String, HealthStatus> by statuses {`
`17`	`19`
`18`	`20`	`fun isPassing() = statuses.all { (_, v) -> v == HealthStatus.OK }`