You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by am...@apache.org on 2021/01/26 08:52:56 UTC
[ignite-3] branch ignite-13748 updated (5b49b24 -> 18eba9b)
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a change to branch ignite-13748
in repository https://gitbox.apache.org/repos/asf/ignite-3.git.
from 5b49b24 Merge branch 'main' into ignite-13748
add 02512fe IGNITE-13836 Support for multiple configuration roots, REST module improvements (#14)
add 1736652 IGNITE-14000 Fix codestyle in cli and cli-common modules (#31)
add 632539c IGNITE-14060 - Commented out a test to fix compilation
add 553481d Quick fix.
add dc94bba Merge branch 'main' into ignite-13748
add 18eba9b Fix styles.
No new revisions were added by this update.
Summary of changes:
modules/cli-common/pom.xml | 6 +
.../apache/ignite/cli/common/IgniteCommand.java | 7 +
.../{IgniteCommand.java => package-info.java} | 7 +-
.../apache/ignite/cli/CliPathsConfigLoader.java | 78 ++++--
.../java/org/apache/ignite/cli/CliVersionInfo.java | 23 +-
.../java/org/apache/ignite/cli/CommandFactory.java | 21 +-
.../java/org/apache/ignite/cli/ErrorHandler.java | 28 +-
.../org/apache/ignite/cli/HelpFactoryImpl.java | 58 ++--
.../org/apache/ignite/cli/IgniteCLIException.java | 19 +-
.../java/org/apache/ignite/cli/IgniteCliApp.java | 7 +-
.../java/org/apache/ignite/cli/IgnitePaths.java | 88 +++++-
.../org/apache/ignite/cli/IgniteProgressBar.java | 30 +-
.../org/apache/ignite/cli/InteractiveWrapper.java | 29 +-
.../src/main/java/org/apache/ignite/cli/Table.java | 55 ++--
.../org/apache/ignite/cli/VersionProvider.java | 20 +-
.../ignite/cli/builtins/SystemPathResolver.java | 12 +-
.../cli/builtins/config/ConfigurationClient.java | 89 ++++--
.../cli/builtins/config/HttpClientFactory.java | 9 +-
.../ignite/cli/builtins/config/package-info.java} | 8 +-
.../cli/builtins/init/InitIgniteCommand.java | 121 ++++++---
.../ignite/cli/builtins/init/package-info.java} | 8 +-
.../cli/builtins/module/MavenArtifactResolver.java | 188 ++++++++-----
.../cli/builtins/module/MavenCoordinates.java | 49 +++-
.../ignite/cli/builtins/module/ModuleManager.java | 203 ++++++++++----
.../ignite/cli/builtins/module/ModuleRegistry.java | 233 ++++++++++++++++
.../ignite/cli/builtins/module/ModuleStorage.java | 141 ----------
.../ignite/cli/builtins/module/ResolveResult.java | 17 +-
.../builtins/module/StandardModuleDefinition.java | 36 ++-
.../ignite/cli/builtins/module/package-info.java} | 8 +-
.../ignite/cli/builtins/node/NodeManager.java | 197 ++++++++++----
.../ignite/cli/builtins/node/package-info.java} | 8 +-
.../apache/ignite/cli/builtins/package-info.java} | 8 +-
.../java/org/apache/ignite/cli/package-info.java} | 8 +-
.../org/apache/ignite/cli/spec/CategorySpec.java | 4 +
.../org/apache/ignite/cli/spec/CommandSpec.java | 4 +
.../apache/ignite/cli/spec/ConfigCommandSpec.java | 59 +++-
.../org/apache/ignite/cli/spec/IgniteCliSpec.java | 54 ++--
.../ignite/cli/spec/InitIgniteCommandSpec.java | 15 +-
.../apache/ignite/cli/spec/ModuleCommandSpec.java | 90 ++++--
.../apache/ignite/cli/spec/NodeCommandSpec.java | 87 ++++--
.../org/apache/ignite/cli/spec/SpecAdapter.java | 3 +
.../org/apache/ignite/cli/spec/package-info.java} | 8 +-
.../apache/ignite/cli/IgniteCliInterfaceTest.java | 301 +++++++++++++--------
.../cli/builtins/init/InitIgniteCommandTest.java | 69 +++--
.../ignite/cli/builtins/init/package-info.java} | 8 +-
.../{init => module}/ModuleMangerTest.java | 78 ++++--
.../ignite/cli/builtins/module/package-info.java} | 8 +-
.../java/org/apache/ignite/cli/package-info.java} | 8 +-
.../ignite/internal/schema/PartialIndexImpl.java | 6 +-
.../ignite/internal/schema/PrimaryIndexImpl.java | 2 +-
.../ignite/internal/schema/SortedIndexImpl.java | 13 +-
.../schema/builder/PartialIndexBuilderImpl.java | 1 -
.../schema/builder/SortedIndexBuilderImpl.java | 4 -
modules/configuration-annotation-processor/pom.xml | 12 +
.../processor/internal/Processor.java | 32 ++-
.../processor/internal/HasFieldMatcher.java | 2 +-
.../processor/internal/HasMethodMatcher.java | 2 +-
.../processor/internal/ProcessorTest.java | 11 +-
.../sample/CacheConfigurationSchema.java | 1 +
.../sample/ClusterWideConfigurationSchema.java | 1 +
...hema.java => DiscoveryConfigurationSchema.java} | 14 +-
...Schema.java => NetworkConfigurationSchema.java} | 11 +-
.../ignite/configuration/sample/UsageTest.java | 84 ++++--
...onfigurator.java => ConfigurationRegistry.java} | 36 +--
.../apache/ignite/configuration/Configurator.java | 17 ++
.../org/apache/ignite/configuration/RootKey.java} | 7 +-
.../src/main/resources/bootstrap-config.json | 1 -
modules/{ignite-runner => rest}/pom.xml | 34 ++-
.../java/org/apache/ignite/rest/ErrorResult.java | 0
.../java/org/apache/ignite/rest/RestModule.java | 153 ++++++-----
.../configuration}/RestConfigurationSchema.java | 5 +-
.../presentation/ConfigurationPresentation.java | 52 ++++
.../ignite/rest}/presentation/FormatConverter.java | 7 +-
.../rest}/presentation/json/JsonConverter.java | 17 +-
.../rest/presentation/json/JsonPresentation.java | 83 ++++++
modules/{ignite-runner => runner}/pom.xml | 7 +
.../java/org/apache/ignite/app/IgniteRunner.java | 52 +++-
.../ignite/configuration/ConfigurationModule.java | 38 +--
.../extended/AutoAdjustConfigurationSchema.java | 1 -
.../extended/BaselineConfigurationSchema.java | 0
.../extended/DataStorageConfigurationSchema.java | 0
.../extended/LocalConfigurationSchema.java | 4 -
.../org/apache/ignite/utils/IgniteProperties.java | 0
.../src/main/resources/bootstrap-config.json | 19 ++
.../src/main/resources/ignite.properties | 0
.../src/main/resources/simplelogger.properties | 0
parent/pom.xml | 7 +
pom.xml | 3 +-
88 files changed, 2360 insertions(+), 994 deletions(-)
copy modules/cli-common/src/main/java/org/apache/ignite/cli/common/{IgniteCommand.java => package-info.java} (89%)
copy modules/{cli-common/src/main/java/org/apache/ignite/cli/common/IgniteCommand.java => cli/src/main/java/org/apache/ignite/cli/builtins/config/package-info.java} (86%)
copy modules/{cli-common/src/main/java/org/apache/ignite/cli/common/IgniteCommand.java => cli/src/main/java/org/apache/ignite/cli/builtins/init/package-info.java} (89%)
create mode 100644 modules/cli/src/main/java/org/apache/ignite/cli/builtins/module/ModuleRegistry.java
delete mode 100644 modules/cli/src/main/java/org/apache/ignite/cli/builtins/module/ModuleStorage.java
copy modules/{cli-common/src/main/java/org/apache/ignite/cli/common/IgniteCommand.java => cli/src/main/java/org/apache/ignite/cli/builtins/module/package-info.java} (88%)
copy modules/{cli-common/src/main/java/org/apache/ignite/cli/common/IgniteCommand.java => cli/src/main/java/org/apache/ignite/cli/builtins/node/package-info.java} (88%)
copy modules/{cli-common/src/main/java/org/apache/ignite/cli/common/IgniteCommand.java => cli/src/main/java/org/apache/ignite/cli/builtins/package-info.java} (87%)
copy modules/{cli-common/src/main/java/org/apache/ignite/cli/common/IgniteCommand.java => cli/src/main/java/org/apache/ignite/cli/package-info.java} (89%)
copy modules/{cli-common/src/main/java/org/apache/ignite/cli/common/IgniteCommand.java => cli/src/main/java/org/apache/ignite/cli/spec/package-info.java} (87%)
copy modules/{cli-common/src/main/java/org/apache/ignite/cli/common/IgniteCommand.java => cli/src/test/java/org/apache/ignite/cli/builtins/init/package-info.java} (89%)
rename modules/cli/src/test/java/org/apache/ignite/cli/builtins/{init => module}/ModuleMangerTest.java (66%)
copy modules/{cli-common/src/main/java/org/apache/ignite/cli/common/IgniteCommand.java => cli/src/test/java/org/apache/ignite/cli/builtins/module/package-info.java} (88%)
copy modules/{cli-common/src/main/java/org/apache/ignite/cli/common/IgniteCommand.java => cli/src/test/java/org/apache/ignite/cli/package-info.java} (91%)
copy modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/sample/{CacheConfigurationSchema.java => DiscoveryConfigurationSchema.java} (80%)
copy modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/sample/{LocalConfigurationSchema.java => NetworkConfigurationSchema.java} (83%)
copy modules/configuration/src/main/java/org/apache/ignite/configuration/{PublicConfigurator.java => ConfigurationRegistry.java} (55%)
copy modules/{cli-common/src/main/java/org/apache/ignite/cli/common/IgniteCommand.java => configuration/src/main/java/org/apache/ignite/configuration/RootKey.java} (84%)
delete mode 100644 modules/ignite-runner/src/main/resources/bootstrap-config.json
copy modules/{ignite-runner => rest}/pom.xml (84%)
rename modules/{ignite-runner => rest}/src/main/java/org/apache/ignite/rest/ErrorResult.java (100%)
rename modules/{ignite-runner => rest}/src/main/java/org/apache/ignite/rest/RestModule.java (65%)
rename modules/{ignite-runner/src/main/java/org/apache/ignite/configuration/extended => rest/src/main/java/org/apache/ignite/rest/configuration}/RestConfigurationSchema.java (92%)
create mode 100644 modules/rest/src/main/java/org/apache/ignite/rest/presentation/ConfigurationPresentation.java
rename modules/{ignite-runner/src/main/java/org/apache/ignite/configuration => rest/src/main/java/org/apache/ignite/rest}/presentation/FormatConverter.java (86%)
rename modules/{ignite-runner/src/main/java/org/apache/ignite/configuration => rest/src/main/java/org/apache/ignite/rest}/presentation/json/JsonConverter.java (74%)
create mode 100644 modules/rest/src/main/java/org/apache/ignite/rest/presentation/json/JsonPresentation.java
rename modules/{ignite-runner => runner}/pom.xml (91%)
rename modules/{ignite-runner => runner}/src/main/java/org/apache/ignite/app/IgniteRunner.java (73%)
rename modules/{ignite-runner => runner}/src/main/java/org/apache/ignite/configuration/ConfigurationModule.java (71%)
rename modules/{ignite-runner => runner}/src/main/java/org/apache/ignite/configuration/extended/AutoAdjustConfigurationSchema.java (99%)
rename modules/{ignite-runner => runner}/src/main/java/org/apache/ignite/configuration/extended/BaselineConfigurationSchema.java (100%)
rename modules/{ignite-runner => runner}/src/main/java/org/apache/ignite/configuration/extended/DataStorageConfigurationSchema.java (100%)
rename modules/{ignite-runner => runner}/src/main/java/org/apache/ignite/configuration/extended/LocalConfigurationSchema.java (94%)
rename modules/{ignite-runner => runner}/src/main/java/org/apache/ignite/utils/IgniteProperties.java (100%)
create mode 100644 modules/runner/src/main/resources/bootstrap-config.json
rename modules/{ignite-runner => runner}/src/main/resources/ignite.properties (100%)
rename modules/{ignite-runner => runner}/src/main/resources/simplelogger.properties (100%)