[rd-refactoring]

Domonion · Domonion · commit 0abcff8c1ea1 · 2022-11-25T13:29:25.000+03:00
Rd version bump, model regeneration typos and small adjustments
diff --git a/gradle.properties b/gradle.properties
@@ -28,6 +28,11 @@ kotlinVersion=1.7.20
 log4j2Version=2.13.3
 coroutinesVersion=1.6.3
 collectionsVersion=0.3.4
+# after updating plugin version you should manually bump corresponding versions in plugin
+# as they cannot be set from properties
+# utbot-intellij/build.gradle.kts
+# utbot-rd/build.gradle
+rdVersion=2022.3.4
 intellijPluginVersion=1.7.0
 jacocoVersion=0.8.8
 commonsLangVersion=3.11
diff --git a/utbot-framework-api/build.gradle.kts b/utbot-framework-api/build.gradle.kts
@@ -4,6 +4,7 @@ val junit4Version: String by rootProject
 val sootVersion: String by rootProject
 val commonsLangVersion: String by rootProject
 val kotlinLoggingVersion: String? by rootProject
+val rdVersion: String? by rootProject
 
 plugins {
     id("com.github.johnrengelman.shadow") version "7.1.2"
@@ -13,8 +14,8 @@ dependencies {
     api(project(":utbot-core"))
     api(project(":utbot-api"))
     api(project(":utbot-rd"))
-    implementation(group ="com.jetbrains.rd", name = "rd-framework", version = "2022.3.1")
-    implementation(group ="com.jetbrains.rd", name = "rd-core", version = "2022.3.1")
+    implementation(group ="com.jetbrains.rd", name = "rd-framework", version = rdVersion)
+    implementation(group ="com.jetbrains.rd", name = "rd-core", version = rdVersion)
     implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}") {
         exclude(group="com.google.guava", module="guava")
     }
diff --git a/utbot-framework-api/src/main/kotlin/org/utbot/framework/UtSettings.kt b/utbot-framework-api/src/main/kotlin/org/utbot/framework/UtSettings.kt
@@ -264,10 +264,7 @@ object UtSettings : AbstractSettings(
         DEFAULT_CONCRETE_EXECUTION_TIMEOUT_IN_INSTRUMENTED_PROCESS_MS
     )
 
-    /**
-     * Log level for instrumented process.
-     */
-    var instrumentedProcessLogLevel by getEnumProperty(LogLevel.Info)
+// region engine process debug
 
     /**
      * Path to custom log4j2 configuration file for EngineProcess.
@@ -294,6 +291,9 @@ object UtSettings : AbstractSettings(
      */
     var engineProcessDebugSuspendPolicy by getBooleanProperty(true)
 
+// endregion
+
+// region instrumented process debug
     /**
      * Port which will be used for debugging instrumented process
      */
