Merge pull request #767 from k163377/refactors

Refactors

Author: k163377

.github/workflows/main.yml

@@ -19,7 +19,7 @@ on:
 
 permissions:
   contents: read
-  
+
 jobs:
   build:
     runs-on: ${{ matrix.os }}
@@ -28,14 +28,14 @@ jobs:
       matrix:
         java_version: ['8', '11', '17', '21']
         # kotlin-reflect 1.8.2x has a bug and some tests fail, so we are downgrading to 1.8.10.
-        kotlin_version: ['1.7.22', '1.8.10', '1.9.22', '2.0.0-Beta2']
+        kotlin_version: ['1.7.22', '1.8.10', '1.9.22', '2.0.0-Beta3']
         os: ['ubuntu-20.04']
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}

pom.xml

@@ -136,7 +136,6 @@
     </dependencies>
 
     <build>
-        <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
         <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
         <plugins>
             <plugin>
@@ -151,6 +150,13 @@
                         <goals>
                             <goal>compile</goal>
                         </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <source>${project.basedir}/target/generated-sources</source>
+                                <source>${project.basedir}/src/main/java</source>
+                                <source>${project.basedir}/src/main/kotlin</source>
+                            </sourceDirs>
+                        </configuration>
                     </execution>
 
                     <execution>

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

@@ -48,9 +48,9 @@ internal object JavaToKotlinDurationConverter : StdConverter<JavaDuration, Kotli
 // @see KotlinNamesAnnotationIntrospector.findNullSerializer
 internal class ValueClassBoxConverter<S : Any?, D : Any>(
     unboxedClass: Class<S>,
-    valueClass: KClass<D>
+    val boxedClass: KClass<D>
 ) : StdConverter<S, D>() {
-    private val boxMethod = valueClass.java.getDeclaredMethod("box-impl", unboxedClass).apply {
+    private val boxMethod = boxedClass.java.getDeclaredMethod("box-impl", unboxedClass).apply {
         if (!this.isAccessible) this.isAccessible = true
     }
 

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

@@ -136,10 +136,10 @@ internal class ReflectionCache(reflectionCacheSize: Int) : Serializable {
         }.orElse(null)
     }
 
-    fun getValueClassBoxConverter(unboxedClass: Class<*>, valueClass: KClass<*>): ValueClassBoxConverter<*, *> =
-        valueClassBoxConverterCache.get(valueClass) ?: run {
-            val value = ValueClassBoxConverter(unboxedClass, valueClass)
-            (valueClassBoxConverterCache.putIfAbsent(valueClass, value) ?: value)
+    fun getValueClassBoxConverter(unboxedClass: Class<*>, boxedClass: KClass<*>): ValueClassBoxConverter<*, *> =
+        valueClassBoxConverterCache.get(boxedClass) ?: run {
+            val value = ValueClassBoxConverter(unboxedClass, boxedClass)
+            (valueClassBoxConverterCache.putIfAbsent(boxedClass, value) ?: value)
         }
 
     fun findKotlinParameter(param: AnnotatedParameter): KParameter? = when (val owner = param.owner.member) {