Skip to content

Commit b64d2b1

Browse files
authored
IGNITE-24187 Fix code style issues in SystemDistributedConfigurationPropertyHolder (#5027)
1 parent 076d3af commit b64d2b1

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

modules/configuration-system/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ dependencies {
2525

2626
implementation project(':ignite-configuration-api')
2727
implementation project(':ignite-configuration-root')
28+
implementation project(':ignite-core')
2829
implementation libs.auto.service.annotations
2930

3031
testImplementation(testFixtures(project(':ignite-core')))

modules/configuration-system/src/main/java/org/apache/ignite/internal/configuration/utils/SystemDistributedConfigurationPropertyHolder.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
package org.apache.ignite.internal.configuration.utils;
1919

20-
import java.util.concurrent.CompletableFuture;
21-
import java.util.concurrent.atomic.AtomicReference;
22-
import java.util.function.BiConsumer;
20+
import static org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture;
21+
2322
import java.util.function.Function;
23+
import java.util.function.ObjLongConsumer;
2424
import org.apache.ignite.internal.configuration.SystemDistributedConfiguration;
2525
import org.apache.ignite.internal.configuration.SystemDistributedView;
2626
import org.apache.ignite.internal.configuration.SystemPropertyView;
@@ -37,10 +37,10 @@ public class SystemDistributedConfigurationPropertyHolder<T> {
3737
private final SystemDistributedConfiguration systemDistributedConfig;
3838

3939
/** Current value of target system distributed configuration property. */
40-
private final AtomicReference<T> currentValue = new AtomicReference<>();
40+
private volatile T currentValue;
4141

4242
/** Listener, which receives (newValue, revision) on every configuration update. */
43-
private final BiConsumer<T, Long> valueListener;
43+
private final ObjLongConsumer<T> valueListener;
4444

4545
/** Converter to translate {@link String} representation of property value to target type. */
4646
private final Function<String, T> propertyConverter;
@@ -56,7 +56,7 @@ public class SystemDistributedConfigurationPropertyHolder<T> {
5656
*/
5757
public SystemDistributedConfigurationPropertyHolder(
5858
SystemDistributedConfiguration systemDistributedConfig,
59-
BiConsumer<T, Long> valueListener,
59+
ObjLongConsumer<T> valueListener,
6060
String propertyName,
6161
T defaultValue,
6262
Function<String, T> propertyConverter
@@ -70,7 +70,7 @@ public SystemDistributedConfigurationPropertyHolder(
7070
systemDistributedConfig.listen(ctx -> {
7171
updateSystemProperties(ctx.newValue(), ctx.storageRevision());
7272

73-
return CompletableFuture.completedFuture(null);
73+
return nullCompletedFuture();
7474
});
7575
}
7676

@@ -89,7 +89,7 @@ public void init() {
8989
* @return Current value.
9090
*/
9191
public T currentValue() {
92-
return currentValue.get();
92+
return currentValue;
9393
}
9494

9595
/**
@@ -103,7 +103,7 @@ private void updateSystemProperties(SystemDistributedView view, long revision) {
103103

104104
T value = (systemPropertyView == null) ? defaultValue : propertyConverter.apply(systemPropertyView.propertyValue());
105105

106-
currentValue.set(value);
106+
currentValue = value;
107107

108108
if (revision != -1) {
109109
valueListener.accept(value, revision);

modules/configuration-system/src/test/java/org/apache/ignite/internal/configuration/utils/SystemDistributedConfigurationPropertyHolderTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626

2727
import java.util.concurrent.CompletableFuture;
2828
import java.util.concurrent.atomic.AtomicReference;
29-
import java.util.function.BiConsumer;
3029
import java.util.function.Function;
30+
import java.util.function.ObjLongConsumer;
3131
import org.apache.ignite.internal.configuration.SystemDistributedConfiguration;
3232
import org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
3333
import org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
@@ -42,7 +42,7 @@ public class SystemDistributedConfigurationPropertyHolderTest extends BaseIgnite
4242

4343
private static final String DEFAULT_VALUE = "defaultValue";
4444

45-
private static final BiConsumer<String, Long> noOpConsumer = (value, revision) -> {};
45+
private static final ObjLongConsumer<String> noOpConsumer = (value, revision) -> {};
4646

4747
@Test
4848
void testEmptySystemProperties(@InjectConfiguration SystemDistributedConfiguration systemConfig) {

0 commit comments

Comments
 (0)