diff --git a/PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/InitCommand.kt b/PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/InitCommand.kt index f5d9e21f..e0e825a2 100644 --- a/PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/InitCommand.kt +++ b/PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/InitCommand.kt @@ -1,9 +1,8 @@ package work.slhaf.partner.ctl.commands -import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json -import kotlinx.serialization.json.JsonObject import picocli.CommandLine +import work.slhaf.partner.ctl.commands.data.GatewayConfig import work.slhaf.partner.ctl.commands.init.buildFromSource import work.slhaf.partner.ctl.commands.init.configureExternalGateway import work.slhaf.partner.ctl.commands.init.configureWebSocketGateway @@ -164,16 +163,5 @@ class InitCommand : Runnable { BUILD_FROM_SOURCE } - @Serializable - data class GatewayConfig( - val defaultChannel: String, - val channels: List - ) { - @Serializable - data class ChannelConfig( - val channelName: String, - val params: JsonObject - ) - } } \ No newline at end of file diff --git a/PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/data/config.kt b/PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/data/config.kt new file mode 100644 index 00000000..9ff6d897 --- /dev/null +++ b/PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/data/config.kt @@ -0,0 +1,16 @@ +package work.slhaf.partner.ctl.commands.data + +import kotlinx.serialization.Serializable +import kotlinx.serialization.json.JsonObject + +@Serializable +data class GatewayConfig( + val defaultChannel: String, + val channels: List +) { + @Serializable + data class ChannelConfig( + val channelName: String, + val params: JsonObject + ) +} \ No newline at end of file diff --git a/PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/init/configure.kt b/PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/init/configure.kt index f7244934..c7282373 100644 --- a/PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/init/configure.kt +++ b/PartnerCtl/src/main/java/work/slhaf/partner/ctl/commands/init/configure.kt @@ -1,7 +1,7 @@ package work.slhaf.partner.ctl.commands.init import kotlinx.serialization.json.* -import work.slhaf.partner.ctl.commands.InitCommand.GatewayConfig +import work.slhaf.partner.ctl.commands.data.GatewayConfig import work.slhaf.partner.ctl.support.* import work.slhaf.partner.ctl.ui.Prompt import java.nio.file.Files