Skip to content

Preserve HTTP parameter order #131

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Preserve HTTP parameter order #131

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions server/src/com/mirth/connect/util/HttpUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
Expand Down Expand Up @@ -104,7 +104,7 @@ public static Map<String, List<String>> getTableMap(boolean useVariable, String
}

public static Map<String, List<String>> getTableMap(String mapVariable, MessageMaps messageMaps, ConnectorMessage connectorMessage) {
Map<String, List<String>> map = new HashMap<String, List<String>>();
Map<String, List<String>> map = new LinkedHashMap<String, List<String>>();

try {
Map<?, ?> source = (Map<?, ?>) messageMaps.get(mapVariable, connectorMessage);
Expand Down
22 changes: 22 additions & 0 deletions server/test/com/mirth/connect/util/HttpUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@

package com.mirth.connect.util;

import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.fail;

import java.security.KeyStore;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.UUID;

import javax.net.ssl.SSLContext;
Expand All @@ -22,6 +25,9 @@
import org.apache.http.ssl.SSLContexts;
import org.junit.Test;

import com.mirth.connect.donkey.model.message.ConnectorMessage;
import com.mirth.connect.donkey.util.MessageMaps;

public class HttpUtilTest {

@Test
Expand All @@ -40,4 +46,20 @@ public void testExecuteGetRequest() throws Exception {
} catch (Exception e) {
}
}

@Test
public void testMapOrderPreserved() throws Exception {
final String MAP_KEY = "MyMap";

Map<String, Object> initial = new LinkedHashMap<>();
initial.put("First", 1);
initial.put("Second", 2);
initial.put("Third", 3);

ConnectorMessage cm = new ConnectorMessage();
cm.getSourceMap().put(MAP_KEY, initial);

Map<String, ?> copied = HttpUtil.getTableMap(MAP_KEY, new MessageMaps(), cm);
assertArrayEquals("Failed to preserve key order", initial.keySet().toArray(), copied.keySet().toArray());
}
}