Skip to content

Commit d1f5258

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents 7193ef8 + b3d300a commit d1f5258

File tree

14 files changed

+225
-37
lines changed

14 files changed

+225
-37
lines changed

‎.github/workflows/maven-build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ jobs:
1515
runs-on: ${{ matrix.os }}
1616
strategy:
1717
matrix:
18-
java: [17, 21]
18+
java: [17, 21, 25]
1919
os: [ubuntu-latest]
2020
distribution: [temurin]
2121
include:
22-
- java: 17
22+
- java: 21
2323
os: windows-latest
2424
distribution: temurin
25-
- java: 17
25+
- java: 21
2626
os: macos-latest
2727
distribution: temurin
2828

‎.github/workflows/maven-deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: actions/setup-java@v5
2929
with:
3030
distribution: temurin
31-
java-version: 17
31+
java-version: 21
3232
cache: maven
3333

3434
- name: Build, verify, deploy, generate site

‎changes.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@
2424
xsi:schemaLocation="http://maven.apache.org/changes/2.0.0 https://maven.apache.org/xsd/changes-2.0.0.xsd">
2525
<body>
2626

27+
<release version="1.19.0" date="2025-11-17">
28+
<action type="add" dev="bsommerfeld" issue="149">
29+
Support deep merge of list entries with 'key' field: When merging lists with map objects containing a 'key' field, entries with the same key are now merged instead of replaced, preserving fields from base configuration that are not overridden in variants.
30+
</action>
31+
</release>
32+
2733
<release version="1.18.0" date="2025-09-25">
2834
<action type="update" dev="sseifert">
2935
Switch to Java 17.

‎generator/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>io.wcm.devops.conga</groupId>
2727
<artifactId>io.wcm.devops.conga.parent</artifactId>
28-
<version>1.18.0</version>
28+
<version>1.19.0</version>
2929
<relativePath>../parent/pom.xml</relativePath>
3030
</parent>
3131

@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>io.wcm.devops.conga</groupId>
4646
<artifactId>io.wcm.devops.conga.model</artifactId>
47-
<version>1.18.0</version>
47+
<version>1.19.0</version>
4848
<scope>compile</scope>
4949
</dependency>
5050

‎model/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>io.wcm.devops.conga</groupId>
2727
<artifactId>io.wcm.devops.conga.parent</artifactId>
28-
<version>1.18.0</version>
28+
<version>1.19.0</version>
2929
<relativePath>../parent/pom.xml</relativePath>
3030
</parent>
3131

@@ -40,7 +40,7 @@
4040
<dependency>
4141
<groupId>io.wcm.devops.conga</groupId>
4242
<artifactId>io.wcm.devops.conga.resource</artifactId>
43-
<version>1.18.0</version>
43+
<version>1.19.0</version>
4444
<scope>compile</scope>
4545
</dependency>
4646

‎model/src/main/java/io/wcm/devops/conga/model/util/MergingList.java‎

Lines changed: 67 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
*/
2020
package io.wcm.devops.conga.model.util;
2121

22+
import java.util.HashMap;
2223
import java.util.LinkedList;
24+
import java.util.Map;
2325

2426
/**
2527
* Special list that marks a list as "mergeable" in downstream and preservers the merge position.
@@ -52,7 +54,7 @@ void addCheckMergeToken(T item) {
5254
}
5355
}
5456
else {
55-
this.addIgnoreDuplicates(item);
57+
this.addIgnoreDuplicates(Integer.MAX_VALUE, item);
5658
}
5759
}
5860

@@ -73,19 +75,19 @@ public boolean add(T item) {
7375
return false;
7476
}
7577
else {
76-
return this.addIgnoreDuplicates(item);
78+
return this.addIgnoreDuplicates(Integer.MAX_VALUE, item);
7779
}
7880
}
7981

80-
private boolean addIgnoreDuplicates(T item) {
81-
if (!this.contains(item)) {
82-
super.add(item);
83-
return true;
84-
}
85-
return false;
86-
}
87-
8882
private boolean addIgnoreDuplicates(int index, T item) {
83+
// Check for key-based duplicate in case of Map objects with "key" field
84+
int existingIndex = findIndexByKey(item);
85+
if (existingIndex >= 0) {
86+
// Item with same key already exists - merge the maps
87+
mergeItemAtIndex(existingIndex, item);
88+
return false;
89+
}
90+
// Standard duplicate check
8991
if (!this.contains(item)) {
9092
if (index > this.size() - 1) {
9193
super.add(item);
@@ -98,6 +100,61 @@ private boolean addIgnoreDuplicates(int index, T item) {
98100
return false;
99101
}
100102

103+
/**
104+
* Merges a new item into an existing item at the given index.
105+
* For Map objects, performs a deep merge where the existing item takes precedence.
106+
* This is because the existing item is typically from a variant (higher priority),
107+
* and the new item is from a base config (lower priority).
108+
* @param index Index of existing item
109+
* @param newItem New item to merge in
110+
*/
111+
@SuppressWarnings("unchecked")
112+
private void mergeItemAtIndex(int index, T newItem) {
113+
T existingItem = this.get(index);
114+
if (existingItem instanceof Map && newItem instanceof Map) {
115+
Map<Object, Object> existingMap = (Map<Object, Object>)existingItem;
116+
Map<?, ?> newMap = (Map<?, ?>)newItem;
117+
118+
// Merge: Start with new (base), then override with existing (variant)
119+
// This preserves fields from base that are not in variant
120+
Map<Object, Object> mergedMap = new HashMap<>(newMap);
121+
mergedMap.putAll(existingMap);
122+
123+
super.set(index, (T)mergedMap);
124+
}
125+
// For non-Map objects, keep the existing one
126+
// (do nothing, existing item has higher priority)
127+
}
128+
129+
/**
130+
* Finds an existing item in the list that has the same "key" value as the given item.
131+
* This applies only to Map objects that contain a "key" field.
132+
* @param item Item to check
133+
* @return Index of existing item with same key, or -1 if not found
134+
*/
135+
private int findIndexByKey(T item) {
136+
if (!(item instanceof Map)) {
137+
return -1;
138+
}
139+
Map<?, ?> itemMap = (Map<?, ?>)item;
140+
Object itemKey = itemMap.get("key");
141+
if (itemKey == null) {
142+
return -1;
143+
}
144+
145+
for (int i = 0; i < this.size(); i++) {
146+
T existing = this.get(i);
147+
if (existing instanceof Map) {
148+
Map<?, ?> existingMap = (Map<?, ?>)existing;
149+
Object existingKey = existingMap.get("key");
150+
if (itemKey.equals(existingKey)) {
151+
return i;
152+
}
153+
}
154+
}
155+
return -1;
156+
}
157+
101158
/**
102159
* @return true if list has a merge position
103160
*/

