Merge pull request #374 from FasterXML/kotlin-1.4

Use Kotlin 1.4

Author: dinomite

pom.xml

@@ -53,7 +53,7 @@
         <javac.target.version>1.8</javac.target.version>
 
         <version.junit>4.12</version.junit>
-        <version.kotlin>1.3.72</version.kotlin>
+        <version.kotlin>1.4.10</version.kotlin>
 
         <!-- Generate PackageVersion.java into this directory. -->
         <packageVersion.dir>com/fasterxml/jackson/module/kotlin</packageVersion.dir>
@@ -138,17 +138,22 @@
                         <goals>
                             <goal>test-compile</goal>
                         </goals>
+                        <configuration>
+                            <args>
+                                <arg>-Xinline-classes</arg>
+                            </args>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
             <plugin>
 	      <groupId>org.apache.maven.plugins</groupId>
 	      <artifactId>maven-surefire-plugin</artifactId>
 	      <configuration>
-		<excludes>
-		  <exclude>com/fasterxml/jackson/**/failing/*</exclude>
-		</excludes>
-	      </configuration>
+              <excludes>
+                  <exclude>com/fasterxml/jackson/**/failing/*</exclude>
+              </excludes>
+          </configuration>
 	    </plugin>
             <plugin>
                 <!-- Inherited from oss-base. Generate PackageVersion.java.-->
@@ -171,11 +176,11 @@
                     <optimize>true</optimize>
                 </configuration>
             </plugin>
-	    <!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
-	    <plugin>
-              <groupId>de.jjohannes</groupId>
-              <artifactId>gradle-module-metadata-maven-plugin</artifactId>
-	    </plugin>
+            <!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
+            <plugin>
+                  <groupId>de.jjohannes</groupId>
+                  <artifactId>gradle-module-metadata-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 

src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/failing/Github356.kt

@@ -0,0 +1,33 @@
+package com.fasterxml.jackson.module.kotlin.test.failing
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.readValue
+import org.junit.Test
+import kotlin.test.assertEquals
+
+class TestGithub356 {
+    private val mapper = jacksonObjectMapper()
+
+    @Test
+    fun deserializeInlineClass() {
+        val original = ClassWithInlineMember(InlineClass("bar"))
+        assertEquals(original, mapper.readValue(mapper.writeValueAsString(original)))
+    }
+
+    @Test
+    fun serializeInlineClass() {
+        val original = ClassWithInlineMember(InlineClass("bar"))
+        assertEquals("""{"inlineClassProperty":"bar"}""", mapper.writeValueAsString(original))
+    }
+}
+
+@Suppress("EXPERIMENTAL_FEATURE_WARNING") // Enabled in test-compile
+inline class InlineClass(val value: String)
+
+@JsonDeserialize(builder = ClassWithInlineMember.JacksonBuilder::class)
+data class ClassWithInlineMember(val inlineClassProperty: InlineClass) {
+    data class JacksonBuilder constructor(val inlineClassProperty: String) {
+        fun build() = ClassWithInlineMember(InlineClass(inlineClassProperty))
+    }
+}