From 8630ddef3dff8bc957a207e883b5ad99254c5138 Mon Sep 17 00:00:00 2001 From: Richard Ogin Date: Fri, 18 Apr 2025 20:20:00 -0500 Subject: [PATCH] Maintain consistent element order in exports Signed-off-by: Richard Ogin --- .../mirth/connect/donkey/model/message/MapContent.java | 4 ++-- .../java/com/mirth/connect/donkey/util/MapUtil.java | 6 +++--- .../model/codetemplates/CodeTemplateContextSet.java | 4 ++-- .../model/codetemplates/CodeTemplateLibrary.java | 10 +++++----- .../connect/model/converters/MapContentConverter.java | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/donkey/src/main/java/com/mirth/connect/donkey/model/message/MapContent.java b/donkey/src/main/java/com/mirth/connect/donkey/model/message/MapContent.java index d07a77e702..7fad432ce1 100644 --- a/donkey/src/main/java/com/mirth/connect/donkey/model/message/MapContent.java +++ b/donkey/src/main/java/com/mirth/connect/donkey/model/message/MapContent.java @@ -9,11 +9,11 @@ package com.mirth.connect.donkey.model.message; -import java.util.HashMap; +import java.util.TreeMap; import java.util.Map; public class MapContent extends Content { - private Object content = new HashMap(); + private Object content = new TreeMap(); private transient boolean persisted = false; public MapContent() { diff --git a/donkey/src/main/java/com/mirth/connect/donkey/util/MapUtil.java b/donkey/src/main/java/com/mirth/connect/donkey/util/MapUtil.java index d13a3485c3..4288015af7 100644 --- a/donkey/src/main/java/com/mirth/connect/donkey/util/MapUtil.java +++ b/donkey/src/main/java/com/mirth/connect/donkey/util/MapUtil.java @@ -9,7 +9,7 @@ package com.mirth.connect.donkey.util; -import java.util.HashMap; +import java.util.TreeMap; import java.util.Map; import java.util.Map.Entry; @@ -61,7 +61,7 @@ public static String serializeMap(Serializer serializer, Map map try { return serializer.serialize(map); } catch (Exception e) { - Map newMap = new HashMap(); + Map newMap = new TreeMap(); for (Entry entry : map.entrySet()) { Object value = entry.getValue(); @@ -108,7 +108,7 @@ public static Map deserializeMapWithInvalidValues(Serializer ser * If an exception occurs while deserializing, we build up a new map manually, attempting to * deserialize each entry and replacing entries that fail with their string representations. */ - Map map = new HashMap(); + Map map = new TreeMap(); for (DonkeyElement entry : mapElement.getChildElements()) { if (!entry.getNodeName().equalsIgnoreCase("entry")) { diff --git a/server/src/com/mirth/connect/model/codetemplates/CodeTemplateContextSet.java b/server/src/com/mirth/connect/model/codetemplates/CodeTemplateContextSet.java index f922398d7e..3c26ade6d0 100644 --- a/server/src/com/mirth/connect/model/codetemplates/CodeTemplateContextSet.java +++ b/server/src/com/mirth/connect/model/codetemplates/CodeTemplateContextSet.java @@ -12,7 +12,7 @@ import java.io.Serializable; import java.util.Arrays; import java.util.Collection; -import java.util.HashSet; +import java.util.TreeSet; import java.util.Iterator; import java.util.Set; @@ -25,7 +25,7 @@ public CodeTemplateContextSet(ContextType... contextTypes) { } public CodeTemplateContextSet(Collection contextTypes) { - delegate = new HashSet(contextTypes); + delegate = new TreeSet(contextTypes); } public CodeTemplateContextSet addContext(ContextType... contextTypes) { diff --git a/server/src/com/mirth/connect/model/codetemplates/CodeTemplateLibrary.java b/server/src/com/mirth/connect/model/codetemplates/CodeTemplateLibrary.java index 722490fe03..272ebaf18e 100644 --- a/server/src/com/mirth/connect/model/codetemplates/CodeTemplateLibrary.java +++ b/server/src/com/mirth/connect/model/codetemplates/CodeTemplateLibrary.java @@ -15,7 +15,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.HashMap; -import java.util.HashSet; +import java.util.TreeSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -46,8 +46,8 @@ public class CodeTemplateLibrary implements Serializable, Migratable, Purgable, public CodeTemplateLibrary() { id = UUID.randomUUID().toString(); - enabledChannelIds = new HashSet(); - disabledChannelIds = new HashSet(); + enabledChannelIds = new TreeSet(); + disabledChannelIds = new TreeSet(); codeTemplates = new ArrayList(); } @@ -58,8 +58,8 @@ public CodeTemplateLibrary(CodeTemplateLibrary library) { lastModified = library.getLastModified(); description = library.getDescription(); includeNewChannels = library.isIncludeNewChannels(); - enabledChannelIds = new HashSet(library.getEnabledChannelIds()); - disabledChannelIds = new HashSet(library.getDisabledChannelIds()); + enabledChannelIds = new TreeSet(library.getEnabledChannelIds()); + disabledChannelIds = new TreeSet(library.getDisabledChannelIds()); codeTemplates = new ArrayList(); if (CollectionUtils.isNotEmpty(library.getCodeTemplates())) { for (CodeTemplate codeTemplate : library.getCodeTemplates()) { diff --git a/server/src/com/mirth/connect/model/converters/MapContentConverter.java b/server/src/com/mirth/connect/model/converters/MapContentConverter.java index 5ef6257433..0015cd8e62 100644 --- a/server/src/com/mirth/connect/model/converters/MapContentConverter.java +++ b/server/src/com/mirth/connect/model/converters/MapContentConverter.java @@ -53,7 +53,7 @@ public void marshal(Object value, HierarchicalStreamWriter writer, MarshallingCo try { DonkeyElement mapElement = new DonkeyElement(serializedMap); mapElement.setNodeName("content"); - mapElement.setAttribute("class", "map"); + mapElement.setAttribute("class", "tree-map"); copier.copy(new XppReader(new StringReader(mapElement.toXml()), new MXParser()), writer); } catch (DonkeyElementException e) { throw new SerializerException(e);