From f76a918843025d40568d9d7a7b63eb00653f3a1b Mon Sep 17 00:00:00 2001 From: Krystian Panek Date: Mon, 24 Feb 2020 22:48:47 +0100 Subject: [PATCH] Common upgrade / lazy props alignment --- build.gradle.kts | 2 +- .../aem/common/instance/InstanceHttpClient.kt | 35 +++++++--- .../aem/common/instance/InstanceManager.kt | 2 +- .../common/instance/LocalInstanceManager.kt | 2 +- .../common/instance/action/AwaitDownAction.kt | 34 +++++++--- .../common/instance/action/AwaitUpAction.kt | 65 +++++++++++++------ .../aem/common/instance/check/BundlesCheck.kt | 8 +-- .../aem/common/instance/check/CheckRunner.kt | 18 +++-- .../common/instance/check/ComponentsCheck.kt | 12 ++-- .../aem/common/instance/check/DefaultCheck.kt | 31 ++++----- .../aem/common/instance/check/EventsCheck.kt | 10 +-- .../aem/common/instance/check/TimeoutCheck.kt | 8 +-- .../common/instance/check/UnavailableCheck.kt | 4 +- .../common/instance/check/UnchangedCheck.kt | 4 +- .../instance/service/repository/Repository.kt | 2 +- 15 files changed, 140 insertions(+), 97 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 44dabd06d..5fa05a268 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -32,7 +32,7 @@ repositories { dependencies { implementation(gradleApi()) - implementation("com.cognifide.gradle:common-plugin:0.1.7") + implementation("com.cognifide.gradle:common-plugin:0.1.9") implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.10.1") implementation("com.jayway.jsonpath:json-path:2.4.0") diff --git a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/InstanceHttpClient.kt b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/InstanceHttpClient.kt index f03d0145a..f5fd2c99c 100644 --- a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/InstanceHttpClient.kt +++ b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/InstanceHttpClient.kt @@ -9,18 +9,33 @@ import org.apache.http.HttpResponse open class InstanceHttpClient(aem: AemExtension, val instance: Instance) : HttpClient(aem.common) { init { - baseUrl = instance.httpUrl - basicUser = instance.user - basicPassword = instance.password - authorizationPreemptive = true + baseUrl.set(instance.httpUrl) + basicUser.set(instance.user) + basicPassword.set(instance.password) + authorizationPreemptive.set(true) - connectionTimeout = aem.prop.int("instance.http.connectionTimeout") ?: 30000 - connectionRetries = aem.prop.boolean("instance.http.connectionRetries") ?: true - connectionIgnoreSsl = aem.prop.boolean("instance.http.connectionIgnoreSsl") ?: true + connectionTimeout.apply { + convention(30_000) + aem.prop.int("instance.http.connectionTimeout")?.let { set(it) } + } + connectionRetries.apply { + convention(true) + aem.prop.boolean("instance.http.connectionRetries")?.let { set(it) } - proxyHost = aem.prop.string("instance.http.proxyHost") - proxyPort = aem.prop.int("instance.http.proxyPort") - proxyScheme = aem.prop.string("instance.http.proxyScheme") + } + connectionIgnoreSsl.apply { + convention(true) + aem.prop.boolean("instance.http.connectionIgnoreSsl")?.let { set(it) } + } + proxyHost.apply { + aem.prop.string("instance.http.proxyHost")?.let { set(it) } + } + proxyPort.apply { + aem.prop.int("instance.http.proxyPort")?.let { set(it) } + } + proxyScheme.apply { + aem.prop.string("instance.http.proxyScheme")?.let { set(it) } + } } override fun throwStatusException(response: HttpResponse) { diff --git a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/InstanceManager.kt b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/InstanceManager.kt index a748b8745..e5643070c 100644 --- a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/InstanceManager.kt +++ b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/InstanceManager.kt @@ -24,7 +24,7 @@ open class InstanceManager(val aem: AemExtension) { " or setting property 'instance.projectDir'!" ) }) - aem.prop.file("instance.projectDir")?.let { set(it) } + aem.prop.string("instance.projectDir")?.let { set(project.rootProject.file(it)) } } /** diff --git a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/LocalInstanceManager.kt b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/LocalInstanceManager.kt index f2b8abf14..e597e66c2 100644 --- a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/LocalInstanceManager.kt +++ b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/LocalInstanceManager.kt @@ -35,7 +35,7 @@ class LocalInstanceManager(private val aem: AemExtension) : Serializable { " or setting property 'localInstance.projectDir'!" ) }) - aem.prop.file("localInstance.projectDir")?.let { set(it) } + aem.prop.string("localInstance.projectDir")?.let { set(project.rootProject.file(it)) } } /** diff --git a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/action/AwaitDownAction.kt b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/action/AwaitDownAction.kt index 8656da9c1..f309c5485 100644 --- a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/action/AwaitDownAction.kt +++ b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/action/AwaitDownAction.kt @@ -12,10 +12,14 @@ import java.util.concurrent.TimeUnit class AwaitDownAction(aem: AemExtension) : DefaultAction(aem) { private var timeoutOptions: TimeoutCheck.() -> Unit = { - stateTime = aem.prop.long("instance.awaitDown.timeout.stateTime") - ?: TimeUnit.MINUTES.toMillis(2) - constantTime = aem.prop.long("instance.awaitDown.timeout.constantTime") - ?: TimeUnit.MINUTES.toMillis(10) + stateTime.apply { + convention(TimeUnit.MINUTES.toMillis(2)) + aem.prop.long("instance.awaitDown.timeout.stateTime")?.let { set(it) } + } + constantTime.apply { + convention(TimeUnit.MINUTES.toMillis(10)) + aem.prop.long("instance.awaitDown.timeout.constantTime")?.let { set(it) } + } } fun timeout(options: TimeoutCheck.() -> Unit) { @@ -23,8 +27,10 @@ class AwaitDownAction(aem: AemExtension) : DefaultAction(aem) { } private var unavailableOptions: UnavailableCheck.() -> Unit = { - utilisationTime = aem.prop.long("instance.awaitDown.unavailable.utilizationTime") - ?: TimeUnit.SECONDS.toMillis(10) + utilisationTime.apply { + convention(TimeUnit.SECONDS.toMillis(10)) + aem.prop.long("instance.awaitDown.unavailable.utilizationTime")?.let { set(it) } + } } fun unavailable(options: UnavailableCheck.() -> Unit) { @@ -32,8 +38,10 @@ class AwaitDownAction(aem: AemExtension) : DefaultAction(aem) { } private var unchangedOptions: UnchangedCheck.() -> Unit = { - awaitTime = aem.prop.long("instance.awaitDown.unchanged.awaitTime") - ?: TimeUnit.SECONDS.toMillis(3) + awaitTime.apply { + convention(TimeUnit.SECONDS.toMillis(3)) + aem.prop.long("instance.awaitDown.unchanged.awaitTime")?.let { set(it) } + } } fun unchanged(options: UnchangedCheck.() -> Unit) { @@ -41,8 +49,14 @@ class AwaitDownAction(aem: AemExtension) : DefaultAction(aem) { } private val runner = CheckRunner(aem).apply { - delay = aem.prop.long("instance.awaitDown.delay") ?: TimeUnit.SECONDS.toMillis(1) - verbose = aem.prop.boolean("instance.awaitDown.verbose") ?: true + delay.apply { + convention(TimeUnit.SECONDS.toMillis(1)) + aem.prop.long("instance.awaitDown.delay")?.let { set(it) } + } + verbose.apply { + convention(true) + aem.prop.boolean("instance.awaitDown.verbose")?.let { set(it) } + } checks { listOf( diff --git a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/action/AwaitUpAction.kt b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/action/AwaitUpAction.kt index edb5cd00d..674ec1fd6 100644 --- a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/action/AwaitUpAction.kt +++ b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/action/AwaitUpAction.kt @@ -12,10 +12,14 @@ import java.util.concurrent.TimeUnit class AwaitUpAction(aem: AemExtension) : DefaultAction(aem) { private var timeoutOptions: TimeoutCheck.() -> Unit = { - stateTime = aem.prop.long("instance.awaitUp.timeout.stateTime") - ?: TimeUnit.MINUTES.toMillis(10) - constantTime = aem.prop.long("instance.awaitUp.timeout.constantTime") - ?: TimeUnit.MINUTES.toMillis(30) + stateTime.apply { + convention(TimeUnit.MINUTES.toMillis(10)) + aem.prop.long("instance.awaitUp.timeout.stateTime")?.let { set(it) } + } + constantTime.apply { + convention(TimeUnit.MINUTES.toMillis(30)) + aem.prop.long("instance.awaitUp.timeout.constantTime")?.let { set(it) } + } } fun timeout(options: TimeoutCheck.() -> Unit) { @@ -23,8 +27,10 @@ class AwaitUpAction(aem: AemExtension) : DefaultAction(aem) { } private var bundlesOptions: BundlesCheck.() -> Unit = { - symbolicNamesIgnored = aem.prop.list("instance.awaitUp.bundles.symbolicNamesIgnored") - ?: listOf() + symbolicNamesIgnored.apply { + convention(listOf()) + aem.prop.list("instance.awaitUp.bundles.symbolicNamesIgnored")?.let { set(it) } + } } fun bundles(options: BundlesCheck.() -> Unit) { @@ -32,13 +38,18 @@ class AwaitUpAction(aem: AemExtension) : DefaultAction(aem) { } private var eventsOptions: EventsCheck.() -> Unit = { - unstableTopics = aem.prop.list("instance.awaitUp.event.unstableTopics") ?: listOf( - "org/osgi/framework/ServiceEvent/*", - "org/osgi/framework/FrameworkEvent/*", - "org/osgi/framework/BundleEvent/*" - ) - unstableAgeMillis = aem.prop.long("instance.awaitUp.event.unstableAgeMillis") - ?: TimeUnit.SECONDS.toMillis(5) + unstableTopics.apply { + convention(listOf( + "org/osgi/framework/ServiceEvent/*", + "org/osgi/framework/FrameworkEvent/*", + "org/osgi/framework/BundleEvent/*" + )) + aem.prop.list("instance.awaitUp.event.unstableTopics")?.let { set(it) } + } + unstableAgeMillis.apply { + convention(TimeUnit.SECONDS.toMillis(5)) + aem.prop.long("instance.awaitUp.event.unstableAgeMillis")?.let { set(it) } + } } fun events(options: EventsCheck.() -> Unit) { @@ -46,10 +57,14 @@ class AwaitUpAction(aem: AemExtension) : DefaultAction(aem) { } private var componentsOptions: ComponentsCheck.() -> Unit = { - platformComponents = aem.prop.list("instance.awaitUp.components.platform") - ?: listOf("com.day.crx.packaging.*", "org.apache.sling.installer.*") - specificComponents = aem.prop.list("instance.awaitUp.components.specific") - ?: aem.javaPackages.map { "$it.*" } + platformComponents.apply { + convention(listOf("com.day.crx.packaging.*", "org.apache.sling.installer.*")) + aem.prop.list("instance.awaitUp.components.platform")?.let { set(it) } + } + specificComponents.apply { + convention(aem.obj.provider { aem.javaPackages.map { "$it.*" } }) + aem.prop.list("instance.awaitUp.components.specific")?.let { set(it) } + } } fun components(options: ComponentsCheck.() -> Unit) { @@ -57,8 +72,10 @@ class AwaitUpAction(aem: AemExtension) : DefaultAction(aem) { } private var unchangedOptions: UnchangedCheck.() -> Unit = { - awaitTime = aem.prop.long("instance.awaitUp.unchanged.awaitTime") - ?: TimeUnit.SECONDS.toMillis(3) + awaitTime.apply { + convention(TimeUnit.SECONDS.toMillis(3)) + aem.prop.long("instance.awaitUp.unchanged.awaitTime")?.let { set(it) } + } } fun unchanged(options: UnchangedCheck.() -> Unit) { @@ -66,8 +83,14 @@ class AwaitUpAction(aem: AemExtension) : DefaultAction(aem) { } private val runner = CheckRunner(aem).apply { - delay = aem.prop.long("instance.awaitUp.delay") ?: TimeUnit.SECONDS.toMillis(1) - verbose = aem.prop.boolean("instance.awaitUp.verbose") ?: true + delay.apply { + convention(TimeUnit.SECONDS.toMillis(1)) + aem.prop.long("instance.awaitUp.delay")?.let { set(it) } + } + verbose.apply { + convention(true) + aem.prop.boolean("instance.awaitUp.verbose")?.let { set(it) } + } checks { listOf( diff --git a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/BundlesCheck.kt b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/BundlesCheck.kt index 78db49894..97a142564 100644 --- a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/BundlesCheck.kt +++ b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/BundlesCheck.kt @@ -3,12 +3,12 @@ package com.cognifide.gradle.aem.common.instance.check @Suppress("MagicNumber") class BundlesCheck(group: CheckGroup) : DefaultCheck(group) { - var symbolicNamesIgnored = listOf() + val symbolicNamesIgnored = aem.obj.strings { convention(listOf()) } init { sync.apply { - http.connectionTimeout = 750 - http.connectionRetries = false + http.connectionTimeout.convention(750) + http.connectionRetries.convention(false) } } @@ -25,7 +25,7 @@ class BundlesCheck(group: CheckGroup) : DefaultCheck(group) { return } - val unstable = state.bundlesExcept(symbolicNamesIgnored).filter { !it.stable } + val unstable = state.bundlesExcept(symbolicNamesIgnored.get()).filter { !it.stable } if (unstable.isNotEmpty()) { statusLogger.error( when (unstable.size) { diff --git a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/CheckRunner.kt b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/CheckRunner.kt index 6df0bdc1b..9c1993faf 100644 --- a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/CheckRunner.kt +++ b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/CheckRunner.kt @@ -21,7 +21,7 @@ class CheckRunner(internal val aem: AemExtension) { checks = definitions } - var progresses = listOf() + private var progresses = listOf() /** * Get current checking progress of concrete instance. @@ -34,31 +34,29 @@ class CheckRunner(internal val aem: AemExtension) { /** * How long to wait after failed checking before checking again. */ - var delay = 0L + val delay = aem.obj.long { convention(0L) } /** * Controls if aborted running should fail build. */ - var verbose = true + val verbose = aem.obj.boolean { convention(true) } /** * Time since running started. */ - val runningTime: Long - get() = runningWatch.time + val runningTime: Long get() = runningWatch.time private val runningWatch = StopWatch() /** * Error causing running stopped. */ - var abortCause: Exception? = null + internal var abortCause: Exception? = null /** * Verify if running is stopped. */ - val aborted: Boolean - get() = abortCause != null + val aborted: Boolean get() = abortCause != null /** * Controls logging behavior @@ -114,7 +112,7 @@ class CheckRunner(internal val aem: AemExtension) { break } - Behaviors.waitFor(delay) + Behaviors.waitFor(delay.get()) } while (isActive) } @@ -129,7 +127,7 @@ class CheckRunner(internal val aem: AemExtension) { progresses.forEach { it.currentCheck?.log() } } - if (verbose) { + if (verbose.get()) { abortCause?.let { throw it } } else { aem.logger.error("Checking error", abortCause) diff --git a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/ComponentsCheck.kt b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/ComponentsCheck.kt index dfc1e09f2..1ef781173 100644 --- a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/ComponentsCheck.kt +++ b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/ComponentsCheck.kt @@ -6,13 +6,13 @@ import com.cognifide.gradle.common.utils.Formats @Suppress("MagicNumber") class ComponentsCheck(group: CheckGroup) : DefaultCheck(group) { - var platformComponents = listOf() + val platformComponents = aem.obj.strings { convention(listOf()) } - var specificComponents = listOf() + val specificComponents = aem.obj.strings { convention(listOf()) } init { sync.apply { - http.connectionTimeout = 10000 + http.connectionTimeout.convention(10_000) } } @@ -31,7 +31,7 @@ class ComponentsCheck(group: CheckGroup) : DefaultCheck(group) { val total = state.components.size - val inactive = state.find(platformComponents, listOf()).filter { !it.active } + val inactive = state.find(platformComponents.get(), listOf()).filter { !it.active } if (inactive.isNotEmpty()) { statusLogger.error( when (inactive.size) { @@ -43,7 +43,7 @@ class ComponentsCheck(group: CheckGroup) : DefaultCheck(group) { ) } - val failed = state.find(specificComponents, listOf()).filter { it.failedActivation } + val failed = state.find(specificComponents.get(), listOf()).filter { it.failedActivation } if (failed.isNotEmpty()) { statusLogger.error( when (failed.size) { @@ -55,7 +55,7 @@ class ComponentsCheck(group: CheckGroup) : DefaultCheck(group) { ) } - val unsatisfied = state.find(specificComponents, listOf()).filter { it.unsatisfied } + val unsatisfied = state.find(specificComponents.get(), listOf()).filter { it.unsatisfied } if (unsatisfied.isNotEmpty()) { statusLogger.error( when (unsatisfied.size) { diff --git a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/DefaultCheck.kt b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/DefaultCheck.kt index 07d721829..59d660742 100644 --- a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/DefaultCheck.kt +++ b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/DefaultCheck.kt @@ -15,23 +15,20 @@ abstract class DefaultCheck(protected val group: CheckGroup) : Check { val instance = group.instance - val progress: CheckProgress - get() = runner.progress(instance) + val progress: CheckProgress get() = runner.progress(instance) val statusLogger = group.statusLogger var sync: InstanceSync = instance.sync.apply { - http.connectionTimeout = 1000 - http.connectionRetries = false + http.connectionTimeout.convention(1000) + http.connectionRetries.convention(false) applyInstanceInitialized() } - override val status: String - get() = statusLogger.entries.firstOrNull()?.summary ?: "Check passed" + override val status: String get() = statusLogger.entries.firstOrNull()?.summary ?: "Check passed" - override val success: Boolean - get() = statusLogger.entries.none { it.level == LogLevel.ERROR } + override val success: Boolean get() = statusLogger.entries.none { it.level == LogLevel.ERROR } fun state(value: T) = value.also { group.state(it) } @@ -53,25 +50,21 @@ abstract class DefaultCheck(protected val group: CheckGroup) : Check { val authInit = cache.get(cacheKey) ?: false if (authInit) { - http.basicUser = Instance.USER_DEFAULT - http.basicPassword = Instance.PASSWORD_DEFAULT + http.basicUser.set(Instance.USER_DEFAULT) + http.basicPassword.set(Instance.PASSWORD_DEFAULT) } - val originHttpResponseHandler = http.responseHandler - - http.responseHandler = { response -> - originHttpResponseHandler(response) - + http.responseHandler { response -> if (response.statusLine.statusCode == HttpStatus.SC_UNAUTHORIZED) { val authInitCurrent = cache.get(cacheKey) ?: false if (!authInitCurrent) { aem.logger.info("Switching instance '${instance.name}' credentials from customized to defaults.") - http.basicUser = Instance.USER_DEFAULT - http.basicPassword = Instance.PASSWORD_DEFAULT + http.basicUser.set(Instance.USER_DEFAULT) + http.basicPassword.set(Instance.PASSWORD_DEFAULT) } else { aem.logger.info("Switching instance '${instance.name}' credentials from defaults to customized.") - http.basicUser = instance.user - http.basicPassword = instance.password + http.basicUser.set(instance.user) + http.basicPassword.set(instance.password) } cache.put(cacheKey, !authInitCurrent) } diff --git a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/EventsCheck.kt b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/EventsCheck.kt index c2a5d3d99..e12cd6f44 100644 --- a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/EventsCheck.kt +++ b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/EventsCheck.kt @@ -7,14 +7,14 @@ import org.apache.commons.lang3.StringUtils @Suppress("MagicNumber") class EventsCheck(group: CheckGroup) : DefaultCheck(group) { - var unstableTopics = listOf() + val unstableTopics = aem.obj.strings { convention(listOf()) } - var unstableAgeMillis = TimeUnit.SECONDS.toMillis(5) + val unstableAgeMillis = aem.obj.long { convention(TimeUnit.SECONDS.toMillis(5)) } init { sync.apply { - http.connectionTimeout = 250 - http.connectionRetries = false + http.connectionTimeout.convention(250) + http.connectionRetries.convention(false) } } @@ -31,7 +31,7 @@ class EventsCheck(group: CheckGroup) : DefaultCheck(group) { return } - val unstable = state.matching(unstableTopics, unstableAgeMillis, instance.zoneId) + val unstable = state.matching(unstableTopics.get(), unstableAgeMillis.get(), instance.zoneId) if (unstable.isNotEmpty()) { statusLogger.error( when (unstable.size) { diff --git a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/TimeoutCheck.kt b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/TimeoutCheck.kt index 86529a00f..151fdc693 100644 --- a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/TimeoutCheck.kt +++ b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/TimeoutCheck.kt @@ -9,19 +9,19 @@ class TimeoutCheck(group: CheckGroup) : DefaultCheck(group) { /** * Prevents too long inactivity time. */ - var stateTime: Long = TimeUnit.MINUTES.toMillis(10) + val stateTime = aem.obj.long { convention(TimeUnit.MINUTES.toMillis(10)) } /** * Prevents circular restarting of OSGi bundles & components. */ - var constantTime: Long = TimeUnit.MINUTES.toMillis(30) + val constantTime = aem.obj.long { convention(TimeUnit.MINUTES.toMillis(30)) } override fun check() { - if (progress.stateTime >= stateTime) { + if (progress.stateTime >= stateTime.get()) { throw InstanceException("Instance state timeout reached '${Formats.duration(progress.stateTime)}' for $instance!") } - if (runner.runningTime >= constantTime) { + if (runner.runningTime >= constantTime.get()) { throw InstanceException("Instance constant timeout reached '${Formats.duration(runner.runningTime)}'!") } } diff --git a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/UnavailableCheck.kt b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/UnavailableCheck.kt index 5e95c98f8..6758731f8 100644 --- a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/UnavailableCheck.kt +++ b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/UnavailableCheck.kt @@ -9,7 +9,7 @@ class UnavailableCheck(group: CheckGroup) : DefaultCheck(group) { /** * Status of remote instances cannot be checked easily. Because of that, check will work just a little bit longer. */ - var utilisationTime = TimeUnit.SECONDS.toMillis(15) + val utilisationTime = aem.obj.long { convention(TimeUnit.SECONDS.toMillis(15)) } override fun check() { val bundleState = state(sync.osgiFramework.determineBundleState()) @@ -30,7 +30,7 @@ class UnavailableCheck(group: CheckGroup) : DefaultCheck(group) { ) } } else { - if (utilisationTime !in 0..progress.stateTime) { + if (utilisationTime.get() !in 0..progress.stateTime) { statusLogger.error( "Awaiting utilized", "HTTP server not responding. Waiting for utilization (port releasing) of $instance" diff --git a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/UnchangedCheck.kt b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/UnchangedCheck.kt index db27bc12f..be63692c8 100644 --- a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/UnchangedCheck.kt +++ b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/check/UnchangedCheck.kt @@ -10,10 +10,10 @@ import java.util.concurrent.TimeUnit */ class UnchangedCheck(group: CheckGroup) : DefaultCheck(group) { - var awaitTime: Long = TimeUnit.SECONDS.toMillis(3) + val awaitTime = aem.obj.long { convention(TimeUnit.SECONDS.toMillis(3)) } override fun check() { - if (progress.stateChanges <= 1 && progress.stateTime < awaitTime) { + if (progress.stateChanges <= 1 && progress.stateTime < awaitTime.get()) { statusLogger.error( "State unchanged", "Awaiting state to be changed on $instance" diff --git a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/service/repository/Repository.kt b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/service/repository/Repository.kt index 108dcb3e1..e66a5bc77 100644 --- a/src/main/kotlin/com/cognifide/gradle/aem/common/instance/service/repository/Repository.kt +++ b/src/main/kotlin/com/cognifide/gradle/aem/common/instance/service/repository/Repository.kt @@ -76,7 +76,7 @@ class Repository(sync: InstanceSync) : InstanceService(sync) { internal val http by lazy { RepositoryHttpClient(aem, instance).apply { - responseChecks = this@Repository.responseChecks.get() + responseChecks.set(this@Repository.responseChecks) } } }