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 2020/12/25 14:45:50 UTC
[ignite-3] 01/04: Merge branch 'main' into ignite-13618
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch gg-13618-asm
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 1747f88d7c402fe890db52f2ae88366047609a45
Merge: 17fc9ce 0cd0b7d
Author: Andrew Mashenkov <an...@gmail.com>
AuthorDate: Tue Dec 22 16:21:18 2020 +0300
Merge branch 'main' into ignite-13618
# Conflicts:
# pom.xml
.asf.yaml | 47 ++
.gitignore | 1 +
modules/cli-demo/cli-common/pom.xml | 33 +
.../apache/ignite/cli/common/IgniteCommand.java | 21 +
modules/cli-demo/cli/ignite.sh | 11 +
modules/cli-demo/cli/pom.xml | 240 ++++++
.../progressbar/IgniteProgressBarRenderer.java | 43 +
.../apache/ignite/cli/CliPathsConfigLoader.java | 79 ++
.../java/org/apache/ignite/cli/CliVersionInfo.java | 46 ++
.../java/org/apache/ignite/cli/CommandFactory.java | 36 +
.../java/org/apache/ignite/cli/ErrorHandler.java | 60 ++
.../org/apache/ignite/cli/HelpFactoryImpl.java | 147 ++++
.../org/apache/ignite/cli/IgniteCLIException.java | 30 +
.../java/org/apache/ignite/cli/IgniteCliApp.java | 30 +
.../java/org/apache/ignite/cli/IgnitePaths.java | 60 ++
.../org/apache/ignite/cli/IgniteProgressBar.java | 96 +++
.../org/apache/ignite/cli/InteractiveWrapper.java | 93 +++
.../src/main/java/org/apache/ignite/cli/Table.java | 174 ++++
.../org/apache/ignite/cli/VersionProvider.java | 39 +
.../ignite/cli/builtins/SystemPathResolver.java | 46 ++
.../cli/builtins/config/ConfigurationClient.java | 110 +++
.../cli/builtins/config/HttpClientFactory.java | 34 +
.../cli/builtins/init/InitIgniteCommand.java | 141 ++++
.../cli/builtins/module/MavenArtifactResolver.java | 273 +++++++
.../cli/builtins/module/MavenCoordinates.java | 45 +
.../ignite/cli/builtins/module/ModuleManager.java | 183 +++++
.../ignite/cli/builtins/module/ModuleStorage.java | 120 +++
.../ignite/cli/builtins/module/ResolveResult.java | 33 +
.../builtins/module/StandardModuleDefinition.java | 38 +
.../ignite/cli/builtins/node/NodeManager.java | 245 ++++++
.../org/apache/ignite/cli/spec/CategorySpec.java | 33 +
.../org/apache/ignite/cli/spec/CommandSpec.java | 25 +
.../apache/ignite/cli/spec/ConfigCommandSpec.java | 101 +++
.../org/apache/ignite/cli/spec/IgniteCliSpec.java | 123 +++
.../ignite/cli/spec/InitIgniteCommandSpec.java | 35 +
.../apache/ignite/cli/spec/ModuleCommandSpec.java | 102 +++
.../apache/ignite/cli/spec/NodeCommandSpec.java | 133 +++
.../org/apache/ignite/cli/spec/SpecAdapter.java | 55 ++
.../cli/src/main/resources/builtin_modules.conf | 13 +
.../cli/src/main/resources/default-config.xml | 29 +
.../cli-demo/cli/src/main/resources/logback.xml | 14 +
.../cli/src/main/resources/version.properties | 18 +
.../apache/ignite/cli/IgniteCliInterfaceTest.java | 425 ++++++++++
.../demo-module-all/demo-module-cli/pom.xml | 55 ++
.../ignite/snapshot/cli/SnapshotCommand.java | 65 ++
.../org.apache.ignite.cli.common.IgniteCommand | 1 +
.../cli-demo/demo-module-all/demo-module/pom.xml | 34 +
.../org/apache/ignite/snapshot/IgniteSnapshot.java | 25 +
modules/cli-demo/demo-module-all/pom.xml | 56 ++
modules/cli-demo/pom.xml | 90 ++
modules/configuration-annotation-processor/pom.xml | 113 +++
.../internal/ConfigurationDescription.java | 42 +
.../processor/internal/ConfigurationElement.java | 74 ++
.../processor/internal/ConfigurationNode.java | 53 ++
.../processor/internal/Processor.java | 910 +++++++++++++++++++++
.../processor/internal/ProcessorException.java | 32 +
.../configuration/processor/internal/Utils.java | 217 +++++
.../internal/pojo/ChangeClassGenerator.java | 87 ++
.../processor/internal/pojo/ClassGenerator.java | 127 +++
.../processor/internal/pojo/FieldMapping.java | 52 ++
.../internal/pojo/InitClassGenerator.java | 83 ++
.../internal/pojo/ViewClassGenerator.java | 79 ++
.../internal/validation/ValidationGenerator.java | 174 ++++
.../services/javax.annotation.processing.Processor | 1 +
.../processor/internal/AbstractProcessorTest.java | 164 ++++
.../processor/internal/ConfigSet.java | 123 +++
.../processor/internal/HasFieldMatcher.java | 129 +++
.../processor/internal/HasMethodMatcher.java | 126 +++
.../processor/internal/ParsedClass.java | 107 +++
.../processor/internal/ProcessorTest.java | 104 +++
.../configuration/processor/internal/Types.java | 32 +
.../sample/AutoAdjustConfigurationSchema.java | 42 +
.../sample/BaselineConfigurationSchema.java | 37 +
.../sample/CacheConfigurationSchema.java | 33 +
.../sample/ClusterWideConfigurationSchema.java | 36 +
.../sample/LocalConfigurationSchema.java | 32 +
.../sample/NodeConfigurationSchema.java | 45 +
.../ignite/configuration/sample/UsageTest.java | 95 +++
.../sample/validation/AutoAdjustValidator.java | 41 +
.../sample/validation/AutoAdjustValidator2.java | 41 +
.../sample/validation/NodeValidator.java | 40 +
.../internal/TestConfigurationSchema.java | 22 +
modules/configuration/pom.xml | 69 ++
.../configuration/ConfigurationProperty.java | 46 ++
.../ignite/configuration/ConfigurationTree.java | 30 +
.../ignite/configuration/ConfigurationValue.java | 25 +
.../apache/ignite/configuration/Configurator.java | 207 +++++
.../ignite/configuration/PropertyListener.java | 61 ++
.../ignite/configuration/PublicConfigurator.java | 42 +
.../ignite/configuration/annotation/Config.java | 69 ++
.../configuration/annotation/ConfigValue.java | 47 ++
.../configuration/annotation/NamedConfigValue.java | 51 ++
.../ignite/configuration/annotation/Validate.java | 75 ++
.../ignite/configuration/annotation/Value.java | 40 +
.../internal/DynamicConfiguration.java | 150 ++++
.../configuration/internal/DynamicProperty.java | 203 +++++
.../ignite/configuration/internal/Modifier.java | 48 ++
.../ignite/configuration/internal/NamedList.java | 44 +
.../internal/NamedListConfiguration.java | 126 +++
.../internal/selector/BaseSelectors.java | 157 ++++
.../configuration/internal/selector/Selector.java | 40 +
.../selector/SelectorNotFoundException.java | 33 +
.../internal/validation/MaxValidator.java | 44 +
.../internal/validation/MemberKey.java | 51 ++
.../internal/validation/MinValidator.java | 44 +
.../internal/validation/NotNullValidator.java | 41 +
.../storage/ConfigurationStorage.java | 56 ++
.../configuration/storage/StorageException.java | 36 +
.../ConfigurationValidationException.java | 30 +
.../configuration/validation/FieldValidator.java | 47 ++
modules/ignite-runner/pom.xml | 86 ++
.../java/org/apache/ignite/app/IgniteRunner.java | 116 +++
.../ignite/configuration/ConfigurationModule.java | 82 ++
.../extended/AutoAdjustConfigurationSchema.java | 36 +
.../extended/BaselineConfigurationSchema.java | 29 +
.../extended/DataStorageConfigurationSchema.java | 37 +
.../extended/LocalConfigurationSchema.java | 39 +
.../extended/RestConfigurationSchema.java | 33 +
.../presentation/FormatConverter.java | 35 +
.../presentation/json/JsonConverter.java | 63 ++
.../java/org/apache/ignite/rest/ErrorResult.java | 33 +
.../java/org/apache/ignite/rest/RestModule.java | 160 ++++
.../org/apache/ignite/utils/IgniteProperties.java | 75 ++
.../src/main/resources/bootstrap-config.json | 1 +
.../src/main/resources/ignite.properties | 18 +
.../src/main/resources/simplelogger.properties | 19 +
pom.xml | 12 +-
127 files changed, 10061 insertions(+), 4 deletions(-)
diff --cc pom.xml
index 73e6a1c,9e93eef..23d7483
--- a/pom.xml
+++ b/pom.xml
@@@ -46,88 -25,9 +46,84 @@@
</licenses>
<properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <!-- Dependencies versions. -->
+ <javapoet.version>1.13.0</javapoet.version>
+ <javax.annotation.api.version>1.3.2</javax.annotation.api.version>
+ <jetbrains.annotations.version>20.1.0</jetbrains.annotations.version>
+ <jmh.framework.verion>1.9.3</jmh.framework.verion>
+ <junit.jupiter.version>5.7.0</junit.jupiter.version>
+ <mockito.core.version>3.6.28</mockito.core.version>
+
+ <!-- Maven plugins -->
<maven.compiler.release>11</maven.compiler.release>
+
+ <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
+ <maven.surefire.plugin.version>3.0.0-M4</maven.surefire.plugin.version>
+ <apache.rat.plugin.version>0.13</apache.rat.plugin.version>
</properties>
+ <profiles>
+ <profile>
+ <id>check-licenses</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${apache.rat.plugin.version}</version>
+ <configuration>
+ <addDefaultLicenseMatchers>true</addDefaultLicenseMatchers>
+ <licenses>
+ <license implementation="org.apache.rat.analysis.license.FullTextMatchingLicense">
+ <licenseFamilyCategory>IAL20</licenseFamilyCategory>
+ <licenseFamilyName>Ignite Apache License 2.0</licenseFamilyName>
+ <fullText>
+ 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.
+ </fullText>
+ </license>
+ </licenses>
+ <licenseFamilies>
+ <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+ <familyName>Ignite Apache License 2.0</familyName>
+ </licenseFamily>
+ </licenseFamilies>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <excludes>
+ <exclude>README.md</exclude>
+ <exclude>work/**</exclude>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
- <modules>
- <module>modules/commons</module>
- </modules>
-
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
@@@ -137,19 -37,10 +133,27 @@@
</dependency>
</dependencies>
+ <modules>
+ <module>modules/configuration</module>
+ <module>modules/configuration-annotation-processor</module>
+ <module>modules/ignite-runner</module>
+ <module>modules/cli-demo</module>
++ <module>modules/commons</module>
+ </modules>
++
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven.compiler.plugin.version}</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven.surefire.plugin.version}</version>
+ </plugin>
+ </plugins>
+ </build>
</project>