You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sd...@apache.org on 2022/09/21 09:35:36 UTC
[ignite-3] branch main updated: IGNITE-17518 Actualize cli module (#1086)
This is an automated email from the ASF dual-hosted git repository.
sdanilov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new babd3ba145 IGNITE-17518 Actualize cli module (#1086)
babd3ba145 is described below
commit babd3ba1457272feba5b179ef10c5428000b27ba
Author: Vadim Pakhnushev <86...@users.noreply.github.com>
AuthorDate: Wed Sep 21 12:35:30 2022 +0300
IGNITE-17518 Actualize cli module (#1086)
---
modules/cli-common/README.md | 5 ---
modules/cli-common/build.gradle | 25 -----------
modules/cli-common/pom.xml | 42 -------------------
.../apache/ignite/cli/common/IgniteCommand.java | 28 -------------
.../org/apache/ignite/cli/common/package-info.java | 22 ----------
modules/cli/build.gradle | 1 -
modules/cli/pom.xml | 9 +---
.../{ => internal}/cli/IntegrationTestBase.java | 2 +-
.../call/CallInitializedIntegrationTestBase.java | 4 +-
.../configuration/ItShowConfigurationCallTest.java | 6 +--
.../ItUpdateConfigurationCallTest.java | 6 +--
.../CliCommandTestInitializedIntegrationBase.java | 2 +-
...liCommandTestNotInitializedIntegrationBase.java | 14 +++----
.../ItClusterConfigCommandNotInitializedTest.java | 4 +-
.../ItClusterStatusCommandInitializedTest.java | 4 +-
.../ItClusterStatusCommandNotInitializedTest.java | 4 +-
.../ItTopologyCommandInitializedClusterTest.java | 6 +--
...ItTopologyCommandNotInitializedClusterTest.java | 6 +--
.../configuration/ItConfigCommandTest.java | 4 +-
.../cli/commands/connect/ItConnectCommandTest.java | 8 ++--
.../commands/questions/ItConnectToClusterTest.java | 20 ++++-----
.../cli/commands/sql/ItSqlCommandTest.java | 6 +--
.../cli/commands/version/ItVersionCommandTest.java | 4 +-
.../cli/deprecated/AbstractCliIntegrationTest.java | 4 +-
.../cli/deprecated/ItClusterCommandTest.java | 2 +-
.../cli/deprecated/ItConfigCommandTest.java | 2 +-
.../rest/ItGeneratedRestClientTest.java | 2 +-
.../ignite/{ => internal}/cli/CliVersionInfo.java | 4 +-
.../org/apache/ignite/{ => internal}/cli/Main.java | 26 ++++++------
.../ignite/{ => internal}/cli/VersionProvider.java | 2 +-
.../cli/call/cliconfig/CliConfigGetCall.java | 10 ++---
.../cli/call/cliconfig/CliConfigGetCallInput.java | 4 +-
.../cli/call/cliconfig/CliConfigSetCall.java | 12 +++---
.../cli/call/cliconfig/CliConfigSetCallInput.java | 4 +-
.../cli/call/cliconfig/CliConfigShowCall.java | 14 +++----
.../profile/CliConfigProfileActivateCall.java | 12 +++---
.../profile/CliConfigProfileCreateCall.java | 14 +++----
.../profile/CliConfigProfileCreateCallInput.java | 4 +-
.../profile/CliConfigProfileListCall.java | 14 +++----
.../profile/CliConfigProfileShowCall.java | 12 +++---
.../cli/call/cliconfig/profile/ProfileList.java | 2 +-
.../cli/call/cluster/ClusterInitCall.java | 8 ++--
.../cli/call/cluster/ClusterInitCallInput.java | 6 +--
.../cli/call/cluster/status/ClusterStatus.java | 2 +-
.../cli/call/cluster/status/ClusterStatusCall.java | 16 ++++----
.../call/cluster/topology/LogicalTopologyCall.java | 10 ++---
.../cluster/topology/PhysicalTopologyCall.java | 10 ++---
.../call/cluster/topology/TopologyCallOutput.java | 6 +--
.../call/configuration/ClusterConfigShowCall.java | 8 ++--
.../configuration/ClusterConfigShowCallInput.java | 4 +-
.../configuration/ClusterConfigUpdateCall.java | 8 ++--
.../ClusterConfigUpdateCallInput.java | 4 +-
.../cli/call/configuration/JsonString.java | 2 +-
.../cli/call/configuration/NodeConfigShowCall.java | 8 ++--
.../configuration/NodeConfigShowCallInput.java | 4 +-
.../call/configuration/NodeConfigUpdateCall.java | 8 ++--
.../configuration/NodeConfigUpdateCallInput.java | 4 +-
.../cli/call/connect/ConnectCall.java | 22 +++++-----
.../cli/call/connect/ConnectCallInput.java | 4 +-
.../cli/call/connect/DisconnectCall.java | 16 ++++----
.../cli/call/node/status/NodeStatus.java | 2 +-
.../cli/call/node/status/NodeStatusCall.java | 12 +++---
.../{ => internal}/cli/call/node/status/State.java | 2 +-
.../{ => internal}/cli/call/sql/SqlQueryCall.java | 14 +++----
.../{ => internal}/cli/commands/BaseCommand.java | 2 +-
.../cli/commands/OptionsConstants.java | 4 +-
.../{ => internal}/cli/commands/ProfileMixin.java | 8 ++--
.../cli/commands/TopLevelCliCommand.java | 14 +++----
.../cli/commands/TopLevelCliReplCommand.java | 18 ++++----
.../cli/commands/cliconfig/CliCommand.java | 4 +-
.../cli/commands/cliconfig/CliConfigCommand.java | 6 +--
.../commands/cliconfig/CliConfigGetCommand.java | 12 +++---
.../cliconfig/CliConfigGetReplCommand.java | 10 ++---
.../commands/cliconfig/CliConfigReplCommand.java | 6 +--
.../commands/cliconfig/CliConfigSetCommand.java | 12 +++---
.../cliconfig/CliConfigSetReplCommand.java | 10 ++---
.../commands/cliconfig/CliConfigShowCommand.java | 14 +++----
.../cliconfig/CliConfigShowReplCommand.java | 12 +++---
.../cli/commands/cliconfig/CliReplCommand.java | 4 +-
.../profile/CliConfigProfileActivateCommand.java | 10 ++---
.../cliconfig/profile/CliConfigProfileCommand.java | 4 +-
.../profile/CliConfigProfileCreateCommand.java | 10 ++---
.../profile/CliConfigProfileListCommand.java | 12 +++---
.../profile/CliConfigProfileShowCommand.java | 10 ++---
.../cli/commands/cluster/ClusterCommand.java | 10 ++---
.../cli/commands/cluster/ClusterReplCommand.java | 10 ++---
.../cli/commands/cluster/ClusterUrlMixin.java | 10 ++---
.../commands/cluster/ClusterUrlProfileMixin.java | 10 ++---
.../cluster/config/ClusterConfigCommand.java | 4 +-
.../cluster/config/ClusterConfigReplCommand.java | 4 +-
.../cluster/config/ClusterConfigShowCommand.java | 16 ++++----
.../config/ClusterConfigShowReplCommand.java | 16 ++++----
.../cluster/config/ClusterConfigUpdateCommand.java | 14 +++----
.../config/ClusterConfigUpdateReplCommand.java | 16 ++++----
.../commands/cluster/init/ClusterInitCommand.java | 12 +++---
.../commands/cluster/init/ClusterInitOptions.java | 2 +-
.../cluster/init/ClusterInitReplCommand.java | 14 +++----
.../cluster/status/ClusterStatusCommand.java | 14 +++----
.../cluster/status/ClusterStatusReplCommand.java | 14 +++----
.../cli/commands/connect/ConnectCommand.java | 16 ++++----
.../cli/commands/connect/DisconnectCommand.java | 10 ++---
.../cli/commands/node/NodeCommand.java | 8 ++--
.../cli/commands/node/NodeReplCommand.java | 8 ++--
.../cli/commands/node/NodeUrlMixin.java | 10 ++---
.../cli/commands/node/NodeUrlProfileMixin.java | 10 ++---
.../commands/node/config/NodeConfigCommand.java | 4 +-
.../node/config/NodeConfigReplCommand.java | 4 +-
.../node/config/NodeConfigShowCommand.java | 14 +++----
.../node/config/NodeConfigShowReplCommand.java | 14 +++----
.../node/config/NodeConfigUpdateCommand.java | 12 +++---
.../node/config/NodeConfigUpdateReplCommand.java | 14 +++----
.../commands/node/status/NodeStatusCommand.java | 14 +++----
.../node/status/NodeStatusReplCommand.java | 14 +++----
.../questions/ConnectToClusterQuestion.java | 24 +++++------
.../cli/commands/sql/SqlCommand.java | 20 ++++-----
.../cli/commands/sql/SqlCompleter.java | 4 +-
.../cli/commands/sql/SqlMetaData.java | 2 +-
.../cli/commands/sql/SqlReplCommand.java | 32 +++++++--------
.../commands/sql/SqlReplTopLevelCliCommand.java | 2 +-
.../commands/topology/LogicalTopologyCommand.java | 16 ++++----
.../topology/LogicalTopologyReplCommand.java | 18 ++++----
.../commands/topology/PhysicalTopologyCommand.java | 14 +++----
.../topology/PhysicalTopologyReplCommand.java | 16 ++++----
.../cli/commands/topology/TopologyCommand.java | 4 +-
.../cli/commands/topology/TopologyReplCommand.java | 4 +-
.../cli/commands/version/VersionCommand.java | 6 +--
.../cli/config/CachedConfigManagerProvider.java | 4 +-
.../cli/config/CachedStateConfigProvider.java | 2 +-
.../ignite/{ => internal}/cli/config/Config.java | 2 +-
.../{ => internal}/cli/config/ConfigConstants.java | 2 +-
.../cli/config/ConfigDefaultValueProvider.java | 2 +-
.../cli/config/ConfigInitializationException.java | 2 +-
.../{ => internal}/cli/config/ConfigManager.java | 2 +-
.../cli/config/ConfigManagerProvider.java | 2 +-
.../cli/config/ConfigStoringException.java | 2 +-
.../ignite/{ => internal}/cli/config/Profile.java | 2 +-
.../cli/config/ProfileNotFoundException.java | 2 +-
.../{ => internal}/cli/config/StateConfig.java | 6 +--
.../cli/config/StateConfigProvider.java | 2 +-
.../cli/config/StateFolderProvider.java | 2 +-
.../{ => internal}/cli/config/ini/IniConfig.java | 4 +-
.../cli/config/ini/IniConfigManager.java | 16 ++++----
.../{ => internal}/cli/config/ini/IniFile.java | 4 +-
.../{ => internal}/cli/config/ini/IniParser.java | 2 +-
.../{ => internal}/cli/config/ini/IniProfile.java | 6 +--
.../{ => internal}/cli/config/ini/IniSection.java | 2 +-
.../config/ini/SectionAlreadyExistsException.java | 2 +-
.../cli/core/CallExecutionPipelineProvider.java | 8 ++--
.../ignite/{ => internal}/cli/core/call/Call.java | 2 +-
.../cli/core/call/CallExecutionPipeline.java | 16 ++++----
.../{ => internal}/cli/core/call/CallInput.java | 2 +-
.../{ => internal}/cli/core/call/CallOutput.java | 2 +-
.../cli/core/call/CallOutputStatus.java | 2 +-
.../cli/core/call/DefaultCallOutput.java | 2 +-
.../cli/core/call/EmptyCallInput.java | 2 +-
.../cli/core/call/StringCallInput.java | 2 +-
.../{ => internal}/cli/core/call/UrlCallInput.java | 2 +-
.../core/converters/NetworkAddressConverter.java | 2 +-
.../cli/core/converters/UrlConverter.java | 2 +-
.../cli/core/decorator/Decorator.java | 2 +-
.../cli/core/decorator/DecoratorRegistry.java | 4 +-
.../cli/core/decorator/TerminalOutput.java | 2 +-
.../core/exception/CommandExecutionException.java | 2 +-
.../core/exception/ConnectCommandException.java | 2 +-
.../cli/core/exception/ExceptionHandler.java | 4 +-
.../cli/core/exception/ExceptionHandlers.java | 2 +-
.../cli/core/exception/ExceptionWriter.java | 2 +-
.../cli/core/exception/IgniteCliApiException.java | 2 +-
.../cli/core/exception/WrappedException.java | 2 +-
.../ClusterNotInitializedExceptionHandler.java | 10 ++---
.../handler/ConfigStoringExceptionHandler.java | 10 ++---
.../handler/DefaultExceptionHandlers.java | 4 +-
.../handler/EndOfFileExceptionHandler.java | 6 +--
.../handler/FlowInterruptExceptionHandler.java | 8 ++--
.../handler/IgniteCliApiExceptionHandler.java | 16 ++++----
.../handler/IgniteCliExceptionHandler.java | 10 ++---
.../handler/PicocliExecutionExceptionHandler.java | 4 +-
.../handler/ProfileNotFoundExceptionHandler.java | 10 ++---
.../exception/handler/ReplExceptionHandlers.java | 4 +-
.../SectionAlreadyExistsExceptionHandler.java | 10 ++---
.../exception/handler/SqlExceptionHandler.java | 10 ++---
.../exception/handler/TimeoutExceptionHandler.java | 8 ++--
.../handler/UnknownCommandExceptionHandler.java | 8 ++--
.../handler/UserInterruptExceptionHandler.java | 6 +--
.../cli/core/flow/DefaultFlowable.java | 4 +-
.../ignite/{ => internal}/cli/core/flow/Flow.java | 2 +-
.../cli/core/flow/FlowInterruptException.java | 2 +-
.../{ => internal}/cli/core/flow/Flowable.java | 2 +-
.../cli/core/flow/builder/FlowBuilder.java | 12 +++---
.../cli/core/flow/builder/FlowBuilderImpl.java | 30 +++++++-------
.../cli/core/flow/builder/Flows.java | 24 +++++------
.../core/flow/question/AcceptedQuestionAnswer.java | 2 +-
.../flow/question/InterruptQuestionAnswer.java | 4 +-
.../flow/question/JlineQuestionWriterReader.java | 4 +-
.../cli/core/flow/question/QuestionAnswer.java | 2 +-
.../cli/core/flow/question/QuestionAsker.java | 2 +-
.../core/flow/question/QuestionAskerFactory.java | 2 +-
.../core/flow/question/QuestionWriterReader.java | 2 +-
.../ignite/{ => internal}/cli/core/repl/Repl.java | 14 +++----
.../{ => internal}/cli/core/repl/ReplBuilder.java | 8 ++--
.../{ => internal}/cli/core/repl/Session.java | 2 +-
.../cli/core/repl/SessionDefaultValueProvider.java | 6 +--
.../cli/core/repl/completer/CompleterFilter.java | 2 +-
.../cli/core/repl/completer/DynamicCompleter.java | 2 +-
.../completer/DynamicCompleterActivationPoint.java | 2 +-
.../repl/completer/DynamicCompleterFactory.java | 10 ++---
.../repl/completer/DynamicCompleterFilter.java | 8 ++--
.../repl/completer/DynamicCompleterRegistry.java | 2 +-
.../core/repl/completer/HoconDynamicCompleter.java | 2 +-
.../core/repl/completer/LazyDynamicCompleter.java | 2 +-
.../cli/core/repl/completer/NodeUrlProvider.java | 10 ++---
.../core/repl/config/ClientConnectorConfig.java | 2 +-
.../cli/core/repl/config/RootConfig.java | 2 +-
.../cli/core/repl/context/CommandLineContext.java | 2 +-
.../repl/context/CommandLineContextProvider.java | 2 +-
.../core/repl/executor/IgnitePicocliCommands.java | 8 ++--
.../repl/executor/RegistryCommandExecutor.java | 10 ++---
.../cli/core/repl/executor/ReplExecutor.java | 26 ++++++------
.../core/repl/executor/ReplExecutorProvider.java | 2 +-
.../cli/core/repl/expander/NoopExpander.java | 2 +-
.../cli/core/repl/prompt/PromptProvider.java | 2 +-
.../cli/core/repl/prompt/ReplPromptProvider.java | 10 ++---
.../cli/core/repl/terminal/TerminalCustomizer.java | 2 +-
.../cli/core/repl/terminal/TerminalFactory.java | 2 +-
.../cli/core/style/AnsiStringSupport.java | 2 +-
.../cli/core/style/component/ErrorUiComponent.java | 14 +++----
.../core/style/component/MessageUiComponent.java | 8 ++--
.../core/style/component/QuestionUiComponent.java | 8 ++--
.../cli/core/style/component/UiComponent.java | 2 +-
.../cli/core/style/element/MarkedUiElement.java | 4 +-
.../cli/core/style/element/UiElement.java | 2 +-
.../cli/core/style/element/UiElements.java | 8 ++--
.../cli/core/style/element/UiString.java | 2 +-
.../cli/decorators/ClusterStatusDecorator.java | 14 +++----
.../cli/decorators/DefaultDecorator.java | 6 +--
.../cli/decorators/DefaultDecoratorRegistry.java | 21 +++++-----
.../cli/decorators/JsonDecorator.java | 8 ++--
.../cli/decorators/NodeStatusDecorator.java | 16 ++++----
.../cli/decorators/ProfileDecorator.java | 8 ++--
.../cli/decorators/ProfileListDecorator.java | 12 +++---
.../cli/decorators/SqlQueryResultDecorator.java | 8 ++--
.../cli/decorators/TableDecorator.java | 8 ++--
.../cli/decorators/TopologyDecorator.java | 6 +--
.../cli/deprecated/CliPathsConfigLoader.java | 6 +--
.../cli/deprecated/CommandFactory.java | 2 +-
.../cli/deprecated/IgniteCliException.java | 2 +-
.../{ => internal}/cli/deprecated/IgnitePaths.java | 4 +-
.../{ => internal}/cli/deprecated/Table.java | 2 +-
.../deprecated/builtins/SystemPathResolver.java | 6 +--
.../builtins/init/InitIgniteCommand.java | 18 ++++----
.../cli/deprecated/builtins/init/package-info.java | 2 +-
.../builtins/module/MavenArtifactResolver.java | 8 ++--
.../builtins/module/MavenCoordinates.java | 4 +-
.../deprecated/builtins/module/ModuleManager.java | 8 ++--
.../deprecated/builtins/module/ModuleRegistry.java | 6 +--
.../deprecated/builtins/module/ResolveResult.java | 2 +-
.../builtins/module/StandardModuleDefinition.java | 2 +-
.../deprecated/builtins/module/package-info.java | 2 +-
.../cli/deprecated/builtins/node/NodeManager.java | 8 ++--
.../cli/deprecated/builtins/node/package-info.java | 2 +-
.../cli/deprecated/builtins/package-info.java | 2 +-
.../cli/deprecated/package-info.java | 2 +-
.../spec/BootstrapIgniteCommandSpec.java | 11 ++---
.../cli/deprecated/spec/NodeCommandSpec.java | 18 ++++----
.../cli/deprecated/spec/NodeEndpointOptions.java | 4 +-
.../cli/deprecated/spec/package-info.java | 2 +-
.../cli/deprecated/ui/ProgressBar.java | 2 +-
.../{ => internal}/cli/deprecated/ui/Spinner.java | 2 +-
.../{ => internal}/cli/sql/MetadataSupplier.java | 2 +-
.../{ => internal}/cli/sql/SchemaProvider.java | 2 +-
.../ignite/{ => internal}/cli/sql/SqlManager.java | 4 +-
.../{ => internal}/cli/sql/SqlQueryResult.java | 10 ++---
.../ignite/{ => internal}/cli/sql/SqlSchema.java | 2 +-
.../{ => internal}/cli/sql/SqlSchemaLoader.java | 2 +-
.../{ => internal}/cli/sql/SqlSchemaProvider.java | 2 +-
.../ignite/{ => internal}/cli/sql/table/Table.java | 2 +-
.../{ => internal}/cli/sql/table/TableRow.java | 2 +-
.../cli/call/node/status/NodeStatusCallTest.java | 6 +--
.../cli/commands/CliCommandTestBase.java | 2 +-
.../cli/commands/PicocliBugTest.java | 4 +-
.../cli/commands/ProfileMixinTest.java | 36 ++++++++--------
.../cli/commands/UrlOptionsNegativeTest.java | 48 +++++++++++-----------
.../cliconfig/CliConfigCommandTestBase.java | 6 +--
.../cliconfig/CliConfigGetCommandTest.java | 2 +-
.../CliConfigProfileActivateCommandTest.java | 4 +-
.../CliConfigProfileCreateCommandTest.java | 6 +--
.../cliconfig/CliConfigProfileListCommandTest.java | 6 +--
.../cliconfig/CliConfigProfileShowCommandTest.java | 6 +--
.../cliconfig/CliConfigSetCommandTest.java | 6 +--
.../cliconfig/CliConfigShowCommandTest.java | 2 +-
.../cli/commands/cliconfig/ConfigManagerTest.java | 4 +-
.../cliconfig/TestConfigManagerHelper.java | 4 +-
.../cliconfig/TestConfigManagerProvider.java | 8 ++--
.../{ => internal}/cli/commands/flow/FlowTest.java | 18 ++++----
.../{ => internal}/cli/commands/flow/IntCall.java | 8 ++--
.../cli/commands/flow/IntCallInput.java | 4 +-
.../{ => internal}/cli/commands/flow/StrCall.java | 8 ++--
.../cli/commands/flow/StrCallInput.java | 4 +-
.../cli/commands/flow/TestExceptionHandler.java | 6 +--
.../cli/commands/flow/ThrowingStrCall.java | 8 ++--
.../cli/commands/sql/SchemaProviderMock.java | 6 +--
.../cli/commands/sql/SqlCommandTest.java | 4 +-
.../cli/commands/sql/SqlCompleterTest.java | 2 +-
.../cli/config/TestStateConfigHelper.java | 4 +-
.../cli/config/TestStateConfigProvider.java | 2 +-
.../repl/completer/DynamicCompleterFilterTest.java | 4 +-
.../completer/DynamicCompleterRegistryTest.java | 2 +-
.../repl/completer/HoconDynamicCompleterTest.java | 2 +-
.../core/style/component/ErrorUiComponentTest.java | 4 +-
.../style/component/MessageUiComponentTest.java | 4 +-
.../cli/deprecated/AbstractCliTest.java | 2 +-
.../cli/deprecated/IgniteCliInterfaceTest.java | 8 ++--
.../builtins/init/InitIgniteCommandTest.java | 12 +++---
.../cli/deprecated/builtins/init/package-info.java | 2 +-
.../cli/deprecated/package-info.java | 2 +-
.../cli/deprecated/ui/ProgressBarTest.java | 4 +-
.../cli/deprecated/ui/SpinnerTest.java | 2 +-
.../cli/deprecated/ui/package-info.java | 2 +-
.../cli/sql/SqlSchemaProviderTest.java | 2 +-
.../{ => internal}/cli/sql/table/TableTest.java | 2 +-
modules/jacoco-report/build.gradle | 1 -
modules/jacoco-report/pom.xml | 5 ---
parent/pom.xml | 6 ---
pom.xml | 1 -
settings.gradle | 2 -
325 files changed, 1088 insertions(+), 1233 deletions(-)
diff --git a/modules/cli-common/README.md b/modules/cli-common/README.md
deleted file mode 100644
index 15496dc0d3..0000000000
--- a/modules/cli-common/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Ignite CLI common module
-
-This module contains all needed stuff for implementation external commands for Ignite CLI.
-For more details read the javadoc of `IgniteCommand` interface.
-
diff --git a/modules/cli-common/build.gradle b/modules/cli-common/build.gradle
deleted file mode 100644
index 9ea69031f5..0000000000
--- a/modules/cli-common/build.gradle
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-apply from: "$rootDir/buildscripts/java-core.gradle"
-apply from: "$rootDir/buildscripts/java-junit5.gradle"
-
-dependencies {
- implementation libs.picocli.core
-}
-
-description = 'ignite-cli-common'
diff --git a/modules/cli-common/pom.xml b/modules/cli-common/pom.xml
deleted file mode 100644
index 61cbd81da8..0000000000
--- a/modules/cli-common/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.ignite</groupId>
- <artifactId>ignite-parent</artifactId>
- <version>1</version>
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>ignite-cli-common</artifactId>
- <version>3.0.0-SNAPSHOT</version>
-
- <dependencies>
- <!-- 3rd party dependencies -->
- <dependency>
- <groupId>info.picocli</groupId>
- <artifactId>picocli</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/modules/cli-common/src/main/java/org/apache/ignite/cli/common/IgniteCommand.java b/modules/cli-common/src/main/java/org/apache/ignite/cli/common/IgniteCommand.java
deleted file mode 100644
index 796814ece8..0000000000
--- a/modules/cli-common/src/main/java/org/apache/ignite/cli/common/IgniteCommand.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cli.common;
-
-/**
- * Marker interface, which must be implemented by any external Ignite CLI command instance. This marker will be used by java {@link
- * java.util.ServiceLoader} to find the commands inside your module.
- *
- * <p>Note: Also, to be a valid command you must ensure that your class satisfy one of the criteria from {@link
- * picocli.CommandLine#addSubcommand(Object)}
- */
-public interface IgniteCommand {
-}
diff --git a/modules/cli-common/src/main/java/org/apache/ignite/cli/common/package-info.java b/modules/cli-common/src/main/java/org/apache/ignite/cli/common/package-info.java
deleted file mode 100644
index 3f08897660..0000000000
--- a/modules/cli-common/src/main/java/org/apache/ignite/cli/common/package-info.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Contains base classes and interfaces for implement Ignite CLI extension module.
- */
-
-package org.apache.ignite.cli.common;
diff --git a/modules/cli/build.gradle b/modules/cli/build.gradle
index 22a4714773..1b98d96cdf 100644
--- a/modules/cli/build.gradle
+++ b/modules/cli/build.gradle
@@ -34,7 +34,6 @@ dependencies {
annotationProcessor libs.micronaut.inject.annotation.processor
annotationProcessor libs.micronaut.validation.annotation.processor
- implementation project(':ignite-cli-common')
implementation project(':ignite-core')
implementation project(':ignite-api')
implementation project(':ignite-client')
diff --git a/modules/cli/pom.xml b/modules/cli/pom.xml
index 2c2df5213f..92543600aa 100644
--- a/modules/cli/pom.xml
+++ b/modules/cli/pom.xml
@@ -48,11 +48,6 @@
<artifactId>jline-console</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.ignite</groupId>
- <artifactId>ignite-cli-common</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
@@ -419,7 +414,7 @@
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
- <Main-Class>org.apache.ignite.cli.Main</Main-Class>
+ <Main-Class>org.apache.ignite.internal.cli.Main</Main-Class>
</manifestEntries>
</transformer>
<transformer
@@ -515,7 +510,7 @@
<argument>${project.build.directory}/ignite_completion.sh</argument>
<argument>-n</argument>
<argument>ignite</argument>
- <argument>org.apache.ignite.cli.commands.TopLevelCliCommand</argument>
+ <argument>org.apache.ignite.internal.cli.commands.TopLevelCliCommand</argument>
</arguments>
</configuration>
</plugin>
diff --git a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/IntegrationTestBase.java b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/IntegrationTestBase.java
similarity index 99%
rename from modules/cli/src/integrationTest/java/org/apache/ignite/cli/IntegrationTestBase.java
rename to modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/IntegrationTestBase.java
index 535dc1bcd5..7f47bd641a 100644
--- a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/IntegrationTestBase.java
+++ b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/IntegrationTestBase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli;
+package org.apache.ignite.internal.cli;
import static java.util.stream.Collectors.toList;
import static org.apache.ignite.internal.testframework.IgniteTestUtils.await;
diff --git a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/call/CallInitializedIntegrationTestBase.java b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/CallInitializedIntegrationTestBase.java
similarity index 93%
rename from modules/cli/src/integrationTest/java/org/apache/ignite/cli/call/CallInitializedIntegrationTestBase.java
rename to modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/CallInitializedIntegrationTestBase.java
index 2f44d7f808..e1877d31fc 100644
--- a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/call/CallInitializedIntegrationTestBase.java
+++ b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/CallInitializedIntegrationTestBase.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call;
+package org.apache.ignite.internal.cli.call;
import static org.apache.ignite.internal.testframework.IgniteTestUtils.testNodeName;
import java.util.concurrent.ExecutionException;
-import org.apache.ignite.cli.IntegrationTestBase;
+import org.apache.ignite.internal.cli.IntegrationTestBase;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.TestInfo;
diff --git a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/call/configuration/ItShowConfigurationCallTest.java b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/configuration/ItShowConfigurationCallTest.java
similarity index 94%
rename from modules/cli/src/integrationTest/java/org/apache/ignite/cli/call/configuration/ItShowConfigurationCallTest.java
rename to modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/configuration/ItShowConfigurationCallTest.java
index 3c9407b19f..ccf64d89f7 100644
--- a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/call/configuration/ItShowConfigurationCallTest.java
+++ b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/configuration/ItShowConfigurationCallTest.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.configuration;
+package org.apache.ignite.internal.cli.call.configuration;
import static org.assertj.core.api.Assertions.assertThat;
import jakarta.inject.Inject;
-import org.apache.ignite.cli.call.CallInitializedIntegrationTestBase;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.call.CallInitializedIntegrationTestBase;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/call/configuration/ItUpdateConfigurationCallTest.java b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/configuration/ItUpdateConfigurationCallTest.java
similarity index 93%
rename from modules/cli/src/integrationTest/java/org/apache/ignite/cli/call/configuration/ItUpdateConfigurationCallTest.java
rename to modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/configuration/ItUpdateConfigurationCallTest.java
index b2ce90f556..7eab198d6b 100644
--- a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/call/configuration/ItUpdateConfigurationCallTest.java
+++ b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/configuration/ItUpdateConfigurationCallTest.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.configuration;
+package org.apache.ignite.internal.cli.call.configuration;
import static org.assertj.core.api.Assertions.assertThat;
import jakarta.inject.Inject;
-import org.apache.ignite.cli.call.CallInitializedIntegrationTestBase;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.call.CallInitializedIntegrationTestBase;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/CliCommandTestInitializedIntegrationBase.java b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/CliCommandTestInitializedIntegrationBase.java
similarity index 96%
rename from modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/CliCommandTestInitializedIntegrationBase.java
rename to modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/CliCommandTestInitializedIntegrationBase.java
index 28d408cba8..55da842a08 100644
--- a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/CliCommandTestInitializedIntegrationBase.java
+++ b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/CliCommandTestInitializedIntegrationBase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands;
+package org.apache.ignite.internal.cli.commands;
import static org.apache.ignite.internal.testframework.IgniteTestUtils.testNodeName;
diff --git a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/CliCommandTestNotInitializedIntegrationBase.java b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/CliCommandTestNotInitializedIntegrationBase.java
similarity index 91%
rename from modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/CliCommandTestNotInitializedIntegrationBase.java
rename to modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/CliCommandTestNotInitializedIntegrationBase.java
index dcfbd9faab..b9faad25d6 100644
--- a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/CliCommandTestNotInitializedIntegrationBase.java
+++ b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/CliCommandTestNotInitializedIntegrationBase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands;
+package org.apache.ignite.internal.cli.commands;
import static org.assertj.core.api.Assertions.assertThat;
@@ -25,12 +25,12 @@ import jakarta.inject.Inject;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.concurrent.ExecutionException;
-import org.apache.ignite.cli.IntegrationTestBase;
-import org.apache.ignite.cli.commands.cliconfig.TestConfigManagerHelper;
-import org.apache.ignite.cli.commands.cliconfig.TestConfigManagerProvider;
-import org.apache.ignite.cli.config.ConfigDefaultValueProvider;
-import org.apache.ignite.cli.config.ini.IniConfigManager;
-import org.apache.ignite.cli.core.repl.context.CommandLineContextProvider;
+import org.apache.ignite.internal.cli.IntegrationTestBase;
+import org.apache.ignite.internal.cli.commands.cliconfig.TestConfigManagerHelper;
+import org.apache.ignite.internal.cli.commands.cliconfig.TestConfigManagerProvider;
+import org.apache.ignite.internal.cli.config.ConfigDefaultValueProvider;
+import org.apache.ignite.internal.cli.config.ini.IniConfigManager;
+import org.apache.ignite.internal.cli.core.repl.context.CommandLineContextProvider;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
diff --git a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/cluster/config/ItClusterConfigCommandNotInitializedTest.java b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/cluster/config/ItClusterConfigCommandNotInitializedTest.java
similarity index 91%
rename from modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/cluster/config/ItClusterConfigCommandNotInitializedTest.java
rename to modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/cluster/config/ItClusterConfigCommandNotInitializedTest.java
index c5c57b81ef..5e0e44cd7e 100644
--- a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/cluster/config/ItClusterConfigCommandNotInitializedTest.java
+++ b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/cluster/config/ItClusterConfigCommandNotInitializedTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cluster.config;
+package org.apache.ignite.internal.cli.commands.cluster.config;
import static org.junit.jupiter.api.Assertions.assertAll;
-import org.apache.ignite.cli.commands.CliCommandTestNotInitializedIntegrationBase;
+import org.apache.ignite.internal.cli.commands.CliCommandTestNotInitializedIntegrationBase;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/cluster/status/ItClusterStatusCommandInitializedTest.java b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/cluster/status/ItClusterStatusCommandInitializedTest.java
similarity index 93%
rename from modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/cluster/status/ItClusterStatusCommandInitializedTest.java
rename to modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/cluster/status/ItClusterStatusCommandInitializedTest.java
index 6a0ddcc13e..3bb4111051 100644
--- a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/cluster/status/ItClusterStatusCommandInitializedTest.java
+++ b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/cluster/status/ItClusterStatusCommandInitializedTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cluster.status;
+package org.apache.ignite.internal.cli.commands.cluster.status;
import static org.junit.jupiter.api.Assertions.assertAll;
-import org.apache.ignite.cli.commands.CliCommandTestInitializedIntegrationBase;
+import org.apache.ignite.internal.cli.commands.CliCommandTestInitializedIntegrationBase;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/cluster/status/ItClusterStatusCommandNotInitializedTest.java b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/cluster/status/ItClusterStatusCommandNotInitializedTest.java
similarity index 90%
rename from modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/cluster/status/ItClusterStatusCommandNotInitializedTest.java
rename to modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/cluster/status/ItClusterStatusCommandNotInitializedTest.java
index ff70efbce5..413b57f4b5 100644
--- a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/cluster/status/ItClusterStatusCommandNotInitializedTest.java
+++ b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/cluster/status/ItClusterStatusCommandNotInitializedTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cluster.status;
+package org.apache.ignite.internal.cli.commands.cluster.status;
import static org.junit.jupiter.api.Assertions.assertAll;
-import org.apache.ignite.cli.commands.CliCommandTestNotInitializedIntegrationBase;
+import org.apache.ignite.internal.cli.commands.CliCommandTestNotInitializedIntegrationBase;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/cluster/topology/ItTopologyCommandInitializedClusterTest.java b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/cluster/topology/ItTopologyCommandInitializedClusterTest.java
similarity index 89%
rename from modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/cluster/topology/ItTopologyCommandInitializedClusterTest.java
rename to modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/cluster/topology/ItTopologyCommandInitializedClusterTest.java
index 26acbc9baa..c42c186dda 100644
--- a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/cluster/topology/ItTopologyCommandInitializedClusterTest.java
+++ b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/cluster/topology/ItTopologyCommandInitializedClusterTest.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cluster.topology;
+package org.apache.ignite.internal.cli.commands.cluster.topology;
import static org.junit.jupiter.api.Assertions.assertAll;
-import org.apache.ignite.cli.commands.CliCommandTestInitializedIntegrationBase;
-import org.apache.ignite.cli.commands.topology.TopologyCommand;
+import org.apache.ignite.internal.cli.commands.CliCommandTestInitializedIntegrationBase;
+import org.apache.ignite.internal.cli.commands.topology.TopologyCommand;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/cluster/topology/ItTopologyCommandNotInitializedClusterTest.java b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/cluster/topology/ItTopologyCommandNotInitializedClusterTest.java
similarity index 90%
rename from modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/cluster/topology/ItTopologyCommandNotInitializedClusterTest.java
rename to modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/cluster/topology/ItTopologyCommandNotInitializedClusterTest.java
index 96071d37c2..4af17214b5 100644
--- a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/cluster/topology/ItTopologyCommandNotInitializedClusterTest.java
+++ b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/cluster/topology/ItTopologyCommandNotInitializedClusterTest.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cluster.topology;
+package org.apache.ignite.internal.cli.commands.cluster.topology;
import static org.junit.jupiter.api.Assertions.assertAll;
-import org.apache.ignite.cli.commands.CliCommandTestNotInitializedIntegrationBase;
-import org.apache.ignite.cli.commands.topology.TopologyCommand;
+import org.apache.ignite.internal.cli.commands.CliCommandTestNotInitializedIntegrationBase;
+import org.apache.ignite.internal.cli.commands.topology.TopologyCommand;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/configuration/ItConfigCommandTest.java b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/configuration/ItConfigCommandTest.java
similarity index 95%
rename from modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/configuration/ItConfigCommandTest.java
rename to modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/configuration/ItConfigCommandTest.java
index 380a1eb122..68a93d9b46 100644
--- a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/configuration/ItConfigCommandTest.java
+++ b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/configuration/ItConfigCommandTest.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.configuration;
+package org.apache.ignite.internal.cli.commands.configuration;
import static org.junit.jupiter.api.Assertions.assertAll;
-import org.apache.ignite.cli.commands.CliCommandTestInitializedIntegrationBase;
+import org.apache.ignite.internal.cli.commands.CliCommandTestInitializedIntegrationBase;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/connect/ItConnectCommandTest.java b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/connect/ItConnectCommandTest.java
similarity index 93%
rename from modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/connect/ItConnectCommandTest.java
rename to modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/connect/ItConnectCommandTest.java
index 1be2bd8afd..75267cf256 100644
--- a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/connect/ItConnectCommandTest.java
+++ b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/connect/ItConnectCommandTest.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.connect;
+package org.apache.ignite.internal.cli.commands.connect;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertAll;
import jakarta.inject.Inject;
-import org.apache.ignite.cli.commands.CliCommandTestInitializedIntegrationBase;
-import org.apache.ignite.cli.commands.TopLevelCliReplCommand;
-import org.apache.ignite.cli.core.repl.prompt.PromptProvider;
+import org.apache.ignite.internal.cli.commands.CliCommandTestInitializedIntegrationBase;
+import org.apache.ignite.internal.cli.commands.TopLevelCliReplCommand;
+import org.apache.ignite.internal.cli.core.repl.prompt.PromptProvider;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import picocli.CommandLine.Help.Ansi;
diff --git a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/questions/ItConnectToClusterTest.java b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/questions/ItConnectToClusterTest.java
similarity index 87%
rename from modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/questions/ItConnectToClusterTest.java
rename to modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/questions/ItConnectToClusterTest.java
index e373a3620f..3df96fe8d6 100644
--- a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/questions/ItConnectToClusterTest.java
+++ b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/questions/ItConnectToClusterTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.questions;
+package org.apache.ignite.internal.cli.commands.questions;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertAll;
@@ -26,15 +26,15 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
-import org.apache.ignite.cli.commands.CliCommandTestInitializedIntegrationBase;
-import org.apache.ignite.cli.commands.cliconfig.TestConfigManagerHelper;
-import org.apache.ignite.cli.config.ConfigConstants;
-import org.apache.ignite.cli.config.TestStateConfigHelper;
-import org.apache.ignite.cli.config.TestStateConfigProvider;
-import org.apache.ignite.cli.config.ini.IniConfigManager;
-import org.apache.ignite.cli.core.flow.question.JlineQuestionWriterReader;
-import org.apache.ignite.cli.core.flow.question.QuestionAskerFactory;
-import org.apache.ignite.cli.core.repl.prompt.PromptProvider;
+import org.apache.ignite.internal.cli.commands.CliCommandTestInitializedIntegrationBase;
+import org.apache.ignite.internal.cli.commands.cliconfig.TestConfigManagerHelper;
+import org.apache.ignite.internal.cli.config.ConfigConstants;
+import org.apache.ignite.internal.cli.config.TestStateConfigHelper;
+import org.apache.ignite.internal.cli.config.TestStateConfigProvider;
+import org.apache.ignite.internal.cli.config.ini.IniConfigManager;
+import org.apache.ignite.internal.cli.core.flow.question.JlineQuestionWriterReader;
+import org.apache.ignite.internal.cli.core.flow.question.QuestionAskerFactory;
+import org.apache.ignite.internal.cli.core.repl.prompt.PromptProvider;
import org.jline.reader.impl.LineReaderImpl;
import org.jline.terminal.Terminal;
import org.jline.terminal.impl.DumbTerminal;
diff --git a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/sql/ItSqlCommandTest.java b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/sql/ItSqlCommandTest.java
similarity index 94%
rename from modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/sql/ItSqlCommandTest.java
rename to modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/sql/ItSqlCommandTest.java
index 6aa1fcee34..d369b5a3f4 100644
--- a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/sql/ItSqlCommandTest.java
+++ b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/sql/ItSqlCommandTest.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.sql;
+package org.apache.ignite.internal.cli.commands.sql;
-import static org.apache.ignite.cli.core.exception.handler.SqlExceptionHandler.CLIENT_CONNECTION_FAILED_MESSAGE;
+import static org.apache.ignite.internal.cli.core.exception.handler.SqlExceptionHandler.CLIENT_CONNECTION_FAILED_MESSAGE;
import static org.junit.jupiter.api.Assertions.assertAll;
-import org.apache.ignite.cli.commands.CliCommandTestInitializedIntegrationBase;
+import org.apache.ignite.internal.cli.commands.CliCommandTestInitializedIntegrationBase;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
diff --git a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/version/ItVersionCommandTest.java b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/version/ItVersionCommandTest.java
similarity index 90%
rename from modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/version/ItVersionCommandTest.java
rename to modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/version/ItVersionCommandTest.java
index 57b64680bb..6bc21f4ff8 100644
--- a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/commands/version/ItVersionCommandTest.java
+++ b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/version/ItVersionCommandTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.version;
+package org.apache.ignite.internal.cli.commands.version;
import static org.junit.jupiter.api.Assertions.assertAll;
-import org.apache.ignite.cli.commands.CliCommandTestInitializedIntegrationBase;
+import org.apache.ignite.internal.cli.commands.CliCommandTestInitializedIntegrationBase;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/deprecated/AbstractCliIntegrationTest.java b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/deprecated/AbstractCliIntegrationTest.java
similarity index 93%
rename from modules/cli/src/integrationTest/java/org/apache/ignite/cli/deprecated/AbstractCliIntegrationTest.java
rename to modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/deprecated/AbstractCliIntegrationTest.java
index 9da087be5f..f56ac8a9fb 100644
--- a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/deprecated/AbstractCliIntegrationTest.java
+++ b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/deprecated/AbstractCliIntegrationTest.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated;
+package org.apache.ignite.internal.cli.deprecated;
import io.micronaut.context.ApplicationContext;
import java.io.ByteArrayOutputStream;
import java.io.PrintWriter;
-import org.apache.ignite.cli.commands.TopLevelCliCommand;
+import org.apache.ignite.internal.cli.commands.TopLevelCliCommand;
import picocli.CommandLine;
/**
diff --git a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/deprecated/ItClusterCommandTest.java b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/deprecated/ItClusterCommandTest.java
similarity index 99%
rename from modules/cli/src/integrationTest/java/org/apache/ignite/cli/deprecated/ItClusterCommandTest.java
rename to modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/deprecated/ItClusterCommandTest.java
index fde6576e48..4462157619 100644
--- a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/deprecated/ItClusterCommandTest.java
+++ b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/deprecated/ItClusterCommandTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated;
+package org.apache.ignite.internal.cli.deprecated;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.concurrent.TimeUnit.SECONDS;
diff --git a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/deprecated/ItConfigCommandTest.java b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/deprecated/ItConfigCommandTest.java
similarity index 99%
rename from modules/cli/src/integrationTest/java/org/apache/ignite/cli/deprecated/ItConfigCommandTest.java
rename to modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/deprecated/ItConfigCommandTest.java
index 88b58a56ee..76f35969f9 100644
--- a/modules/cli/src/integrationTest/java/org/apache/ignite/cli/deprecated/ItConfigCommandTest.java
+++ b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/deprecated/ItConfigCommandTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated;
+package org.apache.ignite.internal.cli.deprecated;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.ignite.internal.testframework.IgniteTestUtils.testNodeName;
diff --git a/modules/cli/src/integrationTest/java/org/apache/ignite/rest/ItGeneratedRestClientTest.java b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/rest/ItGeneratedRestClientTest.java
similarity index 99%
rename from modules/cli/src/integrationTest/java/org/apache/ignite/rest/ItGeneratedRestClientTest.java
rename to modules/cli/src/integrationTest/java/org/apache/ignite/internal/rest/ItGeneratedRestClientTest.java
index c738aa686d..b9dc04f8aa 100644
--- a/modules/cli/src/integrationTest/java/org/apache/ignite/rest/ItGeneratedRestClientTest.java
+++ b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/rest/ItGeneratedRestClientTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.rest;
+package org.apache.ignite.internal.rest;
import static java.util.stream.Collectors.toList;
import static org.apache.ignite.internal.testframework.IgniteTestUtils.testNodeName;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/CliVersionInfo.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/CliVersionInfo.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/CliVersionInfo.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/CliVersionInfo.java
index 98f2345e3c..8dbb5b9fbe 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/CliVersionInfo.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/CliVersionInfo.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.ignite.cli;
+package org.apache.ignite.internal.cli;
import jakarta.inject.Singleton;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
-import org.apache.ignite.cli.deprecated.IgniteCliException;
+import org.apache.ignite.internal.cli.deprecated.IgniteCliException;
/**
* Provider of current Ignite CLI version info from the builtin properties file.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/Main.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/Main.java
similarity index 88%
rename from modules/cli/src/main/java/org/apache/ignite/cli/Main.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/Main.java
index 46d93d0777..e99b5590b9 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/Main.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/Main.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli;
+package org.apache.ignite.internal.cli;
import io.micronaut.configuration.picocli.MicronautFactory;
import java.io.IOException;
@@ -26,18 +26,18 @@ import java.nio.file.StandardCopyOption;
import java.util.Arrays;
import java.util.HashMap;
import java.util.stream.Collectors;
-import org.apache.ignite.cli.commands.TopLevelCliCommand;
-import org.apache.ignite.cli.commands.TopLevelCliReplCommand;
-import org.apache.ignite.cli.commands.questions.ConnectToClusterQuestion;
-import org.apache.ignite.cli.config.ConfigDefaultValueProvider;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
-import org.apache.ignite.cli.core.call.StringCallInput;
-import org.apache.ignite.cli.core.exception.handler.DefaultExceptionHandlers;
-import org.apache.ignite.cli.core.exception.handler.PicocliExecutionExceptionHandler;
-import org.apache.ignite.cli.core.repl.Repl;
-import org.apache.ignite.cli.core.repl.SessionDefaultValueProvider;
-import org.apache.ignite.cli.core.repl.executor.ReplExecutorProvider;
-import org.apache.ignite.cli.core.repl.prompt.PromptProvider;
+import org.apache.ignite.internal.cli.commands.TopLevelCliCommand;
+import org.apache.ignite.internal.cli.commands.TopLevelCliReplCommand;
+import org.apache.ignite.internal.cli.commands.questions.ConnectToClusterQuestion;
+import org.apache.ignite.internal.cli.config.ConfigDefaultValueProvider;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.core.call.StringCallInput;
+import org.apache.ignite.internal.cli.core.exception.handler.DefaultExceptionHandlers;
+import org.apache.ignite.internal.cli.core.exception.handler.PicocliExecutionExceptionHandler;
+import org.apache.ignite.internal.cli.core.repl.Repl;
+import org.apache.ignite.internal.cli.core.repl.SessionDefaultValueProvider;
+import org.apache.ignite.internal.cli.core.repl.executor.ReplExecutorProvider;
+import org.apache.ignite.internal.cli.core.repl.prompt.PromptProvider;
import org.fusesource.jansi.AnsiConsole;
import picocli.CommandLine;
import picocli.CommandLine.Help.Ansi;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/VersionProvider.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/VersionProvider.java
similarity index 97%
rename from modules/cli/src/main/java/org/apache/ignite/cli/VersionProvider.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/VersionProvider.java
index 6e1ff63ead..b1f70cd01f 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/VersionProvider.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/VersionProvider.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli;
+package org.apache.ignite.internal.cli;
import io.micronaut.core.annotation.Introspected;
import jakarta.inject.Inject;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/CliConfigGetCall.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/CliConfigGetCall.java
similarity index 82%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/CliConfigGetCall.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/CliConfigGetCall.java
index fcbc9b7122..e64960df1d 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/CliConfigGetCall.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/CliConfigGetCall.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.cliconfig;
+package org.apache.ignite.internal.cli.call.cliconfig;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
-import org.apache.ignite.cli.config.ConfigManager;
-import org.apache.ignite.cli.config.ConfigManagerProvider;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.config.ConfigManager;
+import org.apache.ignite.internal.cli.config.ConfigManagerProvider;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
/**
* Gets CLI configuration parameter.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/CliConfigGetCallInput.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/CliConfigGetCallInput.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/CliConfigGetCallInput.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/CliConfigGetCallInput.java
index bbc7e83bac..13c975e6fc 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/CliConfigGetCallInput.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/CliConfigGetCallInput.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.cliconfig;
+package org.apache.ignite.internal.cli.call.cliconfig;
-import org.apache.ignite.cli.core.call.CallInput;
+import org.apache.ignite.internal.cli.core.call.CallInput;
/**
* Input for {@link CliConfigGetCall}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/CliConfigSetCall.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/CliConfigSetCall.java
similarity index 80%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/CliConfigSetCall.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/CliConfigSetCall.java
index 1504e29aca..0d8cf0cea3 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/CliConfigSetCall.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/CliConfigSetCall.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.cliconfig;
+package org.apache.ignite.internal.cli.call.cliconfig;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
-import org.apache.ignite.cli.config.ConfigManager;
-import org.apache.ignite.cli.config.ConfigManagerProvider;
-import org.apache.ignite.cli.config.Profile;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.config.ConfigManager;
+import org.apache.ignite.internal.cli.config.ConfigManagerProvider;
+import org.apache.ignite.internal.cli.config.Profile;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
/**
* Sets CLI configuration parameters.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/CliConfigSetCallInput.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/CliConfigSetCallInput.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/CliConfigSetCallInput.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/CliConfigSetCallInput.java
index f775cc4d09..1f0643cd81 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/CliConfigSetCallInput.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/CliConfigSetCallInput.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.cliconfig;
+package org.apache.ignite.internal.cli.call.cliconfig;
import java.util.Map;
-import org.apache.ignite.cli.core.call.CallInput;
+import org.apache.ignite.internal.cli.core.call.CallInput;
/**
* Input for {@link CliConfigSetCall}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/CliConfigShowCall.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/CliConfigShowCall.java
similarity index 76%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/CliConfigShowCall.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/CliConfigShowCall.java
index b6f7fab0c2..9fce829d7e 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/CliConfigShowCall.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/CliConfigShowCall.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.cliconfig;
+package org.apache.ignite.internal.cli.call.cliconfig;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
-import org.apache.ignite.cli.config.ConfigManager;
-import org.apache.ignite.cli.config.ConfigManagerProvider;
-import org.apache.ignite.cli.config.Profile;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
-import org.apache.ignite.cli.core.call.StringCallInput;
+import org.apache.ignite.internal.cli.config.ConfigManager;
+import org.apache.ignite.internal.cli.config.ConfigManagerProvider;
+import org.apache.ignite.internal.cli.config.Profile;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.core.call.StringCallInput;
/**
* Gets entire CLI configuration.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/profile/CliConfigProfileActivateCall.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/profile/CliConfigProfileActivateCall.java
similarity index 78%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/profile/CliConfigProfileActivateCall.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/profile/CliConfigProfileActivateCall.java
index 4d50cf4359..653593b5de 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/profile/CliConfigProfileActivateCall.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/profile/CliConfigProfileActivateCall.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.cliconfig.profile;
+package org.apache.ignite.internal.cli.call.cliconfig.profile;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
-import org.apache.ignite.cli.config.ConfigManagerProvider;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.CallOutput;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
-import org.apache.ignite.cli.core.call.StringCallInput;
+import org.apache.ignite.internal.cli.config.ConfigManagerProvider;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.CallOutput;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.core.call.StringCallInput;
/**
* Activate CLI profile as default.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/profile/CliConfigProfileCreateCall.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/profile/CliConfigProfileCreateCall.java
similarity index 81%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/profile/CliConfigProfileCreateCall.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/profile/CliConfigProfileCreateCall.java
index 9929d97b11..b29980136a 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/profile/CliConfigProfileCreateCall.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/profile/CliConfigProfileCreateCall.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.cliconfig.profile;
+package org.apache.ignite.internal.cli.call.cliconfig.profile;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
-import org.apache.ignite.cli.config.ConfigManager;
-import org.apache.ignite.cli.config.ConfigManagerProvider;
-import org.apache.ignite.cli.config.Profile;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.CallOutput;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.config.ConfigManager;
+import org.apache.ignite.internal.cli.config.ConfigManagerProvider;
+import org.apache.ignite.internal.cli.config.Profile;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.CallOutput;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
/**
* Create CLI profile.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/profile/CliConfigProfileCreateCallInput.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/profile/CliConfigProfileCreateCallInput.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/profile/CliConfigProfileCreateCallInput.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/profile/CliConfigProfileCreateCallInput.java
index de201ecf82..c16a667c07 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/profile/CliConfigProfileCreateCallInput.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/profile/CliConfigProfileCreateCallInput.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.cliconfig.profile;
+package org.apache.ignite.internal.cli.call.cliconfig.profile;
-import org.apache.ignite.cli.core.call.CallInput;
+import org.apache.ignite.internal.cli.core.call.CallInput;
/**
* Create profile call parameters.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/profile/CliConfigProfileListCall.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/profile/CliConfigProfileListCall.java
similarity index 77%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/profile/CliConfigProfileListCall.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/profile/CliConfigProfileListCall.java
index 4be27251ee..beaa38531e 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/profile/CliConfigProfileListCall.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/profile/CliConfigProfileListCall.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.cliconfig.profile;
+package org.apache.ignite.internal.cli.call.cliconfig.profile;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import java.util.Collection;
-import org.apache.ignite.cli.config.ConfigManager;
-import org.apache.ignite.cli.config.ConfigManagerProvider;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.CallOutput;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
-import org.apache.ignite.cli.core.call.EmptyCallInput;
+import org.apache.ignite.internal.cli.config.ConfigManager;
+import org.apache.ignite.internal.cli.config.ConfigManagerProvider;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.CallOutput;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.core.call.EmptyCallInput;
/**
* List profiles call.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/profile/CliConfigProfileShowCall.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/profile/CliConfigProfileShowCall.java
similarity index 77%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/profile/CliConfigProfileShowCall.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/profile/CliConfigProfileShowCall.java
index a19b8986da..95f097bf32 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/profile/CliConfigProfileShowCall.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/profile/CliConfigProfileShowCall.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.cliconfig.profile;
+package org.apache.ignite.internal.cli.call.cliconfig.profile;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
-import org.apache.ignite.cli.config.ConfigManagerProvider;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.CallOutput;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
-import org.apache.ignite.cli.core.call.EmptyCallInput;
+import org.apache.ignite.internal.cli.config.ConfigManagerProvider;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.CallOutput;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.core.call.EmptyCallInput;
/**
* Show current profile call.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/profile/ProfileList.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/profile/ProfileList.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/profile/ProfileList.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/profile/ProfileList.java
index 7cb861ca6a..7556c44de8 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/cliconfig/profile/ProfileList.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cliconfig/profile/ProfileList.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.cliconfig.profile;
+package org.apache.ignite.internal.cli.call.cliconfig.profile;
import java.util.Collection;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/cluster/ClusterInitCall.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/ClusterInitCall.java
similarity index 89%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/cluster/ClusterInitCall.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/ClusterInitCall.java
index 8d80eecc92..cc7efae316 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/cluster/ClusterInitCall.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/ClusterInitCall.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.cluster;
+package org.apache.ignite.internal.cli.call.cluster;
import jakarta.inject.Singleton;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
-import org.apache.ignite.cli.core.exception.IgniteCliApiException;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
import org.apache.ignite.rest.client.api.ClusterManagementApi;
import org.apache.ignite.rest.client.invoker.ApiClient;
import org.apache.ignite.rest.client.invoker.ApiException;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/cluster/ClusterInitCallInput.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/ClusterInitCallInput.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/cluster/ClusterInitCallInput.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/ClusterInitCallInput.java
index 55a29731b1..fe911c7dda 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/cluster/ClusterInitCallInput.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/ClusterInitCallInput.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.cluster;
+package org.apache.ignite.internal.cli.call.cluster;
import java.util.List;
-import org.apache.ignite.cli.commands.cluster.init.ClusterInitOptions;
-import org.apache.ignite.cli.core.call.CallInput;
+import org.apache.ignite.internal.cli.commands.cluster.init.ClusterInitOptions;
+import org.apache.ignite.internal.cli.core.call.CallInput;
/**
* Input for {@link ClusterInitCall}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/cluster/status/ClusterStatus.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/status/ClusterStatus.java
similarity index 98%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/cluster/status/ClusterStatus.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/status/ClusterStatus.java
index 28c9fbd292..940448254d 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/cluster/status/ClusterStatus.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/status/ClusterStatus.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.cluster.status;
+package org.apache.ignite.internal.cli.call.cluster.status;
import java.util.List;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/cluster/status/ClusterStatusCall.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/status/ClusterStatusCall.java
similarity index 83%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/cluster/status/ClusterStatusCall.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/status/ClusterStatusCall.java
index 9257d04200..b1e624765b 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/cluster/status/ClusterStatusCall.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/status/ClusterStatusCall.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.cluster.status;
+package org.apache.ignite.internal.cli.call.cluster.status;
import jakarta.inject.Singleton;
-import org.apache.ignite.cli.call.cluster.status.ClusterStatus.ClusterStatusBuilder;
-import org.apache.ignite.cli.call.cluster.topology.PhysicalTopologyCall;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.CallOutput;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
-import org.apache.ignite.cli.core.call.UrlCallInput;
-import org.apache.ignite.cli.core.exception.IgniteCliApiException;
+import org.apache.ignite.internal.cli.call.cluster.status.ClusterStatus.ClusterStatusBuilder;
+import org.apache.ignite.internal.cli.call.cluster.topology.PhysicalTopologyCall;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.CallOutput;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.core.call.UrlCallInput;
+import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
import org.apache.ignite.rest.client.api.ClusterManagementApi;
import org.apache.ignite.rest.client.invoker.ApiClient;
import org.apache.ignite.rest.client.invoker.ApiException;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/cluster/topology/LogicalTopologyCall.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/topology/LogicalTopologyCall.java
similarity index 85%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/cluster/topology/LogicalTopologyCall.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/topology/LogicalTopologyCall.java
index e2657f4d3e..1daefe6b05 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/cluster/topology/LogicalTopologyCall.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/topology/LogicalTopologyCall.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.cluster.topology;
+package org.apache.ignite.internal.cli.call.cluster.topology;
import jakarta.inject.Singleton;
import java.util.List;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.CallOutput;
-import org.apache.ignite.cli.core.call.UrlCallInput;
-import org.apache.ignite.cli.core.exception.IgniteCliApiException;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.CallOutput;
+import org.apache.ignite.internal.cli.core.call.UrlCallInput;
+import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
import org.apache.ignite.rest.client.api.TopologyApi;
import org.apache.ignite.rest.client.invoker.ApiException;
import org.apache.ignite.rest.client.invoker.Configuration;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/cluster/topology/PhysicalTopologyCall.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/topology/PhysicalTopologyCall.java
similarity index 85%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/cluster/topology/PhysicalTopologyCall.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/topology/PhysicalTopologyCall.java
index b58e9896e4..cd6529e55b 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/cluster/topology/PhysicalTopologyCall.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/topology/PhysicalTopologyCall.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.cluster.topology;
+package org.apache.ignite.internal.cli.call.cluster.topology;
import jakarta.inject.Singleton;
import java.util.List;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.CallOutput;
-import org.apache.ignite.cli.core.call.UrlCallInput;
-import org.apache.ignite.cli.core.exception.IgniteCliApiException;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.CallOutput;
+import org.apache.ignite.internal.cli.core.call.UrlCallInput;
+import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
import org.apache.ignite.rest.client.api.TopologyApi;
import org.apache.ignite.rest.client.invoker.ApiException;
import org.apache.ignite.rest.client.invoker.Configuration;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/cluster/topology/TopologyCallOutput.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/topology/TopologyCallOutput.java
similarity index 90%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/cluster/topology/TopologyCallOutput.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/topology/TopologyCallOutput.java
index ffc0104bf7..40d1b4ff37 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/cluster/topology/TopologyCallOutput.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/topology/TopologyCallOutput.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.cluster.topology;
+package org.apache.ignite.internal.cli.call.cluster.topology;
import java.util.List;
-import org.apache.ignite.cli.core.call.CallOutput;
-import org.apache.ignite.cli.core.exception.IgniteCliApiException;
+import org.apache.ignite.internal.cli.core.call.CallOutput;
+import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
import org.apache.ignite.rest.client.model.ClusterNode;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/ClusterConfigShowCall.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/ClusterConfigShowCall.java
similarity index 89%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/ClusterConfigShowCall.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/ClusterConfigShowCall.java
index 86deaa4820..a88dda16a3 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/ClusterConfigShowCall.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/ClusterConfigShowCall.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.configuration;
+package org.apache.ignite.internal.cli.call.configuration;
import jakarta.inject.Singleton;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
-import org.apache.ignite.cli.core.exception.IgniteCliApiException;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
import org.apache.ignite.rest.client.api.ClusterConfigurationApi;
import org.apache.ignite.rest.client.invoker.ApiClient;
import org.apache.ignite.rest.client.invoker.ApiException;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/ClusterConfigShowCallInput.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/ClusterConfigShowCallInput.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/ClusterConfigShowCallInput.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/ClusterConfigShowCallInput.java
index dc38312409..f43c982b04 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/ClusterConfigShowCallInput.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/ClusterConfigShowCallInput.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.configuration;
+package org.apache.ignite.internal.cli.call.configuration;
-import org.apache.ignite.cli.core.call.CallInput;
+import org.apache.ignite.internal.cli.core.call.CallInput;
/**
* Input for {@link ClusterConfigShowCall}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/ClusterConfigUpdateCall.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/ClusterConfigUpdateCall.java
similarity index 89%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/ClusterConfigUpdateCall.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/ClusterConfigUpdateCall.java
index 49f334695f..c48f06327d 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/ClusterConfigUpdateCall.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/ClusterConfigUpdateCall.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.configuration;
+package org.apache.ignite.internal.cli.call.configuration;
import jakarta.inject.Singleton;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
-import org.apache.ignite.cli.core.exception.IgniteCliApiException;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
import org.apache.ignite.rest.client.api.ClusterConfigurationApi;
import org.apache.ignite.rest.client.invoker.ApiClient;
import org.apache.ignite.rest.client.invoker.ApiException;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/ClusterConfigUpdateCallInput.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/ClusterConfigUpdateCallInput.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/ClusterConfigUpdateCallInput.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/ClusterConfigUpdateCallInput.java
index d818548aac..1fd56ab96b 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/ClusterConfigUpdateCallInput.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/ClusterConfigUpdateCallInput.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.configuration;
+package org.apache.ignite.internal.cli.call.configuration;
-import org.apache.ignite.cli.core.call.CallInput;
+import org.apache.ignite.internal.cli.core.call.CallInput;
/**
* Input for {@link ClusterConfigUpdateCall}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/JsonString.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/JsonString.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/JsonString.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/JsonString.java
index 00f83b8377..957c35d9c2 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/JsonString.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/JsonString.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.configuration;
+package org.apache.ignite.internal.cli.call.configuration;
/**
* Wrapper class for String instance with Json content.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/NodeConfigShowCall.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/NodeConfigShowCall.java
similarity index 89%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/NodeConfigShowCall.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/NodeConfigShowCall.java
index a178cb9358..505c065d6b 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/NodeConfigShowCall.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/NodeConfigShowCall.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.configuration;
+package org.apache.ignite.internal.cli.call.configuration;
import jakarta.inject.Singleton;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
-import org.apache.ignite.cli.core.exception.IgniteCliApiException;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
import org.apache.ignite.rest.client.api.NodeConfigurationApi;
import org.apache.ignite.rest.client.invoker.ApiClient;
import org.apache.ignite.rest.client.invoker.ApiException;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/NodeConfigShowCallInput.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/NodeConfigShowCallInput.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/NodeConfigShowCallInput.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/NodeConfigShowCallInput.java
index 6e77fde5ac..82228d5f0d 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/NodeConfigShowCallInput.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/NodeConfigShowCallInput.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.configuration;
+package org.apache.ignite.internal.cli.call.configuration;
-import org.apache.ignite.cli.core.call.CallInput;
+import org.apache.ignite.internal.cli.core.call.CallInput;
/**
* Input for {@link NodeConfigShowCall}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/NodeConfigUpdateCall.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/NodeConfigUpdateCall.java
similarity index 89%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/NodeConfigUpdateCall.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/NodeConfigUpdateCall.java
index 5021524dd7..94d4b5ccc2 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/NodeConfigUpdateCall.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/NodeConfigUpdateCall.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.configuration;
+package org.apache.ignite.internal.cli.call.configuration;
import jakarta.inject.Singleton;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
-import org.apache.ignite.cli.core.exception.IgniteCliApiException;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
import org.apache.ignite.rest.client.api.NodeConfigurationApi;
import org.apache.ignite.rest.client.invoker.ApiClient;
import org.apache.ignite.rest.client.invoker.ApiException;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/NodeConfigUpdateCallInput.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/NodeConfigUpdateCallInput.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/NodeConfigUpdateCallInput.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/NodeConfigUpdateCallInput.java
index f4cffaa3d1..9a17d73e67 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/configuration/NodeConfigUpdateCallInput.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/NodeConfigUpdateCallInput.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.configuration;
+package org.apache.ignite.internal.cli.call.configuration;
-import org.apache.ignite.cli.core.call.CallInput;
+import org.apache.ignite.internal.cli.core.call.CallInput;
/**
* Input for {@link NodeConfigUpdateCall}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/connect/ConnectCall.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/connect/ConnectCall.java
similarity index 82%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/connect/ConnectCall.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/connect/ConnectCall.java
index 2d766a5d91..cd65c5e27d 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/connect/ConnectCall.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/connect/ConnectCall.java
@@ -15,22 +15,22 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.connect;
+package org.apache.ignite.internal.cli.call.connect;
import com.google.gson.Gson;
import jakarta.inject.Singleton;
import java.net.MalformedURLException;
import java.net.URL;
-import org.apache.ignite.cli.config.ConfigConstants;
-import org.apache.ignite.cli.config.StateConfigProvider;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.CallOutput;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
-import org.apache.ignite.cli.core.exception.IgniteCliApiException;
-import org.apache.ignite.cli.core.repl.Session;
-import org.apache.ignite.cli.core.repl.config.RootConfig;
-import org.apache.ignite.cli.core.style.component.MessageUiComponent;
-import org.apache.ignite.cli.core.style.element.UiElements;
+import org.apache.ignite.internal.cli.config.ConfigConstants;
+import org.apache.ignite.internal.cli.config.StateConfigProvider;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.CallOutput;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
+import org.apache.ignite.internal.cli.core.repl.Session;
+import org.apache.ignite.internal.cli.core.repl.config.RootConfig;
+import org.apache.ignite.internal.cli.core.style.component.MessageUiComponent;
+import org.apache.ignite.internal.cli.core.style.element.UiElements;
import org.apache.ignite.rest.client.api.NodeConfigurationApi;
import org.apache.ignite.rest.client.api.NodeManagementApi;
import org.apache.ignite.rest.client.invoker.ApiException;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/connect/ConnectCallInput.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/connect/ConnectCallInput.java
similarity index 90%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/connect/ConnectCallInput.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/connect/ConnectCallInput.java
index ec6573fdfb..d1b9876878 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/connect/ConnectCallInput.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/connect/ConnectCallInput.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.connect;
+package org.apache.ignite.internal.cli.call.connect;
-import org.apache.ignite.cli.core.call.CallInput;
+import org.apache.ignite.internal.cli.core.call.CallInput;
/**
* Input for connect call to Ignite 3 node.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/connect/DisconnectCall.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/connect/DisconnectCall.java
similarity index 76%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/connect/DisconnectCall.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/connect/DisconnectCall.java
index 9de8e6919f..d7fd7bd557 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/connect/DisconnectCall.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/connect/DisconnectCall.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.connect;
+package org.apache.ignite.internal.cli.call.connect;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.CallOutput;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
-import org.apache.ignite.cli.core.call.EmptyCallInput;
-import org.apache.ignite.cli.core.repl.Session;
-import org.apache.ignite.cli.core.style.component.MessageUiComponent;
-import org.apache.ignite.cli.core.style.element.UiElements;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.CallOutput;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.core.call.EmptyCallInput;
+import org.apache.ignite.internal.cli.core.repl.Session;
+import org.apache.ignite.internal.cli.core.style.component.MessageUiComponent;
+import org.apache.ignite.internal.cli.core.style.element.UiElements;
/**
* Call for disconnect.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/node/status/NodeStatus.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/node/status/NodeStatus.java
similarity index 97%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/node/status/NodeStatus.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/node/status/NodeStatus.java
index d410ec1e52..a69301488f 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/node/status/NodeStatus.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/node/status/NodeStatus.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.node.status;
+package org.apache.ignite.internal.cli.call.node.status;
/**
* Represents the status of the node.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/node/status/NodeStatusCall.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/node/status/NodeStatusCall.java
similarity index 84%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/node/status/NodeStatusCall.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/node/status/NodeStatusCall.java
index 833e59978c..7e179d7f93 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/node/status/NodeStatusCall.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/node/status/NodeStatusCall.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.node.status;
+package org.apache.ignite.internal.cli.call.node.status;
import jakarta.inject.Singleton;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.CallOutput;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
-import org.apache.ignite.cli.core.call.UrlCallInput;
-import org.apache.ignite.cli.core.exception.IgniteCliApiException;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.CallOutput;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.core.call.UrlCallInput;
+import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
import org.apache.ignite.rest.client.api.NodeManagementApi;
import org.apache.ignite.rest.client.invoker.ApiClient;
import org.apache.ignite.rest.client.invoker.ApiException;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/node/status/State.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/node/status/State.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/node/status/State.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/node/status/State.java
index 6f3b3e5b50..ca7a8db5ec 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/node/status/State.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/node/status/State.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.node.status;
+package org.apache.ignite.internal.cli.call.node.status;
/**
* Represents node states.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/call/sql/SqlQueryCall.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/sql/SqlQueryCall.java
similarity index 79%
rename from modules/cli/src/main/java/org/apache/ignite/cli/call/sql/SqlQueryCall.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/sql/SqlQueryCall.java
index 41475b6d4b..1101383b8d 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/call/sql/SqlQueryCall.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/sql/SqlQueryCall.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.sql;
+package org.apache.ignite.internal.cli.call.sql;
import java.sql.SQLException;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.CallOutput;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
-import org.apache.ignite.cli.core.call.StringCallInput;
-import org.apache.ignite.cli.sql.SqlManager;
-import org.apache.ignite.cli.sql.SqlQueryResult;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.CallOutput;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.core.call.StringCallInput;
+import org.apache.ignite.internal.cli.sql.SqlManager;
+import org.apache.ignite.internal.cli.sql.SqlQueryResult;
/**
* Call implementation for SQL command execution.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/BaseCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/BaseCommand.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/BaseCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/BaseCommand.java
index 5266c488e0..f375068158 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/BaseCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/BaseCommand.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands;
+package org.apache.ignite.internal.cli.commands;
import picocli.CommandLine.Model.CommandSpec;
import picocli.CommandLine.Option;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/OptionsConstants.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/OptionsConstants.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/OptionsConstants.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/OptionsConstants.java
index bacc5f4dcd..72d25c1fce 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/OptionsConstants.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/OptionsConstants.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands;
+package org.apache.ignite.internal.cli.commands;
-import org.apache.ignite.cli.config.ConfigConstants;
+import org.apache.ignite.internal.cli.config.ConfigConstants;
/**
* Constants to use in {@code Option} annotations for commands.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/ProfileMixin.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/ProfileMixin.java
similarity index 78%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/ProfileMixin.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/ProfileMixin.java
index dec1160b40..d0cf65817b 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/ProfileMixin.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/ProfileMixin.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands;
+package org.apache.ignite.internal.cli.commands;
-import static org.apache.ignite.cli.commands.OptionsConstants.PROFILE_OPTION;
-import static org.apache.ignite.cli.commands.OptionsConstants.PROFILE_OPTION_DESC;
-import static org.apache.ignite.cli.commands.OptionsConstants.PROFILE_OPTION_SHORT;
+import static org.apache.ignite.internal.cli.commands.OptionsConstants.PROFILE_OPTION;
+import static org.apache.ignite.internal.cli.commands.OptionsConstants.PROFILE_OPTION_DESC;
+import static org.apache.ignite.internal.cli.commands.OptionsConstants.PROFILE_OPTION_SHORT;
import picocli.CommandLine.Option;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/TopLevelCliCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/TopLevelCliCommand.java
similarity index 79%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/TopLevelCliCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/TopLevelCliCommand.java
index 6973d2ae58..8dd090875e 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/TopLevelCliCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/TopLevelCliCommand.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands;
+package org.apache.ignite.internal.cli.commands;
-import org.apache.ignite.cli.VersionProvider;
-import org.apache.ignite.cli.commands.cliconfig.CliCommand;
-import org.apache.ignite.cli.commands.cluster.ClusterCommand;
-import org.apache.ignite.cli.commands.node.NodeCommand;
-import org.apache.ignite.cli.commands.sql.SqlCommand;
-import org.apache.ignite.cli.deprecated.spec.BootstrapIgniteCommandSpec;
+import org.apache.ignite.internal.cli.VersionProvider;
+import org.apache.ignite.internal.cli.commands.cliconfig.CliCommand;
+import org.apache.ignite.internal.cli.commands.cluster.ClusterCommand;
+import org.apache.ignite.internal.cli.commands.node.NodeCommand;
+import org.apache.ignite.internal.cli.commands.sql.SqlCommand;
+import org.apache.ignite.internal.cli.deprecated.spec.BootstrapIgniteCommandSpec;
import picocli.CommandLine;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/TopLevelCliReplCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/TopLevelCliReplCommand.java
similarity index 70%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/TopLevelCliReplCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/TopLevelCliReplCommand.java
index e2dc79799c..acc03c623e 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/TopLevelCliReplCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/TopLevelCliReplCommand.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands;
+package org.apache.ignite.internal.cli.commands;
-import org.apache.ignite.cli.commands.cliconfig.CliReplCommand;
-import org.apache.ignite.cli.commands.cluster.ClusterReplCommand;
-import org.apache.ignite.cli.commands.connect.ConnectCommand;
-import org.apache.ignite.cli.commands.connect.DisconnectCommand;
-import org.apache.ignite.cli.commands.node.NodeReplCommand;
-import org.apache.ignite.cli.commands.sql.SqlReplCommand;
-import org.apache.ignite.cli.commands.version.VersionCommand;
-import org.apache.ignite.cli.deprecated.spec.BootstrapIgniteCommandSpec;
+import org.apache.ignite.internal.cli.commands.cliconfig.CliReplCommand;
+import org.apache.ignite.internal.cli.commands.cluster.ClusterReplCommand;
+import org.apache.ignite.internal.cli.commands.connect.ConnectCommand;
+import org.apache.ignite.internal.cli.commands.connect.DisconnectCommand;
+import org.apache.ignite.internal.cli.commands.node.NodeReplCommand;
+import org.apache.ignite.internal.cli.commands.sql.SqlReplCommand;
+import org.apache.ignite.internal.cli.commands.version.VersionCommand;
+import org.apache.ignite.internal.cli.deprecated.spec.BootstrapIgniteCommandSpec;
import picocli.CommandLine;
import picocli.shell.jline3.PicocliCommands;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliCommand.java
similarity index 90%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliCommand.java
index 0c9484f0b4..edc7e65534 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliCommand.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig;
+package org.apache.ignite.internal.cli.commands.cliconfig;
-import org.apache.ignite.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
import picocli.CommandLine.Command;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliConfigCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigCommand.java
similarity index 85%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliConfigCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigCommand.java
index 1f444064fc..c62cf0c54e 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliConfigCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigCommand.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig;
+package org.apache.ignite.internal.cli.commands.cliconfig;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.commands.cliconfig.profile.CliConfigProfileCommand;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.cliconfig.profile.CliConfigProfileCommand;
import picocli.CommandLine.Command;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliConfigGetCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigGetCommand.java
similarity index 81%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliConfigGetCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigGetCommand.java
index 47fc56d9ea..c5e213203f 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliConfigGetCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigGetCommand.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig;
+package org.apache.ignite.internal.cli.commands.cliconfig;
import jakarta.inject.Inject;
import java.util.concurrent.Callable;
-import org.apache.ignite.cli.call.cliconfig.CliConfigGetCall;
-import org.apache.ignite.cli.call.cliconfig.CliConfigGetCallInput;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.commands.ProfileMixin;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.call.cliconfig.CliConfigGetCall;
+import org.apache.ignite.internal.cli.call.cliconfig.CliConfigGetCallInput;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.ProfileMixin;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
import picocli.CommandLine.Parameters;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliConfigGetReplCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigGetReplCommand.java
similarity index 83%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliConfigGetReplCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigGetReplCommand.java
index 8be4a03612..e975668c5a 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliConfigGetReplCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigGetReplCommand.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig;
+package org.apache.ignite.internal.cli.commands.cliconfig;
import jakarta.inject.Inject;
import java.util.concurrent.Callable;
-import org.apache.ignite.cli.call.cliconfig.CliConfigGetCall;
-import org.apache.ignite.cli.call.cliconfig.CliConfigGetCallInput;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.call.cliconfig.CliConfigGetCall;
+import org.apache.ignite.internal.cli.call.cliconfig.CliConfigGetCallInput;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
import picocli.CommandLine.Command;
import picocli.CommandLine.Parameters;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliConfigReplCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigReplCommand.java
similarity index 85%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliConfigReplCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigReplCommand.java
index 9da6d7934c..cd41593cbe 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliConfigReplCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigReplCommand.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig;
+package org.apache.ignite.internal.cli.commands.cliconfig;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.commands.cliconfig.profile.CliConfigProfileCommand;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.cliconfig.profile.CliConfigProfileCommand;
import picocli.CommandLine.Command;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliConfigSetCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigSetCommand.java
similarity index 82%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliConfigSetCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigSetCommand.java
index c8a2fb5a1c..6849fa4aef 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliConfigSetCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigSetCommand.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig;
+package org.apache.ignite.internal.cli.commands.cliconfig;
import jakarta.inject.Inject;
import java.util.Map;
import java.util.concurrent.Callable;
-import org.apache.ignite.cli.call.cliconfig.CliConfigSetCall;
-import org.apache.ignite.cli.call.cliconfig.CliConfigSetCallInput;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.commands.ProfileMixin;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.call.cliconfig.CliConfigSetCall;
+import org.apache.ignite.internal.cli.call.cliconfig.CliConfigSetCallInput;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.ProfileMixin;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
import picocli.CommandLine.Parameters;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliConfigSetReplCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigSetReplCommand.java
similarity index 83%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliConfigSetReplCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigSetReplCommand.java
index 6064874bce..d0f3f7a03b 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliConfigSetReplCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigSetReplCommand.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig;
+package org.apache.ignite.internal.cli.commands.cliconfig;
import jakarta.inject.Inject;
import java.util.Map;
import java.util.concurrent.Callable;
-import org.apache.ignite.cli.call.cliconfig.CliConfigSetCall;
-import org.apache.ignite.cli.call.cliconfig.CliConfigSetCallInput;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.call.cliconfig.CliConfigSetCall;
+import org.apache.ignite.internal.cli.call.cliconfig.CliConfigSetCallInput;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
import picocli.CommandLine.Command;
import picocli.CommandLine.Parameters;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliConfigShowCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigShowCommand.java
similarity index 78%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliConfigShowCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigShowCommand.java
index f37e2974ea..41a6314903 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliConfigShowCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigShowCommand.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig;
+package org.apache.ignite.internal.cli.commands.cliconfig;
import jakarta.inject.Inject;
import java.util.concurrent.Callable;
-import org.apache.ignite.cli.call.cliconfig.CliConfigShowCall;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.commands.ProfileMixin;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
-import org.apache.ignite.cli.core.call.StringCallInput;
-import org.apache.ignite.cli.decorators.ProfileDecorator;
+import org.apache.ignite.internal.cli.call.cliconfig.CliConfigShowCall;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.ProfileMixin;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.core.call.StringCallInput;
+import org.apache.ignite.internal.cli.decorators.ProfileDecorator;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliConfigShowReplCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigShowReplCommand.java
similarity index 79%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliConfigShowReplCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigShowReplCommand.java
index 8ffcfd3ae2..9a40f49fbd 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliConfigShowReplCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigShowReplCommand.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig;
+package org.apache.ignite.internal.cli.commands.cliconfig;
import jakarta.inject.Inject;
import java.util.concurrent.Callable;
-import org.apache.ignite.cli.call.cliconfig.CliConfigShowCall;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
-import org.apache.ignite.cli.core.call.StringCallInput;
-import org.apache.ignite.cli.decorators.ProfileDecorator;
+import org.apache.ignite.internal.cli.call.cliconfig.CliConfigShowCall;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.core.call.StringCallInput;
+import org.apache.ignite.internal.cli.decorators.ProfileDecorator;
import picocli.CommandLine.Command;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliReplCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliReplCommand.java
similarity index 90%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliReplCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliReplCommand.java
index 637a7b852e..c9b409f902 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/CliReplCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/CliReplCommand.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig;
+package org.apache.ignite.internal.cli.commands.cliconfig;
-import org.apache.ignite.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
import picocli.CommandLine.Command;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/profile/CliConfigProfileActivateCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileActivateCommand.java
similarity index 82%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/profile/CliConfigProfileActivateCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileActivateCommand.java
index d7a1032e2f..9784d76391 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/profile/CliConfigProfileActivateCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileActivateCommand.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig.profile;
+package org.apache.ignite.internal.cli.commands.cliconfig.profile;
import jakarta.inject.Inject;
import java.util.concurrent.Callable;
-import org.apache.ignite.cli.call.cliconfig.profile.CliConfigProfileActivateCall;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
-import org.apache.ignite.cli.core.call.StringCallInput;
+import org.apache.ignite.internal.cli.call.cliconfig.profile.CliConfigProfileActivateCall;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.core.call.StringCallInput;
import picocli.CommandLine.Command;
import picocli.CommandLine.Parameters;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/profile/CliConfigProfileCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileCommand.java
similarity index 90%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/profile/CliConfigProfileCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileCommand.java
index fcc178e3a3..af40678b94 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/profile/CliConfigProfileCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileCommand.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig.profile;
+package org.apache.ignite.internal.cli.commands.cliconfig.profile;
-import org.apache.ignite.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
import picocli.CommandLine.Command;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/profile/CliConfigProfileCreateCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileCreateCommand.java
similarity index 84%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/profile/CliConfigProfileCreateCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileCreateCommand.java
index a290965305..057497a476 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/profile/CliConfigProfileCreateCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileCreateCommand.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig.profile;
+package org.apache.ignite.internal.cli.commands.cliconfig.profile;
import jakarta.inject.Inject;
import java.util.concurrent.Callable;
-import org.apache.ignite.cli.call.cliconfig.profile.CliConfigProfileCreateCall;
-import org.apache.ignite.cli.call.cliconfig.profile.CliConfigProfileCreateCallInput;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.call.cliconfig.profile.CliConfigProfileCreateCall;
+import org.apache.ignite.internal.cli.call.cliconfig.profile.CliConfigProfileCreateCallInput;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
import picocli.CommandLine.Parameters;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/profile/CliConfigProfileListCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileListCommand.java
similarity index 78%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/profile/CliConfigProfileListCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileListCommand.java
index 9694575c36..93300b9494 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/profile/CliConfigProfileListCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileListCommand.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig.profile;
+package org.apache.ignite.internal.cli.commands.cliconfig.profile;
import jakarta.inject.Inject;
import java.util.concurrent.Callable;
-import org.apache.ignite.cli.call.cliconfig.profile.CliConfigProfileListCall;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
-import org.apache.ignite.cli.core.call.EmptyCallInput;
-import org.apache.ignite.cli.decorators.ProfileListDecorator;
+import org.apache.ignite.internal.cli.call.cliconfig.profile.CliConfigProfileListCall;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.core.call.EmptyCallInput;
+import org.apache.ignite.internal.cli.decorators.ProfileListDecorator;
import picocli.CommandLine;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/profile/CliConfigProfileShowCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileShowCommand.java
similarity index 81%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/profile/CliConfigProfileShowCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileShowCommand.java
index fcb64f280d..e5ef52f884 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cliconfig/profile/CliConfigProfileShowCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cliconfig/profile/CliConfigProfileShowCommand.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig.profile;
+package org.apache.ignite.internal.cli.commands.cliconfig.profile;
import static picocli.CommandLine.Command;
import jakarta.inject.Inject;
import java.util.concurrent.Callable;
-import org.apache.ignite.cli.call.cliconfig.profile.CliConfigProfileShowCall;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
-import org.apache.ignite.cli.core.call.EmptyCallInput;
+import org.apache.ignite.internal.cli.call.cliconfig.profile.CliConfigProfileShowCall;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.core.call.EmptyCallInput;
/**
* Show current profile command.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/ClusterCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/ClusterCommand.java
similarity index 75%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/ClusterCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/ClusterCommand.java
index 72d51e3cae..b17b336caf 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/ClusterCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/ClusterCommand.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cluster;
+package org.apache.ignite.internal.cli.commands.cluster;
-import org.apache.ignite.cli.commands.cluster.config.ClusterConfigCommand;
-import org.apache.ignite.cli.commands.cluster.init.ClusterInitCommand;
-import org.apache.ignite.cli.commands.cluster.status.ClusterStatusCommand;
-import org.apache.ignite.cli.commands.topology.TopologyCommand;
+import org.apache.ignite.internal.cli.commands.cluster.config.ClusterConfigCommand;
+import org.apache.ignite.internal.cli.commands.cluster.init.ClusterInitCommand;
+import org.apache.ignite.internal.cli.commands.cluster.status.ClusterStatusCommand;
+import org.apache.ignite.internal.cli.commands.topology.TopologyCommand;
import picocli.CommandLine.Command;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/ClusterReplCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/ClusterReplCommand.java
similarity index 75%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/ClusterReplCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/ClusterReplCommand.java
index ddf9cb8893..9c1f72fd35 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/ClusterReplCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/ClusterReplCommand.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cluster;
+package org.apache.ignite.internal.cli.commands.cluster;
-import org.apache.ignite.cli.commands.cluster.config.ClusterConfigReplCommand;
-import org.apache.ignite.cli.commands.cluster.init.ClusterInitReplCommand;
-import org.apache.ignite.cli.commands.cluster.status.ClusterStatusReplCommand;
-import org.apache.ignite.cli.commands.topology.TopologyReplCommand;
+import org.apache.ignite.internal.cli.commands.cluster.config.ClusterConfigReplCommand;
+import org.apache.ignite.internal.cli.commands.cluster.init.ClusterInitReplCommand;
+import org.apache.ignite.internal.cli.commands.cluster.status.ClusterStatusReplCommand;
+import org.apache.ignite.internal.cli.commands.topology.TopologyReplCommand;
import picocli.CommandLine.Command;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/ClusterUrlMixin.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/ClusterUrlMixin.java
similarity index 75%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/ClusterUrlMixin.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/ClusterUrlMixin.java
index 82c2a9a939..685900ac3c 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/ClusterUrlMixin.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/ClusterUrlMixin.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cluster;
+package org.apache.ignite.internal.cli.commands.cluster;
-import static org.apache.ignite.cli.commands.OptionsConstants.CLUSTER_URL_DESC;
-import static org.apache.ignite.cli.commands.OptionsConstants.CLUSTER_URL_OPTION;
-import static org.apache.ignite.cli.commands.OptionsConstants.URL_OPTION_SHORT;
+import static org.apache.ignite.internal.cli.commands.OptionsConstants.CLUSTER_URL_DESC;
+import static org.apache.ignite.internal.cli.commands.OptionsConstants.CLUSTER_URL_OPTION;
+import static org.apache.ignite.internal.cli.commands.OptionsConstants.URL_OPTION_SHORT;
import java.net.URL;
-import org.apache.ignite.cli.core.converters.UrlConverter;
+import org.apache.ignite.internal.cli.core.converters.UrlConverter;
import picocli.CommandLine.Option;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/ClusterUrlProfileMixin.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/ClusterUrlProfileMixin.java
similarity index 84%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/ClusterUrlProfileMixin.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/ClusterUrlProfileMixin.java
index 8fd00df46d..b52c020130 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/ClusterUrlProfileMixin.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/ClusterUrlProfileMixin.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cluster;
+package org.apache.ignite.internal.cli.commands.cluster;
import jakarta.inject.Inject;
-import org.apache.ignite.cli.commands.ProfileMixin;
-import org.apache.ignite.cli.config.ConfigConstants;
-import org.apache.ignite.cli.config.ConfigManager;
-import org.apache.ignite.cli.config.ConfigManagerProvider;
+import org.apache.ignite.internal.cli.commands.ProfileMixin;
+import org.apache.ignite.internal.cli.config.ConfigConstants;
+import org.apache.ignite.internal.cli.config.ConfigManager;
+import org.apache.ignite.internal.cli.config.ConfigManagerProvider;
import picocli.CommandLine.Mixin;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/config/ClusterConfigCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigCommand.java
similarity index 89%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/config/ClusterConfigCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigCommand.java
index 2db71a6834..7b1baf9405 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/config/ClusterConfigCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigCommand.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cluster.config;
+package org.apache.ignite.internal.cli.commands.cluster.config;
-import org.apache.ignite.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
import picocli.CommandLine.Command;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/config/ClusterConfigReplCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigReplCommand.java
similarity index 90%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/config/ClusterConfigReplCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigReplCommand.java
index 0455671bc7..693a59a8a7 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/config/ClusterConfigReplCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigReplCommand.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cluster.config;
+package org.apache.ignite.internal.cli.commands.cluster.config;
-import org.apache.ignite.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
import picocli.CommandLine.Command;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/config/ClusterConfigShowCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigShowCommand.java
similarity index 79%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/config/ClusterConfigShowCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigShowCommand.java
index f2c8cfda07..6c80a5df16 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/config/ClusterConfigShowCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigShowCommand.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cluster.config;
+package org.apache.ignite.internal.cli.commands.cluster.config;
import jakarta.inject.Inject;
import java.util.concurrent.Callable;
-import org.apache.ignite.cli.call.configuration.ClusterConfigShowCall;
-import org.apache.ignite.cli.call.configuration.ClusterConfigShowCallInput;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.commands.cluster.ClusterUrlProfileMixin;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
-import org.apache.ignite.cli.core.exception.handler.ClusterNotInitializedExceptionHandler;
-import org.apache.ignite.cli.decorators.JsonDecorator;
+import org.apache.ignite.internal.cli.call.configuration.ClusterConfigShowCall;
+import org.apache.ignite.internal.cli.call.configuration.ClusterConfigShowCallInput;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.cluster.ClusterUrlProfileMixin;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.core.exception.handler.ClusterNotInitializedExceptionHandler;
+import org.apache.ignite.internal.cli.decorators.JsonDecorator;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
import picocli.CommandLine.Parameters;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/config/ClusterConfigShowReplCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigShowReplCommand.java
similarity index 77%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/config/ClusterConfigShowReplCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigShowReplCommand.java
index 5dbd1a7072..e105bb0527 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/config/ClusterConfigShowReplCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigShowReplCommand.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cluster.config;
+package org.apache.ignite.internal.cli.commands.cluster.config;
import jakarta.inject.Inject;
-import org.apache.ignite.cli.call.configuration.ClusterConfigShowCall;
-import org.apache.ignite.cli.call.configuration.ClusterConfigShowCallInput;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.commands.cluster.ClusterUrlMixin;
-import org.apache.ignite.cli.commands.questions.ConnectToClusterQuestion;
-import org.apache.ignite.cli.core.exception.handler.ClusterNotInitializedExceptionHandler;
-import org.apache.ignite.cli.core.flow.builder.Flows;
+import org.apache.ignite.internal.cli.call.configuration.ClusterConfigShowCall;
+import org.apache.ignite.internal.cli.call.configuration.ClusterConfigShowCallInput;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.cluster.ClusterUrlMixin;
+import org.apache.ignite.internal.cli.commands.questions.ConnectToClusterQuestion;
+import org.apache.ignite.internal.cli.core.exception.handler.ClusterNotInitializedExceptionHandler;
+import org.apache.ignite.internal.cli.core.flow.builder.Flows;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
import picocli.CommandLine.Parameters;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/config/ClusterConfigUpdateCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigUpdateCommand.java
similarity index 80%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/config/ClusterConfigUpdateCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigUpdateCommand.java
index 6b2041c040..fc4e0892a3 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/config/ClusterConfigUpdateCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigUpdateCommand.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cluster.config;
+package org.apache.ignite.internal.cli.commands.cluster.config;
import jakarta.inject.Inject;
import java.util.concurrent.Callable;
-import org.apache.ignite.cli.call.configuration.ClusterConfigUpdateCall;
-import org.apache.ignite.cli.call.configuration.ClusterConfigUpdateCallInput;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.commands.cluster.ClusterUrlProfileMixin;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
-import org.apache.ignite.cli.core.exception.handler.ClusterNotInitializedExceptionHandler;
+import org.apache.ignite.internal.cli.call.configuration.ClusterConfigUpdateCall;
+import org.apache.ignite.internal.cli.call.configuration.ClusterConfigUpdateCallInput;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.cluster.ClusterUrlProfileMixin;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.core.exception.handler.ClusterNotInitializedExceptionHandler;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
import picocli.CommandLine.Parameters;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/config/ClusterConfigUpdateReplCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigUpdateReplCommand.java
similarity index 77%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/config/ClusterConfigUpdateReplCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigUpdateReplCommand.java
index 62fa2bc3a7..516078d64e 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/config/ClusterConfigUpdateReplCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/config/ClusterConfigUpdateReplCommand.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cluster.config;
+package org.apache.ignite.internal.cli.commands.cluster.config;
import jakarta.inject.Inject;
-import org.apache.ignite.cli.call.configuration.ClusterConfigUpdateCall;
-import org.apache.ignite.cli.call.configuration.ClusterConfigUpdateCallInput;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.commands.cluster.ClusterUrlMixin;
-import org.apache.ignite.cli.commands.questions.ConnectToClusterQuestion;
-import org.apache.ignite.cli.core.exception.handler.ClusterNotInitializedExceptionHandler;
-import org.apache.ignite.cli.core.flow.builder.Flows;
+import org.apache.ignite.internal.cli.call.configuration.ClusterConfigUpdateCall;
+import org.apache.ignite.internal.cli.call.configuration.ClusterConfigUpdateCallInput;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.cluster.ClusterUrlMixin;
+import org.apache.ignite.internal.cli.commands.questions.ConnectToClusterQuestion;
+import org.apache.ignite.internal.cli.core.exception.handler.ClusterNotInitializedExceptionHandler;
+import org.apache.ignite.internal.cli.core.flow.builder.Flows;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
import picocli.CommandLine.Parameters;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/init/ClusterInitCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/init/ClusterInitCommand.java
similarity index 82%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/init/ClusterInitCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/init/ClusterInitCommand.java
index 28674fa271..9dd25accb2 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/init/ClusterInitCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/init/ClusterInitCommand.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cluster.init;
+package org.apache.ignite.internal.cli.commands.cluster.init;
import jakarta.inject.Inject;
import java.util.concurrent.Callable;
-import org.apache.ignite.cli.call.cluster.ClusterInitCall;
-import org.apache.ignite.cli.call.cluster.ClusterInitCallInput;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.commands.cluster.ClusterUrlProfileMixin;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.call.cluster.ClusterInitCall;
+import org.apache.ignite.internal.cli.call.cluster.ClusterInitCallInput;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.cluster.ClusterUrlProfileMixin;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/init/ClusterInitOptions.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/init/ClusterInitOptions.java
similarity index 97%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/init/ClusterInitOptions.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/init/ClusterInitOptions.java
index 169307771f..011512ab5e 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/init/ClusterInitOptions.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/init/ClusterInitOptions.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cluster.init;
+package org.apache.ignite.internal.cli.commands.cluster.init;
import java.util.ArrayList;
import java.util.List;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/init/ClusterInitReplCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/init/ClusterInitReplCommand.java
similarity index 79%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/init/ClusterInitReplCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/init/ClusterInitReplCommand.java
index 623420c7bc..43e6b70bc3 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/init/ClusterInitReplCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/init/ClusterInitReplCommand.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cluster.init;
+package org.apache.ignite.internal.cli.commands.cluster.init;
import static picocli.CommandLine.Command;
import jakarta.inject.Inject;
-import org.apache.ignite.cli.call.cluster.ClusterInitCall;
-import org.apache.ignite.cli.call.cluster.ClusterInitCallInput;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.commands.cluster.ClusterUrlMixin;
-import org.apache.ignite.cli.commands.questions.ConnectToClusterQuestion;
-import org.apache.ignite.cli.core.flow.builder.Flows;
+import org.apache.ignite.internal.cli.call.cluster.ClusterInitCall;
+import org.apache.ignite.internal.cli.call.cluster.ClusterInitCallInput;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.cluster.ClusterUrlMixin;
+import org.apache.ignite.internal.cli.commands.questions.ConnectToClusterQuestion;
+import org.apache.ignite.internal.cli.core.flow.builder.Flows;
import picocli.CommandLine.Mixin;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/status/ClusterStatusCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/status/ClusterStatusCommand.java
similarity index 79%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/status/ClusterStatusCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/status/ClusterStatusCommand.java
index 5ddf36aebc..74f51fa33c 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/status/ClusterStatusCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/status/ClusterStatusCommand.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cluster.status;
+package org.apache.ignite.internal.cli.commands.cluster.status;
import jakarta.inject.Inject;
import java.util.concurrent.Callable;
-import org.apache.ignite.cli.call.cluster.status.ClusterStatusCall;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.commands.cluster.ClusterUrlProfileMixin;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
-import org.apache.ignite.cli.core.call.UrlCallInput;
-import org.apache.ignite.cli.decorators.ClusterStatusDecorator;
+import org.apache.ignite.internal.cli.call.cluster.status.ClusterStatusCall;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.cluster.ClusterUrlProfileMixin;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.core.call.UrlCallInput;
+import org.apache.ignite.internal.cli.decorators.ClusterStatusDecorator;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/status/ClusterStatusReplCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/status/ClusterStatusReplCommand.java
similarity index 76%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/status/ClusterStatusReplCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/status/ClusterStatusReplCommand.java
index cdb354e94d..7aab07bf24 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/cluster/status/ClusterStatusReplCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/status/ClusterStatusReplCommand.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cluster.status;
+package org.apache.ignite.internal.cli.commands.cluster.status;
import jakarta.inject.Inject;
-import org.apache.ignite.cli.call.cluster.status.ClusterStatusCall;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.commands.cluster.ClusterUrlMixin;
-import org.apache.ignite.cli.commands.questions.ConnectToClusterQuestion;
-import org.apache.ignite.cli.core.call.UrlCallInput;
-import org.apache.ignite.cli.core.flow.builder.Flows;
+import org.apache.ignite.internal.cli.call.cluster.status.ClusterStatusCall;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.cluster.ClusterUrlMixin;
+import org.apache.ignite.internal.cli.commands.questions.ConnectToClusterQuestion;
+import org.apache.ignite.internal.cli.core.call.UrlCallInput;
+import org.apache.ignite.internal.cli.core.flow.builder.Flows;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/connect/ConnectCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/connect/ConnectCommand.java
similarity index 75%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/connect/ConnectCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/connect/ConnectCommand.java
index ff93fe891c..38aa97c2c7 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/connect/ConnectCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/connect/ConnectCommand.java
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.connect;
+package org.apache.ignite.internal.cli.commands.connect;
-import static org.apache.ignite.cli.commands.OptionsConstants.CLUSTER_URL_KEY;
-import static org.apache.ignite.cli.commands.OptionsConstants.NODE_URL_DESC;
+import static org.apache.ignite.internal.cli.commands.OptionsConstants.CLUSTER_URL_KEY;
+import static org.apache.ignite.internal.cli.commands.OptionsConstants.NODE_URL_DESC;
import jakarta.inject.Inject;
import java.net.URL;
-import org.apache.ignite.cli.call.connect.ConnectCall;
-import org.apache.ignite.cli.call.connect.ConnectCallInput;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
-import org.apache.ignite.cli.core.converters.UrlConverter;
+import org.apache.ignite.internal.cli.call.connect.ConnectCall;
+import org.apache.ignite.internal.cli.call.connect.ConnectCallInput;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.core.converters.UrlConverter;
import picocli.CommandLine.Command;
import picocli.CommandLine.Parameters;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/connect/DisconnectCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/connect/DisconnectCommand.java
similarity index 82%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/connect/DisconnectCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/connect/DisconnectCommand.java
index 099d089ef5..4b78de3146 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/connect/DisconnectCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/connect/DisconnectCommand.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.connect;
+package org.apache.ignite.internal.cli.commands.connect;
import jakarta.inject.Inject;
-import org.apache.ignite.cli.call.connect.DisconnectCall;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
-import org.apache.ignite.cli.core.call.EmptyCallInput;
+import org.apache.ignite.internal.cli.call.connect.DisconnectCall;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.core.call.EmptyCallInput;
import picocli.CommandLine.Command;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/node/NodeCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/NodeCommand.java
similarity index 79%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/node/NodeCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/NodeCommand.java
index 4fadfdf32c..52f11660e5 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/node/NodeCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/NodeCommand.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.node;
+package org.apache.ignite.internal.cli.commands.node;
-import org.apache.ignite.cli.commands.node.config.NodeConfigCommand;
-import org.apache.ignite.cli.commands.node.status.NodeStatusCommand;
-import org.apache.ignite.cli.deprecated.spec.NodeCommandSpec;
+import org.apache.ignite.internal.cli.commands.node.config.NodeConfigCommand;
+import org.apache.ignite.internal.cli.commands.node.status.NodeStatusCommand;
+import org.apache.ignite.internal.cli.deprecated.spec.NodeCommandSpec;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/node/NodeReplCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/NodeReplCommand.java
similarity index 79%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/node/NodeReplCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/NodeReplCommand.java
index ae32a891df..1b6f008b31 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/node/NodeReplCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/NodeReplCommand.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.node;
+package org.apache.ignite.internal.cli.commands.node;
-import org.apache.ignite.cli.commands.node.config.NodeConfigReplCommand;
-import org.apache.ignite.cli.commands.node.status.NodeStatusReplCommand;
-import org.apache.ignite.cli.deprecated.spec.NodeCommandSpec;
+import org.apache.ignite.internal.cli.commands.node.config.NodeConfigReplCommand;
+import org.apache.ignite.internal.cli.commands.node.status.NodeStatusReplCommand;
+import org.apache.ignite.internal.cli.deprecated.spec.NodeCommandSpec;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/node/NodeUrlMixin.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/NodeUrlMixin.java
similarity index 75%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/node/NodeUrlMixin.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/NodeUrlMixin.java
index 118e3af76d..40c66ed458 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/node/NodeUrlMixin.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/NodeUrlMixin.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.node;
+package org.apache.ignite.internal.cli.commands.node;
-import static org.apache.ignite.cli.commands.OptionsConstants.NODE_URL_DESC;
-import static org.apache.ignite.cli.commands.OptionsConstants.NODE_URL_OPTION;
-import static org.apache.ignite.cli.commands.OptionsConstants.URL_OPTION_SHORT;
+import static org.apache.ignite.internal.cli.commands.OptionsConstants.NODE_URL_DESC;
+import static org.apache.ignite.internal.cli.commands.OptionsConstants.NODE_URL_OPTION;
+import static org.apache.ignite.internal.cli.commands.OptionsConstants.URL_OPTION_SHORT;
import java.net.URL;
-import org.apache.ignite.cli.core.converters.UrlConverter;
+import org.apache.ignite.internal.cli.core.converters.UrlConverter;
import picocli.CommandLine.Option;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/node/NodeUrlProfileMixin.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/NodeUrlProfileMixin.java
similarity index 84%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/node/NodeUrlProfileMixin.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/NodeUrlProfileMixin.java
index a85ff63c38..cd17795b95 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/node/NodeUrlProfileMixin.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/NodeUrlProfileMixin.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.node;
+package org.apache.ignite.internal.cli.commands.node;
import jakarta.inject.Inject;
-import org.apache.ignite.cli.commands.ProfileMixin;
-import org.apache.ignite.cli.config.ConfigConstants;
-import org.apache.ignite.cli.config.ConfigManager;
-import org.apache.ignite.cli.config.ConfigManagerProvider;
+import org.apache.ignite.internal.cli.commands.ProfileMixin;
+import org.apache.ignite.internal.cli.config.ConfigConstants;
+import org.apache.ignite.internal.cli.config.ConfigManager;
+import org.apache.ignite.internal.cli.config.ConfigManagerProvider;
import picocli.CommandLine.Mixin;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/node/config/NodeConfigCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigCommand.java
similarity index 89%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/node/config/NodeConfigCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigCommand.java
index 7d6ecd2771..b72f2198da 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/node/config/NodeConfigCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigCommand.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.node.config;
+package org.apache.ignite.internal.cli.commands.node.config;
-import org.apache.ignite.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
import picocli.CommandLine.Command;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/node/config/NodeConfigReplCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigReplCommand.java
similarity index 90%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/node/config/NodeConfigReplCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigReplCommand.java
index 45263af87a..44c6202cce 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/node/config/NodeConfigReplCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigReplCommand.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.node.config;
+package org.apache.ignite.internal.cli.commands.node.config;
-import org.apache.ignite.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
import picocli.CommandLine.Command;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/node/config/NodeConfigShowCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigShowCommand.java
similarity index 81%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/node/config/NodeConfigShowCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigShowCommand.java
index 2c57db5700..039fb9a8a1 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/node/config/NodeConfigShowCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigShowCommand.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.node.config;
+package org.apache.ignite.internal.cli.commands.node.config;
import jakarta.inject.Inject;
import java.util.concurrent.Callable;
-import org.apache.ignite.cli.call.configuration.NodeConfigShowCall;
-import org.apache.ignite.cli.call.configuration.NodeConfigShowCallInput;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.commands.node.NodeUrlProfileMixin;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
-import org.apache.ignite.cli.decorators.JsonDecorator;
+import org.apache.ignite.internal.cli.call.configuration.NodeConfigShowCall;
+import org.apache.ignite.internal.cli.call.configuration.NodeConfigShowCallInput;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.node.NodeUrlProfileMixin;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.decorators.JsonDecorator;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
import picocli.CommandLine.Parameters;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/node/config/NodeConfigShowReplCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigShowReplCommand.java
similarity index 79%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/node/config/NodeConfigShowReplCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigShowReplCommand.java
index 2f95473668..5e24c35a3f 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/node/config/NodeConfigShowReplCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigShowReplCommand.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.node.config;
+package org.apache.ignite.internal.cli.commands.node.config;
import jakarta.inject.Inject;
-import org.apache.ignite.cli.call.configuration.NodeConfigShowCall;
-import org.apache.ignite.cli.call.configuration.NodeConfigShowCallInput;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.commands.node.NodeUrlMixin;
-import org.apache.ignite.cli.commands.questions.ConnectToClusterQuestion;
-import org.apache.ignite.cli.core.flow.builder.Flows;
+import org.apache.ignite.internal.cli.call.configuration.NodeConfigShowCall;
+import org.apache.ignite.internal.cli.call.configuration.NodeConfigShowCallInput;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.node.NodeUrlMixin;
+import org.apache.ignite.internal.cli.commands.questions.ConnectToClusterQuestion;
+import org.apache.ignite.internal.cli.core.flow.builder.Flows;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
import picocli.CommandLine.Parameters;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/node/config/NodeConfigUpdateCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigUpdateCommand.java
similarity index 82%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/node/config/NodeConfigUpdateCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigUpdateCommand.java
index b0bc3862f0..6088c80764 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/node/config/NodeConfigUpdateCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigUpdateCommand.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.node.config;
+package org.apache.ignite.internal.cli.commands.node.config;
import jakarta.inject.Inject;
import java.util.concurrent.Callable;
-import org.apache.ignite.cli.call.configuration.NodeConfigUpdateCall;
-import org.apache.ignite.cli.call.configuration.NodeConfigUpdateCallInput;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.commands.node.NodeUrlProfileMixin;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.call.configuration.NodeConfigUpdateCall;
+import org.apache.ignite.internal.cli.call.configuration.NodeConfigUpdateCallInput;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.node.NodeUrlProfileMixin;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
import picocli.CommandLine.Parameters;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/node/config/NodeConfigUpdateReplCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigUpdateReplCommand.java
similarity index 79%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/node/config/NodeConfigUpdateReplCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigUpdateReplCommand.java
index 05adccccba..2fcc176d18 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/node/config/NodeConfigUpdateReplCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigUpdateReplCommand.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.node.config;
+package org.apache.ignite.internal.cli.commands.node.config;
import jakarta.inject.Inject;
-import org.apache.ignite.cli.call.configuration.NodeConfigUpdateCall;
-import org.apache.ignite.cli.call.configuration.NodeConfigUpdateCallInput;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.commands.node.NodeUrlMixin;
-import org.apache.ignite.cli.commands.questions.ConnectToClusterQuestion;
-import org.apache.ignite.cli.core.flow.builder.Flows;
+import org.apache.ignite.internal.cli.call.configuration.NodeConfigUpdateCall;
+import org.apache.ignite.internal.cli.call.configuration.NodeConfigUpdateCallInput;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.node.NodeUrlMixin;
+import org.apache.ignite.internal.cli.commands.questions.ConnectToClusterQuestion;
+import org.apache.ignite.internal.cli.core.flow.builder.Flows;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
import picocli.CommandLine.Parameters;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/node/status/NodeStatusCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/status/NodeStatusCommand.java
similarity index 78%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/node/status/NodeStatusCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/status/NodeStatusCommand.java
index 0dc2c158b2..0030c804e6 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/node/status/NodeStatusCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/status/NodeStatusCommand.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.node.status;
+package org.apache.ignite.internal.cli.commands.node.status;
import jakarta.inject.Inject;
import java.util.concurrent.Callable;
-import org.apache.ignite.cli.call.node.status.NodeStatusCall;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.commands.node.NodeUrlProfileMixin;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
-import org.apache.ignite.cli.core.call.UrlCallInput;
-import org.apache.ignite.cli.decorators.NodeStatusDecorator;
+import org.apache.ignite.internal.cli.call.node.status.NodeStatusCall;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.node.NodeUrlProfileMixin;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.core.call.UrlCallInput;
+import org.apache.ignite.internal.cli.decorators.NodeStatusDecorator;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/node/status/NodeStatusReplCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/status/NodeStatusReplCommand.java
similarity index 76%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/node/status/NodeStatusReplCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/status/NodeStatusReplCommand.java
index 7363a4b8ac..2beb29b0a4 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/node/status/NodeStatusReplCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/node/status/NodeStatusReplCommand.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.node.status;
+package org.apache.ignite.internal.cli.commands.node.status;
import jakarta.inject.Inject;
-import org.apache.ignite.cli.call.node.status.NodeStatusCall;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.commands.node.NodeUrlMixin;
-import org.apache.ignite.cli.commands.questions.ConnectToClusterQuestion;
-import org.apache.ignite.cli.core.call.UrlCallInput;
-import org.apache.ignite.cli.core.flow.builder.Flows;
+import org.apache.ignite.internal.cli.call.node.status.NodeStatusCall;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.node.NodeUrlMixin;
+import org.apache.ignite.internal.cli.commands.questions.ConnectToClusterQuestion;
+import org.apache.ignite.internal.cli.core.call.UrlCallInput;
+import org.apache.ignite.internal.cli.core.flow.builder.Flows;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/questions/ConnectToClusterQuestion.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/questions/ConnectToClusterQuestion.java
similarity index 85%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/questions/ConnectToClusterQuestion.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/questions/ConnectToClusterQuestion.java
index 1e2c692ef9..d8bb358c8d 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/questions/ConnectToClusterQuestion.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/questions/ConnectToClusterQuestion.java
@@ -15,22 +15,22 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.questions;
+package org.apache.ignite.internal.cli.commands.questions;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import java.util.Objects;
-import org.apache.ignite.cli.call.connect.ConnectCall;
-import org.apache.ignite.cli.call.connect.ConnectCallInput;
-import org.apache.ignite.cli.config.ConfigConstants;
-import org.apache.ignite.cli.config.ConfigManagerProvider;
-import org.apache.ignite.cli.config.StateConfigProvider;
-import org.apache.ignite.cli.core.flow.Flowable;
-import org.apache.ignite.cli.core.flow.builder.FlowBuilder;
-import org.apache.ignite.cli.core.flow.builder.Flows;
-import org.apache.ignite.cli.core.repl.Session;
-import org.apache.ignite.cli.core.style.component.QuestionUiComponent;
-import org.apache.ignite.cli.core.style.element.UiElements;
+import org.apache.ignite.internal.cli.call.connect.ConnectCall;
+import org.apache.ignite.internal.cli.call.connect.ConnectCallInput;
+import org.apache.ignite.internal.cli.config.ConfigConstants;
+import org.apache.ignite.internal.cli.config.ConfigManagerProvider;
+import org.apache.ignite.internal.cli.config.StateConfigProvider;
+import org.apache.ignite.internal.cli.core.flow.Flowable;
+import org.apache.ignite.internal.cli.core.flow.builder.FlowBuilder;
+import org.apache.ignite.internal.cli.core.flow.builder.Flows;
+import org.apache.ignite.internal.cli.core.repl.Session;
+import org.apache.ignite.internal.cli.core.style.component.QuestionUiComponent;
+import org.apache.ignite.internal.cli.core.style.element.UiElements;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/sql/SqlCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlCommand.java
similarity index 81%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/sql/SqlCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlCommand.java
index 8746e5f3ca..d06d66a496 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/sql/SqlCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlCommand.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.sql;
+package org.apache.ignite.internal.cli.commands.sql;
import java.io.File;
import java.io.IOException;
@@ -23,15 +23,15 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.sql.SQLException;
import java.util.concurrent.Callable;
-import org.apache.ignite.cli.call.sql.SqlQueryCall;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
-import org.apache.ignite.cli.core.call.StringCallInput;
-import org.apache.ignite.cli.core.exception.ExceptionWriter;
-import org.apache.ignite.cli.core.exception.handler.SqlExceptionHandler;
-import org.apache.ignite.cli.decorators.SqlQueryResultDecorator;
-import org.apache.ignite.cli.deprecated.IgniteCliException;
-import org.apache.ignite.cli.sql.SqlManager;
+import org.apache.ignite.internal.cli.call.sql.SqlQueryCall;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.core.call.StringCallInput;
+import org.apache.ignite.internal.cli.core.exception.ExceptionWriter;
+import org.apache.ignite.internal.cli.core.exception.handler.SqlExceptionHandler;
+import org.apache.ignite.internal.cli.decorators.SqlQueryResultDecorator;
+import org.apache.ignite.internal.cli.deprecated.IgniteCliException;
+import org.apache.ignite.internal.cli.sql.SqlManager;
import picocli.CommandLine.ArgGroup;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/sql/SqlCompleter.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlCompleter.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/sql/SqlCompleter.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlCompleter.java
index 0fa0e344ef..c17ba58c8a 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/sql/SqlCompleter.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlCompleter.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.sql;
+package org.apache.ignite.internal.cli.commands.sql;
import java.util.List;
-import org.apache.ignite.cli.sql.SchemaProvider;
+import org.apache.ignite.internal.cli.sql.SchemaProvider;
import org.jline.reader.Candidate;
import org.jline.reader.Completer;
import org.jline.reader.LineReader;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/sql/SqlMetaData.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlMetaData.java
similarity index 99%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/sql/SqlMetaData.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlMetaData.java
index 315f76d4f0..3e015b90af 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/sql/SqlMetaData.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.sql;
+package org.apache.ignite.internal.cli.commands.sql;
/**
* Constants for SQL auto-completion.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/sql/SqlReplCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlReplCommand.java
similarity index 80%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/sql/SqlReplCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlReplCommand.java
index 981a2b1465..b464c12e8e 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/sql/SqlReplCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlReplCommand.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.sql;
+package org.apache.ignite.internal.cli.commands.sql;
import jakarta.inject.Inject;
import java.io.File;
@@ -23,21 +23,21 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.sql.SQLException;
-import org.apache.ignite.cli.call.sql.SqlQueryCall;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.core.CallExecutionPipelineProvider;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
-import org.apache.ignite.cli.core.call.StringCallInput;
-import org.apache.ignite.cli.core.exception.ExceptionHandlers;
-import org.apache.ignite.cli.core.exception.ExceptionWriter;
-import org.apache.ignite.cli.core.exception.handler.SqlExceptionHandler;
-import org.apache.ignite.cli.core.repl.Repl;
-import org.apache.ignite.cli.core.repl.executor.RegistryCommandExecutor;
-import org.apache.ignite.cli.core.repl.executor.ReplExecutorProvider;
-import org.apache.ignite.cli.decorators.SqlQueryResultDecorator;
-import org.apache.ignite.cli.deprecated.IgniteCliException;
-import org.apache.ignite.cli.sql.SqlManager;
-import org.apache.ignite.cli.sql.SqlSchemaProvider;
+import org.apache.ignite.internal.cli.call.sql.SqlQueryCall;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.core.CallExecutionPipelineProvider;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.core.call.StringCallInput;
+import org.apache.ignite.internal.cli.core.exception.ExceptionHandlers;
+import org.apache.ignite.internal.cli.core.exception.ExceptionWriter;
+import org.apache.ignite.internal.cli.core.exception.handler.SqlExceptionHandler;
+import org.apache.ignite.internal.cli.core.repl.Repl;
+import org.apache.ignite.internal.cli.core.repl.executor.RegistryCommandExecutor;
+import org.apache.ignite.internal.cli.core.repl.executor.ReplExecutorProvider;
+import org.apache.ignite.internal.cli.decorators.SqlQueryResultDecorator;
+import org.apache.ignite.internal.cli.deprecated.IgniteCliException;
+import org.apache.ignite.internal.cli.sql.SqlManager;
+import org.apache.ignite.internal.cli.sql.SqlSchemaProvider;
import picocli.CommandLine.ArgGroup;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/sql/SqlReplTopLevelCliCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlReplTopLevelCliCommand.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/sql/SqlReplTopLevelCliCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlReplTopLevelCliCommand.java
index 495ff5e9c5..5993cd1006 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/sql/SqlReplTopLevelCliCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlReplTopLevelCliCommand.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.sql;
+package org.apache.ignite.internal.cli.commands.sql;
import jakarta.inject.Singleton;
import picocli.CommandLine;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/topology/LogicalTopologyCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/topology/LogicalTopologyCommand.java
similarity index 76%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/topology/LogicalTopologyCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/topology/LogicalTopologyCommand.java
index 803b5e7bc4..0062f47a22 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/topology/LogicalTopologyCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/topology/LogicalTopologyCommand.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.topology;
+package org.apache.ignite.internal.cli.commands.topology;
import jakarta.inject.Inject;
import java.util.concurrent.Callable;
-import org.apache.ignite.cli.call.cluster.topology.LogicalTopologyCall;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.commands.cluster.ClusterUrlProfileMixin;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
-import org.apache.ignite.cli.core.call.UrlCallInput;
-import org.apache.ignite.cli.core.exception.handler.ClusterNotInitializedExceptionHandler;
-import org.apache.ignite.cli.decorators.TopologyDecorator;
+import org.apache.ignite.internal.cli.call.cluster.topology.LogicalTopologyCall;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.cluster.ClusterUrlProfileMixin;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.core.call.UrlCallInput;
+import org.apache.ignite.internal.cli.core.exception.handler.ClusterNotInitializedExceptionHandler;
+import org.apache.ignite.internal.cli.decorators.TopologyDecorator;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/topology/LogicalTopologyReplCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/topology/LogicalTopologyReplCommand.java
similarity index 72%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/topology/LogicalTopologyReplCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/topology/LogicalTopologyReplCommand.java
index fa5527c363..d5da3011a2 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/topology/LogicalTopologyReplCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/topology/LogicalTopologyReplCommand.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.topology;
+package org.apache.ignite.internal.cli.commands.topology;
import jakarta.inject.Inject;
-import org.apache.ignite.cli.call.cluster.topology.LogicalTopologyCall;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.commands.cluster.ClusterUrlMixin;
-import org.apache.ignite.cli.commands.questions.ConnectToClusterQuestion;
-import org.apache.ignite.cli.core.call.UrlCallInput;
-import org.apache.ignite.cli.core.exception.handler.ClusterNotInitializedExceptionHandler;
-import org.apache.ignite.cli.core.flow.builder.Flows;
-import org.apache.ignite.cli.decorators.TopologyDecorator;
+import org.apache.ignite.internal.cli.call.cluster.topology.LogicalTopologyCall;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.cluster.ClusterUrlMixin;
+import org.apache.ignite.internal.cli.commands.questions.ConnectToClusterQuestion;
+import org.apache.ignite.internal.cli.core.call.UrlCallInput;
+import org.apache.ignite.internal.cli.core.exception.handler.ClusterNotInitializedExceptionHandler;
+import org.apache.ignite.internal.cli.core.flow.builder.Flows;
+import org.apache.ignite.internal.cli.decorators.TopologyDecorator;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/topology/PhysicalTopologyCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/topology/PhysicalTopologyCommand.java
similarity index 77%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/topology/PhysicalTopologyCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/topology/PhysicalTopologyCommand.java
index 69ee0b2a26..d4b0b100e4 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/topology/PhysicalTopologyCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/topology/PhysicalTopologyCommand.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.topology;
+package org.apache.ignite.internal.cli.commands.topology;
import jakarta.inject.Inject;
import java.util.concurrent.Callable;
-import org.apache.ignite.cli.call.cluster.topology.PhysicalTopologyCall;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.commands.cluster.ClusterUrlProfileMixin;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
-import org.apache.ignite.cli.core.call.UrlCallInput;
-import org.apache.ignite.cli.decorators.TopologyDecorator;
+import org.apache.ignite.internal.cli.call.cluster.topology.PhysicalTopologyCall;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.cluster.ClusterUrlProfileMixin;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.core.call.UrlCallInput;
+import org.apache.ignite.internal.cli.decorators.TopologyDecorator;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/topology/PhysicalTopologyReplCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/topology/PhysicalTopologyReplCommand.java
similarity index 74%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/topology/PhysicalTopologyReplCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/topology/PhysicalTopologyReplCommand.java
index 6aa5edb0c0..b95a0fd333 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/topology/PhysicalTopologyReplCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/topology/PhysicalTopologyReplCommand.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.topology;
+package org.apache.ignite.internal.cli.commands.topology;
import jakarta.inject.Inject;
-import org.apache.ignite.cli.call.cluster.topology.PhysicalTopologyCall;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.commands.cluster.ClusterUrlMixin;
-import org.apache.ignite.cli.commands.questions.ConnectToClusterQuestion;
-import org.apache.ignite.cli.core.call.UrlCallInput;
-import org.apache.ignite.cli.core.flow.builder.Flows;
-import org.apache.ignite.cli.decorators.TopologyDecorator;
+import org.apache.ignite.internal.cli.call.cluster.topology.PhysicalTopologyCall;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.cluster.ClusterUrlMixin;
+import org.apache.ignite.internal.cli.commands.questions.ConnectToClusterQuestion;
+import org.apache.ignite.internal.cli.core.call.UrlCallInput;
+import org.apache.ignite.internal.cli.core.flow.builder.Flows;
+import org.apache.ignite.internal.cli.decorators.TopologyDecorator;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/topology/TopologyCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/topology/TopologyCommand.java
similarity index 90%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/topology/TopologyCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/topology/TopologyCommand.java
index bf50691516..5c4245d7b6 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/topology/TopologyCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/topology/TopologyCommand.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.topology;
+package org.apache.ignite.internal.cli.commands.topology;
-import org.apache.ignite.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
import picocli.CommandLine.Command;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/topology/TopologyReplCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/topology/TopologyReplCommand.java
similarity index 90%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/topology/TopologyReplCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/topology/TopologyReplCommand.java
index 9ff4b1a18a..fe94769cd7 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/topology/TopologyReplCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/topology/TopologyReplCommand.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.topology;
+package org.apache.ignite.internal.cli.commands.topology;
-import org.apache.ignite.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
import picocli.CommandLine.Command;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/commands/version/VersionCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/version/VersionCommand.java
similarity index 88%
rename from modules/cli/src/main/java/org/apache/ignite/cli/commands/version/VersionCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/version/VersionCommand.java
index b142511de1..56c6f02634 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/commands/version/VersionCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/version/VersionCommand.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.version;
+package org.apache.ignite.internal.cli.commands.version;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
-import org.apache.ignite.cli.VersionProvider;
-import org.apache.ignite.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.VersionProvider;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
import picocli.CommandLine.Command;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/config/CachedConfigManagerProvider.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/CachedConfigManagerProvider.java
similarity index 91%
rename from modules/cli/src/main/java/org/apache/ignite/cli/config/CachedConfigManagerProvider.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/config/CachedConfigManagerProvider.java
index 088468a576..c00c2353d7 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/config/CachedConfigManagerProvider.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/CachedConfigManagerProvider.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.config;
+package org.apache.ignite.internal.cli.config;
import jakarta.inject.Singleton;
-import org.apache.ignite.cli.config.ini.IniConfigManager;
+import org.apache.ignite.internal.cli.config.ini.IniConfigManager;
/**
* Provider for {@link ConfigManager}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/config/CachedStateConfigProvider.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/CachedStateConfigProvider.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/config/CachedStateConfigProvider.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/config/CachedStateConfigProvider.java
index 4b82b68c44..276a6038fc 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/config/CachedStateConfigProvider.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/CachedStateConfigProvider.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.config;
+package org.apache.ignite.internal.cli.config;
import jakarta.inject.Singleton;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/config/Config.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/Config.java
similarity index 97%
rename from modules/cli/src/main/java/org/apache/ignite/cli/config/Config.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/config/Config.java
index 3a01630bf7..2faaac2717 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/config/Config.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/Config.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.config;
+package org.apache.ignite.internal.cli.config;
import java.util.Map;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/config/ConfigConstants.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigConstants.java
similarity index 98%
rename from modules/cli/src/main/java/org/apache/ignite/cli/config/ConfigConstants.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigConstants.java
index 87a97c3c35..78e1320b30 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/config/ConfigConstants.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigConstants.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.config;
+package org.apache.ignite.internal.cli.config;
import java.io.File;
import java.nio.file.Path;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/config/ConfigDefaultValueProvider.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigDefaultValueProvider.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/config/ConfigDefaultValueProvider.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigDefaultValueProvider.java
index d6c6b57aac..7eaadd1eac 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/config/ConfigDefaultValueProvider.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigDefaultValueProvider.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.config;
+package org.apache.ignite.internal.cli.config;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/config/ConfigInitializationException.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigInitializationException.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/config/ConfigInitializationException.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigInitializationException.java
index 2ce6410732..17e0bb3624 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/config/ConfigInitializationException.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigInitializationException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.config;
+package org.apache.ignite.internal.cli.config;
/**
* Config initialization exception.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/config/ConfigManager.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigManager.java
similarity index 97%
rename from modules/cli/src/main/java/org/apache/ignite/cli/config/ConfigManager.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigManager.java
index d7d48716c0..5e3e2c8468 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/config/ConfigManager.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigManager.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.config;
+package org.apache.ignite.internal.cli.config;
import java.util.Collection;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/config/ConfigManagerProvider.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigManagerProvider.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/config/ConfigManagerProvider.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigManagerProvider.java
index 4602b91bdb..5d1c2a43b9 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/config/ConfigManagerProvider.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigManagerProvider.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.config;
+package org.apache.ignite.internal.cli.config;
/**
* Provider for {@link ConfigManager}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/config/ConfigStoringException.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigStoringException.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/config/ConfigStoringException.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigStoringException.java
index ae931d0eed..577b21a92b 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/config/ConfigStoringException.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigStoringException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.config;
+package org.apache.ignite.internal.cli.config;
/**
* Exception for case when config not stored correctly.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/config/Profile.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/Profile.java
similarity index 98%
rename from modules/cli/src/main/java/org/apache/ignite/cli/config/Profile.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/config/Profile.java
index 7a04624aa2..790107716e 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/config/Profile.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/Profile.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.config;
+package org.apache.ignite.internal.cli.config;
import java.util.Map;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/config/ProfileNotFoundException.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ProfileNotFoundException.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/config/ProfileNotFoundException.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ProfileNotFoundException.java
index 765dc0f4a8..b879c4b625 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/config/ProfileNotFoundException.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ProfileNotFoundException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.config;
+package org.apache.ignite.internal.cli.config;
/**
* CLI profile not found.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/config/StateConfig.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/StateConfig.java
similarity index 92%
rename from modules/cli/src/main/java/org/apache/ignite/cli/config/StateConfig.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/config/StateConfig.java
index d664c0fd11..6dc1c42d6e 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/config/StateConfig.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/StateConfig.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.config;
+package org.apache.ignite.internal.cli.config;
import java.io.File;
import java.io.IOException;
-import org.apache.ignite.cli.config.ini.IniConfig;
-import org.apache.ignite.cli.config.ini.IniFile;
+import org.apache.ignite.internal.cli.config.ini.IniConfig;
+import org.apache.ignite.internal.cli.config.ini.IniFile;
/**
* Config file which stores information between application restarts, but not part of the config.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/config/StateConfigProvider.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/StateConfigProvider.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/config/StateConfigProvider.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/config/StateConfigProvider.java
index da8d844a28..c68e16a5cb 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/config/StateConfigProvider.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/StateConfigProvider.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.config;
+package org.apache.ignite.internal.cli.config;
/**
* Provider for the application state config.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/config/StateFolderProvider.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/StateFolderProvider.java
similarity index 97%
rename from modules/cli/src/main/java/org/apache/ignite/cli/config/StateFolderProvider.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/config/StateFolderProvider.java
index 7d011083a2..bbbe975806 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/config/StateFolderProvider.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/StateFolderProvider.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.config;
+package org.apache.ignite.internal.cli.config;
import java.io.File;
import java.nio.file.Path;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/config/ini/IniConfig.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ini/IniConfig.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/config/ini/IniConfig.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ini/IniConfig.java
index 23fdae84f3..7b4e57af34 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/config/ini/IniConfig.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ini/IniConfig.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.config.ini;
+package org.apache.ignite.internal.cli.config.ini;
import java.util.Map;
-import org.apache.ignite.cli.config.Config;
+import org.apache.ignite.internal.cli.config.Config;
/**
* Implementation of {@link Config} based on {@link IniSection}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/config/ini/IniConfigManager.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ini/IniConfigManager.java
similarity index 88%
rename from modules/cli/src/main/java/org/apache/ignite/cli/config/ini/IniConfigManager.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ini/IniConfigManager.java
index 4fab2cdbe6..9d747a6e82 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/config/ini/IniConfigManager.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ini/IniConfigManager.java
@@ -15,20 +15,20 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.config.ini;
+package org.apache.ignite.internal.cli.config.ini;
-import static org.apache.ignite.cli.config.ConfigConstants.CLUSTER_URL;
-import static org.apache.ignite.cli.config.ConfigConstants.CURRENT_PROFILE;
-import static org.apache.ignite.cli.config.ConfigConstants.JDBC_URL;
+import static org.apache.ignite.internal.cli.config.ConfigConstants.CLUSTER_URL;
+import static org.apache.ignite.internal.cli.config.ConfigConstants.CURRENT_PROFILE;
+import static org.apache.ignite.internal.cli.config.ConfigConstants.JDBC_URL;
import java.io.File;
import java.io.IOException;
import java.util.Collection;
import java.util.NoSuchElementException;
-import org.apache.ignite.cli.config.ConfigInitializationException;
-import org.apache.ignite.cli.config.ConfigManager;
-import org.apache.ignite.cli.config.Profile;
-import org.apache.ignite.cli.config.ProfileNotFoundException;
+import org.apache.ignite.internal.cli.config.ConfigInitializationException;
+import org.apache.ignite.internal.cli.config.ConfigManager;
+import org.apache.ignite.internal.cli.config.Profile;
+import org.apache.ignite.internal.cli.config.ProfileNotFoundException;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/config/ini/IniFile.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ini/IniFile.java
similarity index 97%
rename from modules/cli/src/main/java/org/apache/ignite/cli/config/ini/IniFile.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ini/IniFile.java
index 4998470352..aa95e41fea 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/config/ini/IniFile.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ini/IniFile.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.config.ini;
+package org.apache.ignite.internal.cli.config.ini;
import java.io.BufferedWriter;
import java.io.File;
@@ -26,7 +26,7 @@ import java.io.OutputStreamWriter;
import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.Map;
-import org.apache.ignite.cli.config.ConfigStoringException;
+import org.apache.ignite.internal.cli.config.ConfigStoringException;
/**
* Representation of INI file.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/config/ini/IniParser.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ini/IniParser.java
similarity index 98%
rename from modules/cli/src/main/java/org/apache/ignite/cli/config/ini/IniParser.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ini/IniParser.java
index e81b4e3390..ac9922fc9c 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/config/ini/IniParser.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ini/IniParser.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.config.ini;
+package org.apache.ignite.internal.cli.config.ini;
import java.io.BufferedReader;
import java.io.File;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/config/ini/IniProfile.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ini/IniProfile.java
similarity index 89%
rename from modules/cli/src/main/java/org/apache/ignite/cli/config/ini/IniProfile.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ini/IniProfile.java
index 380c233ad9..c1b3e5f159 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/config/ini/IniProfile.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ini/IniProfile.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.config.ini;
+package org.apache.ignite.internal.cli.config.ini;
-import org.apache.ignite.cli.config.Config;
-import org.apache.ignite.cli.config.Profile;
+import org.apache.ignite.internal.cli.config.Config;
+import org.apache.ignite.internal.cli.config.Profile;
/**
* Implementation of {@link Profile} based on {@link IniSection}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/config/ini/IniSection.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ini/IniSection.java
similarity index 97%
rename from modules/cli/src/main/java/org/apache/ignite/cli/config/ini/IniSection.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ini/IniSection.java
index 9499a1d975..b9ce806372 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/config/ini/IniSection.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ini/IniSection.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.config.ini;
+package org.apache.ignite.internal.cli.config.ini;
import java.util.Collections;
import java.util.LinkedHashMap;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/config/ini/SectionAlreadyExistsException.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ini/SectionAlreadyExistsException.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/config/ini/SectionAlreadyExistsException.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ini/SectionAlreadyExistsException.java
index d30c933b61..9fd170879f 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/config/ini/SectionAlreadyExistsException.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ini/SectionAlreadyExistsException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.config.ini;
+package org.apache.ignite.internal.cli.config.ini;
/**
* Exception when already created INI section trying to create.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/CallExecutionPipelineProvider.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/CallExecutionPipelineProvider.java
similarity index 82%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/CallExecutionPipelineProvider.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/CallExecutionPipelineProvider.java
index df25cea7a9..32862868ee 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/CallExecutionPipelineProvider.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/CallExecutionPipelineProvider.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core;
+package org.apache.ignite.internal.cli.core;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
-import org.apache.ignite.cli.core.exception.ExceptionHandlers;
-import org.apache.ignite.cli.core.repl.executor.RegistryCommandExecutor;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.core.exception.ExceptionHandlers;
+import org.apache.ignite.internal.cli.core.repl.executor.RegistryCommandExecutor;
/**
* Provider of {@link CallExecutionPipeline}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/call/Call.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/Call.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/call/Call.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/Call.java
index f00bcc8538..1870d732c0 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/call/Call.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/Call.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.call;
+package org.apache.ignite.internal.cli.core.call;
/**
* Call that represents an action that can be performed given an input.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/call/CallExecutionPipeline.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/CallExecutionPipeline.java
similarity index 91%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/call/CallExecutionPipeline.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/CallExecutionPipeline.java
index d7829a3a79..05fb1109d2 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/call/CallExecutionPipeline.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/CallExecutionPipeline.java
@@ -15,19 +15,19 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.call;
+package org.apache.ignite.internal.cli.core.call;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.nio.charset.Charset;
import java.util.function.Supplier;
-import org.apache.ignite.cli.core.decorator.Decorator;
-import org.apache.ignite.cli.core.decorator.TerminalOutput;
-import org.apache.ignite.cli.core.exception.ExceptionHandler;
-import org.apache.ignite.cli.core.exception.ExceptionHandlers;
-import org.apache.ignite.cli.core.exception.ExceptionWriter;
-import org.apache.ignite.cli.core.exception.handler.DefaultExceptionHandlers;
-import org.apache.ignite.cli.decorators.DefaultDecorator;
+import org.apache.ignite.internal.cli.core.decorator.Decorator;
+import org.apache.ignite.internal.cli.core.decorator.TerminalOutput;
+import org.apache.ignite.internal.cli.core.exception.ExceptionHandler;
+import org.apache.ignite.internal.cli.core.exception.ExceptionHandlers;
+import org.apache.ignite.internal.cli.core.exception.ExceptionWriter;
+import org.apache.ignite.internal.cli.core.exception.handler.DefaultExceptionHandlers;
+import org.apache.ignite.internal.cli.decorators.DefaultDecorator;
/**
* Call execution pipeline.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/call/CallInput.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/CallInput.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/call/CallInput.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/CallInput.java
index a88bf97f04..c10e87c95e 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/call/CallInput.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/CallInput.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.call;
+package org.apache.ignite.internal.cli.core.call;
/**
* Input for {@link Call}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/call/CallOutput.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/CallOutput.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/call/CallOutput.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/CallOutput.java
index 3f8e23261a..095770d2fa 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/call/CallOutput.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/CallOutput.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.call;
+package org.apache.ignite.internal.cli.core.call;
/**
* Output of {@link Call}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/call/CallOutputStatus.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/CallOutputStatus.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/call/CallOutputStatus.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/CallOutputStatus.java
index 0780cf8ad3..e5baf1cc57 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/call/CallOutputStatus.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/CallOutputStatus.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.call;
+package org.apache.ignite.internal.cli.core.call;
/**
* The status of the call.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/call/DefaultCallOutput.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/DefaultCallOutput.java
similarity index 99%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/call/DefaultCallOutput.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/DefaultCallOutput.java
index dd05c5baaf..afcb46a004 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/call/DefaultCallOutput.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/DefaultCallOutput.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.call;
+package org.apache.ignite.internal.cli.core.call;
import java.util.Objects;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/call/EmptyCallInput.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/EmptyCallInput.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/call/EmptyCallInput.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/EmptyCallInput.java
index a023ca1396..82aad74809 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/call/EmptyCallInput.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/EmptyCallInput.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.call;
+package org.apache.ignite.internal.cli.core.call;
/**
* Input for executing commands without arguments.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/call/StringCallInput.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/StringCallInput.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/call/StringCallInput.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/StringCallInput.java
index 79526e4f56..22bea1183a 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/call/StringCallInput.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/StringCallInput.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.call;
+package org.apache.ignite.internal.cli.core.call;
/**
* Input for executing commands with {@code String} arguments.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/call/UrlCallInput.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/UrlCallInput.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/call/UrlCallInput.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/UrlCallInput.java
index 2c01482b13..7d66de3499 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/call/UrlCallInput.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/call/UrlCallInput.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.call;
+package org.apache.ignite.internal.cli.core.call;
/** Input for executing commands with URL arguments. */
public class UrlCallInput implements CallInput {
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/converters/NetworkAddressConverter.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/converters/NetworkAddressConverter.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/converters/NetworkAddressConverter.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/converters/NetworkAddressConverter.java
index b381af879d..4753d08e8d 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/converters/NetworkAddressConverter.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/converters/NetworkAddressConverter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.converters;
+package org.apache.ignite.internal.cli.core.converters;
import org.apache.ignite.network.NetworkAddress;
import picocli.CommandLine;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/converters/UrlConverter.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/converters/UrlConverter.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/converters/UrlConverter.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/converters/UrlConverter.java
index 2e39379a7f..6eda860470 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/converters/UrlConverter.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/converters/UrlConverter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.converters;
+package org.apache.ignite.internal.cli.core.converters;
import java.net.MalformedURLException;
import java.net.URL;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/decorator/Decorator.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/decorator/Decorator.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/decorator/Decorator.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/decorator/Decorator.java
index 933237090a..ec09e6ac54 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/decorator/Decorator.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/decorator/Decorator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.decorator;
+package org.apache.ignite.internal.cli.core.decorator;
/**
* Interface for transformation command output to terminal output.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/decorator/DecoratorRegistry.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/decorator/DecoratorRegistry.java
similarity index 92%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/decorator/DecoratorRegistry.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/decorator/DecoratorRegistry.java
index cd329c0fb8..46b200b006 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/decorator/DecoratorRegistry.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/decorator/DecoratorRegistry.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.decorator;
+package org.apache.ignite.internal.cli.core.decorator;
import java.util.HashMap;
import java.util.Map;
-import org.apache.ignite.cli.decorators.DefaultDecorator;
+import org.apache.ignite.internal.cli.decorators.DefaultDecorator;
/**
* Registry for {@link Decorator}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/decorator/TerminalOutput.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/decorator/TerminalOutput.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/decorator/TerminalOutput.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/decorator/TerminalOutput.java
index 2e41f8e4af..2761704a76 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/decorator/TerminalOutput.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/decorator/TerminalOutput.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.decorator;
+package org.apache.ignite.internal.cli.core.decorator;
/**
* Interface for terminal output representation.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/CommandExecutionException.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/CommandExecutionException.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/exception/CommandExecutionException.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/CommandExecutionException.java
index 240e16ae00..3c539cf71f 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/CommandExecutionException.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/CommandExecutionException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.exception;
+package org.apache.ignite.internal.cli.core.exception;
/**
* Command execution exception.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/ConnectCommandException.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/ConnectCommandException.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/exception/ConnectCommandException.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/ConnectCommandException.java
index 87379b9d5f..7b774476e5 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/ConnectCommandException.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/ConnectCommandException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.exception;
+package org.apache.ignite.internal.cli.core.exception;
/**
* Connect command exception.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/ExceptionHandler.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/ExceptionHandler.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/exception/ExceptionHandler.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/ExceptionHandler.java
index fa960f1fbe..48b602115e 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/ExceptionHandler.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/ExceptionHandler.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.exception;
+package org.apache.ignite.internal.cli.core.exception;
-import org.apache.ignite.cli.core.style.component.ErrorUiComponent;
+import org.apache.ignite.internal.cli.core.style.component.ErrorUiComponent;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/ExceptionHandlers.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/ExceptionHandlers.java
similarity index 98%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/exception/ExceptionHandlers.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/ExceptionHandlers.java
index ece95d07fc..27b7ffcfef 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/ExceptionHandlers.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/ExceptionHandlers.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.exception;
+package org.apache.ignite.internal.cli.core.exception;
import java.util.HashMap;
import java.util.Map;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/ExceptionWriter.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/ExceptionWriter.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/exception/ExceptionWriter.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/ExceptionWriter.java
index f3d624df4e..7a7b919772 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/ExceptionWriter.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/ExceptionWriter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.exception;
+package org.apache.ignite.internal.cli.core.exception;
import java.io.PrintWriter;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/IgniteCliApiException.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/IgniteCliApiException.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/exception/IgniteCliApiException.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/IgniteCliApiException.java
index 3cf556185f..dcf9273797 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/IgniteCliApiException.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/IgniteCliApiException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.exception;
+package org.apache.ignite.internal.cli.core.exception;
/**
* Top level runtime exception for throwing the error message from REST API to user.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/WrappedException.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/WrappedException.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/exception/WrappedException.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/WrappedException.java
index e33eba8487..b0fc33d303 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/WrappedException.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/WrappedException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.exception;
+package org.apache.ignite.internal.cli.core.exception;
/**
* Wrapper for checked exception.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/ClusterNotInitializedExceptionHandler.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/ClusterNotInitializedExceptionHandler.java
similarity index 86%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/ClusterNotInitializedExceptionHandler.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/ClusterNotInitializedExceptionHandler.java
index 18fcae0f8e..1e53c4f40a 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/ClusterNotInitializedExceptionHandler.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/ClusterNotInitializedExceptionHandler.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.exception.handler;
+package org.apache.ignite.internal.cli.core.exception.handler;
-import org.apache.ignite.cli.core.exception.ExceptionWriter;
-import org.apache.ignite.cli.core.exception.IgniteCliApiException;
-import org.apache.ignite.cli.core.style.component.ErrorUiComponent;
-import org.apache.ignite.cli.core.style.element.UiElements;
+import org.apache.ignite.internal.cli.core.exception.ExceptionWriter;
+import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
+import org.apache.ignite.internal.cli.core.style.component.ErrorUiComponent;
+import org.apache.ignite.internal.cli.core.style.element.UiElements;
import org.apache.ignite.rest.client.invoker.ApiException;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/ConfigStoringExceptionHandler.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/ConfigStoringExceptionHandler.java
similarity index 82%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/ConfigStoringExceptionHandler.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/ConfigStoringExceptionHandler.java
index ac3d72d2e4..4fa2dc2593 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/ConfigStoringExceptionHandler.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/ConfigStoringExceptionHandler.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.exception.handler;
+package org.apache.ignite.internal.cli.core.exception.handler;
-import org.apache.ignite.cli.config.ConfigStoringException;
-import org.apache.ignite.cli.core.exception.ExceptionHandler;
-import org.apache.ignite.cli.core.exception.ExceptionWriter;
-import org.apache.ignite.cli.core.style.component.ErrorUiComponent;
+import org.apache.ignite.internal.cli.config.ConfigStoringException;
+import org.apache.ignite.internal.cli.core.exception.ExceptionHandler;
+import org.apache.ignite.internal.cli.core.exception.ExceptionWriter;
+import org.apache.ignite.internal.cli.core.style.component.ErrorUiComponent;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/DefaultExceptionHandlers.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/DefaultExceptionHandlers.java
similarity index 92%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/DefaultExceptionHandlers.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/DefaultExceptionHandlers.java
index a56dfa6f45..00976a63d8 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/DefaultExceptionHandlers.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/DefaultExceptionHandlers.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.exception.handler;
+package org.apache.ignite.internal.cli.core.exception.handler;
-import org.apache.ignite.cli.core.exception.ExceptionHandlers;
+import org.apache.ignite.internal.cli.core.exception.ExceptionHandlers;
/**
* Default collection of exception handlers.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/EndOfFileExceptionHandler.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/EndOfFileExceptionHandler.java
similarity index 89%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/EndOfFileExceptionHandler.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/EndOfFileExceptionHandler.java
index 5ba60fbbd3..eca4cff876 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/EndOfFileExceptionHandler.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/EndOfFileExceptionHandler.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.exception.handler;
+package org.apache.ignite.internal.cli.core.exception.handler;
import java.util.function.Consumer;
-import org.apache.ignite.cli.core.exception.ExceptionHandler;
-import org.apache.ignite.cli.core.exception.ExceptionWriter;
+import org.apache.ignite.internal.cli.core.exception.ExceptionHandler;
+import org.apache.ignite.internal.cli.core.exception.ExceptionWriter;
import org.jline.reader.EndOfFileException;
import org.jline.reader.LineReader;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/FlowInterruptExceptionHandler.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/FlowInterruptExceptionHandler.java
similarity index 81%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/FlowInterruptExceptionHandler.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/FlowInterruptExceptionHandler.java
index 42664d53b4..02941ec6f4 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/FlowInterruptExceptionHandler.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/FlowInterruptExceptionHandler.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.exception.handler;
+package org.apache.ignite.internal.cli.core.exception.handler;
-import org.apache.ignite.cli.core.exception.ExceptionHandler;
-import org.apache.ignite.cli.core.exception.ExceptionWriter;
-import org.apache.ignite.cli.core.flow.FlowInterruptException;
+import org.apache.ignite.internal.cli.core.exception.ExceptionHandler;
+import org.apache.ignite.internal.cli.core.exception.ExceptionWriter;
+import org.apache.ignite.internal.cli.core.flow.FlowInterruptException;
/**
* Exception handler for {@link FlowInterruptException}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/IgniteCliApiExceptionHandler.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/IgniteCliApiExceptionHandler.java
similarity index 87%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/IgniteCliApiExceptionHandler.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/IgniteCliApiExceptionHandler.java
index df5bb7b93b..3a090cead9 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/IgniteCliApiExceptionHandler.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/IgniteCliApiExceptionHandler.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.exception.handler;
+package org.apache.ignite.internal.cli.core.exception.handler;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -23,12 +23,12 @@ import java.net.ConnectException;
import java.net.UnknownHostException;
import java.util.List;
import java.util.stream.Collectors;
-import org.apache.ignite.cli.core.exception.ExceptionHandler;
-import org.apache.ignite.cli.core.exception.ExceptionWriter;
-import org.apache.ignite.cli.core.exception.IgniteCliApiException;
-import org.apache.ignite.cli.core.style.component.ErrorUiComponent;
-import org.apache.ignite.cli.core.style.component.ErrorUiComponent.ErrorComponentBuilder;
-import org.apache.ignite.cli.core.style.element.UiElements;
+import org.apache.ignite.internal.cli.core.exception.ExceptionHandler;
+import org.apache.ignite.internal.cli.core.exception.ExceptionWriter;
+import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
+import org.apache.ignite.internal.cli.core.style.component.ErrorUiComponent;
+import org.apache.ignite.internal.cli.core.style.component.ErrorUiComponent.ErrorComponentBuilder;
+import org.apache.ignite.internal.cli.core.style.element.UiElements;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
import org.apache.ignite.rest.client.invoker.ApiException;
@@ -46,7 +46,7 @@ public class IgniteCliApiExceptionHandler implements ExceptionHandler<IgniteCliA
@Override
public int handle(ExceptionWriter err, IgniteCliApiException e) {
- ErrorUiComponent.ErrorComponentBuilder errorComponentBuilder = ErrorUiComponent.builder();
+ ErrorComponentBuilder errorComponentBuilder = ErrorUiComponent.builder();
if (e.getCause() instanceof ApiException) {
ApiException cause = (ApiException) e.getCause();
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/IgniteCliExceptionHandler.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/IgniteCliExceptionHandler.java
similarity index 78%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/IgniteCliExceptionHandler.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/IgniteCliExceptionHandler.java
index 63a98c0d83..6d6c6497e0 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/IgniteCliExceptionHandler.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/IgniteCliExceptionHandler.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.exception.handler;
+package org.apache.ignite.internal.cli.core.exception.handler;
-import org.apache.ignite.cli.core.exception.ExceptionHandler;
-import org.apache.ignite.cli.core.exception.ExceptionWriter;
-import org.apache.ignite.cli.core.style.component.ErrorUiComponent;
-import org.apache.ignite.cli.deprecated.IgniteCliException;
+import org.apache.ignite.internal.cli.core.exception.ExceptionHandler;
+import org.apache.ignite.internal.cli.core.exception.ExceptionWriter;
+import org.apache.ignite.internal.cli.core.style.component.ErrorUiComponent;
+import org.apache.ignite.internal.cli.deprecated.IgniteCliException;
/**
* Exception handler for {@link IgniteCliException}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/PicocliExecutionExceptionHandler.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/PicocliExecutionExceptionHandler.java
similarity index 91%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/PicocliExecutionExceptionHandler.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/PicocliExecutionExceptionHandler.java
index 8b0f580f5c..f8ec61ee0e 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/PicocliExecutionExceptionHandler.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/PicocliExecutionExceptionHandler.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.exception.handler;
+package org.apache.ignite.internal.cli.core.exception.handler;
-import org.apache.ignite.cli.core.exception.ExceptionHandlers;
+import org.apache.ignite.internal.cli.core.exception.ExceptionHandlers;
import picocli.CommandLine;
import picocli.CommandLine.IExecutionExceptionHandler;
import picocli.CommandLine.ParseResult;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/ProfileNotFoundExceptionHandler.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/ProfileNotFoundExceptionHandler.java
similarity index 78%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/ProfileNotFoundExceptionHandler.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/ProfileNotFoundExceptionHandler.java
index af5f1be6ed..8df2a84227 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/ProfileNotFoundExceptionHandler.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/ProfileNotFoundExceptionHandler.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.exception.handler;
+package org.apache.ignite.internal.cli.core.exception.handler;
-import org.apache.ignite.cli.config.ProfileNotFoundException;
-import org.apache.ignite.cli.core.exception.ExceptionHandler;
-import org.apache.ignite.cli.core.exception.ExceptionWriter;
-import org.apache.ignite.cli.core.style.component.ErrorUiComponent;
+import org.apache.ignite.internal.cli.config.ProfileNotFoundException;
+import org.apache.ignite.internal.cli.core.exception.ExceptionHandler;
+import org.apache.ignite.internal.cli.core.exception.ExceptionWriter;
+import org.apache.ignite.internal.cli.core.style.component.ErrorUiComponent;
/**
* Handler for {@link ProfileNotFoundException}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/ReplExceptionHandlers.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/ReplExceptionHandlers.java
similarity index 90%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/ReplExceptionHandlers.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/ReplExceptionHandlers.java
index 6e5bb1d4e4..dc7e398c7a 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/ReplExceptionHandlers.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/ReplExceptionHandlers.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.exception.handler;
+package org.apache.ignite.internal.cli.core.exception.handler;
import java.util.function.Consumer;
-import org.apache.ignite.cli.core.exception.ExceptionHandlers;
+import org.apache.ignite.internal.cli.core.exception.ExceptionHandlers;
/**
* Collection of exception handlers for REPL.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/SectionAlreadyExistsExceptionHandler.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/SectionAlreadyExistsExceptionHandler.java
similarity index 78%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/SectionAlreadyExistsExceptionHandler.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/SectionAlreadyExistsExceptionHandler.java
index b2220150bd..f5cbc50445 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/SectionAlreadyExistsExceptionHandler.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/SectionAlreadyExistsExceptionHandler.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.exception.handler;
+package org.apache.ignite.internal.cli.core.exception.handler;
-import org.apache.ignite.cli.config.ini.SectionAlreadyExistsException;
-import org.apache.ignite.cli.core.exception.ExceptionHandler;
-import org.apache.ignite.cli.core.exception.ExceptionWriter;
-import org.apache.ignite.cli.core.style.component.ErrorUiComponent;
+import org.apache.ignite.internal.cli.config.ini.SectionAlreadyExistsException;
+import org.apache.ignite.internal.cli.core.exception.ExceptionHandler;
+import org.apache.ignite.internal.cli.core.exception.ExceptionWriter;
+import org.apache.ignite.internal.cli.core.style.component.ErrorUiComponent;
/**
* Handler for {@link SectionAlreadyExistsException}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/SqlExceptionHandler.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/SqlExceptionHandler.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/SqlExceptionHandler.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/SqlExceptionHandler.java
index d1e7e249d3..03716e334b 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/SqlExceptionHandler.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/SqlExceptionHandler.java
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.exception.handler;
+package org.apache.ignite.internal.cli.core.exception.handler;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import java.util.function.Function;
-import org.apache.ignite.cli.core.exception.ExceptionHandler;
-import org.apache.ignite.cli.core.exception.ExceptionWriter;
-import org.apache.ignite.cli.core.style.component.ErrorUiComponent;
-import org.apache.ignite.cli.core.style.component.ErrorUiComponent.ErrorComponentBuilder;
import org.apache.ignite.client.IgniteClientConnectionException;
+import org.apache.ignite.internal.cli.core.exception.ExceptionHandler;
+import org.apache.ignite.internal.cli.core.exception.ExceptionWriter;
+import org.apache.ignite.internal.cli.core.style.component.ErrorUiComponent;
+import org.apache.ignite.internal.cli.core.style.component.ErrorUiComponent.ErrorComponentBuilder;
import org.apache.ignite.internal.jdbc.proto.SqlStateCode;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/TimeoutExceptionHandler.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/TimeoutExceptionHandler.java
similarity index 85%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/TimeoutExceptionHandler.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/TimeoutExceptionHandler.java
index e60aa5650e..9d8138bd34 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/TimeoutExceptionHandler.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/TimeoutExceptionHandler.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.exception.handler;
+package org.apache.ignite.internal.cli.core.exception.handler;
import java.util.concurrent.TimeoutException;
-import org.apache.ignite.cli.core.exception.ExceptionHandler;
-import org.apache.ignite.cli.core.exception.ExceptionWriter;
-import org.apache.ignite.cli.core.style.component.ErrorUiComponent;
+import org.apache.ignite.internal.cli.core.exception.ExceptionHandler;
+import org.apache.ignite.internal.cli.core.exception.ExceptionWriter;
+import org.apache.ignite.internal.cli.core.style.component.ErrorUiComponent;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/UnknownCommandExceptionHandler.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/UnknownCommandExceptionHandler.java
similarity index 85%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/UnknownCommandExceptionHandler.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/UnknownCommandExceptionHandler.java
index 7174d3f86c..3711e1740c 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/UnknownCommandExceptionHandler.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/UnknownCommandExceptionHandler.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.exception.handler;
+package org.apache.ignite.internal.cli.core.exception.handler;
-import org.apache.ignite.cli.core.exception.ExceptionHandler;
-import org.apache.ignite.cli.core.exception.ExceptionWriter;
-import org.apache.ignite.cli.core.style.component.ErrorUiComponent;
+import org.apache.ignite.internal.cli.core.exception.ExceptionHandler;
+import org.apache.ignite.internal.cli.core.exception.ExceptionWriter;
+import org.apache.ignite.internal.cli.core.style.component.ErrorUiComponent;
import org.jline.console.impl.SystemRegistryImpl.UnknownCommandException;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/UserInterruptExceptionHandler.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/UserInterruptExceptionHandler.java
similarity index 86%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/UserInterruptExceptionHandler.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/UserInterruptExceptionHandler.java
index a5334617ed..144b75416b 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/exception/handler/UserInterruptExceptionHandler.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/exception/handler/UserInterruptExceptionHandler.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.exception.handler;
+package org.apache.ignite.internal.cli.core.exception.handler;
-import org.apache.ignite.cli.core.exception.ExceptionHandler;
-import org.apache.ignite.cli.core.exception.ExceptionWriter;
+import org.apache.ignite.internal.cli.core.exception.ExceptionHandler;
+import org.apache.ignite.internal.cli.core.exception.ExceptionWriter;
import org.jline.reader.UserInterruptException;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/DefaultFlowable.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/DefaultFlowable.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/flow/DefaultFlowable.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/DefaultFlowable.java
index d521a49add..19b393b86e 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/DefaultFlowable.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/DefaultFlowable.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.flow;
+package org.apache.ignite.internal.cli.core.flow;
import java.util.Objects;
import java.util.StringJoiner;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
/**
* Default implementation of {@link Flowable}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/Flow.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/Flow.java
similarity index 97%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/flow/Flow.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/Flow.java
index dfee14e58a..90a94b55a7 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/Flow.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/Flow.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.flow;
+package org.apache.ignite.internal.cli.core.flow;
/**
* Represents a flow that accepts one flowable and produces a result flowable.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/FlowInterruptException.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/FlowInterruptException.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/flow/FlowInterruptException.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/FlowInterruptException.java
index fcd542a405..1e3db6198c 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/FlowInterruptException.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/FlowInterruptException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.flow;
+package org.apache.ignite.internal.cli.core.flow;
/**
* Internal exception which shows that {@link Flow} was interrupted.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/Flowable.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/Flowable.java
similarity index 98%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/flow/Flowable.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/Flowable.java
index e9e67d0600..5aa59a4872 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/Flowable.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/Flowable.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.flow;
+package org.apache.ignite.internal.cli.core.flow;
import java.util.function.Supplier;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/builder/FlowBuilder.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/builder/FlowBuilder.java
similarity index 91%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/flow/builder/FlowBuilder.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/builder/FlowBuilder.java
index 8c07c12c1e..a1e3b41b9b 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/builder/FlowBuilder.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/builder/FlowBuilder.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.flow.builder;
+package org.apache.ignite.internal.cli.core.flow.builder;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
-import org.apache.ignite.cli.core.decorator.Decorator;
-import org.apache.ignite.cli.core.decorator.TerminalOutput;
-import org.apache.ignite.cli.core.exception.ExceptionHandler;
-import org.apache.ignite.cli.core.flow.Flow;
-import org.apache.ignite.cli.core.flow.question.QuestionAnswer;
+import org.apache.ignite.internal.cli.core.decorator.Decorator;
+import org.apache.ignite.internal.cli.core.decorator.TerminalOutput;
+import org.apache.ignite.internal.cli.core.exception.ExceptionHandler;
+import org.apache.ignite.internal.cli.core.flow.Flow;
+import org.apache.ignite.internal.cli.core.flow.question.QuestionAnswer;
/**
* Builder of {@link Flow}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/builder/FlowBuilderImpl.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/builder/FlowBuilderImpl.java
similarity index 82%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/flow/builder/FlowBuilderImpl.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/builder/FlowBuilderImpl.java
index 91d3e9a353..1d5e60ef86 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/builder/FlowBuilderImpl.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/builder/FlowBuilderImpl.java
@@ -15,26 +15,26 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.flow.builder;
+package org.apache.ignite.internal.cli.core.flow.builder;
import java.io.PrintWriter;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
-import org.apache.ignite.cli.core.decorator.Decorator;
-import org.apache.ignite.cli.core.decorator.DecoratorRegistry;
-import org.apache.ignite.cli.core.decorator.TerminalOutput;
-import org.apache.ignite.cli.core.exception.ExceptionHandler;
-import org.apache.ignite.cli.core.exception.ExceptionHandlers;
-import org.apache.ignite.cli.core.exception.ExceptionWriter;
-import org.apache.ignite.cli.core.exception.handler.DefaultExceptionHandlers;
-import org.apache.ignite.cli.core.flow.Flow;
-import org.apache.ignite.cli.core.flow.FlowInterruptException;
-import org.apache.ignite.cli.core.flow.Flowable;
-import org.apache.ignite.cli.core.flow.question.QuestionAnswer;
-import org.apache.ignite.cli.core.flow.question.QuestionAskerFactory;
-import org.apache.ignite.cli.core.repl.context.CommandLineContextProvider;
-import org.apache.ignite.cli.decorators.DefaultDecoratorRegistry;
+import org.apache.ignite.internal.cli.core.decorator.Decorator;
+import org.apache.ignite.internal.cli.core.decorator.DecoratorRegistry;
+import org.apache.ignite.internal.cli.core.decorator.TerminalOutput;
+import org.apache.ignite.internal.cli.core.exception.ExceptionHandler;
+import org.apache.ignite.internal.cli.core.exception.ExceptionHandlers;
+import org.apache.ignite.internal.cli.core.exception.ExceptionWriter;
+import org.apache.ignite.internal.cli.core.exception.handler.DefaultExceptionHandlers;
+import org.apache.ignite.internal.cli.core.flow.Flow;
+import org.apache.ignite.internal.cli.core.flow.FlowInterruptException;
+import org.apache.ignite.internal.cli.core.flow.Flowable;
+import org.apache.ignite.internal.cli.core.flow.question.QuestionAnswer;
+import org.apache.ignite.internal.cli.core.flow.question.QuestionAskerFactory;
+import org.apache.ignite.internal.cli.core.repl.context.CommandLineContextProvider;
+import org.apache.ignite.internal.cli.decorators.DefaultDecoratorRegistry;
/**
* Implementation of {@link FlowBuilder}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/builder/Flows.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/builder/Flows.java
similarity index 86%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/flow/builder/Flows.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/builder/Flows.java
index 05fb2b32d3..0a1abfdbb6 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/builder/Flows.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/builder/Flows.java
@@ -15,22 +15,22 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.flow.builder;
+package org.apache.ignite.internal.cli.core.flow.builder;
import java.util.List;
import java.util.function.Function;
import java.util.function.Supplier;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.CallInput;
-import org.apache.ignite.cli.core.call.CallOutput;
-import org.apache.ignite.cli.core.flow.DefaultFlowable;
-import org.apache.ignite.cli.core.flow.Flow;
-import org.apache.ignite.cli.core.flow.Flowable;
-import org.apache.ignite.cli.core.flow.question.AcceptedQuestionAnswer;
-import org.apache.ignite.cli.core.flow.question.InterruptQuestionAnswer;
-import org.apache.ignite.cli.core.flow.question.QuestionAnswer;
-import org.apache.ignite.cli.core.flow.question.QuestionAskerFactory;
-import org.apache.ignite.cli.core.style.component.QuestionUiComponent;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.CallInput;
+import org.apache.ignite.internal.cli.core.call.CallOutput;
+import org.apache.ignite.internal.cli.core.flow.DefaultFlowable;
+import org.apache.ignite.internal.cli.core.flow.Flow;
+import org.apache.ignite.internal.cli.core.flow.Flowable;
+import org.apache.ignite.internal.cli.core.flow.question.AcceptedQuestionAnswer;
+import org.apache.ignite.internal.cli.core.flow.question.InterruptQuestionAnswer;
+import org.apache.ignite.internal.cli.core.flow.question.QuestionAnswer;
+import org.apache.ignite.internal.cli.core.flow.question.QuestionAskerFactory;
+import org.apache.ignite.internal.cli.core.style.component.QuestionUiComponent;
/**
* Helper class for operating and creating {@link Flow} and {@link FlowBuilder}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/question/AcceptedQuestionAnswer.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/question/AcceptedQuestionAnswer.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/flow/question/AcceptedQuestionAnswer.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/question/AcceptedQuestionAnswer.java
index 54b4409023..fabf6e402e 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/question/AcceptedQuestionAnswer.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/question/AcceptedQuestionAnswer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.flow.question;
+package org.apache.ignite.internal.cli.core.flow.question;
/**
* Accepted question answer implementation.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/question/InterruptQuestionAnswer.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/question/InterruptQuestionAnswer.java
similarity index 89%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/flow/question/InterruptQuestionAnswer.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/question/InterruptQuestionAnswer.java
index 05af75a052..00c2c8b948 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/question/InterruptQuestionAnswer.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/question/InterruptQuestionAnswer.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.flow.question;
+package org.apache.ignite.internal.cli.core.flow.question;
-import org.apache.ignite.cli.core.flow.Flowable;
+import org.apache.ignite.internal.cli.core.flow.Flowable;
/**
* Interrupt question answer.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/question/JlineQuestionWriterReader.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/question/JlineQuestionWriterReader.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/flow/question/JlineQuestionWriterReader.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/question/JlineQuestionWriterReader.java
index e7f6834f5d..911b1675be 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/question/JlineQuestionWriterReader.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/question/JlineQuestionWriterReader.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.flow.question;
+package org.apache.ignite.internal.cli.core.flow.question;
-import org.apache.ignite.cli.core.flow.FlowInterruptException;
+import org.apache.ignite.internal.cli.core.flow.FlowInterruptException;
import org.jline.reader.EndOfFileException;
import org.jline.reader.LineReader;
import org.jline.reader.MaskingCallback;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/question/QuestionAnswer.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/question/QuestionAnswer.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/flow/question/QuestionAnswer.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/question/QuestionAnswer.java
index 886e0faa27..7e3a3ec37b 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/question/QuestionAnswer.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/question/QuestionAnswer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.flow.question;
+package org.apache.ignite.internal.cli.core.flow.question;
import java.util.function.Predicate;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/question/QuestionAsker.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/question/QuestionAsker.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/flow/question/QuestionAsker.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/question/QuestionAsker.java
index 13c74bbce1..f77d0bb2d9 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/question/QuestionAsker.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/question/QuestionAsker.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.flow.question;
+package org.apache.ignite.internal.cli.core.flow.question;
import java.util.List;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/question/QuestionAskerFactory.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/question/QuestionAskerFactory.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/flow/question/QuestionAskerFactory.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/question/QuestionAskerFactory.java
index 9d3ee6cee9..bc3e59092a 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/question/QuestionAskerFactory.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/question/QuestionAskerFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.flow.question;
+package org.apache.ignite.internal.cli.core.flow.question;
/**
* Factory of {@link QuestionAsker}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/question/QuestionWriterReader.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/question/QuestionWriterReader.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/flow/question/QuestionWriterReader.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/question/QuestionWriterReader.java
index 6bd3c9acea..6ce79776db 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/flow/question/QuestionWriterReader.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/question/QuestionWriterReader.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.flow.question;
+package org.apache.ignite.internal.cli.core.flow.question;
/**
* Question writer and reader interface.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/Repl.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/Repl.java
similarity index 90%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/Repl.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/Repl.java
index 32bf3a8020..4f1f6bd973 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/Repl.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/Repl.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl;
+package org.apache.ignite.internal.cli.core.repl;
import java.util.Map;
-import org.apache.ignite.cli.core.CallExecutionPipelineProvider;
-import org.apache.ignite.cli.core.call.CallExecutionPipeline;
-import org.apache.ignite.cli.core.exception.ExceptionHandlers;
-import org.apache.ignite.cli.core.repl.executor.RegistryCommandExecutor;
-import org.apache.ignite.cli.core.repl.prompt.PromptProvider;
-import org.apache.ignite.cli.core.repl.terminal.TerminalCustomizer;
+import org.apache.ignite.internal.cli.core.CallExecutionPipelineProvider;
+import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
+import org.apache.ignite.internal.cli.core.exception.ExceptionHandlers;
+import org.apache.ignite.internal.cli.core.repl.executor.RegistryCommandExecutor;
+import org.apache.ignite.internal.cli.core.repl.prompt.PromptProvider;
+import org.apache.ignite.internal.cli.core.repl.terminal.TerminalCustomizer;
import org.jline.reader.Completer;
import org.jline.terminal.Terminal;
import picocli.CommandLine.IDefaultValueProvider;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/ReplBuilder.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/ReplBuilder.java
similarity index 93%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/ReplBuilder.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/ReplBuilder.java
index 449f1409a8..467a22a32f 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/ReplBuilder.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/ReplBuilder.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl;
+package org.apache.ignite.internal.cli.core.repl;
import java.util.HashMap;
import java.util.Map;
-import org.apache.ignite.cli.core.CallExecutionPipelineProvider;
-import org.apache.ignite.cli.core.repl.prompt.PromptProvider;
-import org.apache.ignite.cli.core.repl.terminal.TerminalCustomizer;
+import org.apache.ignite.internal.cli.core.CallExecutionPipelineProvider;
+import org.apache.ignite.internal.cli.core.repl.prompt.PromptProvider;
+import org.apache.ignite.internal.cli.core.repl.terminal.TerminalCustomizer;
import org.jline.reader.Completer;
import picocli.CommandLine.IDefaultValueProvider;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/Session.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/Session.java
similarity index 97%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/Session.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/Session.java
index e91b6613c1..66b5cfb1c5 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/Session.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/Session.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl;
+package org.apache.ignite.internal.cli.core.repl;
import jakarta.inject.Singleton;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/SessionDefaultValueProvider.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/SessionDefaultValueProvider.java
similarity index 91%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/SessionDefaultValueProvider.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/SessionDefaultValueProvider.java
index ea8f025830..9c179db2d3 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/SessionDefaultValueProvider.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/SessionDefaultValueProvider.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl;
+package org.apache.ignite.internal.cli.core.repl;
import jakarta.inject.Singleton;
import java.util.Objects;
-import org.apache.ignite.cli.config.ConfigConstants;
-import org.apache.ignite.cli.config.ConfigDefaultValueProvider;
+import org.apache.ignite.internal.cli.config.ConfigConstants;
+import org.apache.ignite.internal.cli.config.ConfigDefaultValueProvider;
import picocli.CommandLine.IDefaultValueProvider;
import picocli.CommandLine.Model.ArgSpec;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/CompleterFilter.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/CompleterFilter.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/CompleterFilter.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/CompleterFilter.java
index e6335ed394..6830f9712b 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/CompleterFilter.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/CompleterFilter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.completer;
+package org.apache.ignite.internal.cli.core.repl.completer;
/**
* Filters the result of completer.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/DynamicCompleter.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/DynamicCompleter.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/DynamicCompleter.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/DynamicCompleter.java
index ac5e19deac..933222f324 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/DynamicCompleter.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/DynamicCompleter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.completer;
+package org.apache.ignite.internal.cli.core.repl.completer;
import java.util.List;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/DynamicCompleterActivationPoint.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/DynamicCompleterActivationPoint.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/DynamicCompleterActivationPoint.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/DynamicCompleterActivationPoint.java
index cbff7b622a..19d85dc78b 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/DynamicCompleterActivationPoint.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/DynamicCompleterActivationPoint.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.completer;
+package org.apache.ignite.internal.cli.core.repl.completer;
import jakarta.inject.Singleton;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/DynamicCompleterFactory.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/DynamicCompleterFactory.java
similarity index 90%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/DynamicCompleterFactory.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/DynamicCompleterFactory.java
index 79b5e534e8..3ae5ef5c13 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/DynamicCompleterFactory.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/DynamicCompleterFactory.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.completer;
+package org.apache.ignite.internal.cli.core.repl.completer;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import io.micronaut.context.annotation.Bean;
import java.util.Set;
-import org.apache.ignite.cli.call.configuration.ClusterConfigShowCall;
-import org.apache.ignite.cli.call.configuration.ClusterConfigShowCallInput;
-import org.apache.ignite.cli.call.configuration.NodeConfigShowCall;
-import org.apache.ignite.cli.call.configuration.NodeConfigShowCallInput;
+import org.apache.ignite.internal.cli.call.configuration.ClusterConfigShowCall;
+import org.apache.ignite.internal.cli.call.configuration.ClusterConfigShowCallInput;
+import org.apache.ignite.internal.cli.call.configuration.NodeConfigShowCall;
+import org.apache.ignite.internal.cli.call.configuration.NodeConfigShowCallInput;
/**
* Factory that creates {@link DynamicCompleter}s.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/DynamicCompleterFilter.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/DynamicCompleterFilter.java
similarity index 87%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/DynamicCompleterFilter.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/DynamicCompleterFilter.java
index 30531f018c..ef345f98d1 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/DynamicCompleterFilter.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/DynamicCompleterFilter.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.completer;
+package org.apache.ignite.internal.cli.core.repl.completer;
-import static org.apache.ignite.cli.commands.OptionsConstants.CLUSTER_URL_OPTION;
-import static org.apache.ignite.cli.commands.OptionsConstants.NODE_URL_OPTION;
+import static org.apache.ignite.internal.cli.commands.OptionsConstants.CLUSTER_URL_OPTION;
+import static org.apache.ignite.internal.cli.commands.OptionsConstants.NODE_URL_OPTION;
import jakarta.inject.Singleton;
import java.util.Arrays;
-import org.apache.ignite.cli.core.repl.Session;
+import org.apache.ignite.internal.cli.core.repl.Session;
/**
* Filters completions according to the current session state.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/DynamicCompleterRegistry.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/DynamicCompleterRegistry.java
similarity index 97%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/DynamicCompleterRegistry.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/DynamicCompleterRegistry.java
index 677f169e49..182deb9ae8 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/DynamicCompleterRegistry.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/DynamicCompleterRegistry.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.completer;
+package org.apache.ignite.internal.cli.core.repl.completer;
import jakarta.inject.Singleton;
import java.util.ArrayList;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/HoconDynamicCompleter.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/HoconDynamicCompleter.java
similarity index 98%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/HoconDynamicCompleter.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/HoconDynamicCompleter.java
index 516f8e51bf..8c2fc20ca3 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/HoconDynamicCompleter.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/HoconDynamicCompleter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.completer;
+package org.apache.ignite.internal.cli.core.repl.completer;
import com.typesafe.config.Config;
import java.util.ArrayList;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/LazyDynamicCompleter.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/LazyDynamicCompleter.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/LazyDynamicCompleter.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/LazyDynamicCompleter.java
index 9ad68d4f7c..6b61cdcdaa 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/LazyDynamicCompleter.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/LazyDynamicCompleter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.completer;
+package org.apache.ignite.internal.cli.core.repl.completer;
import java.util.List;
import java.util.function.Supplier;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/NodeUrlProvider.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/NodeUrlProvider.java
similarity index 86%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/NodeUrlProvider.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/NodeUrlProvider.java
index b43244e642..89f407abec 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/completer/NodeUrlProvider.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/completer/NodeUrlProvider.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.completer;
+package org.apache.ignite.internal.cli.core.repl.completer;
import jakarta.inject.Singleton;
-import org.apache.ignite.cli.commands.OptionsConstants;
-import org.apache.ignite.cli.config.ConfigConstants;
-import org.apache.ignite.cli.config.ConfigManagerProvider;
-import org.apache.ignite.cli.core.repl.Session;
+import org.apache.ignite.internal.cli.commands.OptionsConstants;
+import org.apache.ignite.internal.cli.config.ConfigConstants;
+import org.apache.ignite.internal.cli.config.ConfigManagerProvider;
+import org.apache.ignite.internal.cli.core.repl.Session;
/**
* Url provider for completer.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/config/ClientConnectorConfig.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/config/ClientConnectorConfig.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/config/ClientConnectorConfig.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/config/ClientConnectorConfig.java
index a8198838be..2a8835d2f7 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/config/ClientConnectorConfig.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/config/ClientConnectorConfig.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.config;
+package org.apache.ignite.internal.cli.core.repl.config;
import org.apache.ignite.client.IgniteClientConfiguration;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/config/RootConfig.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/config/RootConfig.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/config/RootConfig.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/config/RootConfig.java
index bb770047ba..1369c91c27 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/config/RootConfig.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/config/RootConfig.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.config;
+package org.apache.ignite.internal.cli.core.repl.config;
/**
* DTO class for node configuration JSON.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/context/CommandLineContext.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/context/CommandLineContext.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/context/CommandLineContext.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/context/CommandLineContext.java
index bea7f4e29e..f371376e5b 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/context/CommandLineContext.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/context/CommandLineContext.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.context;
+package org.apache.ignite.internal.cli.core.repl.context;
import java.io.PrintWriter;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/context/CommandLineContextProvider.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/context/CommandLineContextProvider.java
similarity index 97%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/context/CommandLineContextProvider.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/context/CommandLineContextProvider.java
index 595189579d..cf62cb4e42 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/context/CommandLineContextProvider.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/context/CommandLineContextProvider.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.context;
+package org.apache.ignite.internal.cli.core.repl.context;
import java.io.PrintWriter;
import java.util.function.Consumer;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/executor/IgnitePicocliCommands.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/executor/IgnitePicocliCommands.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/executor/IgnitePicocliCommands.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/executor/IgnitePicocliCommands.java
index 98413625fa..21c7596995 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/executor/IgnitePicocliCommands.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/executor/IgnitePicocliCommands.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.executor;
+package org.apache.ignite.internal.cli.core.repl.executor;
import java.util.ArrayList;
import java.util.Arrays;
@@ -23,9 +23,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.ignite.cli.core.repl.completer.CompleterFilter;
-import org.apache.ignite.cli.core.repl.completer.DynamicCompleter;
-import org.apache.ignite.cli.core.repl.completer.DynamicCompleterRegistry;
+import org.apache.ignite.internal.cli.core.repl.completer.CompleterFilter;
+import org.apache.ignite.internal.cli.core.repl.completer.DynamicCompleter;
+import org.apache.ignite.internal.cli.core.repl.completer.DynamicCompleterRegistry;
import org.jline.builtins.Options.HelpException;
import org.jline.console.ArgDesc;
import org.jline.console.CmdDesc;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/executor/RegistryCommandExecutor.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/executor/RegistryCommandExecutor.java
similarity index 89%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/executor/RegistryCommandExecutor.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/executor/RegistryCommandExecutor.java
index d3199a8de3..7e8f342a5b 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/executor/RegistryCommandExecutor.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/executor/RegistryCommandExecutor.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.executor;
+package org.apache.ignite.internal.cli.core.repl.executor;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.CallOutput;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
-import org.apache.ignite.cli.core.call.StringCallInput;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.CallOutput;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.core.call.StringCallInput;
import org.jline.console.SystemRegistry;
import org.jline.reader.ParsedLine;
import org.jline.reader.Parser;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/executor/ReplExecutor.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/executor/ReplExecutor.java
similarity index 86%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/executor/ReplExecutor.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/executor/ReplExecutor.java
index 6d16790947..5e333de399 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/executor/ReplExecutor.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/executor/ReplExecutor.java
@@ -15,25 +15,25 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.executor;
+package org.apache.ignite.internal.cli.core.repl.executor;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Supplier;
-import org.apache.ignite.cli.config.StateFolderProvider;
-import org.apache.ignite.cli.core.exception.ExceptionHandlers;
-import org.apache.ignite.cli.core.exception.handler.PicocliExecutionExceptionHandler;
-import org.apache.ignite.cli.core.exception.handler.ReplExceptionHandlers;
-import org.apache.ignite.cli.core.flow.question.JlineQuestionWriterReader;
-import org.apache.ignite.cli.core.flow.question.QuestionAskerFactory;
-import org.apache.ignite.cli.core.repl.Repl;
-import org.apache.ignite.cli.core.repl.completer.DynamicCompleterActivationPoint;
-import org.apache.ignite.cli.core.repl.completer.DynamicCompleterFilter;
-import org.apache.ignite.cli.core.repl.completer.DynamicCompleterRegistry;
-import org.apache.ignite.cli.core.repl.context.CommandLineContextProvider;
-import org.apache.ignite.cli.core.repl.expander.NoopExpander;
+import org.apache.ignite.internal.cli.config.StateFolderProvider;
+import org.apache.ignite.internal.cli.core.exception.ExceptionHandlers;
+import org.apache.ignite.internal.cli.core.exception.handler.PicocliExecutionExceptionHandler;
+import org.apache.ignite.internal.cli.core.exception.handler.ReplExceptionHandlers;
+import org.apache.ignite.internal.cli.core.flow.question.JlineQuestionWriterReader;
+import org.apache.ignite.internal.cli.core.flow.question.QuestionAskerFactory;
+import org.apache.ignite.internal.cli.core.repl.Repl;
+import org.apache.ignite.internal.cli.core.repl.completer.DynamicCompleterActivationPoint;
+import org.apache.ignite.internal.cli.core.repl.completer.DynamicCompleterFilter;
+import org.apache.ignite.internal.cli.core.repl.completer.DynamicCompleterRegistry;
+import org.apache.ignite.internal.cli.core.repl.context.CommandLineContextProvider;
+import org.apache.ignite.internal.cli.core.repl.expander.NoopExpander;
import org.jline.console.impl.SystemRegistryImpl;
import org.jline.reader.Completer;
import org.jline.reader.LineReader;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/executor/ReplExecutorProvider.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/executor/ReplExecutorProvider.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/executor/ReplExecutorProvider.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/executor/ReplExecutorProvider.java
index 0244e111d4..34982e7e8b 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/executor/ReplExecutorProvider.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/executor/ReplExecutorProvider.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.executor;
+package org.apache.ignite.internal.cli.core.repl.executor;
import io.micronaut.configuration.picocli.MicronautFactory;
import jakarta.inject.Inject;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/expander/NoopExpander.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/expander/NoopExpander.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/expander/NoopExpander.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/expander/NoopExpander.java
index 115923c8ee..26e7b4a387 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/expander/NoopExpander.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/expander/NoopExpander.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.expander;
+package org.apache.ignite.internal.cli.core.repl.expander;
import org.jline.reader.Expander;
import org.jline.reader.History;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/prompt/PromptProvider.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/prompt/PromptProvider.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/prompt/PromptProvider.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/prompt/PromptProvider.java
index e8589264d4..5baa7c67a2 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/prompt/PromptProvider.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/prompt/PromptProvider.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.prompt;
+package org.apache.ignite.internal.cli.core.repl.prompt;
/**
* Interface for prompt provider.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/prompt/ReplPromptProvider.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/prompt/ReplPromptProvider.java
similarity index 80%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/prompt/ReplPromptProvider.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/prompt/ReplPromptProvider.java
index b55ea7ba65..b9c2a83a23 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/prompt/ReplPromptProvider.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/prompt/ReplPromptProvider.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.prompt;
+package org.apache.ignite.internal.cli.core.repl.prompt;
-import static org.apache.ignite.cli.core.style.AnsiStringSupport.ansi;
-import static org.apache.ignite.cli.core.style.AnsiStringSupport.fg;
+import static org.apache.ignite.internal.cli.core.style.AnsiStringSupport.ansi;
+import static org.apache.ignite.internal.cli.core.style.AnsiStringSupport.fg;
import jakarta.inject.Singleton;
-import org.apache.ignite.cli.core.repl.Session;
-import org.apache.ignite.cli.core.style.AnsiStringSupport.Color;
+import org.apache.ignite.internal.cli.core.repl.Session;
+import org.apache.ignite.internal.cli.core.style.AnsiStringSupport.Color;
/**
* Provider for prompt in REPL.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/terminal/TerminalCustomizer.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/terminal/TerminalCustomizer.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/terminal/TerminalCustomizer.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/terminal/TerminalCustomizer.java
index b330882508..2336573b6a 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/terminal/TerminalCustomizer.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/terminal/TerminalCustomizer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.terminal;
+package org.apache.ignite.internal.cli.core.repl.terminal;
import org.jline.terminal.Terminal;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/terminal/TerminalFactory.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/terminal/TerminalFactory.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/repl/terminal/TerminalFactory.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/terminal/TerminalFactory.java
index 8795e0913d..550b4d8091 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/repl/terminal/TerminalFactory.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/terminal/TerminalFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.terminal;
+package org.apache.ignite.internal.cli.core.repl.terminal;
import io.micronaut.context.annotation.Bean;
import io.micronaut.context.annotation.Factory;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/style/AnsiStringSupport.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/AnsiStringSupport.java
similarity index 98%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/style/AnsiStringSupport.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/AnsiStringSupport.java
index a869ced622..0ce4ff8d35 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/style/AnsiStringSupport.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/AnsiStringSupport.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.style;
+package org.apache.ignite.internal.cli.core.style;
import picocli.CommandLine.Help.Ansi;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/style/component/ErrorUiComponent.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/component/ErrorUiComponent.java
similarity index 88%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/style/component/ErrorUiComponent.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/component/ErrorUiComponent.java
index 95cef44ead..1aaffc5a67 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/style/component/ErrorUiComponent.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/component/ErrorUiComponent.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.style.component;
+package org.apache.ignite.internal.cli.core.style.component;
-import static org.apache.ignite.cli.core.style.AnsiStringSupport.ansi;
-import static org.apache.ignite.cli.core.style.AnsiStringSupport.fg;
+import static org.apache.ignite.internal.cli.core.style.AnsiStringSupport.ansi;
+import static org.apache.ignite.internal.cli.core.style.AnsiStringSupport.fg;
import java.util.UUID;
-import org.apache.ignite.cli.core.style.AnsiStringSupport.Color;
-import org.apache.ignite.cli.core.style.AnsiStringSupport.Style;
-import org.apache.ignite.cli.core.style.element.UiElement;
-import org.apache.ignite.cli.core.style.element.UiString;
+import org.apache.ignite.internal.cli.core.style.AnsiStringSupport.Color;
+import org.apache.ignite.internal.cli.core.style.AnsiStringSupport.Style;
+import org.apache.ignite.internal.cli.core.style.element.UiElement;
+import org.apache.ignite.internal.cli.core.style.element.UiString;
/**
* UI component that represent any error message.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/style/component/MessageUiComponent.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/component/MessageUiComponent.java
similarity index 91%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/style/component/MessageUiComponent.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/component/MessageUiComponent.java
index 3200628336..0a1db392bc 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/style/component/MessageUiComponent.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/component/MessageUiComponent.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.style.component;
+package org.apache.ignite.internal.cli.core.style.component;
-import static org.apache.ignite.cli.core.style.AnsiStringSupport.ansi;
+import static org.apache.ignite.internal.cli.core.style.AnsiStringSupport.ansi;
-import org.apache.ignite.cli.core.style.element.UiElement;
-import org.apache.ignite.cli.core.style.element.UiString;
+import org.apache.ignite.internal.cli.core.style.element.UiElement;
+import org.apache.ignite.internal.cli.core.style.element.UiString;
/**
* UI component that represents a message.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/style/component/QuestionUiComponent.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/component/QuestionUiComponent.java
similarity index 88%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/style/component/QuestionUiComponent.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/component/QuestionUiComponent.java
index 38e4b5a4a8..0103e8283c 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/style/component/QuestionUiComponent.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/component/QuestionUiComponent.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.style.component;
+package org.apache.ignite.internal.cli.core.style.component;
-import static org.apache.ignite.cli.core.style.AnsiStringSupport.ansi;
+import static org.apache.ignite.internal.cli.core.style.AnsiStringSupport.ansi;
-import org.apache.ignite.cli.core.style.element.UiElement;
-import org.apache.ignite.cli.core.style.element.UiString;
+import org.apache.ignite.internal.cli.core.style.element.UiElement;
+import org.apache.ignite.internal.cli.core.style.element.UiString;
/**
* UI component that represents a question.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/style/component/UiComponent.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/component/UiComponent.java
similarity index 93%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/style/component/UiComponent.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/component/UiComponent.java
index e4d054b932..7cfe64373c 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/style/component/UiComponent.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/component/UiComponent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.style.component;
+package org.apache.ignite.internal.cli.core.style.component;
/**
* UI component that can render to ANSI String.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/style/element/MarkedUiElement.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/element/MarkedUiElement.java
similarity index 90%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/style/element/MarkedUiElement.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/element/MarkedUiElement.java
index 0e0072d6de..e35be711fc 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/style/element/MarkedUiElement.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/element/MarkedUiElement.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.style.element;
+package org.apache.ignite.internal.cli.core.style.element;
-import org.apache.ignite.cli.core.style.AnsiStringSupport.Marker;
+import org.apache.ignite.internal.cli.core.style.AnsiStringSupport.Marker;
/** IU element that is marked with provided ANSI marker. */
public class MarkedUiElement implements UiElement {
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/style/element/UiElement.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/element/UiElement.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/style/element/UiElement.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/element/UiElement.java
index 16083aa9e5..a9b1e8533b 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/style/element/UiElement.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/element/UiElement.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.style.element;
+package org.apache.ignite.internal.cli.core.style.element;
/** Can represent UI Element as an ANSI string. */
public interface UiElement {
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/style/element/UiElements.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/element/UiElements.java
similarity index 83%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/style/element/UiElements.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/element/UiElements.java
index 3080643c86..f869433bbb 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/style/element/UiElements.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/element/UiElements.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.style.element;
+package org.apache.ignite.internal.cli.core.style.element;
-import static org.apache.ignite.cli.core.style.AnsiStringSupport.fg;
+import static org.apache.ignite.internal.cli.core.style.AnsiStringSupport.fg;
-import org.apache.ignite.cli.core.style.AnsiStringSupport.Color;
-import org.apache.ignite.cli.core.style.AnsiStringSupport.Style;
+import org.apache.ignite.internal.cli.core.style.AnsiStringSupport.Color;
+import org.apache.ignite.internal.cli.core.style.AnsiStringSupport.Style;
/** Defines all UI Elements that are used in the CLI. */
public class UiElements {
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/core/style/element/UiString.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/element/UiString.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/core/style/element/UiString.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/element/UiString.java
index 4b383b88fc..47a4451214 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/core/style/element/UiString.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/style/element/UiString.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.style.element;
+package org.apache.ignite.internal.cli.core.style.element;
import java.util.Arrays;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/decorators/ClusterStatusDecorator.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/ClusterStatusDecorator.java
similarity index 75%
rename from modules/cli/src/main/java/org/apache/ignite/cli/decorators/ClusterStatusDecorator.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/ClusterStatusDecorator.java
index 5c1d84a6a1..3d0c064941 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/decorators/ClusterStatusDecorator.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/ClusterStatusDecorator.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.decorators;
+package org.apache.ignite.internal.cli.decorators;
-import static org.apache.ignite.cli.core.style.AnsiStringSupport.ansi;
-import static org.apache.ignite.cli.core.style.AnsiStringSupport.fg;
+import static org.apache.ignite.internal.cli.core.style.AnsiStringSupport.ansi;
+import static org.apache.ignite.internal.cli.core.style.AnsiStringSupport.fg;
-import org.apache.ignite.cli.call.cluster.status.ClusterStatus;
-import org.apache.ignite.cli.core.decorator.Decorator;
-import org.apache.ignite.cli.core.decorator.TerminalOutput;
-import org.apache.ignite.cli.core.style.AnsiStringSupport.Color;
+import org.apache.ignite.internal.cli.call.cluster.status.ClusterStatus;
+import org.apache.ignite.internal.cli.core.decorator.Decorator;
+import org.apache.ignite.internal.cli.core.decorator.TerminalOutput;
+import org.apache.ignite.internal.cli.core.style.AnsiStringSupport.Color;
/**
* Decorator for {@link ClusterStatus}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/decorators/DefaultDecorator.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/DefaultDecorator.java
similarity index 85%
rename from modules/cli/src/main/java/org/apache/ignite/cli/decorators/DefaultDecorator.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/DefaultDecorator.java
index cb3cf21b1d..a2309896e5 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/decorators/DefaultDecorator.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/DefaultDecorator.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.decorators;
+package org.apache.ignite.internal.cli.decorators;
-import org.apache.ignite.cli.core.decorator.Decorator;
-import org.apache.ignite.cli.core.decorator.TerminalOutput;
+import org.apache.ignite.internal.cli.core.decorator.Decorator;
+import org.apache.ignite.internal.cli.core.decorator.TerminalOutput;
/**
* Default decorator that calls toString method.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/decorators/DefaultDecoratorRegistry.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/DefaultDecoratorRegistry.java
similarity index 66%
rename from modules/cli/src/main/java/org/apache/ignite/cli/decorators/DefaultDecoratorRegistry.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/DefaultDecoratorRegistry.java
index 7025a75212..a1b444e193 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/decorators/DefaultDecoratorRegistry.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/DefaultDecoratorRegistry.java
@@ -15,19 +15,20 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.decorators;
+package org.apache.ignite.internal.cli.decorators;
-import org.apache.ignite.cli.call.cliconfig.profile.ProfileList;
-import org.apache.ignite.cli.call.cluster.status.ClusterStatus;
-import org.apache.ignite.cli.call.configuration.JsonString;
-import org.apache.ignite.cli.call.node.status.NodeStatus;
-import org.apache.ignite.cli.config.Profile;
-import org.apache.ignite.cli.core.decorator.DecoratorRegistry;
-import org.apache.ignite.cli.sql.SqlQueryResult;
-import org.apache.ignite.cli.sql.table.Table;
+import org.apache.ignite.internal.cli.call.cliconfig.profile.ProfileList;
+import org.apache.ignite.internal.cli.call.cluster.status.ClusterStatus;
+import org.apache.ignite.internal.cli.call.configuration.JsonString;
+import org.apache.ignite.internal.cli.call.node.status.NodeStatus;
+import org.apache.ignite.internal.cli.config.Profile;
+import org.apache.ignite.internal.cli.core.decorator.Decorator;
+import org.apache.ignite.internal.cli.core.decorator.DecoratorRegistry;
+import org.apache.ignite.internal.cli.sql.SqlQueryResult;
+import org.apache.ignite.internal.cli.sql.table.Table;
/**
- * Default set of {@link org.apache.ignite.cli.core.decorator.Decorator}.
+ * Default set of {@link Decorator}.
*/
public class DefaultDecoratorRegistry extends DecoratorRegistry {
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/decorators/JsonDecorator.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/JsonDecorator.java
similarity index 85%
rename from modules/cli/src/main/java/org/apache/ignite/cli/decorators/JsonDecorator.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/JsonDecorator.java
index d300f59270..e140836e56 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/decorators/JsonDecorator.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/JsonDecorator.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.decorators;
+package org.apache.ignite.internal.cli.decorators;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.ignite.cli.call.configuration.JsonString;
-import org.apache.ignite.cli.core.decorator.Decorator;
-import org.apache.ignite.cli.core.decorator.TerminalOutput;
+import org.apache.ignite.internal.cli.call.configuration.JsonString;
+import org.apache.ignite.internal.cli.core.decorator.Decorator;
+import org.apache.ignite.internal.cli.core.decorator.TerminalOutput;
/**
* Pretty json decorator.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/decorators/NodeStatusDecorator.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/NodeStatusDecorator.java
similarity index 69%
rename from modules/cli/src/main/java/org/apache/ignite/cli/decorators/NodeStatusDecorator.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/NodeStatusDecorator.java
index bffc33ef89..9354774c30 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/decorators/NodeStatusDecorator.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/NodeStatusDecorator.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.decorators;
+package org.apache.ignite.internal.cli.decorators;
-import static org.apache.ignite.cli.core.style.AnsiStringSupport.ansi;
-import static org.apache.ignite.cli.core.style.AnsiStringSupport.fg;
+import static org.apache.ignite.internal.cli.core.style.AnsiStringSupport.ansi;
+import static org.apache.ignite.internal.cli.core.style.AnsiStringSupport.fg;
-import org.apache.ignite.cli.call.node.status.NodeStatus;
-import org.apache.ignite.cli.call.node.status.State;
-import org.apache.ignite.cli.core.decorator.Decorator;
-import org.apache.ignite.cli.core.decorator.TerminalOutput;
-import org.apache.ignite.cli.core.style.AnsiStringSupport.Color;
+import org.apache.ignite.internal.cli.call.node.status.NodeStatus;
+import org.apache.ignite.internal.cli.call.node.status.State;
+import org.apache.ignite.internal.cli.core.decorator.Decorator;
+import org.apache.ignite.internal.cli.core.decorator.TerminalOutput;
+import org.apache.ignite.internal.cli.core.style.AnsiStringSupport.Color;
/**
* Decorator for {@link NodeStatus}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/decorators/ProfileDecorator.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/ProfileDecorator.java
similarity index 85%
rename from modules/cli/src/main/java/org/apache/ignite/cli/decorators/ProfileDecorator.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/ProfileDecorator.java
index 854cbb5f92..0331163027 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/decorators/ProfileDecorator.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/ProfileDecorator.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.decorators;
+package org.apache.ignite.internal.cli.decorators;
import java.util.stream.Collectors;
-import org.apache.ignite.cli.config.Profile;
-import org.apache.ignite.cli.core.decorator.Decorator;
-import org.apache.ignite.cli.core.decorator.TerminalOutput;
+import org.apache.ignite.internal.cli.config.Profile;
+import org.apache.ignite.internal.cli.core.decorator.Decorator;
+import org.apache.ignite.internal.cli.core.decorator.TerminalOutput;
/**
* Decorator for printing {@link Profile}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/decorators/ProfileListDecorator.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/ProfileListDecorator.java
similarity index 82%
rename from modules/cli/src/main/java/org/apache/ignite/cli/decorators/ProfileListDecorator.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/ProfileListDecorator.java
index 3df79f5124..f2a4782b08 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/decorators/ProfileListDecorator.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/ProfileListDecorator.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.decorators;
+package org.apache.ignite.internal.cli.decorators;
-import static org.apache.ignite.cli.core.style.AnsiStringSupport.Style;
-import static org.apache.ignite.cli.core.style.AnsiStringSupport.ansi;
+import static org.apache.ignite.internal.cli.core.style.AnsiStringSupport.Style;
+import static org.apache.ignite.internal.cli.core.style.AnsiStringSupport.ansi;
import java.util.stream.Collectors;
-import org.apache.ignite.cli.call.cliconfig.profile.ProfileList;
-import org.apache.ignite.cli.core.decorator.Decorator;
-import org.apache.ignite.cli.core.decorator.TerminalOutput;
+import org.apache.ignite.internal.cli.call.cliconfig.profile.ProfileList;
+import org.apache.ignite.internal.cli.core.decorator.Decorator;
+import org.apache.ignite.internal.cli.core.decorator.TerminalOutput;
/**
* Decorator for printing {@link ProfileList}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/decorators/SqlQueryResultDecorator.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/SqlQueryResultDecorator.java
similarity index 83%
rename from modules/cli/src/main/java/org/apache/ignite/cli/decorators/SqlQueryResultDecorator.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/SqlQueryResultDecorator.java
index 8b06cdd22c..1566dac9da 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/decorators/SqlQueryResultDecorator.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/SqlQueryResultDecorator.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.decorators;
+package org.apache.ignite.internal.cli.decorators;
-import org.apache.ignite.cli.core.decorator.Decorator;
-import org.apache.ignite.cli.core.decorator.TerminalOutput;
-import org.apache.ignite.cli.sql.SqlQueryResult;
+import org.apache.ignite.internal.cli.core.decorator.Decorator;
+import org.apache.ignite.internal.cli.core.decorator.TerminalOutput;
+import org.apache.ignite.internal.cli.sql.SqlQueryResult;
/**
* Composite decorator for {@link SqlQueryResult}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/decorators/TableDecorator.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/TableDecorator.java
similarity index 85%
rename from modules/cli/src/main/java/org/apache/ignite/cli/decorators/TableDecorator.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/TableDecorator.java
index 69c97402ff..33716a4310 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/decorators/TableDecorator.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/TableDecorator.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.decorators;
+package org.apache.ignite.internal.cli.decorators;
import com.jakewharton.fliptables.FlipTableConverters;
-import org.apache.ignite.cli.core.decorator.Decorator;
-import org.apache.ignite.cli.core.decorator.TerminalOutput;
-import org.apache.ignite.cli.sql.table.Table;
+import org.apache.ignite.internal.cli.core.decorator.Decorator;
+import org.apache.ignite.internal.cli.core.decorator.TerminalOutput;
+import org.apache.ignite.internal.cli.sql.table.Table;
/**
* Implementation of {@link Decorator} for {@link Table}.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/decorators/TopologyDecorator.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/TopologyDecorator.java
similarity index 91%
rename from modules/cli/src/main/java/org/apache/ignite/cli/decorators/TopologyDecorator.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/TopologyDecorator.java
index 8f471902b0..f94070d1fd 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/decorators/TopologyDecorator.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/TopologyDecorator.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.decorators;
+package org.apache.ignite.internal.cli.decorators;
import com.jakewharton.fliptables.FlipTable;
import java.util.List;
-import org.apache.ignite.cli.core.decorator.Decorator;
-import org.apache.ignite.cli.core.decorator.TerminalOutput;
+import org.apache.ignite.internal.cli.core.decorator.Decorator;
+import org.apache.ignite.internal.cli.core.decorator.TerminalOutput;
import org.apache.ignite.rest.client.model.ClusterNode;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/CliPathsConfigLoader.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/CliPathsConfigLoader.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/CliPathsConfigLoader.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/CliPathsConfigLoader.java
index 0528765617..755f569843 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/CliPathsConfigLoader.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/CliPathsConfigLoader.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated;
+package org.apache.ignite.internal.cli.deprecated;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
@@ -25,8 +25,8 @@ import java.io.InputStream;
import java.nio.file.Path;
import java.util.Optional;
import java.util.Properties;
-import org.apache.ignite.cli.CliVersionInfo;
-import org.apache.ignite.cli.deprecated.builtins.SystemPathResolver;
+import org.apache.ignite.internal.cli.CliVersionInfo;
+import org.apache.ignite.internal.cli.deprecated.builtins.SystemPathResolver;
/**
* Due to the nature of Ignite CLI tool it can be run in the environment without configuration file at all. This class created to simplify
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/CommandFactory.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/CommandFactory.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/CommandFactory.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/CommandFactory.java
index 9df5f1aef4..67d61b72b0 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/CommandFactory.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/CommandFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated;
+package org.apache.ignite.internal.cli.deprecated;
import io.micronaut.context.ApplicationContext;
import java.util.Optional;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/IgniteCliException.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/IgniteCliException.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/IgniteCliException.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/IgniteCliException.java
index bf0d45b576..26c682e931 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/IgniteCliException.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/IgniteCliException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated;
+package org.apache.ignite.internal.cli.deprecated;
/**
* Top level runtime exception for throwing the error message to user.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/IgnitePaths.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/IgnitePaths.java
similarity index 97%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/IgnitePaths.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/IgnitePaths.java
index 16e4957785..205fe5fef1 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/IgnitePaths.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/IgnitePaths.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated;
+package org.apache.ignite.internal.cli.deprecated;
import java.io.File;
import java.nio.file.Path;
-import org.apache.ignite.cli.deprecated.builtins.module.ModuleRegistry;
+import org.apache.ignite.internal.cli.deprecated.builtins.module.ModuleRegistry;
/**
* The main resolver of Ignite paths for the current installation (like bin, work and etc. dirs). Current Ignite distributive has the
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/Table.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/Table.java
similarity index 99%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/Table.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/Table.java
index 22e1859704..d8af5badc4 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/Table.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/Table.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated;
+package org.apache.ignite.internal.cli.deprecated;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/SystemPathResolver.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/SystemPathResolver.java
similarity index 92%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/SystemPathResolver.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/SystemPathResolver.java
index 9daa1c5103..5e088bb538 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/SystemPathResolver.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/SystemPathResolver.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated.builtins;
+package org.apache.ignite.internal.cli.deprecated.builtins;
import io.micronaut.core.annotation.Introspected;
import jakarta.inject.Singleton;
import java.io.File;
import java.net.URISyntaxException;
import java.nio.file.Path;
-import org.apache.ignite.cli.Main;
-import org.apache.ignite.cli.deprecated.IgniteCliException;
+import org.apache.ignite.internal.cli.Main;
+import org.apache.ignite.internal.cli.deprecated.IgniteCliException;
/**
* Interface for resolving different fs paths like home directory.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/init/InitIgniteCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/init/InitIgniteCommand.java
similarity index 92%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/init/InitIgniteCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/init/InitIgniteCommand.java
index e0b1a8832e..9d135cc29e 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/init/InitIgniteCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/init/InitIgniteCommand.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated.builtins.init;
+package org.apache.ignite.internal.cli.deprecated.builtins.init;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.ignite.cli.core.style.AnsiStringSupport.ansi;
+import static org.apache.ignite.internal.cli.core.style.AnsiStringSupport.ansi;
import jakarta.inject.Inject;
import java.io.File;
@@ -32,13 +32,13 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Optional;
import java.util.Properties;
-import org.apache.ignite.cli.core.style.component.MessageUiComponent;
-import org.apache.ignite.cli.core.style.element.UiElements;
-import org.apache.ignite.cli.deprecated.CliPathsConfigLoader;
-import org.apache.ignite.cli.deprecated.IgniteCliException;
-import org.apache.ignite.cli.deprecated.IgnitePaths;
-import org.apache.ignite.cli.deprecated.builtins.SystemPathResolver;
-import org.apache.ignite.cli.deprecated.builtins.module.ModuleManager;
+import org.apache.ignite.internal.cli.core.style.component.MessageUiComponent;
+import org.apache.ignite.internal.cli.core.style.element.UiElements;
+import org.apache.ignite.internal.cli.deprecated.CliPathsConfigLoader;
+import org.apache.ignite.internal.cli.deprecated.IgniteCliException;
+import org.apache.ignite.internal.cli.deprecated.IgnitePaths;
+import org.apache.ignite.internal.cli.deprecated.builtins.SystemPathResolver;
+import org.apache.ignite.internal.cli.deprecated.builtins.module.ModuleManager;
import org.jetbrains.annotations.NotNull;
import picocli.CommandLine.Help.ColorScheme;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/init/package-info.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/init/package-info.java
similarity index 92%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/init/package-info.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/init/package-info.java
index 74aae3975f..253e3afcfe 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/init/package-info.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/init/package-info.java
@@ -19,4 +19,4 @@
* Contains classes for Ignite init process.
*/
-package org.apache.ignite.cli.deprecated.builtins.init;
+package org.apache.ignite.internal.cli.deprecated.builtins.init;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/module/MavenArtifactResolver.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/module/MavenArtifactResolver.java
similarity index 97%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/module/MavenArtifactResolver.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/module/MavenArtifactResolver.java
index 9be65379f5..b41932300a 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/module/MavenArtifactResolver.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/module/MavenArtifactResolver.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated.builtins.module;
+package org.apache.ignite.internal.cli.deprecated.builtins.module;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
@@ -28,9 +28,9 @@ import java.nio.file.Path;
import java.text.ParseException;
import java.util.List;
import java.util.stream.Collectors;
-import org.apache.ignite.cli.deprecated.IgniteCliException;
-import org.apache.ignite.cli.deprecated.builtins.SystemPathResolver;
-import org.apache.ignite.cli.deprecated.ui.ProgressBar;
+import org.apache.ignite.internal.cli.deprecated.IgniteCliException;
+import org.apache.ignite.internal.cli.deprecated.builtins.SystemPathResolver;
+import org.apache.ignite.internal.cli.deprecated.ui.ProgressBar;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
import org.apache.ivy.Ivy;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/module/MavenCoordinates.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/module/MavenCoordinates.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/module/MavenCoordinates.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/module/MavenCoordinates.java
index fdef658f68..d3fd6cfc03 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/module/MavenCoordinates.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/module/MavenCoordinates.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated.builtins.module;
+package org.apache.ignite.internal.cli.deprecated.builtins.module;
-import org.apache.ignite.cli.deprecated.IgniteCliException;
+import org.apache.ignite.internal.cli.deprecated.IgniteCliException;
/**
* Simple wrapper of maven artifact coordinates groupid:artifactd:version.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/module/ModuleManager.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/module/ModuleManager.java
similarity index 97%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/module/ModuleManager.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/module/ModuleManager.java
index 7f4769502a..72f992f484 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/module/ModuleManager.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/module/ModuleManager.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated.builtins.module;
+package org.apache.ignite.internal.cli.deprecated.builtins.module;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigObject;
@@ -33,9 +33,9 @@ import java.util.List;
import java.util.Map;
import java.util.jar.JarInputStream;
import java.util.stream.Collectors;
-import org.apache.ignite.cli.CliVersionInfo;
-import org.apache.ignite.cli.deprecated.IgniteCliException;
-import org.apache.ignite.cli.deprecated.IgnitePaths;
+import org.apache.ignite.internal.cli.CliVersionInfo;
+import org.apache.ignite.internal.cli.deprecated.IgniteCliException;
+import org.apache.ignite.internal.cli.deprecated.IgnitePaths;
import picocli.CommandLine.Help.ColorScheme;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/module/ModuleRegistry.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/module/ModuleRegistry.java
similarity index 97%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/module/ModuleRegistry.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/module/ModuleRegistry.java
index cebc240d52..e2f46eed6b 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/module/ModuleRegistry.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/module/ModuleRegistry.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated.builtins.module;
+package org.apache.ignite.internal.cli.deprecated.builtins.module;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonGetter;
@@ -28,8 +28,8 @@ import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
-import org.apache.ignite.cli.deprecated.CliPathsConfigLoader;
-import org.apache.ignite.cli.deprecated.IgniteCliException;
+import org.apache.ignite.internal.cli.deprecated.CliPathsConfigLoader;
+import org.apache.ignite.internal.cli.deprecated.IgniteCliException;
import org.apache.ignite.internal.tostring.IgniteToStringInclude;
import org.apache.ignite.internal.tostring.S;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/module/ResolveResult.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/module/ResolveResult.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/module/ResolveResult.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/module/ResolveResult.java
index d34e2bbea7..d4b4001fb5 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/module/ResolveResult.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/module/ResolveResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated.builtins.module;
+package org.apache.ignite.internal.cli.deprecated.builtins.module;
import java.nio.file.Path;
import java.util.Collections;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/module/StandardModuleDefinition.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/module/StandardModuleDefinition.java
similarity index 97%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/module/StandardModuleDefinition.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/module/StandardModuleDefinition.java
index f13286a75f..302a344504 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/module/StandardModuleDefinition.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/module/StandardModuleDefinition.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated.builtins.module;
+package org.apache.ignite.internal.cli.deprecated.builtins.module;
import java.util.Collections;
import java.util.List;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/module/package-info.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/module/package-info.java
similarity index 92%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/module/package-info.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/module/package-info.java
index dc0e016aaa..868ef5decb 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/module/package-info.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/module/package-info.java
@@ -19,4 +19,4 @@
* Contains classes for Ignite module management.
*/
-package org.apache.ignite.cli.deprecated.builtins.module;
+package org.apache.ignite.internal.cli.deprecated.builtins.module;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/node/NodeManager.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/node/NodeManager.java
similarity index 98%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/node/NodeManager.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/node/NodeManager.java
index 41fe6215c1..af391000fd 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/node/NodeManager.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/node/NodeManager.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated.builtins.node;
+package org.apache.ignite.internal.cli.deprecated.builtins.node;
import static java.nio.charset.StandardCharsets.UTF_8;
@@ -35,9 +35,9 @@ import java.util.Optional;
import java.util.concurrent.locks.LockSupport;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.ignite.cli.deprecated.IgniteCliException;
-import org.apache.ignite.cli.deprecated.builtins.module.ModuleRegistry;
-import org.apache.ignite.cli.deprecated.ui.Spinner;
+import org.apache.ignite.internal.cli.deprecated.IgniteCliException;
+import org.apache.ignite.internal.cli.deprecated.builtins.module.ModuleRegistry;
+import org.apache.ignite.internal.cli.deprecated.ui.Spinner;
/**
* Manager of local Ignite nodes.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/node/package-info.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/node/package-info.java
similarity index 92%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/node/package-info.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/node/package-info.java
index 134fd27c34..ec12f55dc9 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/node/package-info.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/node/package-info.java
@@ -19,4 +19,4 @@
* Contains classes for Ignite node management.
*/
-package org.apache.ignite.cli.deprecated.builtins.node;
+package org.apache.ignite.internal.cli.deprecated.builtins.node;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/package-info.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/package-info.java
similarity index 93%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/package-info.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/package-info.java
index a6f91107e0..e15e17c1c1 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/builtins/package-info.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/builtins/package-info.java
@@ -19,4 +19,4 @@
* Contains classes and packages for builtin commands of Ignite CLI.
*/
-package org.apache.ignite.cli.deprecated.builtins;
+package org.apache.ignite.internal.cli.deprecated.builtins;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/package-info.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/package-info.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/package-info.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/package-info.java
index a6deed0f3b..0c8868c6ea 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/package-info.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/package-info.java
@@ -19,4 +19,4 @@
* Contains classes and packages for Ignite CLI tool.
*/
-package org.apache.ignite.cli.deprecated;
+package org.apache.ignite.internal.cli.deprecated;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/spec/BootstrapIgniteCommandSpec.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/spec/BootstrapIgniteCommandSpec.java
similarity index 85%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/spec/BootstrapIgniteCommandSpec.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/spec/BootstrapIgniteCommandSpec.java
index a99f8bb628..d13960705e 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/spec/BootstrapIgniteCommandSpec.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/spec/BootstrapIgniteCommandSpec.java
@@ -15,23 +15,20 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated.spec;
+package org.apache.ignite.internal.cli.deprecated.spec;
import jakarta.inject.Inject;
import java.net.URL;
import java.util.concurrent.Callable;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.common.IgniteCommand;
-import org.apache.ignite.cli.deprecated.builtins.init.InitIgniteCommand;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.deprecated.builtins.init.InitIgniteCommand;
import picocli.CommandLine;
/**
* Command for install Ignite distributive to start new nodes on the current machine.
- *
- * @see IgniteCommand
*/
@CommandLine.Command(name = "bootstrap", description = "Installs Ignite core modules locally.")
-public class BootstrapIgniteCommandSpec extends BaseCommand implements IgniteCommand, Callable<Integer> {
+public class BootstrapIgniteCommandSpec extends BaseCommand implements Callable<Integer> {
/** Init command implementation. */
@Inject
private InitIgniteCommand cmd;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/spec/NodeCommandSpec.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/spec/NodeCommandSpec.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/spec/NodeCommandSpec.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/spec/NodeCommandSpec.java
index 8752f7aade..eb2933953b 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/spec/NodeCommandSpec.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/spec/NodeCommandSpec.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated.spec;
+package org.apache.ignite.internal.cli.deprecated.spec;
-import static org.apache.ignite.cli.core.style.AnsiStringSupport.ansi;
+import static org.apache.ignite.internal.cli.core.style.AnsiStringSupport.ansi;
import com.jakewharton.fliptables.FlipTable;
import com.typesafe.config.Config;
@@ -33,13 +33,13 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
import java.util.stream.Collectors;
-import org.apache.ignite.cli.commands.BaseCommand;
-import org.apache.ignite.cli.core.converters.NetworkAddressConverter;
-import org.apache.ignite.cli.core.style.element.UiElements;
-import org.apache.ignite.cli.deprecated.CliPathsConfigLoader;
-import org.apache.ignite.cli.deprecated.IgniteCliException;
-import org.apache.ignite.cli.deprecated.IgnitePaths;
-import org.apache.ignite.cli.deprecated.builtins.node.NodeManager;
+import org.apache.ignite.internal.cli.commands.BaseCommand;
+import org.apache.ignite.internal.cli.core.converters.NetworkAddressConverter;
+import org.apache.ignite.internal.cli.core.style.element.UiElements;
+import org.apache.ignite.internal.cli.deprecated.CliPathsConfigLoader;
+import org.apache.ignite.internal.cli.deprecated.IgniteCliException;
+import org.apache.ignite.internal.cli.deprecated.IgnitePaths;
+import org.apache.ignite.internal.cli.deprecated.builtins.node.NodeManager;
import org.apache.ignite.network.NetworkAddress;
import picocli.CommandLine.ArgGroup;
import picocli.CommandLine.Command;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/spec/NodeEndpointOptions.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/spec/NodeEndpointOptions.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/spec/NodeEndpointOptions.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/spec/NodeEndpointOptions.java
index 1021a89dc2..5051f4f4b9 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/spec/NodeEndpointOptions.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/spec/NodeEndpointOptions.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated.spec;
+package org.apache.ignite.internal.cli.deprecated.spec;
-import org.apache.ignite.cli.deprecated.IgniteCliException;
+import org.apache.ignite.internal.cli.deprecated.IgniteCliException;
import picocli.CommandLine;
/**
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/spec/package-info.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/spec/package-info.java
similarity index 94%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/spec/package-info.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/spec/package-info.java
index 0a8afca13b..098a0e04b1 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/spec/package-info.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/spec/package-info.java
@@ -19,4 +19,4 @@
* Contains classes with specification of CLI commands and parameters.
*/
-package org.apache.ignite.cli.deprecated.spec;
+package org.apache.ignite.internal.cli.deprecated.spec;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/ui/ProgressBar.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/ui/ProgressBar.java
similarity index 98%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/ui/ProgressBar.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/ui/ProgressBar.java
index d09d1c6a92..dbe46c1b6f 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/ui/ProgressBar.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/ui/ProgressBar.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated.ui;
+package org.apache.ignite.internal.cli.deprecated.ui;
import java.io.PrintWriter;
import java.time.Duration;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/ui/Spinner.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/ui/Spinner.java
similarity index 97%
rename from modules/cli/src/main/java/org/apache/ignite/cli/deprecated/ui/Spinner.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/ui/Spinner.java
index 352e180207..1bd7763ff1 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/deprecated/ui/Spinner.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/deprecated/ui/Spinner.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated.ui;
+package org.apache.ignite.internal.cli.deprecated.ui;
import java.io.PrintWriter;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/sql/MetadataSupplier.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/MetadataSupplier.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/sql/MetadataSupplier.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/MetadataSupplier.java
index 45b80cda96..b2d242f34c 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/sql/MetadataSupplier.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/MetadataSupplier.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.sql;
+package org.apache.ignite.internal.cli.sql;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/sql/SchemaProvider.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/SchemaProvider.java
similarity index 95%
rename from modules/cli/src/main/java/org/apache/ignite/cli/sql/SchemaProvider.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/SchemaProvider.java
index 5407b6d17e..b2914b6808 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/sql/SchemaProvider.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/SchemaProvider.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.sql;
+package org.apache.ignite.internal.cli.sql;
/**
* Database schema provider.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/sql/SqlManager.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/SqlManager.java
similarity index 96%
rename from modules/cli/src/main/java/org/apache/ignite/cli/sql/SqlManager.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/SqlManager.java
index ebd3ff8536..2dbaad3c34 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/sql/SqlManager.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/SqlManager.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.sql;
+package org.apache.ignite.internal.cli.sql;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
@@ -23,7 +23,7 @@ import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import org.apache.ignite.cli.sql.table.Table;
+import org.apache.ignite.internal.cli.sql.table.Table;
/**
* Manager to work with any sql operation.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/sql/SqlQueryResult.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/SqlQueryResult.java
similarity index 86%
rename from modules/cli/src/main/java/org/apache/ignite/cli/sql/SqlQueryResult.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/SqlQueryResult.java
index 22411811b0..fd85e85605 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/sql/SqlQueryResult.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/SqlQueryResult.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.sql;
+package org.apache.ignite.internal.cli.sql;
-import org.apache.ignite.cli.core.decorator.Decorator;
-import org.apache.ignite.cli.core.decorator.TerminalOutput;
-import org.apache.ignite.cli.decorators.TableDecorator;
-import org.apache.ignite.cli.sql.table.Table;
+import org.apache.ignite.internal.cli.core.decorator.Decorator;
+import org.apache.ignite.internal.cli.core.decorator.TerminalOutput;
+import org.apache.ignite.internal.cli.decorators.TableDecorator;
+import org.apache.ignite.internal.cli.sql.table.Table;
/**
* Composite object of sql query result.
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/sql/SqlSchema.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/SqlSchema.java
similarity index 98%
rename from modules/cli/src/main/java/org/apache/ignite/cli/sql/SqlSchema.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/SqlSchema.java
index d5cec3e340..96aa5c9de1 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/sql/SqlSchema.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/SqlSchema.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.sql;
+package org.apache.ignite.internal.cli.sql;
import java.util.Collections;
import java.util.Map;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/sql/SqlSchemaLoader.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/SqlSchemaLoader.java
similarity index 98%
rename from modules/cli/src/main/java/org/apache/ignite/cli/sql/SqlSchemaLoader.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/SqlSchemaLoader.java
index f7f49a9f18..e187e178b0 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/sql/SqlSchemaLoader.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/SqlSchemaLoader.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.sql;
+package org.apache.ignite.internal.cli.sql;
import java.sql.ResultSet;
import java.sql.SQLException;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/sql/SqlSchemaProvider.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/SqlSchemaProvider.java
similarity index 97%
rename from modules/cli/src/main/java/org/apache/ignite/cli/sql/SqlSchemaProvider.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/SqlSchemaProvider.java
index 79d59055bc..85906f7f7a 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/sql/SqlSchemaProvider.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/SqlSchemaProvider.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.sql;
+package org.apache.ignite.internal.cli.sql;
import java.time.Duration;
import java.time.Instant;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/sql/table/Table.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/table/Table.java
similarity index 98%
rename from modules/cli/src/main/java/org/apache/ignite/cli/sql/table/Table.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/table/Table.java
index a084c5c660..61b9ce9be1 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/sql/table/Table.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/table/Table.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.sql.table;
+package org.apache.ignite.internal.cli.sql.table;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
diff --git a/modules/cli/src/main/java/org/apache/ignite/cli/sql/table/TableRow.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/table/TableRow.java
similarity index 97%
rename from modules/cli/src/main/java/org/apache/ignite/cli/sql/table/TableRow.java
rename to modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/table/TableRow.java
index 37fec14cc7..3a4e73a356 100644
--- a/modules/cli/src/main/java/org/apache/ignite/cli/sql/table/TableRow.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/sql/table/TableRow.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.sql.table;
+package org.apache.ignite.internal.cli.sql.table;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/call/node/status/NodeStatusCallTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/call/node/status/NodeStatusCallTest.java
similarity index 94%
rename from modules/cli/src/test/java/org/apache/ignite/cli/call/node/status/NodeStatusCallTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/call/node/status/NodeStatusCallTest.java
index 6de041f861..782799dd92 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/call/node/status/NodeStatusCallTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/call/node/status/NodeStatusCallTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.call.node.status;
+package org.apache.ignite.internal.cli.call.node.status;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalToIgnoringCase;
@@ -27,8 +27,8 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.util.Arrays;
import java.util.stream.Stream;
-import org.apache.ignite.cli.core.call.CallOutput;
-import org.apache.ignite.cli.core.call.UrlCallInput;
+import org.apache.ignite.internal.cli.core.call.CallOutput;
+import org.apache.ignite.internal.cli.core.call.UrlCallInput;
import org.apache.ignite.rest.client.model.NodeState;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/CliCommandTestBase.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/CliCommandTestBase.java
similarity index 98%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/CliCommandTestBase.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/CliCommandTestBase.java
index 75dbdf46db..a8873dc8bc 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/CliCommandTestBase.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/CliCommandTestBase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands;
+package org.apache.ignite.internal.cli.commands;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/PicocliBugTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/PicocliBugTest.java
similarity index 98%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/PicocliBugTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/PicocliBugTest.java
index 80ade2d379..cee5a94edb 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/PicocliBugTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/PicocliBugTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands;
+package org.apache.ignite.internal.cli.commands;
import io.micronaut.configuration.picocli.MicronautFactory;
import io.micronaut.context.ApplicationContext;
@@ -85,4 +85,4 @@ class PicocliBugTest {
spec.commandLine().getOut().flush();
}
}
-}
\ No newline at end of file
+}
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/ProfileMixinTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/ProfileMixinTest.java
similarity index 87%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/ProfileMixinTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/ProfileMixinTest.java
index 3701a9b26b..362ab48392 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/ProfileMixinTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/ProfileMixinTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands;
+package org.apache.ignite.internal.cli.commands;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.params.provider.Arguments.arguments;
@@ -30,23 +30,23 @@ import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
import jakarta.inject.Inject;
import java.util.function.Function;
import java.util.stream.Stream;
-import org.apache.ignite.cli.call.cluster.ClusterInitCall;
-import org.apache.ignite.cli.call.cluster.ClusterInitCallInput;
-import org.apache.ignite.cli.call.cluster.topology.LogicalTopologyCall;
-import org.apache.ignite.cli.call.cluster.topology.PhysicalTopologyCall;
-import org.apache.ignite.cli.call.configuration.ClusterConfigShowCall;
-import org.apache.ignite.cli.call.configuration.ClusterConfigShowCallInput;
-import org.apache.ignite.cli.call.configuration.ClusterConfigUpdateCall;
-import org.apache.ignite.cli.call.configuration.ClusterConfigUpdateCallInput;
-import org.apache.ignite.cli.call.configuration.NodeConfigShowCall;
-import org.apache.ignite.cli.call.configuration.NodeConfigShowCallInput;
-import org.apache.ignite.cli.call.configuration.NodeConfigUpdateCall;
-import org.apache.ignite.cli.call.configuration.NodeConfigUpdateCallInput;
-import org.apache.ignite.cli.call.node.status.NodeStatusCall;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.CallInput;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
-import org.apache.ignite.cli.core.call.UrlCallInput;
+import org.apache.ignite.internal.cli.call.cluster.ClusterInitCall;
+import org.apache.ignite.internal.cli.call.cluster.ClusterInitCallInput;
+import org.apache.ignite.internal.cli.call.cluster.topology.LogicalTopologyCall;
+import org.apache.ignite.internal.cli.call.cluster.topology.PhysicalTopologyCall;
+import org.apache.ignite.internal.cli.call.configuration.ClusterConfigShowCall;
+import org.apache.ignite.internal.cli.call.configuration.ClusterConfigShowCallInput;
+import org.apache.ignite.internal.cli.call.configuration.ClusterConfigUpdateCall;
+import org.apache.ignite.internal.cli.call.configuration.ClusterConfigUpdateCallInput;
+import org.apache.ignite.internal.cli.call.configuration.NodeConfigShowCall;
+import org.apache.ignite.internal.cli.call.configuration.NodeConfigShowCallInput;
+import org.apache.ignite.internal.cli.call.configuration.NodeConfigUpdateCall;
+import org.apache.ignite.internal.cli.call.configuration.NodeConfigUpdateCallInput;
+import org.apache.ignite.internal.cli.call.node.status.NodeStatusCall;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.CallInput;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.core.call.UrlCallInput;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/UrlOptionsNegativeTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/UrlOptionsNegativeTest.java
similarity index 85%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/UrlOptionsNegativeTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/UrlOptionsNegativeTest.java
index 2793855cd5..215687b84a 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/UrlOptionsNegativeTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/UrlOptionsNegativeTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands;
+package org.apache.ignite.internal.cli.commands;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertAll;
@@ -29,29 +29,29 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.List;
-import org.apache.ignite.cli.commands.cliconfig.TestConfigManagerHelper;
-import org.apache.ignite.cli.commands.cliconfig.TestConfigManagerProvider;
-import org.apache.ignite.cli.commands.cluster.config.ClusterConfigShowCommand;
-import org.apache.ignite.cli.commands.cluster.config.ClusterConfigShowReplCommand;
-import org.apache.ignite.cli.commands.cluster.config.ClusterConfigUpdateCommand;
-import org.apache.ignite.cli.commands.cluster.config.ClusterConfigUpdateReplCommand;
-import org.apache.ignite.cli.commands.cluster.init.ClusterInitCommand;
-import org.apache.ignite.cli.commands.cluster.init.ClusterInitReplCommand;
-import org.apache.ignite.cli.commands.cluster.status.ClusterStatusCommand;
-import org.apache.ignite.cli.commands.cluster.status.ClusterStatusReplCommand;
-import org.apache.ignite.cli.commands.connect.ConnectCommand;
-import org.apache.ignite.cli.commands.node.config.NodeConfigShowCommand;
-import org.apache.ignite.cli.commands.node.config.NodeConfigShowReplCommand;
-import org.apache.ignite.cli.commands.node.config.NodeConfigUpdateCommand;
-import org.apache.ignite.cli.commands.node.config.NodeConfigUpdateReplCommand;
-import org.apache.ignite.cli.commands.node.status.NodeStatusCommand;
-import org.apache.ignite.cli.commands.node.status.NodeStatusReplCommand;
-import org.apache.ignite.cli.commands.topology.LogicalTopologyCommand;
-import org.apache.ignite.cli.commands.topology.LogicalTopologyReplCommand;
-import org.apache.ignite.cli.commands.topology.PhysicalTopologyCommand;
-import org.apache.ignite.cli.commands.topology.PhysicalTopologyReplCommand;
-import org.apache.ignite.cli.config.ini.IniConfigManager;
-import org.apache.ignite.cli.core.repl.context.CommandLineContextProvider;
+import org.apache.ignite.internal.cli.commands.cliconfig.TestConfigManagerHelper;
+import org.apache.ignite.internal.cli.commands.cliconfig.TestConfigManagerProvider;
+import org.apache.ignite.internal.cli.commands.cluster.config.ClusterConfigShowCommand;
+import org.apache.ignite.internal.cli.commands.cluster.config.ClusterConfigShowReplCommand;
+import org.apache.ignite.internal.cli.commands.cluster.config.ClusterConfigUpdateCommand;
+import org.apache.ignite.internal.cli.commands.cluster.config.ClusterConfigUpdateReplCommand;
+import org.apache.ignite.internal.cli.commands.cluster.init.ClusterInitCommand;
+import org.apache.ignite.internal.cli.commands.cluster.init.ClusterInitReplCommand;
+import org.apache.ignite.internal.cli.commands.cluster.status.ClusterStatusCommand;
+import org.apache.ignite.internal.cli.commands.cluster.status.ClusterStatusReplCommand;
+import org.apache.ignite.internal.cli.commands.connect.ConnectCommand;
+import org.apache.ignite.internal.cli.commands.node.config.NodeConfigShowCommand;
+import org.apache.ignite.internal.cli.commands.node.config.NodeConfigShowReplCommand;
+import org.apache.ignite.internal.cli.commands.node.config.NodeConfigUpdateCommand;
+import org.apache.ignite.internal.cli.commands.node.config.NodeConfigUpdateReplCommand;
+import org.apache.ignite.internal.cli.commands.node.status.NodeStatusCommand;
+import org.apache.ignite.internal.cli.commands.node.status.NodeStatusReplCommand;
+import org.apache.ignite.internal.cli.commands.topology.LogicalTopologyCommand;
+import org.apache.ignite.internal.cli.commands.topology.LogicalTopologyReplCommand;
+import org.apache.ignite.internal.cli.commands.topology.PhysicalTopologyCommand;
+import org.apache.ignite.internal.cli.commands.topology.PhysicalTopologyReplCommand;
+import org.apache.ignite.internal.cli.config.ini.IniConfigManager;
+import org.apache.ignite.internal.cli.core.repl.context.CommandLineContextProvider;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigCommandTestBase.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigCommandTestBase.java
similarity index 86%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigCommandTestBase.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigCommandTestBase.java
index 3c7b224561..9a6f9b4c89 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigCommandTestBase.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigCommandTestBase.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig;
+package org.apache.ignite.internal.cli.commands.cliconfig;
import jakarta.inject.Inject;
-import org.apache.ignite.cli.commands.CliCommandTestBase;
-import org.apache.ignite.cli.config.ini.IniConfigManager;
+import org.apache.ignite.internal.cli.commands.CliCommandTestBase;
+import org.apache.ignite.internal.cli.config.ini.IniConfigManager;
import org.junit.jupiter.api.BeforeEach;
/**
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigGetCommandTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigGetCommandTest.java
similarity index 98%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigGetCommandTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigGetCommandTest.java
index bd674d5ba9..2625537b3c 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigGetCommandTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigGetCommandTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig;
+package org.apache.ignite.internal.cli.commands.cliconfig;
import static org.junit.jupiter.api.Assertions.assertAll;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigProfileActivateCommandTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigProfileActivateCommandTest.java
similarity index 92%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigProfileActivateCommandTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigProfileActivateCommandTest.java
index 0f70eb61ef..ae3d432ee0 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigProfileActivateCommandTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigProfileActivateCommandTest.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig;
+package org.apache.ignite.internal.cli.commands.cliconfig;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertAll;
-import org.apache.ignite.cli.commands.cliconfig.profile.CliConfigProfileActivateCommand;
+import org.apache.ignite.internal.cli.commands.cliconfig.profile.CliConfigProfileActivateCommand;
import org.junit.jupiter.api.Test;
class CliConfigProfileActivateCommandTest extends CliConfigCommandTestBase {
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigProfileCreateCommandTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigProfileCreateCommandTest.java
similarity index 94%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigProfileCreateCommandTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigProfileCreateCommandTest.java
index a1c4b184f3..c42426115a 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigProfileCreateCommandTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigProfileCreateCommandTest.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig;
+package org.apache.ignite.internal.cli.commands.cliconfig;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.jupiter.api.Assertions.assertAll;
-import org.apache.ignite.cli.commands.cliconfig.profile.CliConfigProfileCreateCommand;
-import org.apache.ignite.cli.config.ProfileNotFoundException;
+import org.apache.ignite.internal.cli.commands.cliconfig.profile.CliConfigProfileCreateCommand;
+import org.apache.ignite.internal.cli.config.ProfileNotFoundException;
import org.junit.jupiter.api.Test;
class CliConfigProfileCreateCommandTest extends CliConfigCommandTestBase {
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigProfileListCommandTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigProfileListCommandTest.java
similarity index 90%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigProfileListCommandTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigProfileListCommandTest.java
index 01e6e19504..2ae6a624b6 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigProfileListCommandTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigProfileListCommandTest.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig;
+package org.apache.ignite.internal.cli.commands.cliconfig;
import static org.junit.jupiter.api.Assertions.assertAll;
-import org.apache.ignite.cli.commands.cliconfig.profile.CliConfigProfileListCommand;
-import org.apache.ignite.cli.config.ini.IniConfigManager;
+import org.apache.ignite.internal.cli.commands.cliconfig.profile.CliConfigProfileListCommand;
+import org.apache.ignite.internal.cli.config.ini.IniConfigManager;
import org.junit.jupiter.api.Test;
class CliConfigProfileListCommandTest extends CliConfigCommandTestBase {
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigProfileShowCommandTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigProfileShowCommandTest.java
similarity index 88%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigProfileShowCommandTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigProfileShowCommandTest.java
index 2ed751fd1d..dcaaa7fdd4 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigProfileShowCommandTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigProfileShowCommandTest.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig;
+package org.apache.ignite.internal.cli.commands.cliconfig;
import static org.junit.jupiter.api.Assertions.assertAll;
-import org.apache.ignite.cli.commands.cliconfig.profile.CliConfigProfileShowCommand;
-import org.apache.ignite.cli.config.ini.IniConfigManager;
+import org.apache.ignite.internal.cli.commands.cliconfig.profile.CliConfigProfileShowCommand;
+import org.apache.ignite.internal.cli.config.ini.IniConfigManager;
import org.junit.jupiter.api.Test;
class CliConfigProfileShowCommandTest extends CliConfigCommandTestBase {
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigSetCommandTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigSetCommandTest.java
similarity index 96%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigSetCommandTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigSetCommandTest.java
index e3faf9361e..aac53fac00 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigSetCommandTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigSetCommandTest.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig;
+package org.apache.ignite.internal.cli.commands.cliconfig;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertAll;
-import org.apache.ignite.cli.config.ConfigConstants;
-import org.apache.ignite.cli.config.ConfigManager;
+import org.apache.ignite.internal.cli.config.ConfigConstants;
+import org.apache.ignite.internal.cli.config.ConfigManager;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigShowCommandTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigShowCommandTest.java
similarity index 97%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigShowCommandTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigShowCommandTest.java
index d36b993f43..29dfadeb48 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/CliConfigShowCommandTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/CliConfigShowCommandTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig;
+package org.apache.ignite.internal.cli.commands.cliconfig;
import static org.junit.jupiter.api.Assertions.assertAll;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/ConfigManagerTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/ConfigManagerTest.java
similarity index 95%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/ConfigManagerTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/ConfigManagerTest.java
index 152a05ead9..a3fae86612 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/ConfigManagerTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/ConfigManagerTest.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig;
+package org.apache.ignite.internal.cli.commands.cliconfig;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.File;
-import org.apache.ignite.cli.config.ini.IniConfigManager;
+import org.apache.ignite.internal.cli.config.ini.IniConfigManager;
import org.junit.jupiter.api.Test;
class ConfigManagerTest {
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/TestConfigManagerHelper.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/TestConfigManagerHelper.java
similarity index 96%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/TestConfigManagerHelper.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/TestConfigManagerHelper.java
index f7dbfd877b..ef019c3eff 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/TestConfigManagerHelper.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/TestConfigManagerHelper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig;
+package org.apache.ignite.internal.cli.commands.cliconfig;
import java.io.File;
import java.io.FileOutputStream;
@@ -24,7 +24,7 @@ import java.io.InputStream;
import java.nio.channels.Channels;
import java.nio.channels.FileChannel;
import java.nio.channels.ReadableByteChannel;
-import org.apache.ignite.cli.config.ConfigManager;
+import org.apache.ignite.internal.cli.config.ConfigManager;
/**
* Test factory for {@link ConfigManager}.
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/TestConfigManagerProvider.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/TestConfigManagerProvider.java
similarity index 83%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/TestConfigManagerProvider.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/TestConfigManagerProvider.java
index 9e977e11da..9e78b1b134 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/cliconfig/TestConfigManagerProvider.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/cliconfig/TestConfigManagerProvider.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.cliconfig;
+package org.apache.ignite.internal.cli.commands.cliconfig;
import io.micronaut.context.annotation.Replaces;
import jakarta.inject.Singleton;
-import org.apache.ignite.cli.config.ConfigManager;
-import org.apache.ignite.cli.config.ConfigManagerProvider;
-import org.apache.ignite.cli.config.ini.IniConfigManager;
+import org.apache.ignite.internal.cli.config.ConfigManager;
+import org.apache.ignite.internal.cli.config.ConfigManagerProvider;
+import org.apache.ignite.internal.cli.config.ini.IniConfigManager;
/**
* Test implementation of {@link ConfigManagerProvider}.
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/flow/FlowTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/flow/FlowTest.java
similarity index 94%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/flow/FlowTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/flow/FlowTest.java
index f946fb4343..ec554ad770 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/flow/FlowTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/flow/FlowTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.flow;
+package org.apache.ignite.internal.cli.commands.flow;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.emptyString;
@@ -29,14 +29,14 @@ import java.io.StringWriter;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
-import org.apache.ignite.cli.core.flow.Flow;
-import org.apache.ignite.cli.core.flow.Flowable;
-import org.apache.ignite.cli.core.flow.builder.FlowBuilder;
-import org.apache.ignite.cli.core.flow.builder.Flows;
-import org.apache.ignite.cli.core.flow.question.JlineQuestionWriterReader;
-import org.apache.ignite.cli.core.flow.question.QuestionAnswer;
-import org.apache.ignite.cli.core.flow.question.QuestionAskerFactory;
-import org.apache.ignite.cli.core.repl.context.CommandLineContextProvider;
+import org.apache.ignite.internal.cli.core.flow.Flow;
+import org.apache.ignite.internal.cli.core.flow.Flowable;
+import org.apache.ignite.internal.cli.core.flow.builder.FlowBuilder;
+import org.apache.ignite.internal.cli.core.flow.builder.Flows;
+import org.apache.ignite.internal.cli.core.flow.question.JlineQuestionWriterReader;
+import org.apache.ignite.internal.cli.core.flow.question.QuestionAnswer;
+import org.apache.ignite.internal.cli.core.flow.question.QuestionAskerFactory;
+import org.apache.ignite.internal.cli.core.repl.context.CommandLineContextProvider;
import org.jline.reader.impl.LineReaderImpl;
import org.jline.terminal.Terminal;
import org.jline.terminal.impl.DumbTerminal;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/flow/IntCall.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/flow/IntCall.java
similarity index 81%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/flow/IntCall.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/flow/IntCall.java
index af229a6f75..a559b2df85 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/flow/IntCall.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/flow/IntCall.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.flow;
+package org.apache.ignite.internal.cli.commands.flow;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.CallOutput;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.CallOutput;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
class IntCall implements Call<IntCallInput, String> {
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/flow/IntCallInput.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/flow/IntCallInput.java
similarity index 89%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/flow/IntCallInput.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/flow/IntCallInput.java
index 15dacc1b19..64e8ff2d11 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/flow/IntCallInput.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/flow/IntCallInput.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.flow;
+package org.apache.ignite.internal.cli.commands.flow;
-import org.apache.ignite.cli.core.call.CallInput;
+import org.apache.ignite.internal.cli.core.call.CallInput;
class IntCallInput implements CallInput {
final int value;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/flow/StrCall.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/flow/StrCall.java
similarity index 81%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/flow/StrCall.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/flow/StrCall.java
index 9f99410813..4acbe2fb21 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/flow/StrCall.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/flow/StrCall.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.flow;
+package org.apache.ignite.internal.cli.commands.flow;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.CallOutput;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.CallOutput;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
class StrCall implements Call<StrCallInput, String> {
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/flow/StrCallInput.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/flow/StrCallInput.java
similarity index 89%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/flow/StrCallInput.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/flow/StrCallInput.java
index e77d1fdac5..d0be1dab78 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/flow/StrCallInput.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/flow/StrCallInput.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.flow;
+package org.apache.ignite.internal.cli.commands.flow;
-import org.apache.ignite.cli.core.call.CallInput;
+import org.apache.ignite.internal.cli.core.call.CallInput;
class StrCallInput implements CallInput {
final String value;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/flow/TestExceptionHandler.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/flow/TestExceptionHandler.java
similarity index 85%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/flow/TestExceptionHandler.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/flow/TestExceptionHandler.java
index 0c2abf68c1..58aedd58d7 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/flow/TestExceptionHandler.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/flow/TestExceptionHandler.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.flow;
+package org.apache.ignite.internal.cli.commands.flow;
-import org.apache.ignite.cli.core.exception.ExceptionHandler;
-import org.apache.ignite.cli.core.exception.ExceptionWriter;
+import org.apache.ignite.internal.cli.core.exception.ExceptionHandler;
+import org.apache.ignite.internal.cli.core.exception.ExceptionWriter;
class TestExceptionHandler implements ExceptionHandler<RuntimeException> {
@Override
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/flow/ThrowingStrCall.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/flow/ThrowingStrCall.java
similarity index 81%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/flow/ThrowingStrCall.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/flow/ThrowingStrCall.java
index ce7afff381..2336daff56 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/flow/ThrowingStrCall.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/flow/ThrowingStrCall.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.flow;
+package org.apache.ignite.internal.cli.commands.flow;
-import org.apache.ignite.cli.core.call.Call;
-import org.apache.ignite.cli.core.call.CallOutput;
-import org.apache.ignite.cli.core.call.DefaultCallOutput;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.CallOutput;
+import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
class ThrowingStrCall implements Call<StrCallInput, String> {
@Override
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/sql/SchemaProviderMock.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/sql/SchemaProviderMock.java
similarity index 86%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/sql/SchemaProviderMock.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/sql/SchemaProviderMock.java
index 6507ccb03d..6ac99f7002 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/sql/SchemaProviderMock.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/sql/SchemaProviderMock.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.sql;
+package org.apache.ignite.internal.cli.commands.sql;
import java.util.Map;
import java.util.Set;
-import org.apache.ignite.cli.sql.SchemaProvider;
-import org.apache.ignite.cli.sql.SqlSchema;
+import org.apache.ignite.internal.cli.sql.SchemaProvider;
+import org.apache.ignite.internal.cli.sql.SqlSchema;
class SchemaProviderMock implements SchemaProvider {
@Override
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/sql/SqlCommandTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/sql/SqlCommandTest.java
similarity index 94%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/sql/SqlCommandTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/sql/SqlCommandTest.java
index f8742318ae..db7faab800 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/sql/SqlCommandTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/sql/SqlCommandTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.sql;
+package org.apache.ignite.internal.cli.commands.sql;
import static org.junit.jupiter.api.Assertions.assertAll;
-import org.apache.ignite.cli.commands.CliCommandTestBase;
+import org.apache.ignite.internal.cli.commands.CliCommandTestBase;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/commands/sql/SqlCompleterTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/sql/SqlCompleterTest.java
similarity index 97%
rename from modules/cli/src/test/java/org/apache/ignite/cli/commands/sql/SqlCompleterTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/sql/SqlCompleterTest.java
index a759f3d440..9fb48f62dd 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/commands/sql/SqlCompleterTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/sql/SqlCompleterTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.commands.sql;
+package org.apache.ignite.internal.cli.commands.sql;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/config/TestStateConfigHelper.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/config/TestStateConfigHelper.java
similarity index 91%
rename from modules/cli/src/test/java/org/apache/ignite/cli/config/TestStateConfigHelper.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/config/TestStateConfigHelper.java
index 63f8b5ac3b..cd432473b2 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/config/TestStateConfigHelper.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/config/TestStateConfigHelper.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.config;
+package org.apache.ignite.internal.cli.config;
-import org.apache.ignite.cli.commands.cliconfig.TestConfigManagerHelper;
+import org.apache.ignite.internal.cli.commands.cliconfig.TestConfigManagerHelper;
/**
* Test factory for application state config.
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/config/TestStateConfigProvider.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/config/TestStateConfigProvider.java
similarity index 96%
rename from modules/cli/src/test/java/org/apache/ignite/cli/config/TestStateConfigProvider.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/config/TestStateConfigProvider.java
index 690b0c3ad5..e0c6b6e515 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/config/TestStateConfigProvider.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/config/TestStateConfigProvider.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.config;
+package org.apache.ignite.internal.cli.config;
import io.micronaut.context.annotation.Replaces;
import jakarta.inject.Singleton;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/core/repl/completer/DynamicCompleterFilterTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/repl/completer/DynamicCompleterFilterTest.java
similarity index 97%
rename from modules/cli/src/test/java/org/apache/ignite/cli/core/repl/completer/DynamicCompleterFilterTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/core/repl/completer/DynamicCompleterFilterTest.java
index 04da7340a1..9d238c6d96 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/core/repl/completer/DynamicCompleterFilterTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/repl/completer/DynamicCompleterFilterTest.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.completer;
+package org.apache.ignite.internal.cli.core.repl.completer;
import static java.util.Arrays.asList;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.emptyArray;
-import org.apache.ignite.cli.core.repl.Session;
+import org.apache.ignite.internal.cli.core.repl.Session;
import org.junit.jupiter.api.Test;
class DynamicCompleterFilterTest {
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/core/repl/completer/DynamicCompleterRegistryTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/repl/completer/DynamicCompleterRegistryTest.java
similarity index 98%
rename from modules/cli/src/test/java/org/apache/ignite/cli/core/repl/completer/DynamicCompleterRegistryTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/core/repl/completer/DynamicCompleterRegistryTest.java
index 4e421ab5ae..f5111708c6 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/core/repl/completer/DynamicCompleterRegistryTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/repl/completer/DynamicCompleterRegistryTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.completer;
+package org.apache.ignite.internal.cli.core.repl.completer;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/core/repl/completer/HoconDynamicCompleterTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/repl/completer/HoconDynamicCompleterTest.java
similarity index 98%
rename from modules/cli/src/test/java/org/apache/ignite/cli/core/repl/completer/HoconDynamicCompleterTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/core/repl/completer/HoconDynamicCompleterTest.java
index 4ff8128ae1..b86356884f 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/core/repl/completer/HoconDynamicCompleterTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/repl/completer/HoconDynamicCompleterTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.repl.completer;
+package org.apache.ignite.internal.cli.core.repl.completer;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/core/style/component/ErrorUiComponentTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/style/component/ErrorUiComponentTest.java
similarity index 95%
rename from modules/cli/src/test/java/org/apache/ignite/cli/core/style/component/ErrorUiComponentTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/core/style/component/ErrorUiComponentTest.java
index 9ab8612891..7462d47004 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/core/style/component/ErrorUiComponentTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/style/component/ErrorUiComponentTest.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.style.component;
+package org.apache.ignite.internal.cli.core.style.component;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import java.util.UUID;
-import org.apache.ignite.cli.core.style.element.UiElements;
+import org.apache.ignite.internal.cli.core.style.element.UiElements;
import org.junit.jupiter.api.Test;
class ErrorUiComponentTest {
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/core/style/component/MessageUiComponentTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/style/component/MessageUiComponentTest.java
similarity index 94%
rename from modules/cli/src/test/java/org/apache/ignite/cli/core/style/component/MessageUiComponentTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/core/style/component/MessageUiComponentTest.java
index 5b5b9553cf..02fb8832a1 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/core/style/component/MessageUiComponentTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/style/component/MessageUiComponentTest.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.core.style.component;
+package org.apache.ignite.internal.cli.core.style.component;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
-import org.apache.ignite.cli.core.style.element.UiElements;
+import org.apache.ignite.internal.cli.core.style.element.UiElements;
import org.junit.jupiter.api.Test;
class MessageUiComponentTest {
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/deprecated/AbstractCliTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/deprecated/AbstractCliTest.java
similarity index 95%
rename from modules/cli/src/test/java/org/apache/ignite/cli/deprecated/AbstractCliTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/deprecated/AbstractCliTest.java
index 9f29aa4216..05172aa7d2 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/deprecated/AbstractCliTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/deprecated/AbstractCliTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated;
+package org.apache.ignite.internal.cli.deprecated;
import org.junit.jupiter.api.BeforeAll;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/deprecated/IgniteCliInterfaceTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/deprecated/IgniteCliInterfaceTest.java
similarity index 99%
rename from modules/cli/src/test/java/org/apache/ignite/cli/deprecated/IgniteCliInterfaceTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/deprecated/IgniteCliInterfaceTest.java
index 314582fcfc..aa86b22bcb 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/deprecated/IgniteCliInterfaceTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/deprecated/IgniteCliInterfaceTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated;
+package org.apache.ignite.internal.cli.deprecated;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.stream.Collectors.toList;
@@ -43,9 +43,9 @@ import java.net.URISyntaxException;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.Collections;
-import org.apache.ignite.cli.commands.TopLevelCliCommand;
-import org.apache.ignite.cli.deprecated.builtins.init.InitIgniteCommand;
-import org.apache.ignite.cli.deprecated.builtins.node.NodeManager;
+import org.apache.ignite.internal.cli.commands.TopLevelCliCommand;
+import org.apache.ignite.internal.cli.deprecated.builtins.init.InitIgniteCommand;
+import org.apache.ignite.internal.cli.deprecated.builtins.node.NodeManager;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/deprecated/builtins/init/InitIgniteCommandTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/deprecated/builtins/init/InitIgniteCommandTest.java
similarity index 90%
rename from modules/cli/src/test/java/org/apache/ignite/cli/deprecated/builtins/init/InitIgniteCommandTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/deprecated/builtins/init/InitIgniteCommandTest.java
index 3a92f262eb..e5268dff6d 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/deprecated/builtins/init/InitIgniteCommandTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/deprecated/builtins/init/InitIgniteCommandTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated.builtins.init;
+package org.apache.ignite.internal.cli.deprecated.builtins.init;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -33,11 +33,11 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Collections;
import java.util.Comparator;
-import org.apache.ignite.cli.deprecated.AbstractCliTest;
-import org.apache.ignite.cli.deprecated.CliPathsConfigLoader;
-import org.apache.ignite.cli.deprecated.builtins.SystemPathResolver;
-import org.apache.ignite.cli.deprecated.builtins.module.MavenArtifactResolver;
-import org.apache.ignite.cli.deprecated.builtins.module.ResolveResult;
+import org.apache.ignite.internal.cli.deprecated.AbstractCliTest;
+import org.apache.ignite.internal.cli.deprecated.CliPathsConfigLoader;
+import org.apache.ignite.internal.cli.deprecated.builtins.SystemPathResolver;
+import org.apache.ignite.internal.cli.deprecated.builtins.module.MavenArtifactResolver;
+import org.apache.ignite.internal.cli.deprecated.builtins.module.ResolveResult;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.io.TempDir;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/deprecated/builtins/init/package-info.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/deprecated/builtins/init/package-info.java
similarity index 92%
rename from modules/cli/src/test/java/org/apache/ignite/cli/deprecated/builtins/init/package-info.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/deprecated/builtins/init/package-info.java
index 5f1812ae68..ee9bae9d93 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/deprecated/builtins/init/package-info.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/deprecated/builtins/init/package-info.java
@@ -19,4 +19,4 @@
* Contains tests for Ignite 'init' process.
*/
-package org.apache.ignite.cli.deprecated.builtins.init;
+package org.apache.ignite.internal.cli.deprecated.builtins.init;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/deprecated/package-info.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/deprecated/package-info.java
similarity index 94%
rename from modules/cli/src/test/java/org/apache/ignite/cli/deprecated/package-info.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/deprecated/package-info.java
index b53d3f7fca..15cfbe8304 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/deprecated/package-info.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/deprecated/package-info.java
@@ -19,4 +19,4 @@
* Contains tests for Ignite CLI.
*/
-package org.apache.ignite.cli.deprecated;
+package org.apache.ignite.internal.cli.deprecated;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/deprecated/ui/ProgressBarTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/deprecated/ui/ProgressBarTest.java
similarity index 96%
rename from modules/cli/src/test/java/org/apache/ignite/cli/deprecated/ui/ProgressBarTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/deprecated/ui/ProgressBarTest.java
index 1dc3586aed..c775b10158 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/deprecated/ui/ProgressBarTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/deprecated/ui/ProgressBarTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated.ui;
+package org.apache.ignite.internal.cli.deprecated.ui;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -24,7 +24,7 @@ import static picocli.CommandLine.Help.Ansi.AUTO;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
-import org.apache.ignite.cli.deprecated.AbstractCliTest;
+import org.apache.ignite.internal.cli.deprecated.AbstractCliTest;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/deprecated/ui/SpinnerTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/deprecated/ui/SpinnerTest.java
similarity index 97%
rename from modules/cli/src/test/java/org/apache/ignite/cli/deprecated/ui/SpinnerTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/deprecated/ui/SpinnerTest.java
index 488ac1960c..7d102423d5 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/deprecated/ui/SpinnerTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/deprecated/ui/SpinnerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.deprecated.ui;
+package org.apache.ignite.internal.cli.deprecated.ui;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/deprecated/ui/package-info.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/deprecated/ui/package-info.java
similarity index 94%
rename from modules/cli/src/test/java/org/apache/ignite/cli/deprecated/ui/package-info.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/deprecated/ui/package-info.java
index f2e1485262..7b8c9d946b 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/deprecated/ui/package-info.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/deprecated/ui/package-info.java
@@ -19,4 +19,4 @@
* Contains tests for Ignite CLI UI elements.
*/
-package org.apache.ignite.cli.deprecated.ui;
+package org.apache.ignite.internal.cli.deprecated.ui;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/sql/SqlSchemaProviderTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/sql/SqlSchemaProviderTest.java
similarity index 98%
rename from modules/cli/src/test/java/org/apache/ignite/cli/sql/SqlSchemaProviderTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/sql/SqlSchemaProviderTest.java
index 5ce6918884..e96ecc35ca 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/sql/SqlSchemaProviderTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/sql/SqlSchemaProviderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.sql;
+package org.apache.ignite.internal.cli.sql;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/sql/table/TableTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/sql/table/TableTest.java
similarity index 97%
rename from modules/cli/src/test/java/org/apache/ignite/cli/sql/table/TableTest.java
rename to modules/cli/src/test/java/org/apache/ignite/internal/cli/sql/table/TableTest.java
index 2aed00dfb7..21779e2d7a 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/sql/table/TableTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/sql/table/TableTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.cli.sql.table;
+package org.apache.ignite.internal.cli.sql.table;
import java.util.Collections;
import java.util.List;
diff --git a/modules/jacoco-report/build.gradle b/modules/jacoco-report/build.gradle
index 5613ad147c..3deae3aa37 100644
--- a/modules/jacoco-report/build.gradle
+++ b/modules/jacoco-report/build.gradle
@@ -26,7 +26,6 @@ dependencies {
implementation project(':ignite-compute')
implementation project(':ignite-sql-engine')
implementation project(':ignite-cli')
- implementation project(':ignite-cli-common')
implementation project(':ignite-configuration')
implementation project(':ignite-configuration-api')
implementation project(':ignite-core')
diff --git a/modules/jacoco-report/pom.xml b/modules/jacoco-report/pom.xml
index 871a767da5..8a7f8ea711 100644
--- a/modules/jacoco-report/pom.xml
+++ b/modules/jacoco-report/pom.xml
@@ -79,11 +79,6 @@
<artifactId>ignite-cli</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.ignite</groupId>
- <artifactId>ignite-cli-common</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-configuration</artifactId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 014fd03e18..78b7ca25da 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -279,12 +279,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.ignite</groupId>
- <artifactId>ignite-cli-common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-configuration</artifactId>
diff --git a/pom.xml b/pom.xml
index 2f49d069b8..d941669adc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,6 @@
<module>modules/binary-tuple</module>
<module>modules/bytecode</module>
<module>modules/cli</module>
- <module>modules/cli-common</module>
<module>modules/client</module>
<module>modules/client-common</module>
<module>modules/client-handler</module>
diff --git a/settings.gradle b/settings.gradle
index 4c6b5a8c3a..cb2a6460d5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -28,7 +28,6 @@ include(':ignite-examples')
include(':ignite-network')
include(':ignite-raft-client')
include(':ignite-configuration-api')
-include(':ignite-cli-common')
include(':ignite-raft')
include(':ignite-schema')
include(':ignite-storage-page-memory')
@@ -75,7 +74,6 @@ project(":ignite-rest").projectDir = file('modules/rest')
project(":ignite-network").projectDir = file('modules/network')
project(":ignite-raft-client").projectDir = file('modules/raft-client')
project(":ignite-configuration-api").projectDir = file('modules/configuration-api')
-project(":ignite-cli-common").projectDir = file('modules/cli-common')
project(":ignite-raft").projectDir = file('modules/raft')
project(":ignite-schema").projectDir = file('modules/schema')
project(":ignite-storage-page-memory").projectDir = file('modules/storage-page-memory')