fix #182 - change a reflection method so that it works on private fields

oshai · Jul 13, 2021 · f125269 · f125269
1 parent bd0c8c3
commit f125269
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/jvmMain/kotlin/mu/internal/KLoggerNameResolver.kt b/src/jvmMain/kotlin/mu/internal/KLoggerNameResolver.kt
@@ -35,7 +35,7 @@ internal object KLoggerNameResolver {
     inline private fun <T : Any> unwrapCompanionClass(clazz: Class<T>): Class<*> {
         if (clazz.enclosingClass != null) {
             try {
-                val field = clazz.enclosingClass.getField(clazz.simpleName)
+                val field = clazz.enclosingClass.getDeclaredField(clazz.simpleName)
                 if (Modifier.isStatic(field.modifiers) && field.type == clazz) {
                     // && field.get(null) === obj
                     // the above might be safer but problematic with initialization order

diff --git a/src/jvmTest/kotlin/mu/internal/KLoggerNameResolverTest.kt b/src/jvmTest/kotlin/mu/internal/KLoggerNameResolverTest.kt
@@ -35,6 +35,7 @@ class KLoggerNameResolverTest {
         )
         assertEquals("mu.internal.Foo\$Bar", KLoggerNameResolver.name(Foo.Bar::class.java))
         assertEquals("mu.internal.Foo\$Bar2", KLoggerNameResolver.name(Foo.Bar3.javaClass))
+        assertEquals("mu.internal.PrivateCompanion", KLoggerNameResolver.name(PrivateCompanion().companionClass))
     }
 }
 
@@ -66,3 +67,8 @@ class Foo {
         val Bar3 = Foo().z
     }
 }
+
+class PrivateCompanion {
+    val companionClass: Class<*> = Companion::class.java
+    private companion object
+}