From 1634a162c5df63e8902e08b76973567608ca159a Mon Sep 17 00:00:00 2001 From: Mikolaj Grzaslewicz Date: Mon, 11 Sep 2023 15:14:18 +0200 Subject: [PATCH] JPERF-273 Move hook functionality out of API. It's not ready yet --- .../infrastructure/database/MysqlFiveConnector.kt | 7 +++---- .../database/MysqlFiveDotSevenJiraConfig.kt | 4 ++-- .../{api => hookapi}/database/DatabaseIpConfig.kt | 8 ++++---- .../{api => hookapi}/database/DockerMysqlServer.kt | 14 ++++++++------ .../jira/install/hook/AsyncProfilerHook.kt | 6 +++--- .../jira/install/hook/DisabledAutoBackup.kt | 4 +++- .../jira/install/hook/JiraHomeProperty.kt | 4 +++- .../{api => hookapi}/jira/install/hook/JiraLogs.kt | 2 +- .../jira/install/hook/JvmConfig.kt | 4 +++- .../jira/install/hook/LateUbuntuSysstat.kt | 6 +++--- .../jira/install/hook/PostInstallHook.kt | 2 +- .../jira/install/hook/PostInstallHooks.kt | 4 ++-- .../jira/install/hook/PreInstallHook.kt | 3 +-- .../jira/install/hook/PreInstallHooks.kt | 2 +- .../jira/install/hook/SystemLog.kt | 4 +++- .../jira/instance/DefaultClusterProperties.kt | 6 +++--- .../jira/instance/JiraDataCenterPlan.kt | 8 ++++---- .../{api => hookapi}/jira/instance/JiraInstance.kt | 3 +-- .../jira/instance/JiraInstancePlan.kt | 4 ++-- .../{api => hookapi}/jira/instance/JiraNodePlan.kt | 6 +++--- .../jira/instance/JiraServerPlan.kt | 4 ++-- .../jira/instance/PostInstanceHook.kt | 2 +- .../jira/instance/PostInstanceHooks.kt | 2 +- .../jira/instance/PreInstanceHook.kt | 4 ++-- .../jira/instance/PreInstanceHooks.kt | 4 ++-- .../jira/sharedhome/NfsSharedHome.kt | 12 ++++++------ .../jira/sharedhome/SambaSharedHome.kt | 13 ++++++------- .../{api => hookapi}/jira/start/hook/AccessLogs.kt | 2 +- .../{api => hookapi}/jira/start/hook/JstatHook.kt | 2 +- .../jira/start/hook/PostStartHook.kt | 2 +- .../jira/start/hook/PostStartHooks.kt | 2 +- .../jira/start/hook/PreStartHook.kt | 2 +- .../jira/start/hook/PreStartHooks.kt | 2 +- .../jira/start/hook/RestUpgrade.kt | 6 +++--- .../loadbalancer/ApacheProxyPlan.kt | 10 +++++----- .../loadbalancer/LoadBalancerPlan.kt | 4 ++-- .../{api => hookapi}/network/HttpServerRoom.kt | 4 ++-- .../jira/install/hook/HookedJiraInstallation.kt | 2 +- .../jira/install/hook/ProfilerHook.kt | 10 +++++----- .../jira/install/hook/SplunkForwarderHook.kt | 4 ++-- .../jira/start/hook/HookedJiraStart.kt | 2 +- .../performance/tools/infrastructure/Datasets.kt | 8 ++++---- .../infrastructure/api/DockerInfrastructure.kt | 4 ++-- .../api/jira/install/hook/PreInstallHooksTest.kt | 2 ++ .../infrastructure/api/jira/instance/JiraPlanIT.kt | 11 ++++++----- 45 files changed, 115 insertions(+), 106 deletions(-) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/database/DatabaseIpConfig.kt (77%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/database/DockerMysqlServer.kt (86%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/install/hook/AsyncProfilerHook.kt (88%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/install/hook/DisabledAutoBackup.kt (65%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/install/hook/JiraHomeProperty.kt (69%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/install/hook/JiraLogs.kt (93%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/install/hook/JvmConfig.kt (79%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/install/hook/LateUbuntuSysstat.kt (83%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/install/hook/PostInstallHook.kt (88%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/install/hook/PostInstallHooks.kt (90%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/install/hook/PreInstallHook.kt (85%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/install/hook/PreInstallHooks.kt (93%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/install/hook/SystemLog.kt (65%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/instance/DefaultClusterProperties.kt (70%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/instance/JiraDataCenterPlan.kt (90%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/instance/JiraInstance.kt (72%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/instance/JiraInstancePlan.kt (68%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/instance/JiraNodePlan.kt (91%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/instance/JiraServerPlan.kt (90%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/instance/PostInstanceHook.kt (84%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/instance/PostInstanceHooks.kt (90%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/instance/PreInstanceHook.kt (68%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/instance/PreInstanceHooks.kt (81%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/sharedhome/NfsSharedHome.kt (82%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/sharedhome/SambaSharedHome.kt (85%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/start/hook/AccessLogs.kt (87%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/start/hook/JstatHook.kt (89%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/start/hook/PostStartHook.kt (88%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/start/hook/PostStartHooks.kt (92%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/start/hook/PreStartHook.kt (88%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/start/hook/PreStartHooks.kt (92%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/jira/start/hook/RestUpgrade.kt (95%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/loadbalancer/ApacheProxyPlan.kt (90%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/loadbalancer/LoadBalancerPlan.kt (53%) rename src/main/kotlin/com/atlassian/performance/tools/infrastructure/{api => hookapi}/network/HttpServerRoom.kt (67%) diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/database/MysqlFiveConnector.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/database/MysqlFiveConnector.kt index 487a4c9c..06cc4388 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/database/MysqlFiveConnector.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/database/MysqlFiveConnector.kt @@ -1,13 +1,12 @@ package com.atlassian.performance.tools.infrastructure.database import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PostInstallHook -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PostInstallHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHook +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHooks import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports import com.atlassian.performance.tools.jvmtasks.api.IdempotentAction import com.atlassian.performance.tools.jvmtasks.api.StaticBackoff import com.atlassian.performance.tools.ssh.api.SshConnection -import java.time.Duration import java.time.Duration.ofSeconds /** @@ -28,4 +27,4 @@ class MysqlFiveConnector : PostInstallHook { ssh.execute("tar -xzf mysql-connector-java-5.1.40.tar.gz") ssh.execute("cp mysql-connector-java-5.1.40/mysql-connector-java-5.1.40-bin.jar ${jira.installation.path}/lib") } -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/database/MysqlFiveDotSevenJiraConfig.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/database/MysqlFiveDotSevenJiraConfig.kt index 8f0f2d7a..99eb410d 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/database/MysqlFiveDotSevenJiraConfig.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/database/MysqlFiveDotSevenJiraConfig.kt @@ -2,8 +2,8 @@ package com.atlassian.performance.tools.infrastructure.database import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira import com.atlassian.performance.tools.infrastructure.api.jira.install.TcpNode -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PostInstallHook -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PostInstallHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHook +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHooks import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports import com.atlassian.performance.tools.infrastructure.api.jira.report.StaticReport import com.atlassian.performance.tools.infrastructure.api.os.RemotePath diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/database/DatabaseIpConfig.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/database/DatabaseIpConfig.kt similarity index 77% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/database/DatabaseIpConfig.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/database/DatabaseIpConfig.kt index 950e73a4..565e67bf 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/database/DatabaseIpConfig.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/database/DatabaseIpConfig.kt @@ -1,9 +1,9 @@ -package com.atlassian.performance.tools.infrastructure.api.database +package com.atlassian.performance.tools.infrastructure.hookapi.database import com.atlassian.performance.tools.infrastructure.api.Sed import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PostInstallHook -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PostInstallHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHook +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHooks import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports import com.atlassian.performance.tools.infrastructure.api.jira.report.StaticReport import com.atlassian.performance.tools.ssh.api.SshConnection @@ -27,4 +27,4 @@ class DatabaseIpConfig( file = dbConfigXml ) } -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/database/DockerMysqlServer.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/database/DockerMysqlServer.kt similarity index 86% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/database/DockerMysqlServer.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/database/DockerMysqlServer.kt index 5050adcc..9ed15edd 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/database/DockerMysqlServer.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/database/DockerMysqlServer.kt @@ -1,16 +1,18 @@ -package com.atlassian.performance.tools.infrastructure.api.database +package com.atlassian.performance.tools.infrastructure.hookapi.database import com.atlassian.performance.tools.infrastructure.api.dataset.DatasetPackage import com.atlassian.performance.tools.infrastructure.api.jira.install.TcpNode -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PreInstallHooks -import com.atlassian.performance.tools.infrastructure.api.jira.instance.JiraInstance -import com.atlassian.performance.tools.infrastructure.api.jira.instance.PostInstanceHook -import com.atlassian.performance.tools.infrastructure.api.jira.instance.PostInstanceHooks -import com.atlassian.performance.tools.infrastructure.api.jira.instance.PreInstanceHook +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PreInstallHooks import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports import com.atlassian.performance.tools.infrastructure.api.network.TcpServerRoom import com.atlassian.performance.tools.infrastructure.api.os.Ubuntu import com.atlassian.performance.tools.infrastructure.database.* +import com.atlassian.performance.tools.infrastructure.database.Mysql +import com.atlassian.performance.tools.infrastructure.database.SshMysqlClient +import com.atlassian.performance.tools.infrastructure.hookapi.jira.instance.JiraInstance +import com.atlassian.performance.tools.infrastructure.hookapi.jira.instance.PostInstanceHook +import com.atlassian.performance.tools.infrastructure.hookapi.jira.instance.PostInstanceHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.instance.PreInstanceHook import com.atlassian.performance.tools.ssh.api.Ssh import com.atlassian.performance.tools.ssh.api.SshConnection diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/AsyncProfilerHook.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/AsyncProfilerHook.kt similarity index 88% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/AsyncProfilerHook.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/AsyncProfilerHook.kt index 453ba963..c17a6a96 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/AsyncProfilerHook.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/AsyncProfilerHook.kt @@ -1,11 +1,11 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.install.hook +package com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook import com.atlassian.performance.tools.infrastructure.api.jira.install.HttpNode import com.atlassian.performance.tools.infrastructure.api.jira.report.Report import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports import com.atlassian.performance.tools.infrastructure.api.jira.start.StartedJira -import com.atlassian.performance.tools.infrastructure.api.jira.start.hook.PostStartHook -import com.atlassian.performance.tools.infrastructure.api.jira.start.hook.PostStartHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook.PostStartHook +import com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook.PostStartHooks import com.atlassian.performance.tools.ssh.api.SshConnection import java.net.URI diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/DisabledAutoBackup.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/DisabledAutoBackup.kt similarity index 65% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/DisabledAutoBackup.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/DisabledAutoBackup.kt index 164da451..50b34110 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/DisabledAutoBackup.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/DisabledAutoBackup.kt @@ -1,7 +1,9 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.install.hook +package com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHook +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHooks import com.atlassian.performance.tools.ssh.api.SshConnection class DisabledAutoBackup : PostInstallHook { diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/JiraHomeProperty.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/JiraHomeProperty.kt similarity index 69% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/JiraHomeProperty.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/JiraHomeProperty.kt index b09991b5..cbd517c8 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/JiraHomeProperty.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/JiraHomeProperty.kt @@ -1,7 +1,9 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.install.hook +package com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHook +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHooks import com.atlassian.performance.tools.ssh.api.SshConnection class JiraHomeProperty : PostInstallHook { diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/JiraLogs.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/JiraLogs.kt similarity index 93% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/JiraLogs.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/JiraLogs.kt index 7d544f19..5758e5bb 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/JiraLogs.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/JiraLogs.kt @@ -1,4 +1,4 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.install.hook +package com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira import com.atlassian.performance.tools.infrastructure.api.jira.report.Report diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/JvmConfig.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/JvmConfig.kt similarity index 79% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/JvmConfig.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/JvmConfig.kt index 3fe4ab97..dbaaa717 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/JvmConfig.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/JvmConfig.kt @@ -1,4 +1,4 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.install.hook +package com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook import com.atlassian.performance.tools.infrastructure.api.jira.JiraGcLog import com.atlassian.performance.tools.infrastructure.api.jira.JiraNodeConfig @@ -6,6 +6,8 @@ import com.atlassian.performance.tools.infrastructure.api.jira.SetenvSh import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira import com.atlassian.performance.tools.infrastructure.api.jira.report.FileListing import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHook +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHooks import com.atlassian.performance.tools.ssh.api.SshConnection class JvmConfig( diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/LateUbuntuSysstat.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/LateUbuntuSysstat.kt similarity index 83% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/LateUbuntuSysstat.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/LateUbuntuSysstat.kt index 2404e567..0a3c89c6 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/LateUbuntuSysstat.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/LateUbuntuSysstat.kt @@ -1,14 +1,14 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.install.hook +package com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook import com.atlassian.performance.tools.infrastructure.Iostat import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports import com.atlassian.performance.tools.infrastructure.api.jira.start.StartedJira -import com.atlassian.performance.tools.infrastructure.api.jira.start.hook.PostStartHook -import com.atlassian.performance.tools.infrastructure.api.jira.start.hook.PostStartHooks import com.atlassian.performance.tools.infrastructure.api.os.OsMetric import com.atlassian.performance.tools.infrastructure.api.os.Ubuntu import com.atlassian.performance.tools.infrastructure.api.os.Vmstat +import com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook.PostStartHook +import com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook.PostStartHooks import com.atlassian.performance.tools.infrastructure.jira.report.RemoteMonitoringProcessReport import com.atlassian.performance.tools.ssh.api.SshConnection diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/PostInstallHook.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/PostInstallHook.kt similarity index 88% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/PostInstallHook.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/PostInstallHook.kt index c95cd0cb..9eb4fa2b 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/PostInstallHook.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/PostInstallHook.kt @@ -1,4 +1,4 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.install.hook +package com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/PostInstallHooks.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/PostInstallHooks.kt similarity index 90% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/PostInstallHooks.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/PostInstallHooks.kt index 37088763..41277b3e 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/PostInstallHooks.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/PostInstallHooks.kt @@ -1,9 +1,9 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.install.hook +package com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook import com.atlassian.performance.tools.infrastructure.api.jira.JiraNodeConfig import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports -import com.atlassian.performance.tools.infrastructure.api.jira.start.hook.PreStartHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook.PreStartHooks import com.atlassian.performance.tools.infrastructure.jira.install.hook.ProfilerHook import com.atlassian.performance.tools.infrastructure.jira.install.hook.SplunkForwarderHook import com.atlassian.performance.tools.ssh.api.SshConnection diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/PreInstallHook.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/PreInstallHook.kt similarity index 85% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/PreInstallHook.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/PreInstallHook.kt index 6998f149..49be4fc9 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/PreInstallHook.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/PreInstallHook.kt @@ -1,9 +1,8 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.install.hook +package com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook import com.atlassian.performance.tools.infrastructure.api.jira.install.HttpNode import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports import com.atlassian.performance.tools.ssh.api.SshConnection -import org.apache.http.HttpHost /** * Intercepts a call before Jira is installed. diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/PreInstallHooks.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/PreInstallHooks.kt similarity index 93% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/PreInstallHooks.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/PreInstallHooks.kt index d748580f..db6ead0c 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/PreInstallHooks.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/PreInstallHooks.kt @@ -1,4 +1,4 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.install.hook +package com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook import com.atlassian.performance.tools.infrastructure.api.jira.install.HttpNode import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/SystemLog.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/SystemLog.kt similarity index 65% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/SystemLog.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/SystemLog.kt index 21904606..42841fc9 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/SystemLog.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/install/hook/SystemLog.kt @@ -1,8 +1,10 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.install.hook +package com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook import com.atlassian.performance.tools.infrastructure.api.jira.install.HttpNode import com.atlassian.performance.tools.infrastructure.api.jira.report.FileListing import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PreInstallHook +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PreInstallHooks import com.atlassian.performance.tools.ssh.api.SshConnection class SystemLog : PreInstallHook { diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/DefaultClusterProperties.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/DefaultClusterProperties.kt similarity index 70% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/DefaultClusterProperties.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/DefaultClusterProperties.kt index ab342f07..2561eb37 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/DefaultClusterProperties.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/DefaultClusterProperties.kt @@ -1,8 +1,8 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.instance +package com.atlassian.performance.tools.infrastructure.hookapi.jira.instance import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PostInstallHook -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PostInstallHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHook +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHooks import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports import com.atlassian.performance.tools.infrastructure.jira.instance.ClusterProperties import com.atlassian.performance.tools.ssh.api.SshConnection diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/JiraDataCenterPlan.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/JiraDataCenterPlan.kt similarity index 90% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/JiraDataCenterPlan.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/JiraDataCenterPlan.kt index b0e5f1e4..6b5b652a 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/JiraDataCenterPlan.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/JiraDataCenterPlan.kt @@ -1,12 +1,12 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.instance +package com.atlassian.performance.tools.infrastructure.hookapi.jira.instance import com.atlassian.performance.tools.infrastructure.api.jira.install.HttpNode import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports import com.atlassian.performance.tools.infrastructure.api.jira.start.StartedJira -import com.atlassian.performance.tools.infrastructure.api.loadbalancer.ApacheProxyPlan -import com.atlassian.performance.tools.infrastructure.api.loadbalancer.LoadBalancerPlan -import com.atlassian.performance.tools.infrastructure.api.network.HttpServerRoom +import com.atlassian.performance.tools.infrastructure.hookapi.loadbalancer.ApacheProxyPlan +import com.atlassian.performance.tools.infrastructure.hookapi.loadbalancer.LoadBalancerPlan +import com.atlassian.performance.tools.infrastructure.hookapi.network.HttpServerRoom import java.time.Duration import kotlin.streams.asStream import kotlin.streams.toList diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/JiraInstance.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/JiraInstance.kt similarity index 72% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/JiraInstance.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/JiraInstance.kt index f98b4553..73308d21 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/JiraInstance.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/JiraInstance.kt @@ -1,8 +1,7 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.instance +package com.atlassian.performance.tools.infrastructure.hookapi.jira.instance import com.atlassian.performance.tools.infrastructure.api.jira.install.HttpNode import com.atlassian.performance.tools.infrastructure.api.jira.start.StartedJira -import java.net.URI interface JiraInstance { val address: HttpNode diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/JiraInstancePlan.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/JiraInstancePlan.kt similarity index 68% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/JiraInstancePlan.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/JiraInstancePlan.kt index 2b80ac64..02d8c3f5 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/JiraInstancePlan.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/JiraInstancePlan.kt @@ -1,8 +1,8 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.instance +package com.atlassian.performance.tools.infrastructure.hookapi.jira.instance import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports interface JiraInstancePlan { fun materialize(): JiraInstance fun report(): Reports -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/JiraNodePlan.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/JiraNodePlan.kt similarity index 91% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/JiraNodePlan.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/JiraNodePlan.kt index 922ddd28..828ce080 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/JiraNodePlan.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/JiraNodePlan.kt @@ -1,14 +1,14 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.instance +package com.atlassian.performance.tools.infrastructure.hookapi.jira.instance import com.atlassian.performance.tools.infrastructure.api.distribution.PublicJiraSoftwareDistribution import com.atlassian.performance.tools.infrastructure.api.jira.EmptyJiraHome import com.atlassian.performance.tools.infrastructure.api.jira.install.JiraInstallation import com.atlassian.performance.tools.infrastructure.api.jira.install.ParallelInstallation -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PreInstallHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PreInstallHooks import com.atlassian.performance.tools.infrastructure.api.jira.start.JiraLaunchScript import com.atlassian.performance.tools.infrastructure.api.jira.start.JiraStart import com.atlassian.performance.tools.infrastructure.api.jvm.OracleJDK -import com.atlassian.performance.tools.infrastructure.api.network.HttpServerRoom +import com.atlassian.performance.tools.infrastructure.hookapi.network.HttpServerRoom import com.atlassian.performance.tools.infrastructure.jira.install.hook.HookedJiraInstallation import com.atlassian.performance.tools.infrastructure.jira.start.hook.HookedJiraStart import net.jcip.annotations.NotThreadSafe diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/JiraServerPlan.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/JiraServerPlan.kt similarity index 90% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/JiraServerPlan.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/JiraServerPlan.kt index 348ad7e7..df3ad0db 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/JiraServerPlan.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/JiraServerPlan.kt @@ -1,9 +1,9 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.instance +package com.atlassian.performance.tools.infrastructure.hookapi.jira.instance import com.atlassian.performance.tools.infrastructure.api.jira.install.HttpNode import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports import com.atlassian.performance.tools.infrastructure.api.jira.start.StartedJira -import com.atlassian.performance.tools.infrastructure.api.network.HttpServerRoom +import com.atlassian.performance.tools.infrastructure.hookapi.network.HttpServerRoom class JiraServerPlan private constructor( private val plan: JiraNodePlan, diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/PostInstanceHook.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/PostInstanceHook.kt similarity index 84% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/PostInstanceHook.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/PostInstanceHook.kt index 42e3442c..f680bf49 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/PostInstanceHook.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/PostInstanceHook.kt @@ -1,4 +1,4 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.instance +package com.atlassian.performance.tools.infrastructure.hookapi.jira.instance import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/PostInstanceHooks.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/PostInstanceHooks.kt similarity index 90% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/PostInstanceHooks.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/PostInstanceHooks.kt index b56147ae..f9480026 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/PostInstanceHooks.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/PostInstanceHooks.kt @@ -1,4 +1,4 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.instance +package com.atlassian.performance.tools.infrastructure.hookapi.jira.instance import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports import java.util.* diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/PreInstanceHook.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/PreInstanceHook.kt similarity index 68% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/PreInstanceHook.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/PreInstanceHook.kt index 10de8f1e..73feac8e 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/PreInstanceHook.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/PreInstanceHook.kt @@ -1,6 +1,6 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.instance +package com.atlassian.performance.tools.infrastructure.hookapi.jira.instance -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PreInstallHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PreInstallHooks import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports interface PreInstanceHook { diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/PreInstanceHooks.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/PreInstanceHooks.kt similarity index 81% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/PreInstanceHooks.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/PreInstanceHooks.kt index f732f6df..f9ca9905 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/PreInstanceHooks.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/instance/PreInstanceHooks.kt @@ -1,6 +1,6 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.instance +package com.atlassian.performance.tools.infrastructure.hookapi.jira.instance -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PreInstallHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PreInstallHooks import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports import java.util.* import java.util.concurrent.ConcurrentLinkedQueue diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/sharedhome/NfsSharedHome.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/sharedhome/NfsSharedHome.kt similarity index 82% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/sharedhome/NfsSharedHome.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/sharedhome/NfsSharedHome.kt index 99f7072e..2638f265 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/sharedhome/NfsSharedHome.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/sharedhome/NfsSharedHome.kt @@ -1,17 +1,17 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.sharedhome +package com.atlassian.performance.tools.infrastructure.hookapi.jira.sharedhome import com.atlassian.performance.tools.infrastructure.api.jira.JiraHomeSource import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira import com.atlassian.performance.tools.infrastructure.api.jira.install.TcpNode -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PostInstallHook -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PostInstallHooks -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PreInstallHooks -import com.atlassian.performance.tools.infrastructure.api.jira.instance.PostInstanceHooks -import com.atlassian.performance.tools.infrastructure.api.jira.instance.PreInstanceHook import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports import com.atlassian.performance.tools.infrastructure.api.network.Networked import com.atlassian.performance.tools.infrastructure.api.network.TcpServerRoom import com.atlassian.performance.tools.infrastructure.api.os.Ubuntu +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHook +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PreInstallHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.instance.PostInstanceHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.instance.PreInstanceHook import com.atlassian.performance.tools.infrastructure.jira.sharedhome.SharedHomeProperty import com.atlassian.performance.tools.ssh.api.SshConnection diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/sharedhome/SambaSharedHome.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/sharedhome/SambaSharedHome.kt similarity index 85% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/sharedhome/SambaSharedHome.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/sharedhome/SambaSharedHome.kt index da4d8c29..d92f1590 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/sharedhome/SambaSharedHome.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/sharedhome/SambaSharedHome.kt @@ -1,14 +1,13 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.sharedhome +package com.atlassian.performance.tools.infrastructure.hookapi.jira.sharedhome import com.atlassian.performance.tools.infrastructure.api.jira.JiraHomeSource import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira import com.atlassian.performance.tools.infrastructure.api.jira.install.TcpNode -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PostInstallHook -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PostInstallHooks -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PreInstallHooks -import com.atlassian.performance.tools.infrastructure.api.jira.instance.PostInstanceHooks -import com.atlassian.performance.tools.infrastructure.api.jira.instance.PreInstanceHook -import com.atlassian.performance.tools.infrastructure.api.jira.instance.PreInstanceHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHook +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PreInstallHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.instance.PostInstanceHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.instance.PreInstanceHook import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports import com.atlassian.performance.tools.infrastructure.api.network.TcpServerRoom import com.atlassian.performance.tools.infrastructure.api.os.Ubuntu diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/start/hook/AccessLogs.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/start/hook/AccessLogs.kt similarity index 87% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/start/hook/AccessLogs.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/start/hook/AccessLogs.kt index c2c30a78..1063e810 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/start/hook/AccessLogs.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/start/hook/AccessLogs.kt @@ -1,4 +1,4 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.start.hook +package com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira import com.atlassian.performance.tools.infrastructure.api.jira.report.FileListing diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/start/hook/JstatHook.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/start/hook/JstatHook.kt similarity index 89% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/start/hook/JstatHook.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/start/hook/JstatHook.kt index f1e15be5..3f7d6adb 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/start/hook/JstatHook.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/start/hook/JstatHook.kt @@ -1,4 +1,4 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.start.hook +package com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports import com.atlassian.performance.tools.infrastructure.api.jira.start.StartedJira diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/start/hook/PostStartHook.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/start/hook/PostStartHook.kt similarity index 88% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/start/hook/PostStartHook.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/start/hook/PostStartHook.kt index ee867e14..a8392e41 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/start/hook/PostStartHook.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/start/hook/PostStartHook.kt @@ -1,4 +1,4 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.start.hook +package com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports import com.atlassian.performance.tools.infrastructure.api.jira.start.StartedJira diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/start/hook/PostStartHooks.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/start/hook/PostStartHooks.kt similarity index 92% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/start/hook/PostStartHooks.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/start/hook/PostStartHooks.kt index 77671948..bb2b6455 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/start/hook/PostStartHooks.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/start/hook/PostStartHooks.kt @@ -1,4 +1,4 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.start.hook +package com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports import com.atlassian.performance.tools.infrastructure.api.jira.start.StartedJira diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/start/hook/PreStartHook.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/start/hook/PreStartHook.kt similarity index 88% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/start/hook/PreStartHook.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/start/hook/PreStartHook.kt index 0123305e..5313aeb6 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/start/hook/PreStartHook.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/start/hook/PreStartHook.kt @@ -1,4 +1,4 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.start.hook +package com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/start/hook/PreStartHooks.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/start/hook/PreStartHooks.kt similarity index 92% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/start/hook/PreStartHooks.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/start/hook/PreStartHooks.kt index bc3082f4..b5acd2f1 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/start/hook/PreStartHooks.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/start/hook/PreStartHooks.kt @@ -1,4 +1,4 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.start.hook +package com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/start/hook/RestUpgrade.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/start/hook/RestUpgrade.kt similarity index 95% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/start/hook/RestUpgrade.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/start/hook/RestUpgrade.kt index 3762f7d2..c949f786 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/start/hook/RestUpgrade.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/jira/start/hook/RestUpgrade.kt @@ -1,11 +1,11 @@ -package com.atlassian.performance.tools.infrastructure.api.jira.start.hook +package com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook import com.atlassian.performance.tools.infrastructure.api.jira.JiraLaunchTimeouts -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.JiraLogs import com.atlassian.performance.tools.infrastructure.api.jira.report.FileListing import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports import com.atlassian.performance.tools.infrastructure.api.jira.start.StartedJira import com.atlassian.performance.tools.infrastructure.api.jvm.ThreadDump +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.JiraLogs import com.atlassian.performance.tools.infrastructure.jira.report.JiraLandingPage import com.atlassian.performance.tools.ssh.api.SshConnection import java.net.URI @@ -86,4 +86,4 @@ class RestUpgrade( ) } } -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/loadbalancer/ApacheProxyPlan.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/loadbalancer/ApacheProxyPlan.kt similarity index 90% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/loadbalancer/ApacheProxyPlan.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/loadbalancer/ApacheProxyPlan.kt index 6e5220d8..4f83c125 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/loadbalancer/ApacheProxyPlan.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/loadbalancer/ApacheProxyPlan.kt @@ -1,13 +1,13 @@ -package com.atlassian.performance.tools.infrastructure.api.loadbalancer +package com.atlassian.performance.tools.infrastructure.hookapi.loadbalancer import com.atlassian.performance.tools.infrastructure.api.Sed -import com.atlassian.performance.tools.infrastructure.api.jira.install.HttpNode import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports -import com.atlassian.performance.tools.infrastructure.api.jira.start.hook.PreStartHook -import com.atlassian.performance.tools.infrastructure.api.jira.start.hook.PreStartHooks -import com.atlassian.performance.tools.infrastructure.api.network.HttpServerRoom +import com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook.PreStartHook +import com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook.PreStartHooks +import com.atlassian.performance.tools.infrastructure.hookapi.network.HttpServerRoom import com.atlassian.performance.tools.infrastructure.api.os.Ubuntu +import com.atlassian.performance.tools.infrastructure.api.jira.install.HttpNode import com.atlassian.performance.tools.jvmtasks.api.ExponentialBackoff import com.atlassian.performance.tools.jvmtasks.api.IdempotentAction import com.atlassian.performance.tools.ssh.api.SshConnection diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/loadbalancer/LoadBalancerPlan.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/loadbalancer/LoadBalancerPlan.kt similarity index 53% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/loadbalancer/LoadBalancerPlan.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/loadbalancer/LoadBalancerPlan.kt index bc40a24a..fde4839e 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/loadbalancer/LoadBalancerPlan.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/loadbalancer/LoadBalancerPlan.kt @@ -1,7 +1,7 @@ -package com.atlassian.performance.tools.infrastructure.api.loadbalancer +package com.atlassian.performance.tools.infrastructure.hookapi.loadbalancer import com.atlassian.performance.tools.infrastructure.api.jira.install.HttpNode -import com.atlassian.performance.tools.infrastructure.api.jira.start.hook.PreStartHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook.PreStartHooks interface LoadBalancerPlan { fun materialize(nodes: List, hooks: List): HttpNode diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/network/HttpServerRoom.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/network/HttpServerRoom.kt similarity index 67% rename from src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/network/HttpServerRoom.kt rename to src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/network/HttpServerRoom.kt index 89316ba6..7ca04eb1 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/network/HttpServerRoom.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/hookapi/network/HttpServerRoom.kt @@ -1,8 +1,8 @@ -package com.atlassian.performance.tools.infrastructure.api.network +package com.atlassian.performance.tools.infrastructure.hookapi.network import com.atlassian.performance.tools.infrastructure.api.jira.install.HttpNode interface HttpServerRoom { fun serveHttp(name: String): HttpNode -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/jira/install/hook/HookedJiraInstallation.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/jira/install/hook/HookedJiraInstallation.kt index 89c2ac7d..0b7b7341 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/jira/install/hook/HookedJiraInstallation.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/jira/install/hook/HookedJiraInstallation.kt @@ -3,7 +3,7 @@ package com.atlassian.performance.tools.infrastructure.jira.install.hook import com.atlassian.performance.tools.infrastructure.api.jira.install.HttpNode import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira import com.atlassian.performance.tools.infrastructure.api.jira.install.JiraInstallation -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PreInstallHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PreInstallHooks import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports class HookedJiraInstallation( diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/jira/install/hook/ProfilerHook.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/jira/install/hook/ProfilerHook.kt index 3ecd6098..ec6d4d93 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/jira/install/hook/ProfilerHook.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/jira/install/hook/ProfilerHook.kt @@ -1,13 +1,13 @@ package com.atlassian.performance.tools.infrastructure.jira.install.hook import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PostInstallHook -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PostInstallHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHook +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHooks import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports import com.atlassian.performance.tools.infrastructure.api.jira.start.StartedJira -import com.atlassian.performance.tools.infrastructure.api.jira.start.hook.PostStartHook -import com.atlassian.performance.tools.infrastructure.api.jira.start.hook.PostStartHooks -import com.atlassian.performance.tools.infrastructure.api.jira.start.hook.PreStartHook +import com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook.PostStartHook +import com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook.PostStartHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook.PreStartHook import com.atlassian.performance.tools.infrastructure.api.profiler.Profiler import com.atlassian.performance.tools.infrastructure.jira.report.RemoteMonitoringProcessReport import com.atlassian.performance.tools.ssh.api.SshConnection diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/jira/install/hook/SplunkForwarderHook.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/jira/install/hook/SplunkForwarderHook.kt index 0baf1797..361872d5 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/jira/install/hook/SplunkForwarderHook.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/jira/install/hook/SplunkForwarderHook.kt @@ -1,8 +1,8 @@ package com.atlassian.performance.tools.infrastructure.jira.install.hook import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PostInstallHook -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PostInstallHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHook +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHooks import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports import com.atlassian.performance.tools.infrastructure.api.splunk.SplunkForwarder import com.atlassian.performance.tools.ssh.api.SshConnection diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/jira/start/hook/HookedJiraStart.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/jira/start/hook/HookedJiraStart.kt index 73d02676..8fc68b07 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/jira/start/hook/HookedJiraStart.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/jira/start/hook/HookedJiraStart.kt @@ -4,7 +4,7 @@ import com.atlassian.performance.tools.infrastructure.api.jira.install.Installed import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports import com.atlassian.performance.tools.infrastructure.api.jira.start.JiraStart import com.atlassian.performance.tools.infrastructure.api.jira.start.StartedJira -import com.atlassian.performance.tools.infrastructure.api.jira.start.hook.PreStartHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook.PreStartHooks class HookedJiraStart( private val start: JiraStart, diff --git a/src/test/kotlin/com/atlassian/performance/tools/infrastructure/Datasets.kt b/src/test/kotlin/com/atlassian/performance/tools/infrastructure/Datasets.kt index 6658dac5..e7bf8690 100644 --- a/src/test/kotlin/com/atlassian/performance/tools/infrastructure/Datasets.kt +++ b/src/test/kotlin/com/atlassian/performance/tools/infrastructure/Datasets.kt @@ -1,11 +1,11 @@ package com.atlassian.performance.tools.infrastructure -import com.atlassian.performance.tools.infrastructure.api.database.DockerMysqlServer +import com.atlassian.performance.tools.infrastructure.hookapi.database.DockerMysqlServer import com.atlassian.performance.tools.infrastructure.api.dataset.HttpDatasetPackage import com.atlassian.performance.tools.infrastructure.api.jira.JiraLaunchTimeouts -import com.atlassian.performance.tools.infrastructure.api.jira.instance.PreInstanceHooks -import com.atlassian.performance.tools.infrastructure.api.jira.start.hook.PostStartHooks -import com.atlassian.performance.tools.infrastructure.api.jira.start.hook.RestUpgrade +import com.atlassian.performance.tools.infrastructure.hookapi.jira.instance.PreInstanceHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook.PostStartHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook.RestUpgrade import com.atlassian.performance.tools.infrastructure.api.network.TcpServerRoom import java.net.URI import java.time.Duration diff --git a/src/test/kotlin/com/atlassian/performance/tools/infrastructure/api/DockerInfrastructure.kt b/src/test/kotlin/com/atlassian/performance/tools/infrastructure/api/DockerInfrastructure.kt index fbe8ba50..2c13a576 100644 --- a/src/test/kotlin/com/atlassian/performance/tools/infrastructure/api/DockerInfrastructure.kt +++ b/src/test/kotlin/com/atlassian/performance/tools/infrastructure/api/DockerInfrastructure.kt @@ -2,7 +2,7 @@ package com.atlassian.performance.tools.infrastructure.api import com.atlassian.performance.tools.infrastructure.api.jira.install.HttpNode import com.atlassian.performance.tools.infrastructure.api.jira.install.TcpNode -import com.atlassian.performance.tools.infrastructure.api.network.HttpServerRoom +import com.atlassian.performance.tools.infrastructure.hookapi.network.HttpServerRoom import com.atlassian.performance.tools.infrastructure.api.network.Networked import com.atlassian.performance.tools.infrastructure.api.network.SshServerRoom import com.atlassian.performance.tools.infrastructure.api.network.TcpServerRoom @@ -180,4 +180,4 @@ internal class DockerInfrastructure( ?: break } } -} \ No newline at end of file +} diff --git a/src/test/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/PreInstallHooksTest.kt b/src/test/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/PreInstallHooksTest.kt index b94cfca2..83a6148f 100644 --- a/src/test/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/PreInstallHooksTest.kt +++ b/src/test/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/PreInstallHooksTest.kt @@ -3,6 +3,8 @@ package com.atlassian.performance.tools.infrastructure.api.jira.install.hook import com.atlassian.performance.tools.infrastructure.api.jira.install.HttpNode import com.atlassian.performance.tools.infrastructure.api.jira.install.TcpNode import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PreInstallHook +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PreInstallHooks import com.atlassian.performance.tools.infrastructure.mock.UnimplementedSshConnection import com.atlassian.performance.tools.ssh.api.Ssh import com.atlassian.performance.tools.ssh.api.SshConnection diff --git a/src/test/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/JiraPlanIT.kt b/src/test/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/JiraPlanIT.kt index afc81957..198a6767 100644 --- a/src/test/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/JiraPlanIT.kt +++ b/src/test/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/JiraPlanIT.kt @@ -5,15 +5,16 @@ import com.atlassian.performance.tools.infrastructure.api.DockerInfrastructure import com.atlassian.performance.tools.infrastructure.api.distribution.PublicJiraSoftwareDistribution import com.atlassian.performance.tools.infrastructure.api.jira.JiraHomePackage import com.atlassian.performance.tools.infrastructure.api.jira.install.ParallelInstallation -import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PreInstallHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PreInstallHooks import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports -import com.atlassian.performance.tools.infrastructure.api.jira.sharedhome.SambaSharedHome +import com.atlassian.performance.tools.infrastructure.hookapi.jira.sharedhome.SambaSharedHome import com.atlassian.performance.tools.infrastructure.api.jira.start.JiraLaunchScript import com.atlassian.performance.tools.infrastructure.api.jira.start.StartedJira -import com.atlassian.performance.tools.infrastructure.api.jira.start.hook.PostStartHook -import com.atlassian.performance.tools.infrastructure.api.jira.start.hook.PostStartHooks +import com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook.PostStartHook +import com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook.PostStartHooks import com.atlassian.performance.tools.infrastructure.api.jvm.AdoptOpenJDK -import com.atlassian.performance.tools.infrastructure.api.loadbalancer.ApacheProxyPlan +import com.atlassian.performance.tools.infrastructure.hookapi.loadbalancer.ApacheProxyPlan +import com.atlassian.performance.tools.infrastructure.hookapi.jira.instance.* import com.atlassian.performance.tools.io.api.resolveSafely import com.atlassian.performance.tools.ssh.api.SshConnection import org.assertj.core.api.Assertions.assertThat