‎model/src/test/java/io/wcm/devops/conga/model/util/MapMergerTest.java‎

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,131 @@ void testMergeList_EliminateDuplicates_Map() {
265265
map("k1", list(map("p2", "v2"), map("p3", "v3")))));
266266
}
267267

268+
@Test
269+
@SuppressWarnings("unchecked")
270+
void testMergeList_KeyValueObjects_Override() {
271+
// Test case for key-value objects: objects with same "key" should merge
272+
Map<String, Object> baseConfig = map(
273+
"key", "magnolia.bootstrap.dir",
274+
"value", "WEB-INF/bootstrap/author WEB-INF/bootstrap/common",
275+
"comment", "the directories in which the bootstrap files are searched"
276+
);
277+
278+
Map<String, Object> variantConfig = map(
279+
"key", "magnolia.bootstrap.dir",
280+
"value", "C:/user/test/dir"
281+
);
282+
283+
// When merging with _merge_ token, variant values override base values, but base fields are preserved
284+
Map<String, Object> result = merge(
285+
map("proj.magnolia.cms.properties", list(LIST_MERGE_ENTRY, variantConfig)),
286+
map("proj.magnolia.cms.properties", list(baseConfig))
287+
);
288+
289+
// Should have only one entry with merged values: value from variant, comment from base
290+
List<Object> resultList = (List<Object>)result.get("proj.magnolia.cms.properties");
291+
assertEquals(1, resultList.size());
292+
293+
Map<String, Object> expectedMerged = map(
294+
"key", "magnolia.bootstrap.dir",
295+
"value", "C:/user/test/dir",
296+
"comment", "the directories in which the bootstrap files are searched"
297+
);
298+
assertEquals(expectedMerged, resultList.get(0));
299+
}
300+
301+
@Test
302+
@SuppressWarnings("unchecked")
303+
void testMergeList_KeyValueObjects_OverrideComment() {
304+
// Test that comment can be explicitly overridden if provided in variant
305+
Map<String, Object> baseConfig = map(
306+
"key", "magnolia.bootstrap.dir",
307+
"value", "WEB-INF/bootstrap/author WEB-INF/bootstrap/common",
308+
"comment", "old comment"
309+
);
310+
311+
Map<String, Object> variantConfig = map(
312+
"key", "magnolia.bootstrap.dir",
313+
"value", "woanders",
314+
"comment", "new comment"
315+
);
316+
317+
Map<String, Object> result = merge(
318+
map("props", list(LIST_MERGE_ENTRY, variantConfig)),
319+
map("props", list(baseConfig))
320+
);
321+
322+
// Comment should be overridden because it was explicitly provided in variant
323+
List<Object> resultList = (List<Object>)result.get("props");
324+
assertEquals(1, resultList.size());
325+
assertEquals(variantConfig, resultList.get(0));
326+
}
327+
328+
@Test
329+
@SuppressWarnings("unchecked")
330+
void testMergeList_KeyValueObjects_MultipleKeys() {
331+
// Test with multiple different keys - they should all be preserved
332+
Map<String, Object> config1 = map(
333+
"key", "prop1",
334+
"value", "value1"
335+
);
336+
337+
Map<String, Object> config2 = map(
338+
"key", "prop2",
339+
"value", "value2"
340+
);
341+
342+
Map<String, Object> config3 = map(
343+
"key", "prop3",
344+
"value", "value3"
345+
);
346+
347+
Map<String, Object> result = merge(
348+
map("props", list(LIST_MERGE_ENTRY, config3)),
349+
map("props", list(config1, config2))
350+
);
351+
352+
// Should have all three entries
353+
// When LIST_MERGE_ENTRY is at start of l1, l2 elements are inserted at the beginning
354+
// Result: [config1, config2, config3]
355+
List<Object> resultList = (List<Object>)result.get("props");
356+
assertEquals(3, resultList.size());
357+
assertEquals(config1, resultList.get(0));
358+
assertEquals(config2, resultList.get(1));
359+
assertEquals(config3, resultList.get(2));
360+
}
361+
362+
@Test
363+
@SuppressWarnings("unchecked")
364+
void testMergeList_KeyValueObjects_MixedOverrideAndNew() {
365+
// Test with mix of overriding and new keys
366+
Map<String, Object> config1 = map("key", "prop1", "value", "value1", "comment", "comment1");
367+
Map<String, Object> config2 = map("key", "prop2", "value", "value2", "comment", "comment2");
368+
Map<String, Object> config2Override = map("key", "prop2", "value", "value2-override");
369+
Map<String, Object> config3 = map("key", "prop3", "value", "value3");
370+
371+
Map<String, Object> result = merge(
372+
map("props", list(LIST_MERGE_ENTRY, config2Override, config3)),
373+
map("props", list(config1, config2))
374+
);
375+
376+
// l1 = [LIST_MERGE_ENTRY, config2Override, config3] -> MergingList = [config2Override, config3] with mergePos=0
377+
// l2 = [config1, config2]
378+
// When adding l2:
379+
// - config1 is inserted at position 0 -> [config1, config2Override, config3]
380+
// - config2 is merged into config2Override, preserving comment from config2
381+
// Result: [config1, merged(config2, config2Override), config3]
382+
List<Object> resultList = (List<Object>)result.get("props");
383+
assertEquals(3, resultList.size());
384+
assertEquals(config1, resultList.get(0));
385+
386+
// config2Override should have merged with config2, keeping comment from config2
387+
Map<String, Object> expectedConfig2Merged = map("key", "prop2", "value", "value2-override", "comment", "comment2");
388+
assertEquals(expectedConfig2Merged, resultList.get(1));
389+
390+
assertEquals(config3, resultList.get(2));
391+
}
392+
268393
private static List<Object> list(Object... items) {
269394
return Arrays.asList(items);
270395
}

