This is an automated email from the ASF dual-hosted git repository.
apolovtsev 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 bd006ed45f8 IGNITE-28210 Update config library (#7764)
bd006ed45f8 is described below
commit bd006ed45f87c0c90c9420dd47f6b8b256e75d8a
Author: Vadim Pakhnushev <[email protected]>
AuthorDate: Thu Mar 12 11:16:19 2026 +0300
IGNITE-28210 Update config library (#7764)
---
gradle/libs.versions.toml | 2 +-
.../org/apache/ignite/internal/cli/decorators/HoconDecorator.java | 3 +--
.../org/apache/ignite/internal/cli/decorators/HoconDecoratorTest.java | 4 ++--
.../ignite/internal/configuration/hocon/HoconConverterTest.java | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3a8431bfcc0..11ba77b7c47 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -55,7 +55,7 @@ log4j = "2.25.3"
spoon = "10.4.3-beta-21"
swagger = "2.2.42"
swaggerParser = "2.1.39"
-typesafe = "1.4.5"
+typesafe = "1.4.6"
hamcrest = "3.0"
hamcrestOptional = "2.0.0"
hamcrestPath = "1.0.1"
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/HoconDecorator.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/HoconDecorator.java
index 9dfc509c48d..f7d4e182312 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/HoconDecorator.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/decorators/HoconDecorator.java
@@ -71,8 +71,7 @@ public class HoconDecorator implements Decorator<JsonString,
TerminalOutput> {
} catch (ConfigException.WrongType e) {
// This happens when input is a top-level list. Use fake root
object to parse the input and print the value of that object.
Config config = ConfigFactory.parseString(FAKE_ROOT + "=" +
jsonString);
- // Set json to true to workaround the issue when rendering list at
root
- return
config.getValue(FAKE_ROOT).render(ConfigRenderOptions.concise().setFormatted(true).setJson(true));
+ return
config.getValue(FAKE_ROOT).render(ConfigRenderOptions.concise().setFormatted(true).setJson(false));
}
}
}
diff --git
a/modules/cli/src/test/java/org/apache/ignite/internal/cli/decorators/HoconDecoratorTest.java
b/modules/cli/src/test/java/org/apache/ignite/internal/cli/decorators/HoconDecoratorTest.java
index 855fe8edfc2..a1b0a55c50b 100644
---
a/modules/cli/src/test/java/org/apache/ignite/internal/cli/decorators/HoconDecoratorTest.java
+++
b/modules/cli/src/test/java/org/apache/ignite/internal/cli/decorators/HoconDecoratorTest.java
@@ -34,8 +34,8 @@ class HoconDecoratorTest {
arguments("foo=[bar, baz]", "foo=[\n bar,\n baz\n]\n"),
arguments("foo=bar", "foo=bar\n"),
arguments("foo=[]", "foo=[]\n"),
- arguments("[bar, baz]", "[\n \"bar\",\n \"baz\"\n]"), //
top-level list
- arguments("[{bar=baz}]", "[\n {\n \"bar\" :
\"baz\"\n }\n\n]"), // top-level list with objects
+ arguments("[bar, baz]", "[\n bar,\n baz\n]"), //
top-level list
+ arguments("[{bar=baz}]", "[\n {\n bar=baz\n
}\n]"), // top-level list with objects
arguments("[]", "[]") // top-level list
);
}
diff --git
a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/hocon/HoconConverterTest.java
b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/hocon/HoconConverterTest.java
index 7220b509519..1185e98cf3b 100644
---
a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/hocon/HoconConverterTest.java
+++
b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/hocon/HoconConverterTest.java
@@ -726,7 +726,7 @@ public class HoconConverterTest {
change("rootInjectedName.nestedNamed = [{someName = foo}]");
assertEquals("nested{},nestedNamed=[{someName=foo}]",
asHoconStr(List.of("rootInjectedName")));
- assertEquals("[someName=foo]", asHoconStr(List.of("rootInjectedName",
"nestedNamed")));
+ assertEquals("[{someName=foo}]",
asHoconStr(List.of("rootInjectedName", "nestedNamed")));
assertEquals("{}", asHoconStr(List.of("rootInjectedName",
"nestedNamed", "foo")));
// Let's check that the NamedConfigValue#syntheticKeyName key will not
work.