This is an automated email from the ASF dual-hosted git repository. sergeychugunov 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 882a2ab IGNITE-14001 Minor codestyle fixes (#27) 882a2ab is described below commit 882a2ab250462d2f505ea5eb1769b1a4aa4e1d64 Author: Semyon Danilov <samvi...@yandex.ru> AuthorDate: Mon Jan 18 18:12:05 2021 +0300 IGNITE-14001 Minor codestyle fixes (#27) Signed-off-by: Sergey Chugunov <sergey.chugu...@gmail.com> --- .../src/main/java/org/apache/ignite/configuration/Configurator.java | 4 +--- .../org/apache/ignite/configuration/internal/DynamicProperty.java | 3 +-- .../main/java/org/apache/ignite/configuration/internal/Modifier.java | 1 - .../org/apache/ignite/configuration/internal/selector/Selector.java | 1 - .../org/apache/ignite/configuration/storage/ConfigurationStorage.java | 1 - .../configuration/validation/ConfigurationValidationException.java | 2 -- .../org/apache/ignite/configuration/validation/FieldValidator.java | 1 - 7 files changed, 2 insertions(+), 11 deletions(-) diff --git a/modules/configuration/src/main/java/org/apache/ignite/configuration/Configurator.java b/modules/configuration/src/main/java/org/apache/ignite/configuration/Configurator.java index ba04aca..6150b60 100644 --- a/modules/configuration/src/main/java/org/apache/ignite/configuration/Configurator.java +++ b/modules/configuration/src/main/java/org/apache/ignite/configuration/Configurator.java @@ -132,14 +132,12 @@ public class Configurator<T extends DynamicConfiguration<?, ?, ?>> { Selector<T, TARGET, VIEW, INIT, CHANGE> selector, CHANGE newValue ) throws ConfigurationValidationException { - // TODO: atomic change start final T copy = (T) root.copy(); final TARGET select = selector.select(copy); select.changeWithoutValidation(newValue); copy.validate(root); selector.select(root).changeWithoutValidation(newValue); - // TODO: atomic change end } /** @@ -198,7 +196,7 @@ public class Configurator<T extends DynamicConfiguration<?, ?, ?>> { final String key = property.key(); property.addListener(new PropertyListener<PROP, PROP>() { /** {@inheritDoc} */ - public void update(PROP newValue, ConfigurationProperty<PROP, PROP> modifier) { + @Override public void update(PROP newValue, ConfigurationProperty<PROP, PROP> modifier) { storage.save(key, newValue); } }); diff --git a/modules/configuration/src/main/java/org/apache/ignite/configuration/internal/DynamicProperty.java b/modules/configuration/src/main/java/org/apache/ignite/configuration/internal/DynamicProperty.java index 3ab17db..189eea7 100644 --- a/modules/configuration/src/main/java/org/apache/ignite/configuration/internal/DynamicProperty.java +++ b/modules/configuration/src/main/java/org/apache/ignite/configuration/internal/DynamicProperty.java @@ -141,7 +141,7 @@ public class DynamicProperty<T extends Serializable> implements Modifier<T, T, T } /** {@inheritDoc} */ - public T value() { + @Override public T value() { return val; } @@ -199,5 +199,4 @@ public class DynamicProperty<T extends Serializable> implements Modifier<T, T, T public DynamicProperty<T> copy(DynamicConfiguration<?, ?, ?> newRoot) { return new DynamicProperty<>(this, newRoot); } - } diff --git a/modules/configuration/src/main/java/org/apache/ignite/configuration/internal/Modifier.java b/modules/configuration/src/main/java/org/apache/ignite/configuration/internal/Modifier.java index eb123f4..fcc2ce0 100644 --- a/modules/configuration/src/main/java/org/apache/ignite/configuration/internal/Modifier.java +++ b/modules/configuration/src/main/java/org/apache/ignite/configuration/internal/Modifier.java @@ -26,7 +26,6 @@ import org.apache.ignite.configuration.validation.ConfigurationValidationExcepti public interface Modifier<VIEW, INIT, CHANGE> extends ConfigurationProperty<VIEW, CHANGE> { /** * Change this configuration node value, but without validation. - * FIXME: this is a necessary evil, but this should'n be accessed from outside of the configurator. * @param change CHANGE object. */ void changeWithoutValidation(CHANGE change); diff --git a/modules/configuration/src/main/java/org/apache/ignite/configuration/internal/selector/Selector.java b/modules/configuration/src/main/java/org/apache/ignite/configuration/internal/selector/Selector.java index 177e2c2..ce3ed3c 100644 --- a/modules/configuration/src/main/java/org/apache/ignite/configuration/internal/selector/Selector.java +++ b/modules/configuration/src/main/java/org/apache/ignite/configuration/internal/selector/Selector.java @@ -36,5 +36,4 @@ public interface Selector<ROOT, TARGET extends Modifier<VIEW, INIT, CHANGE>, VIE * @return Configuration element. */ TARGET select(ROOT root); - } diff --git a/modules/configuration/src/main/java/org/apache/ignite/configuration/storage/ConfigurationStorage.java b/modules/configuration/src/main/java/org/apache/ignite/configuration/storage/ConfigurationStorage.java index 9cb37e4..1c77a9a 100644 --- a/modules/configuration/src/main/java/org/apache/ignite/configuration/storage/ConfigurationStorage.java +++ b/modules/configuration/src/main/java/org/apache/ignite/configuration/storage/ConfigurationStorage.java @@ -52,5 +52,4 @@ public interface ConfigurationStorage { * @throws StorageException If failed to attach listener to configuration storage. */ <T extends Serializable> void listen(String key, Consumer<T> listener) throws StorageException; - } diff --git a/modules/configuration/src/main/java/org/apache/ignite/configuration/validation/ConfigurationValidationException.java b/modules/configuration/src/main/java/org/apache/ignite/configuration/validation/ConfigurationValidationException.java index a7860de..20aec33 100644 --- a/modules/configuration/src/main/java/org/apache/ignite/configuration/validation/ConfigurationValidationException.java +++ b/modules/configuration/src/main/java/org/apache/ignite/configuration/validation/ConfigurationValidationException.java @@ -21,10 +21,8 @@ package org.apache.ignite.configuration.validation; * Configuration validation exception. */ public class ConfigurationValidationException extends RuntimeException { - /** Constructor. */ public ConfigurationValidationException(String message) { super(message); } - } diff --git a/modules/configuration/src/main/java/org/apache/ignite/configuration/validation/FieldValidator.java b/modules/configuration/src/main/java/org/apache/ignite/configuration/validation/FieldValidator.java index f32a357..6705cf6 100644 --- a/modules/configuration/src/main/java/org/apache/ignite/configuration/validation/FieldValidator.java +++ b/modules/configuration/src/main/java/org/apache/ignite/configuration/validation/FieldValidator.java @@ -43,5 +43,4 @@ public abstract class FieldValidator<T extends Serializable, C extends Configura * @throws ConfigurationValidationException If validation failed. */ public abstract void validate(T value, C newRoot, C oldRoot) throws ConfigurationValidationException; - }