@@ -319,6 +319,12 @@ object UtSettings : AbstractSettings(
      */
     var runInstrumentedProcessWithDebug by getBooleanProperty(false)
 
+    /**
+     * Log level for instrumented process.
+     */
+    var instrumentedProcessLogLevel by getEnumProperty(LogLevel.Info)
+// endregion
+
     /**
      * Number of branch instructions using for clustering executions in the test minimization phase.
      */
diff --git a/utbot-framework/build.gradle b/utbot-framework/build.gradle
@@ -16,8 +16,8 @@ dependencies {
     api project(':utbot-framework-api')
     api project(':utbot-rd')
 
-    implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: '2022.3.1'
-    implementation group: 'com.jetbrains.rd', name: 'rd-core', version: '2022.3.1'
+    implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: rdVersion
+    implementation group: 'com.jetbrains.rd', name: 'rd-core', version: rdVersion
 
     implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}") {
         exclude group:'com.google.guava', module:'guava'
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/process/generated/EngineProcessModel.Generated.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/process/generated/EngineProcessModel.Generated.kt
@@ -66,10 +66,7 @@ class EngineProcessModel private constructor(
         fun create(lifetime: Lifetime, protocol: IProtocol): EngineProcessModel  {
             EngineProcessRoot.register(protocol.serializers)
             
-            return EngineProcessModel().apply {
-                identify(protocol.identity, RdId.Null.mix("EngineProcessModel"))
-                bind(lifetime, protocol, "EngineProcessModel")
-            }
+            return EngineProcessModel()
         }
         
         
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/process/generated/RdInstrumenterAdapter.Generated.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/process/generated/RdInstrumenterAdapter.Generated.kt
@@ -42,10 +42,7 @@ class RdInstrumenterAdapter private constructor(
         fun create(lifetime: Lifetime, protocol: IProtocol): RdInstrumenterAdapter  {
             EngineProcessRoot.register(protocol.serializers)
             
-            return RdInstrumenterAdapter().apply {
-                identify(protocol.identity, RdId.Null.mix("RdInstrumenterAdapter"))
-                bind(lifetime, protocol, "RdInstrumenterAdapter")
-            }
+            return RdInstrumenterAdapter()
         }
         
         private val __StringNullableSerializer = FrameworkMarshallers.String.nullable()
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/process/generated/RdSourceFindingStrategy.Generated.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/process/generated/RdSourceFindingStrategy.Generated.kt
@@ -44,10 +44,7 @@ class RdSourceFindingStrategy private constructor(
         fun create(lifetime: Lifetime, protocol: IProtocol): RdSourceFindingStrategy  {
             EngineProcessRoot.register(protocol.serializers)
             
-            return RdSourceFindingStrategy().apply {
-                identify(protocol.identity, RdId.Null.mix("RdSourceFindingStrategy"))
-                bind(lifetime, protocol, "RdSourceFindingStrategy")
-            }
+            return RdSourceFindingStrategy()
         }
         
         private val __StringNullableSerializer = FrameworkMarshallers.String.nullable()
diff --git a/utbot-instrumentation-tests/build.gradle b/utbot-instrumentation-tests/build.gradle
@@ -9,8 +9,8 @@ dependencies {
     testImplementation configurations.fetchInstrumentationJar
     testImplementation project(':utbot-sample')
     testImplementation group: 'org.jacoco', name: 'org.jacoco.report', version: jacocoVersion
-    implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: '2022.3.1'
-    implementation group: 'com.jetbrains.rd', name: 'rd-core', version: '2022.3.1'
+    implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: rdVersion
+    implementation group: 'com.jetbrains.rd', name: 'rd-core', version: rdVersion
 }
 
 processResources {
diff --git a/utbot-instrumentation/build.gradle b/utbot-instrumentation/build.gradle
@@ -9,8 +9,8 @@ dependencies {
     implementation group: 'de.javakaffee', name: 'kryo-serializers', version: kryoSerializersVersion
     implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlinLoggingVersion
 
-    implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: '2022.3.1'
-    implementation group: 'com.jetbrains.rd', name: 'rd-core', version: '2022.3.1'
+    implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: rdVersion
+    implementation group: 'com.jetbrains.rd', name: 'rd-core', version: rdVersion
     implementation group: 'net.java.dev.jna', name: 'jna-platform', version: '5.5.0'
 
 
diff --git a/utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/rd/InstrumentedProcess.kt b/utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/rd/InstrumentedProcess.kt
@@ -51,7 +51,7 @@ class InstrumentedProcess private constructor(
                     throw InstrumentedProcessInstantDeathException()
                 }
                 process
-            }.awaitSignal()
+            }.awaitProcessReady()
 
             logger.trace("rd process started")
 
diff --git a/utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/rd/generated/InstrumentedProcessModel.Generated.kt b/utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/rd/generated/InstrumentedProcessModel.Generated.kt
@@ -55,10 +55,7 @@ class InstrumentedProcessModel private constructor(
         fun create(lifetime: Lifetime, protocol: IProtocol): InstrumentedProcessModel  {
             InstrumentedProcessRoot.register(protocol.serializers)
             
-            return InstrumentedProcessModel().apply {
-                identify(protocol.identity, RdId.Null.mix("InstrumentedProcessModel"))
-                bind(lifetime, protocol, "InstrumentedProcessModel")
-            }
+            return InstrumentedProcessModel()
         }
         
         
diff --git a/utbot-intellij/build.gradle.kts b/utbot-intellij/build.gradle.kts
@@ -15,6 +15,7 @@ val jsIde: String? by rootProject
 
 val sootVersion: String? by rootProject
 val kryoVersion: String? by rootProject
+val rdVersion: String? by rootProject
 val semVer: String? by rootProject
 val androidStudioPath: String? by rootProject
 
@@ -90,8 +91,8 @@ tasks {
 }
 
 dependencies {
-    implementation(group ="com.jetbrains.rd", name = "rd-framework", version = "2022.3.1")
-    implementation(group ="com.jetbrains.rd", name = "rd-core", version = "2022.3.1")
+    implementation(group ="com.jetbrains.rd", name = "rd-framework", version = rdVersion)
+    implementation(group ="com.jetbrains.rd", name = "rd-core", version = rdVersion)
     implementation(group ="com.esotericsoftware.kryo", name = "kryo5", version = kryoVersion)
     implementation(group = "io.github.microutils", name = "kotlin-logging", version = kotlinLoggingVersion)
     implementation(group = "org.apache.commons", name = "commons-text", version = apacheCommonsTextVersion)
diff --git a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/process/EngineProcess.kt b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/process/EngineProcess.kt
@@ -145,7 +145,7 @@ class EngineProcess private constructor(val project: Project, rdProcess: Process
 
                     process
                 }
-                rdProcess.awaitSignal()
+                rdProcess.awaitProcessReady()
 
                 return EngineProcess(project, rdProcess)
             }
diff --git a/utbot-intellij/src/main/resources/log4j2.xml b/utbot-intellij/src/main/resources/log4j2.xml
@@ -6,7 +6,7 @@
             <PatternLayout pattern="%msg%n"/>
         </Console>
 <!--        When working as separate process - temporary log4j2.xml would be created, in which -->
-<!--        substring "ref=\"IdeaAppender\"" will be replaced with "ref=\"EngineProcessAppender\""-->
+<!--        substring `ref="IdeaAppender"` will be replaced with `ref="EngineProcessAppender"`-->
         <Console name="EngineProcessAppender" target="SYSTEM_OUT">
             <PatternLayout pattern="%d{HH:mm:ss.SSS} | %-5level | %-25c{1} | %msg%n"/>
         </Console>
diff --git a/utbot-rd/build.gradle b/utbot-rd/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.jetbrains.rdgen' version "2022.3.1"
+    id 'com.jetbrains.rdgen' version "2022.3.4"
 }
 
 import com.jetbrains.rd.generator.gradle.RdGenExtension
@@ -48,14 +48,14 @@ sourceSets {
 
 dependencies {
     implementation project(':utbot-core')
-    implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: '2022.3.1'
-    implementation group: 'com.jetbrains.rd', name: 'rd-core', version: '2022.3.1'
+    implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: rdVersion
+    implementation group: 'com.jetbrains.rd', name: 'rd-core', version: rdVersion
 
     implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlinLoggingVersion
 
     processWithRdServerMockImplementation project(':utbot-rd')
 
-    rdgenModelsCompileClasspath group: 'com.jetbrains.rd', name: 'rd-gen', version: '2022.3.1'
+    rdgenModelsCompileClasspath group: 'com.jetbrains.rd', name: 'rd-gen', version: rdVersion
 }
 
 task lifetimedProcessMockJar(type: Jar) {
diff --git a/utbot-rd/src/main/kotlin/org/utbot/rd/ProcessWithRdServer.kt b/utbot-rd/src/main/kotlin/org/utbot/rd/ProcessWithRdServer.kt
@@ -79,7 +79,7 @@ interface ProcessWithRdServer : LifetimedProcess {
     val port: Int
         get() = protocol.wire.serverPort
 
-    suspend fun awaitSignal(): ProcessWithRdServer
+    suspend fun awaitProcessReady(): ProcessWithRdServer
 }
 
 private val logger = getLogger<ProcessWithRdServer>()
@@ -98,7 +98,7 @@ class ProcessWithRdServerImpl private constructor(
         }
     }
 
-    override suspend fun awaitSignal(): ProcessWithRdServer {
+    override suspend fun awaitProcessReady(): ProcessWithRdServer {
         protocol.scheduler.pump(lifetime) {
             protocol.synchronizationModel
         }
diff --git a/utbot-rd/src/main/kotlin/org/utbot/rd/UtRdUtil.kt b/utbot-rd/src/main/kotlin/org/utbot/rd/UtRdUtil.kt
@@ -27,7 +27,7 @@ fun <TReq, TRes> IRdCall<TReq, TRes>.startBlocking(req: TReq): TRes {
     val call = this
     // We do not use RdCall.sync because it requires timeouts for execution, after which request will be stopped.
     // Some requests, for example test generation, might be either really long, or have their own timeouts.
-    // To honor their timeout logic we do not use RdCall.sync.
+    // To honour their timeout logic we do not use RdCall.sync.
     return runBlocking { call.startSuspending(req) }
 }
 
diff --git a/utbot-rd/src/main/kotlin/org/utbot/rd/generated/SettingsModel.Generated.kt b/utbot-rd/src/main/kotlin/org/utbot/rd/generated/SettingsModel.Generated.kt
@@ -43,10 +43,7 @@ class SettingsModel private constructor(
         fun create(lifetime: Lifetime, protocol: IProtocol): SettingsModel  {
             SettingsRoot.register(protocol.serializers)
             
-            return SettingsModel().apply {
-                identify(protocol.identity, RdId.Null.mix("SettingsModel"))
-                bind(lifetime, protocol, "SettingsModel")
-            }
+            return SettingsModel()
         }
         
         
diff --git a/utbot-rd/src/main/kotlin/org/utbot/rd/generated/SynchronizationModel.Generated.kt b/utbot-rd/src/main/kotlin/org/utbot/rd/generated/SynchronizationModel.Generated.kt
@@ -41,10 +41,7 @@ class SynchronizationModel private constructor(
         fun create(lifetime: Lifetime, protocol: IProtocol): SynchronizationModel  {
             SynchronizationRoot.register(protocol.serializers)
             
-            return SynchronizationModel().apply {
-                identify(protocol.identity, RdId.Null.mix("SynchronizationModel"))
-                bind(lifetime, protocol, "SynchronizationModel")
-            }
+            return SynchronizationModel()
         }
         
         

Original file line number	Diff line number	Diff line change
`@@ -66,10 +66,7 @@ class EngineProcessModel private constructor(`
`66`	`66`	`fun create(lifetime: Lifetime, protocol: IProtocol): EngineProcessModel {`
`67`	`67`	`EngineProcessRoot.register(protocol.serializers)`
`68`	`68`
`69`		`- return EngineProcessModel().apply {`
`70`		`- identify(protocol.identity, RdId.Null.mix("EngineProcessModel"))`
`71`		`- bind(lifetime, protocol, "EngineProcessModel")`
`72`		`- }`
	`69`	`+ return EngineProcessModel()`
`73`	`70`	`}`
`74`	`71`
`75`	`72`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ class InstrumentedProcess private constructor(`
`51`	`51`	`throw InstrumentedProcessInstantDeathException()`
`52`	`52`	`}`
`53`	`53`	`process`
`54`		`- }.awaitSignal()`
	`54`	`+ }.awaitProcessReady()`
`55`	`55`
`56`	`56`	`logger.trace("rd process started")`
`57`	`57`