Merge remote-tracking branch 'origin/2.12' into 2.13

Author: dinomite

pom.xml

@@ -181,6 +181,39 @@
                 <groupId>de.jjohannes</groupId>
                 <artifactId>gradle-module-metadata-maven-plugin</artifactId>
             </plugin>
+
+            <plugin>
+                <groupId>com.github.siom79.japicmp</groupId>
+                <artifactId>japicmp-maven-plugin</artifactId>
+                <version>0.15.3</version>
+                <configuration>
+                    <oldVersion>
+                        <dependency>
+                            <groupId>com.fasterxml.jackson.module</groupId>
+                            <artifactId>jackson-module-kotlin</artifactId>
+                            <version>2.12.2</version>
+                            <type>jar</type>
+                        </dependency>
+                    </oldVersion>
+                    <newVersion>
+                        <file>
+                            <path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
+                        </file>
+                    </newVersion>
+                    <parameter>
+                        <breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
+                        <breakBuildOnSourceIncompatibleModifications>true</breakBuildOnSourceIncompatibleModifications>
+                    </parameter>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>cmp</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

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

@@ -6,7 +6,6 @@ import org.junit.Test
 import kotlin.test.assertEquals
 
 class TestGithub80 {
-
     @Test
     fun testIsBool() {
         val mapper = jacksonObjectMapper()

src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/failing/GitHub337.kt

@@ -0,0 +1,69 @@
+package com.fasterxml.jackson.module.kotlin.test.github.failing
+
+import com.fasterxml.jackson.annotation.JsonInclude
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.databind.MapperFeature.SORT_PROPERTIES_ALPHABETICALLY
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import org.junit.Ignore
+import org.junit.Test
+import kotlin.test.assertEquals
+
+/**
+ * Fields named "is…" are only serialized if they are Boolean
+ */
+class TestGitHub337 {
+    private val mapper = jacksonObjectMapper()
+            .setSerializationInclusion(JsonInclude.Include.ALWAYS)
+            .configure(SORT_PROPERTIES_ALPHABETICALLY, true)
+    private val writer = mapper.writerWithDefaultPrettyPrinter()
+
+    @Test
+    @Ignore
+    fun test_ClassWithIsFields() {
+        data class ClassWithIsFields(
+                val isBooleanField: Boolean,
+                val isIntField: Int
+        )
+
+        val problematic = ClassWithIsFields(true, 9)
+        val expected = """
+        {
+          "isBooleanField" : true,
+          "isIntField" : 9
+        }""".trimIndent()
+        assertEquals(expected, writer.writeValueAsString(problematic))
+    }
+
+    @Test
+    @Ignore
+    fun test_AnnotatedClassWithIsFields() {
+        data class ClassWithIsFields(
+                @JsonProperty("isBooleanField") val isBooleanField: Boolean,
+                @JsonProperty("isIntField") val isIntField: Int
+        )
+
+        val problematic = ClassWithIsFields(true, 9)
+        val expected = """
+        {
+          "isBooleanField" : true,
+          "isIntField" : 9
+        }""".trimIndent()
+        assertEquals(expected, writer.writeValueAsString(problematic))
+    }
+
+    @Test
+    fun test_AnnotatedGetClassWithIsFields() {
+        data class ClassWithIsFields(
+                @JsonProperty("isBooleanField") val isBooleanField: Boolean,
+                @get:JsonProperty("isIntField") val isIntField: Int
+        )
+
+        val problematic = ClassWithIsFields(true, 9)
+        val expected = """
+        {
+          "isBooleanField" : true,
+          "isIntField" : 9
+        }""".trimIndent()
+        assertEquals(expected, writer.writeValueAsString(problematic))
+    }
+}