Skip to content

Commit 75e9c4b

Browse files
committed
spotless
1 parent 017307e commit 75e9c4b

File tree

2 files changed

+22
-14
lines changed

2 files changed

+22
-14
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1737,7 +1737,8 @@ public static Setting<String> simpleString(String key, Setting<String> fallback,
17371737
* @param lookup is used to access the constructor and component getters, allowing {@code RecordClass} to be non-public.
17381738
* @param relevantSettings supply configuration for the components, including (recursively) any components in any
17391739
* nested records.
1740-
* @param properties apply to this {@link Setting} as a whole, and by default to any component settings not specified by {@code relevantSettings}.
1740+
* @param properties apply to this {@link Setting} as a whole,
1741+
* and by default to any component settings not specified by {@code relevantSettings}.
17411742
* @return the {@link Setting}
17421743
* @param <R> the type of {@code recordClass}
17431744
*/

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

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.elasticsearch.test.ESTestCase;
2424
import org.elasticsearch.test.MockLog;
2525
import org.elasticsearch.test.junit.annotations.TestLogging;
26-
import org.junit.Test;
2726

2827
import java.lang.invoke.MethodHandles;
2928
import java.util.Arrays;
@@ -1623,7 +1622,7 @@ record TestSetting(int intSetting) {}
16231622
assertNull("Creating an updater does not call set", watcher.get());
16241623
updater.apply(settings456, settings123);
16251624
assertEquals("Updater called when value changed", new TestSetting(456), watcher.get());
1626-
assertThrows("Throws when there's no default", IllegalStateException.class, ()->updater.apply(Settings.EMPTY, settings456));
1625+
assertThrows("Throws when there's no default", IllegalStateException.class, () -> updater.apply(Settings.EMPTY, settings456));
16271626

16281627
watcher.set(null);
16291628
updater.apply(settings123, settings123);
@@ -1636,10 +1635,18 @@ public void testRecordWithDefaults() {
16361635
record TestSetting(int i1, int i2) {}
16371636
Setting<Integer> i1Setting = Setting.intSetting("record.setting.i1", -1);
16381637
Setting<Integer> i2Setting = Setting.intSetting("record.setting.i2", -2);
1639-
Setting<TestSetting> setting = Setting.recordSetting("record.setting", TestSetting.class, MethodHandles.lookup(), List.of(i1Setting, i2Setting));
1638+
Setting<TestSetting> setting = Setting.recordSetting(
1639+
"record.setting",
1640+
TestSetting.class,
1641+
MethodHandles.lookup(),
1642+
List.of(i1Setting, i2Setting)
1643+
);
16401644
Settings settings123 = Settings.builder().put("record.setting.i1", 123).build();
16411645

1642-
assertEquals(new TestSetting(123, 456), setting.get(Settings.builder().put("record.setting.i1", 123).put("record.setting.i2", 456).build()));
1646+
assertEquals(
1647+
new TestSetting(123, 456),
1648+
setting.get(Settings.builder().put("record.setting.i1", 123).put("record.setting.i2", 456).build())
1649+
);
16431650
assertEquals(new TestSetting(-1, 456), setting.get(Settings.builder().put("record.setting.i2", 456).build()));
16441651
assertEquals(new TestSetting(-1, -2), setting.get(Settings.EMPTY));
16451652

@@ -1660,14 +1667,16 @@ record TestSetting(int i1, int i2) {}
16601667

16611668
public void testAffixRecordSetting() {
16621669
record TestSetting(int intSetting) {}
1663-
var componentSetting = Setting.affixKeySetting(
1664-
"things.",
1665-
"config.int_setting",
1666-
(n,key)-> Setting.intSetting(key, -1));
1670+
var componentSetting = Setting.affixKeySetting("things.", "config.int_setting", (n, key) -> Setting.intSetting(key, -1));
16671671
var setting = Setting.affixKeySetting(
16681672
"things.",
16691673
"config",
1670-
(namespace, key) -> Setting.recordSetting(key, TestSetting.class, MethodHandles.lookup(), List.of(componentSetting.getConcreteSettingForNamespace(namespace)))
1674+
(namespace, key) -> Setting.recordSetting(
1675+
key,
1676+
TestSetting.class,
1677+
MethodHandles.lookup(),
1678+
List.of(componentSetting.getConcreteSettingForNamespace(namespace))
1679+
)
16711680
);
16721681
Settings settings = Settings.builder()
16731682
.put("things.thing1.config.int_setting", 123)
@@ -1676,14 +1685,12 @@ record TestSetting(int intSetting) {}
16761685
assertEquals(new TestSetting(123), setting.getConcreteSetting("things.thing1.config").get(settings));
16771686
assertEquals(new TestSetting(456), setting.getConcreteSetting("things.thing2.config").get(settings));
16781687

1679-
Settings settings1 = Settings.builder()
1680-
.put("things.thing1.config.int_setting", 123)
1681-
.build();
1688+
Settings settings1 = Settings.builder().put("things.thing1.config.int_setting", 123).build();
16821689
assertEquals(new TestSetting(123), setting.getConcreteSetting("things.thing1.config").get(settings));
16831690
assertEquals("Default", new TestSetting(-1), setting.getConcreteSetting("things.thing2.config").get(settings1));
16841691

16851692
Map<String, TestSetting> watcher = new ConcurrentHashMap<>();
1686-
var updater = setting.newAffixUpdater(watcher::put, logger, (k, s)->{});
1693+
var updater = setting.newAffixUpdater(watcher::put, logger, (k, s) -> {});
16871694

16881695
// Test the obvious state transitions
16891696
updater.apply(settings1, Settings.EMPTY);

0 commit comments

Comments
 (0)