Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Config now supports merging of objects and lists #2448

Merged
merged 1 commit into from Oct 15, 2020
Merged

Config now supports merging of objects and lists #2448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 20 additions & 6 deletions config/config/src/main/java/io/helidon/config/ObjectNodeImpl.java
View file
Open in desktop
Expand Up @@ -20,14 +20,13 @@
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function;

import io.helidon.config.AbstractNodeBuilderImpl.MergingKey;
import io.helidon.config.spi.ConfigNode;
import io.helidon.config.spi.ConfigNode.ObjectNode;

import static io.helidon.config.AbstractNodeBuilderImpl.formatFrom;

/**
* Implements {@link ObjectNode}.
*/
Expand Down Expand Up @@ -98,10 +97,7 @@ public MergeableNode merge(MergeableNode node) {
case OBJECT:
return mergeWithObjectNode((ObjectNodeImpl) node);
case LIST:
throw new ConfigException(
String.format("Cannot merge a LIST node%s with an OBJECT node%s.",
formatFrom(((ListNodeImpl) node).description()),
formatFrom(description)));
return mergeWithListNode((ListNodeImpl) node);
case VALUE:
return mergeWithValueNode((ValueNodeImpl) node);
default:
Expand All @@ -126,6 +122,24 @@ private MergeableNode mergeWithObjectNode(ObjectNodeImpl node) {
return builder.build();
}

private MergeableNode mergeWithListNode(ListNodeImpl node) {
final ObjectNodeBuilderImpl builder = ObjectNodeBuilderImpl.create(members, resolveTokenFunction);

if (node.hasValue()) {
builder.value(node.value());
} else if (hasValue()) {
builder.value(value);
}

AtomicInteger index = new AtomicInteger(0);
node.forEach(configNode -> {
int i = index.getAndIncrement();
builder.merge(String.valueOf(i), (MergeableNode) configNode);
});

return builder.build();
}

@Override
public String toString() {
if (null == value) {
Expand Down
31 changes: 15 additions & 16 deletions config/config/src/test/java/io/helidon/config/ObjectNodeBuilderImplTest.java
View file
Open in desktop
Expand Up @@ -195,26 +195,25 @@ public void testMergeListToList() {

@Test
public void testMergeListToObjectWithNonNumberKey() {
ConfigException ex = assertThrows(ConfigException.class, () -> {
new ObjectNodeBuilderImpl()
.addValue("top1.prop1.sub1", "2")
.addList("top1.prop1", ListNode.builder().addValue("1").build())
.build();
});
assertThat(ex.getMessage(),
stringContainsInOrder(List.of("top1", "prop1", "merge", "LIST", "OBJECT")));
ObjectNode rootNode = new ObjectNodeBuilderImpl()
.addValue("top1.prop1.sub1", "2")
.addList("top1.prop1", ListNode.builder().addValue("1").build())
.build();
ObjectNode listNode = (ObjectNode) ((ObjectNode) rootNode.get("top1")).get("prop1");
assertThat(listNode.entrySet(), hasSize(2));
assertThat(listNode.get("0"), valueNode("1"));
assertThat(listNode.get("sub1"), valueNode("2"));
}

@Test
public void testMergeListToObjectWithNumberKey() {
ConfigException ex = assertThrows(ConfigException.class, () -> {
new ObjectNodeBuilderImpl()
.addValue("top1.prop1.0", "2")
.addList("top1.prop1", ListNode.builder().addValue("1").build())
.build();
});
assertThat(ex.getMessage(),
stringContainsInOrder(List.of("top1", "prop1", "merge", "LIST", "OBJECT")));
ObjectNode rootNode = new ObjectNodeBuilderImpl()
.addValue("top1.prop1.0", "2")
.addList("top1.prop1", ListNode.builder().addValue("1").build())
.build();
ObjectNode listNode = (ObjectNode) ((ObjectNode) rootNode.get("top1")).get("prop1");
assertThat(listNode.entrySet(), hasSize(1));
assertThat(listNode.get("0"), valueNode("1"));
}

@Test
Expand Down
37 changes: 18 additions & 19 deletions config/config/src/test/java/io/helidon/config/spi/FallbackMergingStrategyTest.java
View file
Open in desktop
Expand Up @@ -192,29 +192,28 @@ public void testMergeListToList() {

@Test
public void testMergeListToObjectWithNonNumberKey() {
ConfigException ex = assertThrows(ConfigException.class, () -> {
mergeLoads(
ObjectNode.builder().addList("top1.prop1", ListNode.builder()
.addValue("1").build())
.build(),
ObjectNode.builder().addValue("top1.prop1.sub1", "2").build());
});
assertThat(ex.getMessage(),
stringContainsInOrder(List.of("top1", "prop1", "merge", "LIST", "OBJECT")));
ObjectNode rootNode = mergeLoads(
ObjectNode.builder().addList("top1.prop1", ListNode.builder()
.addValue("1").build())
.build(),
ObjectNode.builder().addValue("top1.prop1.sub1", "2").build());
ObjectNode listNode = (ObjectNode) ((ObjectNode) rootNode.get("top1")).get("prop1");
assertThat(listNode.entrySet(), hasSize(2));
assertThat(listNode.get("0"), valueNode("1"));
assertThat(listNode.get("sub1"), valueNode("2"));
}

@Test
public void testMergeListToObjectWithNumberKey() {
ConfigException ex = assertThrows(ConfigException.class, () -> {
mergeLoads(
ObjectNode.builder()
.addList("top1.prop1", ListNode.builder()
.addValue("1").build())
.build(),
ObjectNode.builder().addValue("top1.prop1.0", "2").build());
});
assertThat(ex.getMessage(),
stringContainsInOrder(List.of("top1", "prop1", "merge", "LIST", "OBJECT")));
ObjectNode rootNode = mergeLoads(
ObjectNode.builder()
.addList("top1.prop1", ListNode.builder()
.addValue("1").build())
.build(),
ObjectNode.builder().addValue("top1.prop1.0", "2").build());
ObjectNode listNode = (ObjectNode) ((ObjectNode) rootNode.get("top1")).get("prop1");
assertThat(listNode.entrySet(), hasSize(1));
assertThat(listNode.get("0"), valueNode("1"));
}

@Test
Expand Down