Fix review comments

Author: ArsenHD

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

@@ -144,6 +144,9 @@ val floatWrapperClassId = java.lang.Float::class.id
 val doubleWrapperClassId = java.lang.Double::class.id
 
 val classClassId = java.lang.Class::class.id
+val fieldClassId = java.lang.reflect.Field::class.id
+val methodClassId = java.lang.reflect.Method::class.id
+val constructorClassId = java.lang.reflect.Constructor::class.id
 
 // We consider void wrapper as primitive wrapper
 // because voidClassId is considered primitive here

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

@@ -45,6 +45,7 @@ import org.utbot.framework.plugin.api.UtNullModel
 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.classClassId
 import org.utbot.framework.plugin.api.util.defaultValueModel
 import org.utbot.framework.plugin.api.util.jField
 import org.utbot.framework.plugin.api.util.findFieldByIdOrNull
@@ -351,7 +352,7 @@ internal class CgVariableConstructor(val context: CgContext) :
         val init = if (classId.isAccessibleFrom(testClassPackageName)) {
             CgGetJavaClass(classId)
         } else {
-            Class::class.id[forName](classId.name)
+            classClassId[forName](classId.name)
         }
 
         return newVar(Class::class.id, baseName) { init }

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

@@ -50,7 +50,6 @@ import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.ExecutableId
 import org.utbot.framework.plugin.api.UtModel
 import org.utbot.framework.plugin.api.util.executable
-import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.isArray
 import org.utbot.framework.plugin.api.util.isNotSubtypeOf
 import org.utbot.framework.plugin.api.util.isSubtypeOf
@@ -67,7 +66,10 @@ import org.utbot.framework.plugin.api.ConstructorId
 import org.utbot.framework.plugin.api.FieldId
 import org.utbot.framework.plugin.api.MethodId
 import org.utbot.framework.plugin.api.util.classClassId
+import org.utbot.framework.plugin.api.util.constructorClassId
+import org.utbot.framework.plugin.api.util.fieldClassId
 import org.utbot.framework.plugin.api.util.isPrimitive
+import org.utbot.framework.plugin.api.util.methodClassId
 import java.lang.reflect.Constructor
 import java.lang.reflect.Method
 import kotlin.reflect.KFunction
@@ -306,15 +308,15 @@ internal class CgStatementConstructorImpl(context: CgContext) :
     }
 
     override fun createFieldVariable(fieldId: FieldId): CgVariable {
-        val declaringClass = newVar(Class::class.id) { Class::class.id[forName](fieldId.declaringClass.name) }
+        val declaringClass = newVar(classClassId) { classClassId[forName](fieldId.declaringClass.name) }
         val name = fieldId.name + "Field"
-        return newVar(java.lang.reflect.Field::class.id, name) {
+        return newVar(fieldClassId, name) {
             declaringClass[getDeclaredField](fieldId.name)
         }
     }
 
     override fun createExecutableVariable(executableId: ExecutableId, arguments: List<CgExpression>): CgVariable {
-        val declaringClass = newVar(Class::class.id) { Class::class.id[forName](executableId.classId.name) }
+        val declaringClass = newVar(classClassId) { classClassId[forName](executableId.classId.name) }
         val argTypes = (arguments zip executableId.parameters).map { (argument, parameterType) ->
             val baseName = when (argument) {
                 is CgVariable -> "${argument.name}Type"
@@ -324,21 +326,21 @@ internal class CgStatementConstructorImpl(context: CgContext) :
                 if (parameterType.isPrimitive) {
                     CgGetJavaClass(parameterType)
                 } else {
-                    Class::class.id[forName](parameterType.name)
+                    classClassId[forName](parameterType.name)
                 }
             }
         }
 
         return when (executableId) {
             is MethodId -> {
                 val name = executableId.name + "Method"
-                newVar(java.lang.reflect.Method::class.id, name) {
+                newVar(methodClassId, name) {
                     declaringClass[getDeclaredMethod](executableId.name, *argTypes.toTypedArray())
                 }
             }
             is ConstructorId -> {
                 val name = executableId.classId.prettifiedName.decapitalize() + "Constructor"
-                newVar(java.lang.reflect.Constructor::class.id, name) {
+                newVar(constructorClassId, name) {
                     declaringClass[getDeclaredConstructor](*argTypes.toTypedArray())
                 }
             }
@@ -467,9 +469,9 @@ internal class CgStatementConstructorImpl(context: CgContext) :
     // utils
 
     private fun classRefOrNull(type: ClassId, expr: CgExpression): ClassId? {
-        if (type == Class::class.id && expr is CgGetClass) return expr.classId
+        if (type == classClassId && expr is CgGetClass) return expr.classId
 
-        if (type == Class::class.id && expr is CgExecutableCall && expr.executableId == forName) {
+        if (type == classClassId && expr is CgExecutableCall && expr.executableId == forName) {
             val name = (expr.arguments.getOrNull(0) as? CgLiteral)?.value as? String
 
             if (name != null) {
@@ -487,7 +489,7 @@ internal class CgStatementConstructorImpl(context: CgContext) :
             ExpressionWithType(enumClass, access)
         } else {
             val enumClassVariable = newVar(classCgClassId) {
-                Class::class.id[forName](enumClass.name)
+                classClassId[forName](enumClass.name)
             }
 
             ExpressionWithType(objectClassId, utilsClassId[getEnumConstantByName](enumClassVariable, constant))

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

@@ -1,7 +1,6 @@
 package org.utbot.framework.codegen.model.util
 
 import org.utbot.framework.plugin.api.FieldId
-import org.utbot.framework.plugin.api.util.id
 
 /**
  * For now we will count field accessible if it is not private and its class is also accessible,
@@ -10,7 +9,7 @@ import org.utbot.framework.plugin.api.util.id
  *
  * @param packageName name of the package we check accessibility from
  */
-fun FieldId.isAccessibleFrom(packageName: String): Boolean {
+infix fun FieldId.isAccessibleFrom(packageName: String): Boolean {
     val isClassAccessible = declaringClass.isAccessibleFrom(packageName)
     val isAccessibleByVisibility = isPublic || (declaringClass.packageName == packageName && (isPackagePrivate || isProtected))
     val isAccessibleFromPackageByModifiers = isAccessibleByVisibility && !isSynthetic

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/UtilMethods.kt

@@ -9,8 +9,8 @@ import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.CodegenLanguage
 import org.utbot.framework.plugin.api.MethodId
 import org.utbot.framework.plugin.api.MockFramework
+import org.utbot.framework.plugin.api.util.fieldClassId
 import org.utbot.framework.plugin.api.util.id
-import java.lang.reflect.Field
 import java.lang.reflect.Modifier
 import java.util.Arrays
 import java.util.Objects
@@ -815,7 +815,6 @@ private fun TestClassUtilMethodProvider.regularImportsByUtilMethod(
     id: MethodId,
     codegenLanguage: CodegenLanguage
 ): List<ClassId> {
-    val fieldClassId = Field::class.id
     return when (id) {
         getUnsafeInstanceMethodId -> listOf(fieldClassId)
         createInstanceMethodId -> listOf(java.lang.reflect.InvocationTargetException::class.id)