Support enumConstants extracting #151

Author: lehvolk

jacodb-api/src/main/kotlin/org/jacodb/api/ext/JcClasses.kt

@@ -91,7 +91,7 @@ fun JcClassOrInterface.findMethodOrNull(methodNode: MethodNode): JcMethod? =
 val JcClassOrInterface.enumValues: List<JcField>?
     get() {
         if (isEnum) {
-            return declaredFields.filter { it.isStatic && it.type.typeName == name }
+            return declaredFields.filter { it.isEnum }
         }
         return null
     }

jacodb-api/src/main/kotlin/org/jacodb/api/ext/JcFields.kt

@@ -36,3 +36,9 @@ val JcField.isTransient: Boolean
     get() {
         return access and Opcodes.ACC_TRANSIENT != 0
     }
+
+
+val JcField.isEnum: Boolean
+    get() {
+        return access and Opcodes.ACC_ENUM != 0
+    }

jacodb-core/src/test/kotlin/org/jacodb/testing/ClassesTest.kt

@@ -20,11 +20,12 @@ import kotlinx.coroutines.runBlocking
 import org.jacodb.api.JcClassType
 import org.jacodb.api.JcClasspath
 import org.jacodb.api.ext.HierarchyExtension
+import org.jacodb.api.ext.enumValues
+import org.jacodb.api.ext.findClass
 import org.jacodb.api.ext.findTypeOrNull
 import org.jacodb.impl.features.duplicatedClasses
 import org.jacodb.impl.features.hierarchyExt
-import org.jacodb.testing.structure.EnumExamples.EnumWithField
-import org.jacodb.testing.structure.EnumExamples.SimpleEnum
+import org.jacodb.testing.structure.EnumExamples.*
 import org.jacodb.testing.tests.DatabaseEnvTest
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
@@ -70,5 +71,12 @@ class ClassesTest : DatabaseEnvTest() {
         assertEquals("int", parameters[1].type.typeName)
         assertEquals("int", parameters[2].type.typeName)
     }
+
+    @Test
+    fun `enum values filter out static instances`() {
+        val enumType = cp.findClass<EnumWithStaticInstance>()
+        assertEquals(2, enumType.enumValues!!.size)
+        assertEquals(listOf("C1", "C2"), enumType.enumValues!!.map { it.name })
+    }
 }
 

jacodb-core/src/testFixtures/java/org/jacodb/testing/structure/EnumExamples.java

@@ -31,5 +31,15 @@ public enum EnumWithField {
         final int statusCode;
     }
 
+    public enum EnumWithStaticInstance {
+        C1, C2;
+
+        public static final EnumWithStaticInstance instance = C1;
+    }
+
+    public static void main(String[] args) {
+        System.out.println(EnumWithStaticInstance.values().length);
+    }
+
 }