Fixed Hierarchy.chunkIdForField & minor changes

Author: volivan239

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt

@@ -806,9 +806,6 @@ enum class FieldIdStrategyValues {
  */
 open class FieldId(val declaringClass: ClassId, val name: String) {
 
-    init {
-        //assert(declaringClass.jClass.declaredFields.any { it.name == name })
-    }
     object Strategy {
         var value: FieldIdStrategyValues = FieldIdStrategyValues.Soot
     }

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/util/IdUtil.kt

@@ -290,7 +290,7 @@ fun ClassId.fieldOrNull(fieldId: FieldId): Field? {
         return null
     return try {
         fieldId.field
-    } catch (e: Exception) {
+    } catch (e: IllegalStateException) {
         null
     }
 }

utbot-framework/src/main/kotlin/org/utbot/engine/Hierarchy.kt

@@ -28,17 +28,11 @@ class Hierarchy(private val typeRegistry: TypeRegistry) {
         type as? RefType ?: error("$type is not a refType")
 
         val realType = typeRegistry.findRealType(type) as RefType
+        val realFieldDeclaringClass = typeRegistry.findRealType(field.declaringClass.type) as RefType
 
-
-        /*val ancestorType = field.declaringClass
-        val ancestorType2 = ancestors(realType.sootClass.id).firstOrNull { it.declaresField(field.subSignature) }?.type
-            ?: error("No such field ${field.subSignature} found in ${realType.sootClass.name}")*/
-        val ancestorType = if (field.declaringClass in ancestors(realType.sootClass.id))
-            field.declaringClass
-        else
-            ancestors(realType.sootClass.id).firstOrNull { it.declaresField(field.subSignature) }?.type
-                ?: error("No such field ${field.subSignature} found in ${realType.sootClass.name}")
-        return ChunkId("$ancestorType", field.name)
+        if (realFieldDeclaringClass.sootClass !in ancestors(realType.sootClass.id))
+            error("No such field ${field.subSignature} found in ${realType.sootClass.name}")
+        return ChunkId("$realFieldDeclaringClass", field.name)
     }
 
     /**