This is an automated email from the ASF dual-hosted git repository.
tkalkirill 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 4406359522 IGNITE-23527 Move system properties configuration to new
module ignite-configuration-system (#4622)
4406359522 is described below
commit 4406359522f98b69906b5b2b3ebd7d5f3a5cf139
Author: Kirill Tkalenko <[email protected]>
AuthorDate: Thu Oct 24 09:42:12 2024 +0300
IGNITE-23527 Move system properties configuration to new module
ignite-configuration-system (#4622)
---
.../build.gradle} | 22 ++++++++++------------
.../SystemDistributedConfigurationModule.java} | 13 ++++---------
.../SystemDistributedConfigurationSchema.java | 0
...temDistributedExtensionConfigurationSchema.java | 0
.../SystemLocalConfigurationModule.java | 5 +----
.../SystemLocalConfigurationSchema.java | 0
.../SystemLocalExtensionConfigurationSchema.java | 0
.../SystemPropertyConfigurationSchema.java | 0
modules/metastorage/build.gradle | 1 +
modules/partition-replicator/build.gradle | 1 +
modules/raft/build.gradle | 1 +
modules/runner/build.gradle | 2 ++
modules/table/build.gradle | 1 +
settings.gradle | 2 ++
14 files changed, 23 insertions(+), 25 deletions(-)
diff --git
a/modules/runner/src/main/java/org/apache/ignite/internal/configuration/SystemPropertyConfigurationSchema.java
b/modules/configuration-system/build.gradle
similarity index 64%
copy from
modules/runner/src/main/java/org/apache/ignite/internal/configuration/SystemPropertyConfigurationSchema.java
copy to modules/configuration-system/build.gradle
index 13db30a203..818a0b9719 100644
---
a/modules/runner/src/main/java/org/apache/ignite/internal/configuration/SystemPropertyConfigurationSchema.java
+++ b/modules/configuration-system/build.gradle
@@ -15,18 +15,16 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.configuration;
+apply from: "$rootDir/buildscripts/java-core.gradle"
+apply from: "$rootDir/buildscripts/publishing.gradle"
-import org.apache.ignite.configuration.annotation.Config;
-import org.apache.ignite.configuration.annotation.InjectedName;
-import org.apache.ignite.configuration.annotation.Value;
+dependencies {
+ annotationProcessor project(':ignite-configuration-annotation-processor')
+ annotationProcessor libs.auto.service
-/** System property configuration schema. */
-@Config
-public class SystemPropertyConfigurationSchema {
- @InjectedName
- public String name;
-
- @Value
- public String propertyValue;
+ implementation project(':ignite-configuration-api')
+ implementation project(':ignite-configuration-root')
+ implementation libs.auto.service.annotations
}
+
+description = 'ignite-configuration-system'
diff --git
a/modules/runner/src/main/java/org/apache/ignite/internal/configuration/SystemLocalConfigurationModule.java
b/modules/configuration-system/src/main/java/org/apache/ignite/internal/configuration/SystemDistributedConfigurationModule.java
similarity index 77%
copy from
modules/runner/src/main/java/org/apache/ignite/internal/configuration/SystemLocalConfigurationModule.java
copy to
modules/configuration-system/src/main/java/org/apache/ignite/internal/configuration/SystemDistributedConfigurationModule.java
index 8db27f1b8d..b05c972d39 100644
---
a/modules/runner/src/main/java/org/apache/ignite/internal/configuration/SystemLocalConfigurationModule.java
+++
b/modules/configuration-system/src/main/java/org/apache/ignite/internal/configuration/SystemDistributedConfigurationModule.java
@@ -17,25 +17,20 @@
package org.apache.ignite.internal.configuration;
-import com.google.auto.service.AutoService;
import java.util.Collection;
import java.util.List;
import org.apache.ignite.configuration.ConfigurationModule;
import org.apache.ignite.configuration.annotation.ConfigurationType;
-/**
- * {@link ConfigurationModule} for node-local system configuration.
- */
-@AutoService(ConfigurationModule.class)
-public class SystemLocalConfigurationModule implements ConfigurationModule {
-
+/** {@link ConfigurationModule} for cluster-wide system configuration. */
+public class SystemDistributedConfigurationModule implements
ConfigurationModule {
@Override
public ConfigurationType type() {
- return ConfigurationType.LOCAL;
+ return ConfigurationType.DISTRIBUTED;
}
@Override
public Collection<Class<?>> schemaExtensions() {
- return List.of(SystemLocalExtensionConfigurationSchema.class);
+ return List.of(SystemDistributedExtensionConfigurationSchema.class);
}
}
diff --git
a/modules/runner/src/main/java/org/apache/ignite/internal/configuration/SystemDistributedConfigurationSchema.java
b/modules/configuration-system/src/main/java/org/apache/ignite/internal/configuration/SystemDistributedConfigurationSchema.java
similarity index 100%
rename from
modules/runner/src/main/java/org/apache/ignite/internal/configuration/SystemDistributedConfigurationSchema.java
rename to
modules/configuration-system/src/main/java/org/apache/ignite/internal/configuration/SystemDistributedConfigurationSchema.java
diff --git
a/modules/runner/src/main/java/org/apache/ignite/internal/configuration/SystemDistributedExtensionConfigurationSchema.java
b/modules/configuration-system/src/main/java/org/apache/ignite/internal/configuration/SystemDistributedExtensionConfigurationSchema.java
similarity index 100%
rename from
modules/runner/src/main/java/org/apache/ignite/internal/configuration/SystemDistributedExtensionConfigurationSchema.java
rename to
modules/configuration-system/src/main/java/org/apache/ignite/internal/configuration/SystemDistributedExtensionConfigurationSchema.java
diff --git
a/modules/runner/src/main/java/org/apache/ignite/internal/configuration/SystemLocalConfigurationModule.java
b/modules/configuration-system/src/main/java/org/apache/ignite/internal/configuration/SystemLocalConfigurationModule.java
similarity index 94%
rename from
modules/runner/src/main/java/org/apache/ignite/internal/configuration/SystemLocalConfigurationModule.java
rename to
modules/configuration-system/src/main/java/org/apache/ignite/internal/configuration/SystemLocalConfigurationModule.java
index 8db27f1b8d..c4f37b166d 100644
---
a/modules/runner/src/main/java/org/apache/ignite/internal/configuration/SystemLocalConfigurationModule.java
+++
b/modules/configuration-system/src/main/java/org/apache/ignite/internal/configuration/SystemLocalConfigurationModule.java
@@ -23,12 +23,9 @@ import java.util.List;
import org.apache.ignite.configuration.ConfigurationModule;
import org.apache.ignite.configuration.annotation.ConfigurationType;
-/**
- * {@link ConfigurationModule} for node-local system configuration.
- */
+/** {@link ConfigurationModule} for node-local system configuration. */
@AutoService(ConfigurationModule.class)
public class SystemLocalConfigurationModule implements ConfigurationModule {
-
@Override
public ConfigurationType type() {
return ConfigurationType.LOCAL;
diff --git
a/modules/runner/src/main/java/org/apache/ignite/internal/configuration/SystemLocalConfigurationSchema.java
b/modules/configuration-system/src/main/java/org/apache/ignite/internal/configuration/SystemLocalConfigurationSchema.java
similarity index 100%
rename from
modules/runner/src/main/java/org/apache/ignite/internal/configuration/SystemLocalConfigurationSchema.java
rename to
modules/configuration-system/src/main/java/org/apache/ignite/internal/configuration/SystemLocalConfigurationSchema.java
diff --git
a/modules/runner/src/main/java/org/apache/ignite/internal/configuration/SystemLocalExtensionConfigurationSchema.java
b/modules/configuration-system/src/main/java/org/apache/ignite/internal/configuration/SystemLocalExtensionConfigurationSchema.java
similarity index 100%
rename from
modules/runner/src/main/java/org/apache/ignite/internal/configuration/SystemLocalExtensionConfigurationSchema.java
rename to
modules/configuration-system/src/main/java/org/apache/ignite/internal/configuration/SystemLocalExtensionConfigurationSchema.java
diff --git
a/modules/runner/src/main/java/org/apache/ignite/internal/configuration/SystemPropertyConfigurationSchema.java
b/modules/configuration-system/src/main/java/org/apache/ignite/internal/configuration/SystemPropertyConfigurationSchema.java
similarity index 100%
rename from
modules/runner/src/main/java/org/apache/ignite/internal/configuration/SystemPropertyConfigurationSchema.java
rename to
modules/configuration-system/src/main/java/org/apache/ignite/internal/configuration/SystemPropertyConfigurationSchema.java
diff --git a/modules/metastorage/build.gradle b/modules/metastorage/build.gradle
index 4f28019e27..7fa001c281 100644
--- a/modules/metastorage/build.gradle
+++ b/modules/metastorage/build.gradle
@@ -65,6 +65,7 @@ dependencies {
integrationTestImplementation project(':ignite-metrics')
integrationTestImplementation project(':ignite-runner')
integrationTestImplementation project(':ignite-system-disaster-recovery')
+ integrationTestImplementation project(':ignite-configuration-system')
integrationTestImplementation testFixtures(project(':ignite-core'))
integrationTestImplementation testFixtures(project(':ignite-network'))
integrationTestImplementation testFixtures(project(':ignite-raft'))
diff --git a/modules/partition-replicator/build.gradle
b/modules/partition-replicator/build.gradle
index d544cdf138..b5dd26cb91 100644
--- a/modules/partition-replicator/build.gradle
+++ b/modules/partition-replicator/build.gradle
@@ -67,6 +67,7 @@ dependencies {
integrationTestImplementation project(':ignite-catalog')
integrationTestImplementation project(':ignite-configuration')
integrationTestImplementation project(':ignite-configuration-root')
+ integrationTestImplementation project(':ignite-configuration-system')
integrationTestImplementation project(':ignite-low-watermark')
integrationTestImplementation project(':ignite-index')
integrationTestImplementation project(':ignite-failure-handler')
diff --git a/modules/raft/build.gradle b/modules/raft/build.gradle
index df00fce722..c014faba47 100644
--- a/modules/raft/build.gradle
+++ b/modules/raft/build.gradle
@@ -99,6 +99,7 @@ dependencies {
integrationTestImplementation project(':ignite-raft-api')
integrationTestImplementation project(':ignite-failure-handler')
integrationTestImplementation project(':ignite-runner')
+ integrationTestImplementation project(':ignite-configuration-system')
integrationTestImplementation libs.jetbrains.annotations
integrationTestImplementation libs.dropwizard.metrics
integrationTestImplementation libs.disruptor
diff --git a/modules/runner/build.gradle b/modules/runner/build.gradle
index 6d2644753b..cc76f44247 100644
--- a/modules/runner/build.gradle
+++ b/modules/runner/build.gradle
@@ -49,6 +49,7 @@ dependencies {
implementation project(':ignite-configuration')
implementation project(':ignite-configuration-root')
+ implementation project(':ignite-configuration-system')
implementation project(':ignite-configuration-presentation')
implementation project(':ignite-rest')
implementation project(':ignite-api')
@@ -168,6 +169,7 @@ dependencies {
integrationTestImplementation project(':ignite-low-watermark')
integrationTestImplementation project(':ignite-partition-replicator')
integrationTestImplementation project(':ignite-configuration-root')
+ integrationTestImplementation project(':ignite-configuration-system')
integrationTestImplementation project(':ignite-system-disaster-recovery')
integrationTestImplementation testFixtures(project(":ignite-api"))
integrationTestImplementation testFixtures(project(':ignite-core'))
diff --git a/modules/table/build.gradle b/modules/table/build.gradle
index 67a82c7b6a..bcf1aa90bd 100644
--- a/modules/table/build.gradle
+++ b/modules/table/build.gradle
@@ -153,6 +153,7 @@ dependencies {
integrationTestImplementation project(':ignite-system-view')
integrationTestImplementation project(':ignite-partition-replicator')
integrationTestImplementation project(':ignite-configuration-root')
+ integrationTestImplementation project(':ignite-configuration-system')
integrationTestImplementation project(':ignite-system-disaster-recovery')
integrationTestImplementation(testFixtures(project))
integrationTestImplementation(testFixtures(project(':ignite-core')))
diff --git a/settings.gradle b/settings.gradle
index 6acbcd7482..e8afae0d24 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -89,6 +89,7 @@ include(":ignite-eventlog")
include(":ignite-low-watermark")
include(":ignite-partition-replicator")
include(':ignite-configuration-root')
+include(':ignite-configuration-system')
include(':ignite-system-disaster-recovery')
include(':ignite-system-disaster-recovery-api')
@@ -165,6 +166,7 @@ project(":ignite-eventlog").projectDir =
file('modules/eventlog')
project(":ignite-low-watermark").projectDir = file('modules/low-watermark')
project(":ignite-partition-replicator").projectDir =
file('modules/partition-replicator')
project(":ignite-configuration-root").projectDir =
file('modules/configuration-root')
+project(":ignite-configuration-system").projectDir =
file('modules/configuration-system')
project(":ignite-system-disaster-recovery").projectDir =
file('modules/system-disaster-recovery')
project(":ignite-system-disaster-recovery-api").projectDir =
file('modules/system-disaster-recovery-api')
