Skip to content

Commit c944e16

Browse files
committed
Maintain consistent element order in exports
1 parent 8175b47 commit c944e16

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

donkey/src/main/java/com/mirth/connect/donkey/model/message/MapContent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99

1010
package com.mirth.connect.donkey.model.message;
1111

12-
import java.util.HashMap;
12+
import java.util.TreeMap;
1313
import java.util.Map;
1414

1515
public class MapContent extends Content {
16-
private Object content = new HashMap<String, Object>();
16+
private Object content = new TreeMap<String, Object>();
1717
private transient boolean persisted = false;
1818

1919
public MapContent() {

donkey/src/main/java/com/mirth/connect/donkey/util/MapUtil.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
package com.mirth.connect.donkey.util;
1111

12-
import java.util.HashMap;
12+
import java.util.TreeMap;
1313
import java.util.Map;
1414
import java.util.Map.Entry;
1515

@@ -61,7 +61,7 @@ public static String serializeMap(Serializer serializer, Map<String, Object> map
6161
try {
6262
return serializer.serialize(map);
6363
} catch (Exception e) {
64-
Map<String, Object> newMap = new HashMap<String, Object>();
64+
Map<String, Object> newMap = new TreeMap<String, Object>();
6565

6666
for (Entry<String, Object> entry : map.entrySet()) {
6767
Object value = entry.getValue();
@@ -108,7 +108,7 @@ public static Map<String, Object> deserializeMapWithInvalidValues(Serializer ser
108108
* If an exception occurs while deserializing, we build up a new map manually, attempting to
109109
* deserialize each entry and replacing entries that fail with their string representations.
110110
*/
111-
Map<String, Object> map = new HashMap<String, Object>();
111+
Map<String, Object> map = new TreeMap<String, Object>();
112112

113113
for (DonkeyElement entry : mapElement.getChildElements()) {
114114
if (!entry.getNodeName().equalsIgnoreCase("entry")) {

server/src/com/mirth/connect/model/codetemplates/CodeTemplateContextSet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import java.io.Serializable;
1313
import java.util.Arrays;
1414
import java.util.Collection;
15-
import java.util.HashSet;
15+
import java.util.TreeSet;
1616
import java.util.Iterator;
1717
import java.util.Set;
1818

@@ -25,7 +25,7 @@ public CodeTemplateContextSet(ContextType... contextTypes) {
2525
}
2626

2727
public CodeTemplateContextSet(Collection<ContextType> contextTypes) {
28-
delegate = new HashSet<ContextType>(contextTypes);
28+
delegate = new TreeSet<ContextType>(contextTypes);
2929
}
3030

3131
public CodeTemplateContextSet addContext(ContextType... contextTypes) {

server/src/com/mirth/connect/model/codetemplates/CodeTemplateLibrary.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import java.util.Collections;
1616
import java.util.Comparator;
1717
import java.util.HashMap;
18-
import java.util.HashSet;
18+
import java.util.TreeSet;
1919
import java.util.List;
2020
import java.util.Map;
2121
import java.util.Set;
@@ -46,8 +46,8 @@ public class CodeTemplateLibrary implements Serializable, Migratable, Purgable,
4646

4747
public CodeTemplateLibrary() {
4848
id = UUID.randomUUID().toString();
49-
enabledChannelIds = new HashSet<String>();
50-
disabledChannelIds = new HashSet<String>();
49+
enabledChannelIds = new TreeSet<String>();
50+
disabledChannelIds = new TreeSet<String>();
5151
codeTemplates = new ArrayList<CodeTemplate>();
5252
}
5353

@@ -58,8 +58,8 @@ public CodeTemplateLibrary(CodeTemplateLibrary library) {
5858
lastModified = library.getLastModified();
5959
description = library.getDescription();
6060
includeNewChannels = library.isIncludeNewChannels();
61-
enabledChannelIds = new HashSet<String>(library.getEnabledChannelIds());
62-
disabledChannelIds = new HashSet<String>(library.getDisabledChannelIds());
61+
enabledChannelIds = new TreeSet<String>(library.getEnabledChannelIds());
62+
disabledChannelIds = new TreeSet<String>(library.getDisabledChannelIds());
6363
codeTemplates = new ArrayList<CodeTemplate>();
6464
if (CollectionUtils.isNotEmpty(library.getCodeTemplates())) {
6565
for (CodeTemplate codeTemplate : library.getCodeTemplates()) {

server/src/com/mirth/connect/model/converters/MapContentConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void marshal(Object value, HierarchicalStreamWriter writer, MarshallingCo
5353
try {
5454
DonkeyElement mapElement = new DonkeyElement(serializedMap);
5555
mapElement.setNodeName("content");
56-
mapElement.setAttribute("class", "map");
56+
mapElement.setAttribute("class", "tree-map");
5757
copier.copy(new XppReader(new StringReader(mapElement.toXml()), new MXParser()), writer);
5858
} catch (DonkeyElementException e) {
5959
throw new SerializerException(e);

0 commit comments

Comments
 (0)