Skip to content

Commit 15bd092

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 959d7e8 commit 15bd092

File tree

12 files changed

+103
-58
lines changed

12 files changed

+103
-58
lines changed

‎server/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,12 @@ public ClusterApplierService(String nodeName, ClusterSettings clusterSettings, T
111111
this(nodeName, clusterSettings, new ProjectScopedSettings(), threadPool);
112112
}
113113

114-
public ClusterApplierService(String nodeName, ClusterSettings clusterSettings, ProjectScopedSettings projectScopedSettings, ThreadPool threadPool) {
114+
public ClusterApplierService(
115+
String nodeName,
116+
ClusterSettings clusterSettings,
117+
ProjectScopedSettings projectScopedSettings,
118+
ThreadPool threadPool
119+
) {
115120
this.clusterSettings = clusterSettings;
116121
this.projectScopedSettings = projectScopedSettings;
117122
this.threadPool = threadPool;
@@ -551,8 +556,10 @@ private void applySettings(ClusterChangedEvent clusterChangedEvent, Recorder sto
551556
}
552557
}
553558

554-
ProjectStateRegistry oldProjectStateRegistry = clusterChangedEvent.previousState().custom(ProjectStateRegistry.TYPE, ProjectStateRegistry.EMPTY);
555-
ProjectStateRegistry newProjectStateRegistry = clusterChangedEvent.state().custom(ProjectStateRegistry.TYPE, ProjectStateRegistry.EMPTY);
559+
ProjectStateRegistry oldProjectStateRegistry = clusterChangedEvent.previousState()
560+
.custom(ProjectStateRegistry.TYPE, ProjectStateRegistry.EMPTY);
561+
ProjectStateRegistry newProjectStateRegistry = clusterChangedEvent.state()
562+
.custom(ProjectStateRegistry.TYPE, ProjectStateRegistry.EMPTY);
556563
if (oldProjectStateRegistry != newProjectStateRegistry) {
557564
for (ProjectId projectId : newProjectStateRegistry.knownProjects()) {
558565
Settings oldProjectSettings = oldProjectStateRegistry.getProjectSettings(projectId);

‎server/src/main/java/org/elasticsearch/cluster/service/ClusterService.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,12 @@ public ClusterService(Settings settings, ClusterSettings clusterSettings, Thread
6565
clusterSettings,
6666
new ProjectScopedSettings(Collections.emptySet()),
6767
new MasterService(settings, clusterSettings, threadPool, taskManager),
68-
new ClusterApplierService(Node.NODE_NAME_SETTING.get(settings), clusterSettings,
69-
new ProjectScopedSettings(Collections.emptySet()), threadPool)
68+
new ClusterApplierService(
69+
Node.NODE_NAME_SETTING.get(settings),
70+
clusterSettings,
71+
new ProjectScopedSettings(Collections.emptySet()),
72+
threadPool
73+
)
7074
);
7175
}
7276

‎server/src/main/java/org/elasticsearch/common/settings/AbstractContextlessScopedSettings.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,12 @@ public abstract class AbstractContextlessScopedSettings extends AbstractScopedSe
2323
protected final Settings settings;
2424
private Settings lastSettingsApplied;
2525

26-
public AbstractContextlessScopedSettings(Settings nodeSettings, Settings scopeSettings, AbstractContextlessScopedSettings other, Logger logger) {
26+
public AbstractContextlessScopedSettings(
27+
Settings nodeSettings,
28+
Settings scopeSettings,
29+
AbstractContextlessScopedSettings other,
30+
Logger logger
31+
) {
2732
super(other, logger);
2833

2934
this.settings = nodeSettings;
@@ -140,11 +145,7 @@ public synchronized <A, B> void addSettingsUpdateConsumer(
140145
super.addSettingsUpdateConsumer(a, b, wrapIgnoringContext(consumer), validator);
141146
}
142147

143-
public synchronized <A, B> void addSettingsUpdateConsumer(
144-
Setting<A> a,
145-
Setting<B> b,
146-
BiConsumer<A, B> consumer
147-
) {
148+
public synchronized <A, B> void addSettingsUpdateConsumer(Setting<A> a, Setting<B> b, BiConsumer<A, B> consumer) {
148149
super.addSettingsUpdateConsumer(a, b, wrapIgnoringContext(consumer));
149150
}
150151
}

‎server/src/main/java/org/elasticsearch/common/settings/AbstractScopedSettings.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,10 @@ public synchronized <T> void addAffixUpdateConsumer(
220220
* </p>
221221
*/
222222
@SuppressWarnings("rawtypes")
223-
public synchronized void addAffixGroupUpdateConsumer(List<Setting.AffixSetting<?>> settings, TriConsumer<C, String, Settings> consumer) {
223+
public synchronized void addAffixGroupUpdateConsumer(
224+
List<Setting.AffixSetting<?>> settings,
225+
TriConsumer<C, String, Settings> consumer
226+
) {
224227
List<SettingUpdater> affixUpdaters = new ArrayList<>(settings.size());
225228
for (Setting.AffixSetting<?> setting : settings) {
226229
ensureSettingIsRegistered(setting);
@@ -238,7 +241,7 @@ public boolean hasChanged(Settings current, Settings previous) {
238241
public Map<String, Settings> getValue(Settings current, Settings previous) {
239242
Set<String> namespaces = new HashSet<>();
240243
for (Setting.AffixSetting<?> setting : settings) {
241-
SettingUpdater<?, ?> affixUpdaterA = setting.newAffixUpdater((ctx,k, v) -> namespaces.add(k), logger, (a, b) -> {});
244+
SettingUpdater<?, ?> affixUpdaterA = setting.newAffixUpdater((ctx, k, v) -> namespaces.add(k), logger, (a, b) -> {});
242245
affixUpdaterA.apply(null, current, previous);
243246
}
244247
Map<String, Settings> namespaceToSettings = Maps.newMapWithExpectedSize(namespaces.size());

‎server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java‎

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,9 @@
6969
import org.elasticsearch.common.network.NetworkService;
7070
import org.elasticsearch.common.network.ThreadWatchdog;
7171
import org.elasticsearch.common.settings.Setting.Property;
72-
import org.elasticsearch.common.util.Maps;
7372
import org.elasticsearch.common.util.PageCacheRecycler;
7473
import org.elasticsearch.common.util.concurrent.EsExecutors;
7574
import org.elasticsearch.common.util.concurrent.ThreadContext;
76-
import org.elasticsearch.common.util.set.Sets;
7775
import org.elasticsearch.core.Tuple;
7876
import org.elasticsearch.discovery.DiscoveryModule;
7977
import org.elasticsearch.discovery.HandshakingTransportAddressConnector;
@@ -145,11 +143,8 @@
145143
import org.elasticsearch.transport.TransportSettings;
146144
import org.elasticsearch.watcher.ResourceWatcherService;
147145

148-
import java.util.ArrayList;
149146
import java.util.Collections;
150147
import java.util.HashMap;
151-
import java.util.HashSet;
152-
import java.util.List;
153148
import java.util.Map;
154149
import java.util.Set;
155150
import java.util.function.BiConsumer;
@@ -698,8 +693,16 @@ public synchronized <A, B> void addAffixUpdateConsumer(
698693
// down the road this would be nice to have!
699694
ensureSettingIsRegistered(settingA);
700695
ensureSettingIsRegistered(settingB);
701-
SettingUpdater<Object, Map<SettingUpdater<Object, A>, A>> affixUpdaterA = settingA.newAffixUpdater((ctx, a, b) -> {}, logger, (a, b) -> {});
702-
SettingUpdater<Object, Map<SettingUpdater<Object, B>, B>> affixUpdaterB = settingB.newAffixUpdater((ctx, a, b) -> {}, logger, (a, b) -> {});
696+
SettingUpdater<Object, Map<SettingUpdater<Object, A>, A>> affixUpdaterA = settingA.newAffixUpdater(
697+
(ctx, a, b) -> {},
698+
logger,
699+
(a, b) -> {}
700+
);
701+
SettingUpdater<Object, Map<SettingUpdater<Object, B>, B>> affixUpdaterB = settingB.newAffixUpdater(
702+
(ctx, a, b) -> {},
703+
logger,
704+
(a, b) -> {}
705+
);
703706

704707
addSettingsUpdater(new SettingUpdater<Void, Map<String, Tuple<A, B>>>() {
705708

@@ -711,7 +714,7 @@ public boolean hasChanged(Settings current, Settings previous) {
711714
@Override
712715
public Map<String, Tuple<A, B>> getValue(Settings current, Settings previous) {
713716
Map<String, Tuple<A, B>> map = new HashMap<>();
714-
TriConsumer<Void, String, A> aConsumer = (ctx,key, value) -> {
717+
TriConsumer<Void, String, A> aConsumer = (ctx, key, value) -> {
715718
assert map.containsKey(key) == false : "duplicate key: " + key;
716719
map.put(key, new Tuple<>(value, settingB.getConcreteSettingForNamespace(key).get(current)));
717720
};
@@ -724,14 +727,22 @@ public Map<String, Tuple<A, B>> getValue(Settings current, Settings previous) {
724727
.get(current)
725728
.equals(settingA.getConcreteSettingForNamespace(key).get(previous))
726729
: "expected: "
727-
+ settingA.getConcreteSettingForNamespace(key).get(current)
728-
+ " but was "
729-
+ settingA.getConcreteSettingForNamespace(key).get(previous);
730+
+ settingA.getConcreteSettingForNamespace(key).get(current)
731+
+ " but was "
732+
+ settingA.getConcreteSettingForNamespace(key).get(previous);
730733
map.put(key, new Tuple<>(settingA.getConcreteSettingForNamespace(key).get(current), value));
731734
}
732735
};
733-
SettingUpdater<Void, Map<SettingUpdater<Void, A>, A>> affixUpdaterA = settingA.newAffixUpdater(aConsumer, logger, (a, b) -> {});
734-
SettingUpdater<Void, Map<SettingUpdater<Void, B>, B>> affixUpdaterB = settingB.newAffixUpdater(bConsumer, logger, (a, b) -> {});
736+
SettingUpdater<Void, Map<SettingUpdater<Void, A>, A>> affixUpdaterA = settingA.newAffixUpdater(
737+
aConsumer,
738+
logger,
739+
(a, b) -> {}
740+
);
741+
SettingUpdater<Void, Map<SettingUpdater<Void, B>, B>> affixUpdaterB = settingB.newAffixUpdater(
742+
bConsumer,
743+
logger,
744+
(a, b) -> {}
745+
);
735746
affixUpdaterA.apply(null, current, previous);
736747
affixUpdaterB.apply(null, current, previous);
737748
for (Map.Entry<String, Tuple<A, B>> entry : map.entrySet()) {

‎server/src/main/java/org/elasticsearch/common/settings/Setting.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1000,7 +1000,12 @@ public Map<AbstractScopedSettings.SettingUpdater<C, T>, T> getValue(Settings cur
10001000
}
10011001

10021002
@Override
1003-
public void apply(C context, Map<AbstractScopedSettings.SettingUpdater<C, T>, T> value, Settings current, Settings previous) {
1003+
public void apply(
1004+
C context,
1005+
Map<AbstractScopedSettings.SettingUpdater<C, T>, T> value,
1006+
Settings current,
1007+
Settings previous
1008+
) {
10041009
for (Map.Entry<AbstractScopedSettings.SettingUpdater<C, T>, T> entry : value.entrySet()) {
10051010
entry.getKey().apply(context, entry.getValue(), current, previous);
10061011
}

‎server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceShardsAllocatorTests.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import org.elasticsearch.cluster.service.ClusterService;
4545
import org.elasticsearch.cluster.service.FakeThreadPoolMasterService;
4646
import org.elasticsearch.common.UUIDs;
47-
import org.elasticsearch.common.settings.ProjectScopedSettings;
4847
import org.elasticsearch.common.settings.Settings;
4948
import org.elasticsearch.common.time.TimeProviderUtils;
5049
import org.elasticsearch.common.util.concurrent.DeterministicTaskQueue;

‎server/src/test/java/org/elasticsearch/cluster/service/ClusterApplierServiceTests.java‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@
5555
import static org.hamcrest.Matchers.is;
5656

5757
public class ClusterApplierServiceTests extends ESTestCase {
58-
private static final Setting<Integer> PROJECT_SETTING = new Setting<>("test_project_setting", "0",
59-
Integer::parseInt, value -> {
58+
private static final Setting<Integer> PROJECT_SETTING = new Setting<>("test_project_setting", "0", Integer::parseInt, value -> {
6059
if (value < 0) {
6160
throw new IllegalArgumentException("must be positive");
6261
}
@@ -517,11 +516,12 @@ public void testClusterStateApplierBubblesUpExceptionsInProjectSettingsApplier()
517516
clusterApplierService.onNewClusterState(
518517
"test",
519518
() -> ClusterState.builder(clusterApplierService.state())
520-
.putCustom(ProjectStateRegistry.TYPE, ProjectStateRegistry.builder()
521-
.putProjectSettings(randomUniqueProjectId(), Settings.builder()
522-
.put(PROJECT_SETTING.getKey(), -1)
523-
.build())
524-
.build())
519+
.putCustom(
520+
ProjectStateRegistry.TYPE,
521+
ProjectStateRegistry.builder()
522+
.putProjectSettings(randomUniqueProjectId(), Settings.builder().put(PROJECT_SETTING.getKey(), -1).build())
523+
.build()
524+
)
525525
.build(),
526526
new ActionListener<>() {
527527

@@ -556,7 +556,10 @@ public void testClusterSettingsUpdaterCalledOnSettingsChange() throws Interrupte
556556
Metadata.builder(clusterApplierService.state().metadata())
557557
.persistentSettings(
558558
Settings.builder()
559-
.put(EnableAllocationDecider.CLUSTER_ROUTING_ALLOCATION_ENABLE_SETTING.getKey(), EnableAllocationDecider.Allocation.NEW_PRIMARIES)
559+
.put(
560+
EnableAllocationDecider.CLUSTER_ROUTING_ALLOCATION_ENABLE_SETTING.getKey(),
561+
EnableAllocationDecider.Allocation.NEW_PRIMARIES
562+
)
560563
.build()
561564
)
562565
.build()
@@ -595,12 +598,13 @@ public void testProjectSettingsUpdaterCalledOnSettingsChange() throws Interrupte
595598
clusterApplierService.onNewClusterState(
596599
"test",
597600
() -> ClusterState.builder(clusterApplierService.state())
598-
.putCustom(ProjectStateRegistry.TYPE, ProjectStateRegistry.builder()
599-
.putProjectSettings(projectId, Settings.builder()
600-
.put(PROJECT_SETTING.getKey(), 42)
601-
.build())
602-
.putProjectSettings(randomUniqueProjectId(), Settings.builder().build())
603-
.build())
601+
.putCustom(
602+
ProjectStateRegistry.TYPE,
603+
ProjectStateRegistry.builder()
604+
.putProjectSettings(projectId, Settings.builder().put(PROJECT_SETTING.getKey(), 42).build())
605+
.putProjectSettings(randomUniqueProjectId(), Settings.builder().build())
606+
.build()
607+
)
604608
.build(),
605609
new ActionListener<>() {
606610
@Override

‎server/src/test/java/org/elasticsearch/common/settings/SettingTests.java‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,10 @@ public void testByteSizeSettingValidation() {
105105
final ByteSizeValue byteSizeValue = byteSizeValueSetting.get(Settings.EMPTY);
106106
assertThat(byteSizeValue.getBytes(), equalTo(2048L));
107107
AtomicReference<ByteSizeValue> value = new AtomicReference<>(null);
108-
ClusterSettings.SettingUpdater<Void, ByteSizeValue> settingUpdater = byteSizeValueSetting.newUpdater((ctx, newValue) -> value.set(newValue), logger);
108+
ClusterSettings.SettingUpdater<Void, ByteSizeValue> settingUpdater = byteSizeValueSetting.newUpdater(
109+
(ctx, newValue) -> value.set(newValue),
110+
logger
111+
);
109112

110113
final IllegalArgumentException e = expectThrows(
111114
IllegalArgumentException.class,
@@ -147,7 +150,10 @@ public void testMemorySize() {
147150
assertEquals(memorySizeValue.getBytes(), JvmInfo.jvmInfo().getMem().getHeapMax().getBytes() * 0.25, 1.0);
148151

149152
AtomicReference<ByteSizeValue> value = new AtomicReference<>(null);
150-
ClusterSettings.SettingUpdater<Void, ByteSizeValue> settingUpdater = memorySizeValueSetting.newUpdater((ctx, newValue) -> value.set(newValue), logger);
153+
ClusterSettings.SettingUpdater<Void, ByteSizeValue> settingUpdater = memorySizeValueSetting.newUpdater(
154+
(ctx, newValue) -> value.set(newValue),
155+
logger
156+
);
151157
try {
152158
settingUpdater.apply(null, Settings.builder().put("a.byte.size", 12).build(), Settings.EMPTY);
153159
fail("no unit");
@@ -208,7 +214,10 @@ public void testSimpleUpdate() {
208214

209215
public void testSimpleUpdateOfFilteredSetting() {
210216
Setting<Boolean> booleanSetting = Setting.boolSetting("foo.bar", false, Property.Dynamic, Property.Filtered);
211-
SettingUpdater<Object, Boolean> settingUpdater = booleanSetting.newUpdater((ctx, value) -> fail("Listeners should not be called"), logger);
217+
SettingUpdater<Object, Boolean> settingUpdater = booleanSetting.newUpdater(
218+
(ctx, value) -> fail("Listeners should not be called"),
219+
logger
220+
);
212221
Object ctx = new Object();
213222

214223
// try update bogus value
@@ -600,9 +609,13 @@ public void testGroups() {
600609
assertTrue(setting.match("foo.bar.baz"));
601610
assertFalse(setting.match("foo.baz.bar"));
602611

603-
SettingUpdater<Object, Settings> predicateSettingUpdater = setting.newUpdater((c, value) -> fail("Listeners shouldn't be called"), logger, (s) -> {
604-
throw randomBoolean() ? new RuntimeException("anything") : new IllegalArgumentException("illegal");
605-
});
612+
SettingUpdater<Object, Settings> predicateSettingUpdater = setting.newUpdater(
613+
(c, value) -> fail("Listeners shouldn't be called"),
614+
logger,
615+
(s) -> {
616+
throw randomBoolean() ? new RuntimeException("anything") : new IllegalArgumentException("illegal");
617+
}
618+
);
606619
try {
607620
predicateSettingUpdater.apply(
608621
ctx,
@@ -625,9 +638,13 @@ public void testGroupKeyExists() {
625638
public void testFilteredGroups() {
626639
Setting<Settings> setting = Setting.groupSetting("foo.bar.", Property.Filtered, Property.Dynamic);
627640

628-
ClusterSettings.SettingUpdater<Object, Settings> predicateSettingUpdater = setting.newUpdater((ctx, value) -> fail("Listeners shouldn't be called"), logger, (s) -> {
629-
throw randomBoolean() ? new RuntimeException("anything") : new IllegalArgumentException("illegal");
630-
});
641+
ClusterSettings.SettingUpdater<Object, Settings> predicateSettingUpdater = setting.newUpdater(
642+
(ctx, value) -> fail("Listeners shouldn't be called"),
643+
logger,
644+
(s) -> {
645+
throw randomBoolean() ? new RuntimeException("anything") : new IllegalArgumentException("illegal");
646+
}
647+
);
631648
Object ctx = new Object();
632649
IllegalArgumentException ex = expectThrows(
633650
IllegalArgumentException.class,
@@ -1318,10 +1335,7 @@ public void testTimeValueBounds() {
13181335
public void testSettingsGroupUpdater() {
13191336
Setting<Integer> intSetting = Setting.intSetting("prefix.foo", 1, Property.NodeScope, Property.Dynamic);
13201337
Setting<Integer> intSetting2 = Setting.intSetting("prefix.same", 1, Property.NodeScope, Property.Dynamic);
1321-
SettingUpdater<Object, Settings> updater = Setting.groupedSettingsUpdater(
1322-
(ctx, s) -> {},
1323-
Arrays.asList(intSetting, intSetting2)
1324-
);
1338+
SettingUpdater<Object, Settings> updater = Setting.groupedSettingsUpdater((ctx, s) -> {}, Arrays.asList(intSetting, intSetting2));
13251339

13261340
Settings current = Settings.builder().put("prefix.foo", 123).put("prefix.same", 5555).build();
13271341
Settings previous = Settings.builder().put("prefix.foo", 321).put("prefix.same", 5555).build();

‎server/src/test/java/org/elasticsearch/transport/ProxyConnectionStrategyTests.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import org.elasticsearch.cluster.ClusterName;
1818
import org.elasticsearch.cluster.node.DiscoveryNode;
1919
import org.elasticsearch.cluster.node.VersionInformation;
20-
import org.elasticsearch.common.settings.AbstractScopedSettings;
2120
import org.elasticsearch.common.settings.ClusterSettings;
2221
import org.elasticsearch.common.settings.Setting;
2322
import org.elasticsearch.common.settings.Settings;

0 commit comments

Comments
 (0)