Replace HashMap with LinkedHashMap to ensure order

jimmyli97 · jimmyli97 · commit f938c8030b5f · 2015-06-15T10:34:48.000-04:00
This makes it easier to unit test, as the order of the constraints in
queries are now guranateed. I can't come up with a better
solution. The performance characteristics of LinkedHashMap and HashMap
are similar, so this should not make too much of a difference in
runtime.
diff --git a/src/main/java/com/formulasearchengine/mathmlquerygenerator/XQueryGenerator.java b/src/main/java/com/formulasearchengine/mathmlquerygenerator/XQueryGenerator.java
@@ -11,10 +11,7 @@
 
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
 import java.util.regex.Pattern;
 
 import static com.formulasearchengine.xmlhelper.NonWhitespaceNodeList.getFirstChild;
@@ -32,7 +29,7 @@
 public class XQueryGenerator {
 	private static final Pattern ANNOTATION_XML_PATTERN = Pattern.compile( "annotation(-xml)?" );
 	//Qvar map of qvar name to XPaths referenced by each qvar
-	private Map<String, ArrayList<String>> qvar = new HashMap<>();
+	private Map<String, ArrayList<String>> qvar = new LinkedHashMap<>();
 	private String relativeXPath = "";
 	private String exactMatchXQuery = "";
 	private String lengthConstraint = "";
