update to Kotlin M9

Author: apatrida

.gitignore

@@ -23,3 +23,4 @@ target
 /target
 /.gradle/
 /gradle/
+/out/

pom.xml

@@ -34,7 +34,7 @@
         <version.jackson.annotations>2.4.0</version.jackson.annotations>
         <version.jackson.joda>2.4.2</version.jackson.joda>
         <version.junit>4.11</version.junit>
-        <version.kotlin>0.8.11</version.kotlin>
+        <version.kotlin>0.9.66</version.kotlin>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 

src/main/kotlin/com/fasterxml/jackson/module/kotlin/Extensions.kt

@@ -2,5 +2,5 @@ package com.fasterxml.jackson.module.kotlin
 
 import com.fasterxml.jackson.databind.ObjectMapper
 
-public fun ObjectMapper.registerKotlinModule(): ObjectMapper = this.registerModule(KotlinModule())!!
-public fun jacksonObjectMapper(): ObjectMapper = ObjectMapper().registerKotlinModule()
+public fun jacksonObjectMapper(): ObjectMapper = ObjectMapper().registerKotlinModule()
+public fun ObjectMapper.registerKotlinModule(): ObjectMapper = this.registerModule(KotlinModule())

src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModule.kt

@@ -23,14 +23,14 @@ public class KotlinModule() : SimpleModule(PackageVersion.VERSION) {
     ))
 
     override public fun setupModule(context: SetupContext?) {
-        super.setupModule(context!!)
+        super.setupModule(context)
 
         fun addMixin(clazz: Class<*>, mixin: Class<*>) {
             impliedClasses.add(clazz)
-            context.setMixInAnnotations(clazz, mixin)
+            context?.setMixInAnnotations(clazz, mixin)
         }
 
-        context.appendAnnotationIntrospector(KotlinNamesAnnotationIntrospector(this))
+        context?.appendAnnotationIntrospector(KotlinNamesAnnotationIntrospector(this))
 
         // ranges
         addMixin(javaClass<IntRange>(), javaClass<RangeMixin<*>>())
@@ -61,15 +61,15 @@ internal class KotlinNamesAnnotationIntrospector(val module: KotlinModule) : Nop
     override public fun hasCreatorAnnotation(member: Annotated?): Boolean {
         if (member is AnnotatedParameter) {
             // pretend some built-in Kotlin classes have the JsonCreator annotation
-            // return module.impliedClasses.contains(member.getDeclaringClass()!!)
+            // return module.impliedClasses.contains(member.getDeclaringClass())
             return false
         } else {
             return false
         }
     }
 
     protected fun findKotlinParameterName(param: AnnotatedParameter): String? {
-        if (param.getDeclaringClass()!!.getAnnotation(javaClass<KotlinClass>()) != null) {
+        if (param.getDeclaringClass().getAnnotation(javaClass<KotlinClass>()) != null) {
             // TODO: this will change in the near future to full runtime type information
             return param.getAnnotation(javaClass<JetValueParameter>())?.name()
         }

src/test/kotlin/com/fasterxml/jackson/module/kotlin/KotlinBuiltinsTest.kt

@@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.SerializationFeature
 import com.fasterxml.jackson.annotation.JsonCreator
 
 class TestJacksonWithKotlinBuiltins {
-    private val mapper = jacksonObjectMapper().configure(SerializationFeature.INDENT_OUTPUT, false)!!
+    private val mapper: ObjectMapper = jacksonObjectMapper().configure(SerializationFeature.INDENT_OUTPUT, false)
 
     private data class ClassWithPair(val name: Pair<String, String>, val age: Int)
     Test fun testPair() {

src/test/kotlin/com/fasterxml/jackson/module/kotlin/ParameterNameTests.kt

@@ -41,16 +41,16 @@ public class TestJacksonWithKotlin {
     private val pascalCasedJson = """{"Name":"Frank","Age":30,"PrimaryAddress":"something here","Renamed":true,"CreatedDt":"2014-08-01T12:11:30.000Z"}"""
 
     private val normalCasedMapper = jacksonObjectMapper()
-            .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)!!
-            .configure(SerializationFeature.INDENT_OUTPUT, false)!!
-            .registerModule(JodaModule())!!
+            .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
+            .configure(SerializationFeature.INDENT_OUTPUT, false)
+            .registerModule(JodaModule())
 
 
     private val pascalCasedMapper = jacksonObjectMapper()
-              .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)!!
-              .configure(SerializationFeature.INDENT_OUTPUT, false)!!
-              .registerModule(JodaModule())!!
-              .setPropertyNamingStrategy(PropertyNamingStrategy.PASCAL_CASE_TO_CAMEL_CASE)!!
+              .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
+              .configure(SerializationFeature.INDENT_OUTPUT, false)
+              .registerModule(JodaModule())
+              .setPropertyNamingStrategy(PropertyNamingStrategy.PASCAL_CASE_TO_CAMEL_CASE)
 
     // ==================
 
@@ -63,7 +63,7 @@ public class TestJacksonWithKotlin {
     }
 
     Test fun NoFailWithDefaultAndSpecificConstructor() {
-        val stateObj = normalCasedMapper.readValue(normalCasedJson, javaClass<DefaultAndSpecificConstructor>())!!
+        val stateObj = normalCasedMapper.readValue(normalCasedJson, javaClass<DefaultAndSpecificConstructor>())
         validate(stateObj)
     }
 
@@ -75,7 +75,7 @@ public class TestJacksonWithKotlin {
     }
 
     Test fun doNotFailWithoutJsonCreator() {
-            val stateObj = normalCasedMapper.readValue(normalCasedJson, javaClass<NoFailWithoutJsonCreator>())!!
+            val stateObj = normalCasedMapper.readValue(normalCasedJson, javaClass<NoFailWithoutJsonCreator>())
             validate(stateObj)
     }
 
@@ -88,7 +88,7 @@ public class TestJacksonWithKotlin {
 
     Test fun testDataClassWithExplicitJsonCreator() {
         // data class with explicit JsonCreator and no parameters with JsonProperty
-        val stateObj = normalCasedMapper.readValue(normalCasedJson, javaClass<StateObjectAsDataClassExplicitJsonCreator>())!!
+        val stateObj = normalCasedMapper.readValue(normalCasedJson, javaClass<StateObjectAsDataClassExplicitJsonCreator>())
         validate(stateObj)
 
         val test1out = StringWriter()
@@ -103,7 +103,7 @@ public class TestJacksonWithKotlin {
 
     Test fun testDataClassWithExplicitJsonCreatorAndJsonProperty() {
         // data class with JsonCreator and JsonProperty
-        val stateObj = normalCasedMapper.readValue(normalCasedJson, javaClass<StateObjectAsDataClassWithJsonCreatorAndJsonProperty>())!!
+        val stateObj = normalCasedMapper.readValue(normalCasedJson, javaClass<StateObjectAsDataClassWithJsonCreatorAndJsonProperty>())
         validate(stateObj)
 
         val test1out = normalCasedMapper.writeValueAsString(stateObj)
@@ -116,7 +116,7 @@ public class TestJacksonWithKotlin {
 
     Test fun testNormalClassWithJsonCreator() {
         // normal class
-        val stateObj = normalCasedMapper.readValue(normalCasedJson, javaClass<StateObjectAsNormalClass>())!!
+        val stateObj = normalCasedMapper.readValue(normalCasedJson, javaClass<StateObjectAsNormalClass>())
         validate(stateObj)
     }
 
@@ -129,7 +129,7 @@ public class TestJacksonWithKotlin {
 
     Test fun testNormalClassWithPartialConstructorJsonCreator() {
         // normal class with some fields not in constructor
-        val stateObj = normalCasedMapper.readValue(normalCasedJson, javaClass<StateObjectWithPartialFieldsInConstructor>())!!
+        val stateObj = normalCasedMapper.readValue(normalCasedJson, javaClass<StateObjectWithPartialFieldsInConstructor>())
         validate(stateObj)
     }
 
@@ -142,15 +142,15 @@ public class TestJacksonWithKotlin {
         // the unrecognized fields in the constructor.  Does not work with default values for parameters, because a null does not get converted to the
         // default.
 
-        val stateObj = normalCasedMapper.readValue(normalCasedJson, javaClass<StateObjectAsDataClassConfusingConstructor>())!!
+        val stateObj = normalCasedMapper.readValue(normalCasedJson, javaClass<StateObjectAsDataClassConfusingConstructor>())
         validate(stateObj)
     }
 
     // ==================
 
     Test fun findingConstructorsWithPascalCasedJson() {
         // pascal cased strategy for JSON, note that explicit named JsonProperty are not renamed and must be exactly the same
-        val stateObj = pascalCasedMapper.readValue(pascalCasedJson, javaClass<StateObjectAsDataClassExplicitJsonCreator>())!!
+        val stateObj = pascalCasedMapper.readValue(pascalCasedJson, javaClass<StateObjectAsDataClassExplicitJsonCreator>())
         validate(stateObj)
 
         val test1out = pascalCasedMapper.writeValueAsString(stateObj)
@@ -180,7 +180,7 @@ public class TestJacksonWithKotlin {
          work from class objects, maybe a TypeInstantiator would work
          StateObjectWithFactory.object$.create method is the actual factory when compiled
         */
-        val stateObj = normalCasedMapper.readValue(normalCasedJson, javaClass<StateObjectWithFactory>())!!
+        val stateObj = normalCasedMapper.readValue(normalCasedJson, javaClass<StateObjectWithFactory>())
         validate(stateObj)
     }
 }