Skip to content

Commit 93d8868

Browse files
committed
Fixed rebase errors and review issues
1 parent 071fb38 commit 93d8868

File tree

2 files changed

+35
-14
lines changed

2 files changed

+35
-14
lines changed

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

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ object UtVoidModel : UtModel(voidClassId)
339339
* Model for enum constant
340340
*/
341341
data class UtEnumConstantModel(
342-
override val id: Int?,
342+
override val id: Int,
343343
override val classId: ClassId,
344344
val value: Enum<*>
345345
) : UtReferenceModel(id, classId) {
@@ -351,7 +351,7 @@ data class UtEnumConstantModel(
351351
* Model for class reference
352352
*/
353353
data class UtClassRefModel(
354-
override val id: Int?,
354+
override val id: Int,
355355
override val classId: ClassId,
356356
val value: Class<*>
357357
) : UtReferenceModel(id, classId) {
@@ -455,9 +455,7 @@ data class UtArrayModel(
455455
return true
456456
}
457457

458-
override fun hashCode(): Int {
459-
return id
460-
}
458+
override fun hashCode(): Int = id
461459
}
462460

463461
/**
@@ -469,7 +467,7 @@ data class UtArrayModel(
469467
* @param modificationsChain is a chain of [UtStatementModel] to construct object state.
470468
*/
471469
data class UtAssembleModel private constructor(
472-
override val id: Int?,
470+
override val id: Int,
473471
override val classId: ClassId,
474472
override val modelName: String,
475473
val instantiationCall: UtExecutableCallModel,
@@ -494,7 +492,7 @@ data class UtAssembleModel private constructor(
494492
* as [UtExecutableCallModel.instance].
495493
*/
496494
constructor(
497-
id: Int?,
495+
id: Int,
498496
classId: ClassId,
499497
modelName: String,
500498
instantiationCall: UtExecutableCallModel,
@@ -524,9 +522,7 @@ data class UtAssembleModel private constructor(
524522
return id == other.id
525523
}
526524

527-
override fun hashCode(): Int {
528-
return id ?: 0
529-
}
525+
override fun hashCode(): Int = id
530526
}
531527

532528
/**
@@ -554,7 +550,7 @@ data class UtAssembleModel private constructor(
554550
*/
555551
// TODO: what about support for Kotlin lambdas and function types? See https://github.com/UnitTestBot/UTBotJava/issues/852
556552
class UtLambdaModel(
557-
override val id: Int?,
553+
override val id: Int,
558554
val samType: ClassId,
559555
val declaringClass: ClassId,
560556
val lambdaName: String,
@@ -581,9 +577,7 @@ class UtLambdaModel(
581577
return true
582578
}
583579

584-
override fun hashCode(): Int {
585-
return id ?: 0
586-
}
580+
override fun hashCode(): Int = id
587581
}
588582

589583
/**

utbot-framework-api/src/main/kotlin/org/utbot/framework/process/OpenModulesContainer.kt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,33 @@ object OpenModulesContainer {
1515
openPackage("java.base", "java.lang")
1616
openPackage("java.base", "java.lang.reflect")
1717
openPackage("java.base", "sun.security.provider")
18+
openPackage("java.base", "jdk.internal.event")
19+
openPackage("java.base", "jdk.internal.jimage")
20+
openPackage("java.base", "jdk.internal.jimage.decompressor")
21+
openPackage("java.base", "jdk.internal.jmod")
22+
openPackage("java.base", "jdk.internal.jtrfs")
23+
openPackage("java.base", "jdk.internal.loader")
24+
openPackage("java.base", "jdk.internal.logger")
25+
openPackage("java.base", "jdk.internal.math")
26+
openPackage("java.base", "jdk.internal.misc")
27+
openPackage("java.base", "jdk.internal.module")
28+
openPackage("java.base", "jdk.internal.org.objectweb.asm.commons")
29+
openPackage("java.base", "jdk.internal.org.objectweb.asm.signature")
30+
openPackage("java.base", "jdk.internal.org.objectweb.asm.tree")
31+
openPackage("java.base", "jdk.internal.org.objectweb.asm.tree.analysis")
32+
openPackage("java.base", "jdk.internal.org.objectweb.asm.util")
33+
openPackage("java.base", "jdk.internal.org.xml.sax")
34+
openPackage("java.base", "jdk.internal.org.xml.sax.helpers")
35+
openPackage("java.base", "jdk.internal.perf")
36+
openPackage("java.base", "jdk.internal.platform")
37+
openPackage("java.base", "jdk.internal.ref")
38+
openPackage("java.base", "jdk.internal.reflect")
39+
openPackage("java.base", "jdk.internal.util")
40+
openPackage("java.base", "jdk.internal.util.jar")
41+
openPackage("java.base", "jdk.internal.util.xml")
42+
openPackage("java.base", "jdk.internal.util.xml.impl")
43+
openPackage("java.base", "jdk.internal.vm")
44+
openPackage("java.base", "jdk.internal.vm.annotation")
1845
add("--illegal-access=warn")
1946
}
2047
}

0 commit comments

Comments
 (0)