Codestyle & minor changes

Author: volivan239

utbot-core/src/main/kotlin/org/utbot/common/KClassUtil.kt

@@ -7,7 +7,12 @@ import java.lang.reflect.Method
 
 val Class<*>.packageName: String get() = `package`?.name?:""
 
-fun Class<*>.findDirectAccessedField(fieldName: String): Field? = generateSequence(this) { it.superclass }
+/**
+ * Returns the Field that would be used by compiler when you try to direct access [fieldName] from code, i.e.
+ * when you write `${this.name}.$fieldName`.
+ * If there is no field named [fieldName] in the class, null is returned
+ */
+fun Class<*>.findDirectAccessedFieldOrNull(fieldName: String): Field? = generateSequence(this) { it.superclass }
     .flatMap { it.declaredFields.asSequence() }
     .firstOrNull { it.name == fieldName }
 

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

@@ -20,7 +20,7 @@ import org.utbot.framework.plugin.api.util.charClassId
 import org.utbot.framework.plugin.api.util.constructor
 import org.utbot.framework.plugin.api.util.doubleClassId
 import org.utbot.framework.plugin.api.util.executableId
-import org.utbot.framework.plugin.api.util.fieldOrNull
+import org.utbot.framework.plugin.api.util.fieldByIdOrNull
 import org.utbot.framework.plugin.api.util.floatClassId
 import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.intClassId
@@ -856,7 +856,7 @@ open class FieldId(val declaringClass: ClassId, val name: String) {
         return result
     }
 
