JPERF-273: Distinguish running hooks from hooking them in

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/database/DatabaseIpConfig.kt

@@ -10,7 +10,7 @@ class DatabaseIpConfig(
     private val databaseIp: String
 ) : InstalledJiraHook {
 
-    override fun hook(
+    override fun run(
         ssh: SshConnection,
         jira: InstalledJira,
         flow: JiraNodeFlow

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/database/MysqlConnector.kt

@@ -10,7 +10,7 @@ import java.time.Duration
 
 class MysqlConnector : InstalledJiraHook {
 
-    override fun hook(
+    override fun run(
         ssh: SshConnection,
         jira: InstalledJira,
         flow: JiraNodeFlow

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/flow/install/DataCenterHook.kt

@@ -9,7 +9,7 @@ class DataCenterHook(
     private val sharedHome: SharedHome
 ) : InstalledJiraHook {
 
-    override fun hook(
+    override fun run(
         ssh: SshConnection,
         jira: InstalledJira,
         flow: JiraNodeFlow

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/flow/install/DefaultPostInstallHook.kt

@@ -11,7 +11,7 @@ class DefaultPostInstallHook(
     private val config: JiraNodeConfig
 ) : InstalledJiraHook {
 
-    override fun hook(
+    override fun run(
         ssh: SshConnection,
         jira: InstalledJira,
         flow: JiraNodeFlow
@@ -23,6 +23,6 @@ class DefaultPostInstallHook(
             ProfilerHook(config.profiler),
             SplunkForwarderHook(config.splunkForwarder),
             UbuntuSysstat()
-        ).forEach { it.hook(ssh, jira, flow) }
+        ).forEach { it.run(ssh, jira, flow) }
     }
 }

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/flow/install/DisabledAutoBackup.kt

@@ -5,7 +5,7 @@ import com.atlassian.performance.tools.ssh.api.SshConnection
 
 class DisabledAutoBackup : InstalledJiraHook {
 
-    override fun hook(
+    override fun run(
         ssh: SshConnection,
         jira: InstalledJira,
         flow: JiraNodeFlow

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/flow/install/HookedJiraInstallation.kt

@@ -13,9 +13,9 @@ class HookedJiraInstallation(
         server: TcpServer,
         flow: JiraNodeFlow
     ): InstalledJira {
-        flow.listPreInstallHooks().forEach { it.hook(ssh, server, flow) }
+        flow.listPreInstallHooks().forEach { it.run(ssh, server, flow) }
         val installed = installation.install(ssh, server, flow)
-        flow.listPostInstallHooks().forEach { it.hook(ssh, installed, flow) }
+        flow.listPostInstallHooks().forEach { it.run(ssh, installed, flow) }
         return installed
     }
 }

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/flow/install/InstalledJiraHook.kt

@@ -6,17 +6,18 @@ import com.atlassian.performance.tools.infrastructure.api.jira.flow.start.Starte
 import com.atlassian.performance.tools.ssh.api.SshConnection
 
 interface InstalledJiraHook : StartedJiraHook {
-    fun hook(
+
+    fun run(
         ssh: SshConnection,
         jira: InstalledJira,
         flow: JiraNodeFlow
     )
 
-    override fun hook(
+    override fun run(
         ssh: SshConnection,
         jira: StartedJira,
         flow: JiraNodeFlow
     ) {
-        hook(ssh, jira.installed, flow)
+        run(ssh, jira.installed, flow)
     }
 }

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/flow/install/JiraHomeProperty.kt

@@ -5,7 +5,7 @@ import com.atlassian.performance.tools.ssh.api.SshConnection
 
 class JiraHomeProperty : InstalledJiraHook {
 
-    override fun hook(
+    override fun run(
         ssh: SshConnection,
         jira: InstalledJira,
         flow: JiraNodeFlow

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/flow/install/JiraLogs.kt

@@ -6,7 +6,7 @@ import com.atlassian.performance.tools.ssh.api.SshConnection
 
 class JiraLogs : InstalledJiraHook {
 
-    override fun hook(ssh: SshConnection, jira: InstalledJira, flow: JiraNodeFlow) {
+    override fun run(ssh: SshConnection, jira: InstalledJira, flow: JiraNodeFlow) {
         listOf(
             StaticReport("${jira.home}/log/atlassian-jira.log"),
             StaticReport("${jira.installation}/logs/catalina.out")

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/flow/install/JvmConfig.kt

@@ -11,7 +11,7 @@ class JvmConfig(
     private val config: JiraNodeConfig
 ) : InstalledJiraHook {
 
-    override fun hook(
+    override fun run(
         ssh: SshConnection,
         jira: InstalledJira,
         flow: JiraNodeFlow

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/flow/server/AsyncProfilerHook.kt

@@ -9,7 +9,7 @@ import java.net.URI
 
 class AsyncProfilerHook : TcpServerHook {
 
-    override fun hook(
+    override fun run(
         ssh: SshConnection,
         server: TcpServer,
         flow: JiraNodeFlow
@@ -32,7 +32,7 @@ private class InstalledAsyncProfiler(
     private val profilerPath: String
 ) : StartedJiraHook {
 
-    override fun hook(
+    override fun run(
         ssh: SshConnection,
         jira: StartedJira,
         flow: JiraNodeFlow

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/flow/server/TcpServerHook.kt

@@ -7,17 +7,18 @@ import com.atlassian.performance.tools.infrastructure.api.jira.flow.install.Inst
 import com.atlassian.performance.tools.ssh.api.SshConnection
 
 interface TcpServerHook : InstalledJiraHook {
-    fun hook(
+
+    fun run(
         ssh: SshConnection,
         server: TcpServer,
         flow: JiraNodeFlow
     )
 
-    override fun hook(
+    override fun run(
         ssh: SshConnection,
         jira: InstalledJira,
         flow: JiraNodeFlow
     ) {
-        hook(ssh, jira.server, flow)
+        run(ssh, jira.server, flow)
     }
 }

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/flow/server/UbuntuSysstat.kt

@@ -11,7 +11,7 @@ import com.atlassian.performance.tools.ssh.api.SshConnection
 
 class UbuntuSysstat : TcpServerHook {
 
-    override fun hook(
+    override fun run(
         ssh: SshConnection,
         server: TcpServer,
         flow: JiraNodeFlow
@@ -28,7 +28,7 @@ private class InstalledOsMetric(
     private val metric: OsMetric
 ) : TcpServerHook {
 
-    override fun hook(ssh: SshConnection, server: TcpServer, flow: JiraNodeFlow) {
+    override fun run(ssh: SshConnection, server: TcpServer, flow: JiraNodeFlow) {
         val process = metric.start(ssh)
         flow.reports.add(RemoteMonitoringProcessReport(process))
     }

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/flow/start/AccessLogs.kt

@@ -7,7 +7,7 @@ import com.atlassian.performance.tools.ssh.api.SshConnection
 
 class AccessLogs : StartedJiraHook {
 
-    override fun hook(ssh: SshConnection, jira: StartedJira, flow: JiraNodeFlow) {
+    override fun run(ssh: SshConnection, jira: StartedJira, flow: JiraNodeFlow) {
         flow.reports.add(FileListing("${jira.installed.installation}/logs/*access*"))
     }
 }

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/flow/start/DefaultStartedJiraHook.kt

@@ -7,14 +7,14 @@ import com.atlassian.performance.tools.ssh.api.SshConnection
 
 class DefaultStartedJiraHook : StartedJiraHook {
 
-    override fun hook(
+    override fun run(
         ssh: SshConnection,
         jira: StartedJira,
         flow: JiraNodeFlow
     ) {
         listOf(
             JiraLogs(),
             JstatHook()
-        ).forEach { it.hook(ssh, jira, flow) }
+        ).forEach { it.run(ssh, jira, flow) }
     }
 }

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/flow/start/HookedJiraStart.kt

@@ -14,9 +14,9 @@ class HookedJiraStart(
         installed: InstalledJira,
         flow: JiraNodeFlow
     ): StartedJira {
-        flow.listPreStartHooks().forEach { it.hook(ssh, installed, flow) }
+        flow.listPreStartHooks().forEach { it.run(ssh, installed, flow) }
         val started = start.start(ssh, installed, flow)
-        flow.listPostStartHooks().forEach { it.hook(ssh, started, flow) }
+        flow.listPostStartHooks().forEach { it.run(ssh, started, flow) }
         return started
     }
 }

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/flow/start/JstatHook.kt

@@ -7,7 +7,7 @@ import com.atlassian.performance.tools.ssh.api.SshConnection
 
 class JstatHook : StartedJiraHook {
 
-    override fun hook(
+    override fun run(
         ssh: SshConnection,
         jira: StartedJira,
         flow: JiraNodeFlow

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/flow/start/RestUpgrade.kt

@@ -16,7 +16,7 @@ class RestUpgrade(
     private val adminPassword: String
 ) : StartedJiraHook {
 
-    override fun hook(ssh: SshConnection, jira: StartedJira, flow: JiraNodeFlow) {
+    override fun run(ssh: SshConnection, jira: StartedJira, flow: JiraNodeFlow) {
         val threadDump = ThreadDump(jira.pid, jira.installed.jdk)
         val privatePort = jira.installed.server.privatePort
         val upgradesEndpoint = URI("http://$adminUsername:$adminPassword@localhost:$privatePort/rest/api/2/upgrade")

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/flow/start/StartedJiraHook.kt

@@ -5,7 +5,8 @@ import com.atlassian.performance.tools.infrastructure.api.jira.flow.server.Start
 import com.atlassian.performance.tools.ssh.api.SshConnection
 
 interface StartedJiraHook {
-    fun hook(
+
+    fun run(
         ssh: SshConnection,
         jira: StartedJira,
         flow: JiraNodeFlow

src/main/kotlin/com/atlassian/performance/tools/infrastructure/jira/flow/install/ProfilerHook.kt

@@ -16,7 +16,7 @@ import com.atlassian.performance.tools.ssh.api.SshConnection
 class ProfilerHook(
     private val profiler: Profiler
 ) : InstalledJiraHook {
-    override fun hook(ssh: SshConnection, jira: InstalledJira, flow: JiraNodeFlow) {
+    override fun run(ssh: SshConnection, jira: InstalledJira, flow: JiraNodeFlow) {
         profiler.install(ssh)
         flow.hookPostStart(InstalledProfiler(profiler))
     }
@@ -26,7 +26,7 @@ private class InstalledProfiler(
     private val profiler: Profiler
 ) : StartedJiraHook {
 
-    override fun hook(
+    override fun run(
         ssh: SshConnection,
         jira: StartedJira,
         flow: JiraNodeFlow

src/main/kotlin/com/atlassian/performance/tools/infrastructure/jira/flow/install/SplunkForwarderHook.kt

@@ -10,7 +10,7 @@ internal class SplunkForwarderHook(
     private val splunk: SplunkForwarder
 ) : InstalledJiraHook {
 
-    override fun hook(
+    override fun run(
         ssh: SshConnection,
         jira: InstalledJira,
         flow: JiraNodeFlow

src/test/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/flow/JiraNodeFlowTest.kt

@@ -23,7 +23,7 @@ class JiraNodeFlowTest {
         val server = TcpServer("doesn't matter", 123, "fake-server")
 
         flow.listPreInstallHooks().forEach {
-            it.hook(FailingSshConnection(), server, flow)
+            it.run(FailingSshConnection(), server, flow)
         }
 
         assertThat(counter.count).isEqualTo(3)
@@ -34,15 +34,15 @@ private class CountingHook : TcpServerHook {
 
     var count = 0
 
-    override fun hook(ssh: SshConnection, server: TcpServer, flow: JiraNodeFlow) {
+    override fun run(ssh: SshConnection, server: TcpServer, flow: JiraNodeFlow) {
         count++
     }
 }
 
 private class HookingHook(
     private val hook: TcpServerHook
 ) : TcpServerHook {
-    override fun hook(ssh: SshConnection, server: TcpServer, flow: JiraNodeFlow) {
+    override fun run(ssh: SshConnection, server: TcpServer, flow: JiraNodeFlow) {
         flow.hookPreInstall(hook)
     }
 }

src/test/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/flow/start/HookedJiraStartIT.kt

@@ -132,11 +132,11 @@ class HookedJiraStartIT {
 }
 
 private class FailingHook : TcpServerHook, InstalledJiraHook {
-    override fun hook(ssh: SshConnection, server: TcpServer, flow: JiraNodeFlow) {
+    override fun run(ssh: SshConnection, server: TcpServer, flow: JiraNodeFlow) {
         throw Exception("Failed")
     }
 
-    override fun hook(ssh: SshConnection, jira: InstalledJira, flow: JiraNodeFlow) {
+    override fun run(ssh: SshConnection, jira: InstalledJira, flow: JiraNodeFlow) {
         throw Exception("Failed")
     }
 }