‎parent/pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm.devops</groupId>
2727
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
28-
<version>2.1.0</version>
28+
<version>2.1.2</version>
2929
<relativePath />
3030
</parent>
3131

3232
<groupId>io.wcm.devops.conga</groupId>
3333
<artifactId>io.wcm.devops.conga.parent</artifactId>
34-
<version>1.18.0</version>
34+
<version>1.19.0</version>
3535
<packaging>pom</packaging>
3636

3737
<name>CONGA</name>
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>org.apache.commons</groupId>
6565
<artifactId>commons-lang3</artifactId>
66-
<version>3.19.0</version>
66+
<version>3.20.0</version>
6767
</dependency>
6868

6969
<dependency>
@@ -81,19 +81,19 @@
8181
<dependency>
8282
<groupId>commons-io</groupId>
8383
<artifactId>commons-io</artifactId>
84-
<version>2.20.0</version>
84+
<version>2.21.0</version>
8585
</dependency>
8686

8787
<dependency>
8888
<groupId>commons-cli</groupId>
8989
<artifactId>commons-cli</artifactId>
90-
<version>1.10.0</version>
90+
<version>1.11.0</version>
9191
</dependency>
9292

9393
<dependency>
9494
<groupId>com.github.ben-manes.caffeine</groupId>
9595
<artifactId>caffeine</artifactId>
96-
<version>3.2.2</version>
96+
<version>3.2.3</version>
9797
</dependency>
9898

9999
<dependency>
@@ -116,7 +116,7 @@
116116
<dependency>
117117
<groupId>org.springframework</groupId>
118118
<artifactId>spring-core</artifactId>
119-
<version>6.2.11</version>
119+
<version>7.0.0</version>
120120
</dependency>
121121

122122
<dependency>
@@ -128,7 +128,7 @@
128128
<dependency>
129129
<groupId>org.apache.commons</groupId>
130130
<artifactId>commons-jexl3</artifactId>
131-
<version>3.5.0</version>
131+
<version>3.6.0</version>
132132
</dependency>
133133

134134
<dependency>

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm.devops.conga</groupId>
2727
<artifactId>io.wcm.devops.conga.parent</artifactId>
28-
<version>1.18.0</version>
28+
<version>1.19.0</version>
2929
<relativePath>parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.devops.conga</groupId>
3333
<artifactId>io.wcm.devops.conga.root</artifactId>
34-
<version>1.18.0</version>
34+
<version>1.19.0</version>
3535
<packaging>pom</packaging>
3636

3737
<name>CONGA</name>

0 commit comments

Comments
 (0)