-    override fun toString() = declaringClass.fieldOrNull(this).toString()
+    override fun toString() = declaringClass.fieldByIdOrNull(this).toString()
 }
 
 inline fun <T> withReflection(block: () -> T): T {

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

@@ -285,17 +285,17 @@ val ClassId.isMap: Boolean
 val ClassId.isIterableOrMap: Boolean
     get() = isIterable || isMap
 
-fun ClassId.fieldOrNull(fieldId: FieldId): Field? {
-    if (this.isNotSubtypeOf(fieldId.declaringClass))
-        return null
-    return try {
-        fieldId.field
-    } catch (e: IllegalStateException) {
+fun ClassId.fieldById(fieldId: FieldId): Field =
+    fieldByIdOrNull(fieldId) ?: error("Can't find field ${fieldId.name} in $name")
+
+fun ClassId.fieldByIdOrNull(fieldId: FieldId): Field? =
+    if (isNotSubtypeOf(fieldId.declaringClass)) {
         null
+    } else {
+        fieldId.declaringClass.jClass.declaredFields.firstOrNull { it.name == fieldId.name }
     }
-}
 
-fun ClassId.hasField(fieldId: FieldId): Boolean = fieldOrNull(fieldId) != null
+fun ClassId.hasField(fieldId: FieldId): Boolean = fieldByIdOrNull(fieldId) != null
 
 fun ClassId.defaultValueModel(): UtModel = when (this) {
     intClassId -> UtPrimitiveModel(0)

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

@@ -28,11 +28,12 @@ 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 realFieldDeclaringType = typeRegistry.findRealType(field.declaringClass.type) as RefType
 
-        if (realFieldDeclaringClass.sootClass !in ancestors(realType.sootClass.id))
+        if (realFieldDeclaringType.sootClass !in ancestors(realType.sootClass.id)) {
             error("No such field ${field.subSignature} found in ${realType.sootClass.name}")
-        return ChunkId("$realFieldDeclaringClass", field.name)
+        }
+        return ChunkId("$realFieldDeclaringType", field.name)
     }
 
     /**

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

@@ -89,7 +89,7 @@ import org.utbot.framework.plugin.api.MethodId
 import org.utbot.framework.plugin.api.UtMethod
 import org.utbot.framework.plugin.api.classId
 import org.utbot.framework.plugin.api.id
-import org.utbot.framework.plugin.api.util.field
+import org.utbot.framework.plugin.api.util.fieldById
 import org.utbot.framework.plugin.api.util.jClass
 import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.signature
@@ -639,7 +639,7 @@ class Traverser(
             SECURITY_FIELD_SIGNATURE -> SecurityManager()
             FIELD_FILTER_MAP_FIELD_SIGNATURE -> mapOf(Reflection::class to arrayOf("fieldFilterMap", "methodFilterMap"))
             METHOD_FILTER_MAP_FIELD_SIGNATURE -> emptyMap<Class<*>, Array<String>>()
-            else -> field.fieldId.field.let { it.withAccessibility { it.get(null) } }
+            else -> declaringClass.id.fieldById(field.fieldId).let { it.withAccessibility { it.get(null) } }
         }
 
     private fun isStaticInstanceInMethodResult(id: ClassId, methodResult: MethodResult?) =

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

@@ -36,7 +36,7 @@ import org.utbot.framework.plugin.api.UtVoidModel
 import org.utbot.framework.plugin.api.isMockModel
 import org.utbot.framework.plugin.api.util.constructor
 import org.utbot.framework.plugin.api.util.field
-import org.utbot.framework.plugin.api.util.fieldOrNull
+import org.utbot.framework.plugin.api.util.fieldById
 import org.utbot.framework.plugin.api.util.jClass
 import org.utbot.framework.plugin.api.util.method
 import org.utbot.framework.plugin.api.util.utContext
@@ -213,8 +213,7 @@ class ValueConstructor {
         constructedObjects[model] = classInstance
 
         model.fields.forEach { (field, fieldModel) ->
-            val declaredField =
-                model.classId.fieldOrNull(field) ?: error("Can't find field: $field for $javaClass")
+            val declaredField = model.classId.fieldById(field)
             val accessible = declaredField.isAccessible
 
             try {
@@ -361,7 +360,6 @@ class ValueConstructor {
         val fieldModel = directSetterModel.fieldModel
 
         val field = directSetterModel.fieldId.field
-        // val field = instance::class.java.findField(directSetterModel.fieldId.name)
         val isAccessible = field.isAccessible
 
         try {

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgMethodConstructor.kt

@@ -43,7 +43,6 @@ import org.utbot.framework.codegen.model.tree.CgEqualTo
 import org.utbot.framework.codegen.model.tree.CgErrorTestMethod
 import org.utbot.framework.codegen.model.tree.CgExecutableCall
 import org.utbot.framework.codegen.model.tree.CgExpression
-import org.utbot.framework.codegen.model.tree.CgFieldAccess
 import org.utbot.framework.codegen.model.tree.CgGetJavaClass
 import org.utbot.framework.codegen.model.tree.CgIfStatement
 import org.utbot.framework.codegen.model.tree.CgLiteral

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgVariableConstructor.kt

@@ -15,10 +15,8 @@ import org.utbot.framework.codegen.model.tree.CgAllocateInitializedArray
 import org.utbot.framework.codegen.model.tree.CgDeclaration
 import org.utbot.framework.codegen.model.tree.CgEnumConstantAccess
 import org.utbot.framework.codegen.model.tree.CgExpression
-import org.utbot.framework.codegen.model.tree.CgFieldAccess
 import org.utbot.framework.codegen.model.tree.CgGetJavaClass
 import org.utbot.framework.codegen.model.tree.CgLiteral
-import org.utbot.framework.codegen.model.tree.CgNotNullAssertion
 import org.utbot.framework.codegen.model.tree.CgStaticFieldAccess
 import org.utbot.framework.codegen.model.tree.CgValue
 import org.utbot.framework.codegen.model.tree.CgVariable
@@ -47,7 +45,7 @@ import org.utbot.framework.plugin.api.UtPrimitiveModel
 import org.utbot.framework.plugin.api.UtReferenceModel
 import org.utbot.framework.plugin.api.UtVoidModel
 import org.utbot.framework.plugin.api.util.defaultValueModel
-import org.utbot.framework.plugin.api.util.fieldOrNull
+import org.utbot.framework.plugin.api.util.fieldByIdOrNull
 import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.intClassId
 import org.utbot.framework.plugin.api.util.isArray
@@ -128,7 +126,7 @@ internal class CgVariableConstructor(val context: CgContext) :
 
         for ((fieldId, fieldModel) in model.fields) {
             val variableForField = getOrCreateVariable(fieldModel)
-            val field = obj.type.fieldOrNull(fieldId)
+            val field = obj.type.fieldByIdOrNull(fieldId)
 
             // we cannot set field directly if variable declared type does not have such field
             // or we cannot directly create variable for field with the specified type (it is private, for example)

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/util/DslUtil.kt

@@ -1,6 +1,6 @@
 package org.utbot.framework.codegen.model.util
 
-import org.utbot.common.findDirectAccessedField
+import org.utbot.common.findDirectAccessedFieldOrNull
 import org.utbot.framework.codegen.model.constructor.tree.CgCallableAccessManager
 import org.utbot.framework.codegen.model.tree.CgArrayElementAccess
 import org.utbot.framework.codegen.model.tree.CgDecrement
@@ -76,10 +76,11 @@ fun stringLiteral(string: String) = CgLiteral(stringClassId, string)
 
 // non-static fields
 operator fun CgExpression.get(fieldId: FieldId): CgFieldAccess =
-    if (type.jClass.findDirectAccessedField(fieldId.name) != fieldId.field)
+    if (type.jClass.findDirectAccessedFieldOrNull(fieldId.name) != fieldId.field) {
         CgFieldAccess(CgTypeCast(fieldId.declaringClass, this), fieldId)
-    else
+    } else {
         CgFieldAccess(this, fieldId)
+    }
 
 // static fields
 // TODO: unused receiver

utbot-framework/src/main/kotlin/org/utbot/framework/concrete/MockValueConstructor.kt

@@ -32,7 +32,6 @@ import org.utbot.framework.plugin.api.isMockModel
 import org.utbot.framework.plugin.api.util.constructor
 import org.utbot.framework.plugin.api.util.executableId
 import org.utbot.framework.plugin.api.util.field
-import org.utbot.framework.plugin.api.util.fieldOrNull
 import org.utbot.framework.plugin.api.util.jClass
 import org.utbot.framework.plugin.api.util.method
 import org.utbot.framework.plugin.api.util.utContext
@@ -46,6 +45,7 @@ import org.mockito.Mockito
 import org.mockito.stubbing.Answer
 import org.objectweb.asm.Type
 import org.utbot.common.withAccessibility
+import org.utbot.framework.plugin.api.util.fieldById
 
 /**
  * Constructs values (including mocks) from models.
@@ -170,8 +170,7 @@ class MockValueConstructor(
         }
 
         model.fields.forEach { (field, fieldModel) ->
-            val declaredField =
-                model.classId.fieldOrNull(field) ?: error("Can't find field: $field for $javaClass")
+            val declaredField = model.classId.fieldById(field)
             val accessible = declaredField.isAccessible
             declaredField.isAccessible = true
 

utbot-framework/src/test/kotlin/org/utbot/examples/UtModelTestCaseChecker.kt

@@ -165,8 +165,8 @@ internal abstract class UtModelTestCaseChecker(
     /**
      * Finds field model in [UtCompositeModel] and [UtAssembleModel]. For assemble model supports direct field access only.
      */
-    protected fun UtModel.findField(fieldName: String, declarationClass: ClassId = this.classId): UtModel =
-        findField(FieldId(declarationClass, fieldName))
+    protected fun UtModel.findField(fieldName: String, declaringClass: ClassId = this.classId): UtModel =
+        findField(FieldId(declaringClass, fieldName))
 
     /**
      * Finds field model in [UtCompositeModel] and [UtAssembleModel]. For assemble model supports direct field access only.

utbot-framework/src/test/kotlin/org/utbot/examples/enums/ClassWithEnumTest.kt

@@ -12,7 +12,6 @@ import org.utbot.framework.plugin.api.FieldId
 import org.utbot.framework.plugin.api.util.id
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
-import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.util.field
 
 class ClassWithEnumTest : UtValueTestCaseChecker(testClass = ClassWithEnum::class) {