Added basic support for Proxy classes

gmazzo · Jan 19, 2023 · d4ba111 · d4ba111
1 parent d9521e0
commit d4ba111
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 31 deletions.
diff --git a/.github/actions/host-setup/action.yaml b/.github/actions/host-setup/action.yaml
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -8,6 +8,10 @@ on:
     branches:
       - main
 
+permissions:
+  checks: write
+  pull-requests: write
+
 jobs:
   build:
     name: Build
@@ -17,9 +21,18 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Host setup
-        uses: ./.github/actions/host-setup
+      - name: Setup JDK11
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+          cache: 'gradle'
       - name: Test & Build
         run: ./gradlew -s build
+      - name: Publish Test Report
+        uses: mikepenz/action-junit-report@v3
+        if: always()
+        with:
+          report_paths: '**/build/test-results/*/TEST-*.xml'
       - name: Coverage report
         uses: codecov/codecov-action@v3
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -17,8 +17,12 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Host setup
-        uses: ./.github/actions/host-setup
+      - name: Setup JDK11
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+          cache: 'gradle'
       - name: Publish
         env:
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }}

diff --git a/core/src/main/kotlin/io/github/gmazzo/codeowners/CodeOwners.kt b/core/src/main/kotlin/io/github/gmazzo/codeowners/CodeOwners.kt
@@ -3,6 +3,7 @@
 package io.github.gmazzo.codeowners
 
 import java.io.Reader
+import java.lang.reflect.Proxy
 import kotlin.reflect.KClass
 
 inline fun <reified Type> codeOwnersOf() =
@@ -12,17 +13,21 @@ val KClass<*>.codeOwners
     get() = java.codeOwners
 
 val Class<*>.codeOwners: Set<String>?
-    get() = with(topLevelClass()) { classLoader.getCodeOwners(`package`.name, simpleName) }
+    get() = with(topLevelClass()) { classLoader.getCodeOwners(`package`?.name, simpleName) }
 
 val Throwable.codeOwners
-    get() = stackTrace.asSequence().map { it.codeOwners }.firstOrNull()
+    get() = stackTrace.asSequence().mapNotNull { it.codeOwners }.firstOrNull()
 
 private tailrec fun Class<*>.topLevelClass(): Class<*> = when (val enclosing = enclosingClass) {
-    null -> this
+    null -> when {
+        Proxy.isProxyClass(this) -> interfaces.firstOrNull() ?: this
+        else -> this
+    }
+
     else -> enclosing.topLevelClass()
 }
 
-private val StackTraceElement.codeOwners: Set<String>?
+val StackTraceElement.codeOwners: Set<String>?
     get() {
         val clazz = runCatching { Class.forName(className) }.getOrNull() ?: return null
 
@@ -32,8 +37,8 @@ private val StackTraceElement.codeOwners: Set<String>?
     }
 
 @JvmOverloads
-tailrec fun ClassLoader.getCodeOwners(packageName: String, className: String? = null): Set<String>? {
-    val packagePath = packageName.replace('.', '/')
+tailrec fun ClassLoader.getCodeOwners(packageName: String?, className: String? = null): Set<String>? {
+    val packagePath = packageName?.replace('.', '/') ?: return null
     val path = "$packagePath/${className.orEmpty()}.codeowners"
     val owners = getResources(path).asSequence()
         .flatMap { it.openStream()?.reader()?.use(Reader::readLines).orEmpty() }

diff --git a/core/src/test/kotlin/io/github/gmazzo/codeowners/CodeOwnersTest.kt b/core/src/test/kotlin/io/github/gmazzo/codeowners/CodeOwnersTest.kt
@@ -10,6 +10,7 @@ import foo.bar.impl.FooBarImpl
 import foo.impl.FooImpl
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
+import java.lang.reflect.Proxy
 
 class CodeOwnersTest {
 
@@ -77,4 +78,11 @@ class CodeOwnersTest {
         assertEquals(null, codeOwnersOf<CodeOwnersTest>())
     }
 
+    @Test
+    fun `given proxy class of Foo, returns owners correctly`() {
+        val proxy = Proxy.newProxyInstance(javaClass.classLoader, arrayOf(Foo::class.java)) { _, _, _ -> }
+
+        assertEquals(setOf("foo"), proxy::class.codeOwners)
+    }
+
 }
diff --git a/plugin/src/test/kotlin/io/github/gmazzo/codeowners/CodeOwnersTransformTest.kt b/plugin/src/test/kotlin/io/github/gmazzo/codeowners/CodeOwnersTransformTest.kt
@@ -8,7 +8,6 @@ import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Assertions.assertIterableEquals
 import org.junit.jupiter.api.Test
 import java.io.File
-import java.lang.UnsupportedOperationException
 import java.nio.file.Files
 
 class CodeOwnersTransformTest {
@@ -33,13 +32,14 @@ class CodeOwnersTransformTest {
 
         val outputFiles = outputsDir.walkTopDown()
             .filter { it.isFile }
+            .sorted()
             .map { it.toRelativeString(outputsDir) to it.readText().trim() }
             .toList()
 
         assertIterableEquals(
             listOf(
-                "org/test/utils/.codeowners" to "kotlin-devs",
                 "org/test/lib/.codeowners" to "kotlin-devs",
+                "org/test/utils/.codeowners" to "kotlin-devs",
             ),
             outputFiles
         )