refactor: ArtifactQualifiedName.toClass()

Author: BFergerson

src/main/kotlin/spp/protocol/artifact/ArtifactQualifiedName.kt

@@ -101,4 +101,16 @@ data class ArtifactQualifiedName(
         if (identifier == other.identifier) return false
         return other.identifier.substringBefore("#").startsWith(identifier)
     }
+
+    fun toClass(): ArtifactQualifiedName? {
+        return if (type == ArtifactType.CLASS) {
+            this
+        } else {
+            var parent = asParent()
+            while (parent != null && parent.type != ArtifactType.CLASS) {
+                parent = parent.asParent()
+            }
+            parent
+        }
+    }
 }

src/test/kotlin/spp/protocol/artifact/ArtifactQualifiedNameTest.kt

@@ -18,51 +18,52 @@ package spp.protocol.artifact
 
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Test
+import spp.protocol.artifact.ArtifactType.*
 
 class ArtifactQualifiedNameTest {
 
     @Test
     fun `test parent qualified name`() {
-        val methodExpression = ArtifactQualifiedName("com.example.TestClass.fun()#22", type = ArtifactType.EXPRESSION)
+        val methodExpression = ArtifactQualifiedName("com.example.TestClass.fun()#22", type = EXPRESSION)
         val method = methodExpression.asParent()
         assertNotNull(method)
         assertEquals("com.example.TestClass.fun()", method!!.identifier)
-        assertEquals(ArtifactType.METHOD, method.type)
+        assertEquals(METHOD, method.type)
 
         val clazz = method.asParent()
         assertNotNull(clazz)
         assertEquals("com.example.TestClass", clazz!!.identifier)
-        assertEquals(ArtifactType.CLASS, clazz.type)
+        assertEquals(CLASS, clazz.type)
 
-        val fieldExpression = ArtifactQualifiedName("com.example.TestClass#22", type = ArtifactType.EXPRESSION)
+        val fieldExpression = ArtifactQualifiedName("com.example.TestClass#22", type = EXPRESSION)
         val clazz2 = fieldExpression.asParent()
         assertNotNull(clazz2)
         assertEquals("com.example.TestClass", clazz2!!.identifier)
-        assertEquals(ArtifactType.CLASS, clazz2.type)
+        assertEquals(CLASS, clazz2.type)
     }
 
     @Test
     fun `test parent qualified name with args`() {
         val methodExpression = ArtifactQualifiedName(
             "com.example.TestClass.fun(java.lang.String)#22",
-            type = ArtifactType.EXPRESSION
+            type = EXPRESSION
         )
         val method = methodExpression.asParent()
         assertNotNull(method)
         assertEquals("com.example.TestClass.fun(java.lang.String)", method!!.identifier)
-        assertEquals(ArtifactType.METHOD, method.type)
+        assertEquals(METHOD, method.type)
 
         val clazz = method.asParent()
         assertNotNull(clazz)
         assertEquals("com.example.TestClass", clazz!!.identifier)
-        assertEquals(ArtifactType.CLASS, clazz.type)
+        assertEquals(CLASS, clazz.type)
     }
 
     @Test
     fun `test is child of`() {
-        val clazz = ArtifactQualifiedName("com.example.TestClass", type = ArtifactType.CLASS)
-        val method = ArtifactQualifiedName("com.example.TestClass.fun()", type = ArtifactType.METHOD)
-        val methodExpression = ArtifactQualifiedName("com.example.TestClass.fun()#22", type = ArtifactType.EXPRESSION)
+        val clazz = ArtifactQualifiedName("com.example.TestClass", type = CLASS)
+        val method = ArtifactQualifiedName("com.example.TestClass.fun()", type = METHOD)
+        val methodExpression = ArtifactQualifiedName("com.example.TestClass.fun()#22", type = EXPRESSION)
 
         assertTrue(methodExpression.isChildOf(clazz))
         assertTrue(methodExpression.isChildOf(method))
@@ -78,9 +79,9 @@ class ArtifactQualifiedNameTest {
 
     @Test
     fun `test is parent of`() {
-        val clazz = ArtifactQualifiedName("com.example.TestClass", type = ArtifactType.CLASS)
-        val method = ArtifactQualifiedName("com.example.TestClass.fun()", type = ArtifactType.METHOD)
-        val methodExpression = ArtifactQualifiedName("com.example.TestClass.fun()#22", type = ArtifactType.EXPRESSION)
+        val clazz = ArtifactQualifiedName("com.example.TestClass", type = CLASS)
+        val method = ArtifactQualifiedName("com.example.TestClass.fun()", type = METHOD)
+        val methodExpression = ArtifactQualifiedName("com.example.TestClass.fun()#22", type = EXPRESSION)
 
         assertTrue(clazz.isParentOf(methodExpression))
         assertTrue(method.isParentOf(methodExpression))
@@ -93,4 +94,30 @@ class ArtifactQualifiedNameTest {
         assertFalse(method.isParentOf(clazz))
         assertFalse(methodExpression.isParentOf(method))
     }
+
+    @Test
+    fun `test to class`() {
+        val expression = ArtifactQualifiedName("com.example.TestClass.fun()#22", type = EXPRESSION)
+        val clazz = expression.toClass()
+        assertNotNull(clazz)
+        assertEquals("com.example.TestClass", clazz!!.identifier)
+
+        val method = ArtifactQualifiedName("com.example.TestClass.fun()", type = METHOD)
+        val clazz2 = method.toClass()
+        assertNotNull(clazz2)
+        assertEquals("com.example.TestClass", clazz2!!.identifier)
+    }
+
+    @Test
+    fun `test to inner class`() {
+        val expression = ArtifactQualifiedName("com.example.TestClass\$InnerClass.fun()#22", type = EXPRESSION)
+        val clazz = expression.toClass()
+        assertNotNull(clazz)
+        assertEquals("com.example.TestClass\$InnerClass", clazz!!.identifier)
+
+        val method = ArtifactQualifiedName("com.example.TestClass\$InnerClass.fun()", type = METHOD)
+        val clazz2 = method.toClass()
+        assertNotNull(clazz2)
+        assertEquals("com.example.TestClass\$InnerClass", clazz2!!.identifier)
+    }
 }