Fixes

Author: kaiyaok2

wls-exporter-core/src/main/java/com/oracle/wls/exporter/domain/ExporterConfig.java

@@ -197,7 +197,7 @@ private boolean isMergeableTopLevelQuery(MBeanSelector first, MBeanSelector seco
 
         for (String key : first.getNestedSelectors().keySet())
             if (!first.getNestedSelectors().get(key).mayMergeWith(second.getNestedSelectors().get(key))) return false;
-        
+
         return true;
     }
 

wls-exporter-core/src/main/java/com/oracle/wls/exporter/domain/MBeanSelector.java

@@ -7,6 +7,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -37,7 +38,7 @@ public class MBeanSelector {
     private String key;
     private String keyName;
     private String[] values = null;
-    private Map<String, MBeanSelector> nestedSelectors = new HashMap<>();
+    private Map<String, MBeanSelector> nestedSelectors = new LinkedHashMap<>();
     private QueryType queryType = QueryType.RUNTIME;
 
     private static MBeanSelector createDomainNameSelector() {
@@ -84,7 +85,7 @@ private void addNestedSelector(String key, Object selectorValue) {
 
     private void setValues(String[] values) {
         if (values.length == 0) throw new ConfigurationException("Values specified as empty array");
-        
+
         Set<String> uniqueValues = new HashSet<>(Arrays.asList(values));
         if (values.length != uniqueValues.size())
             reportDuplicateValues(values, uniqueValues);
@@ -257,7 +258,7 @@ private MBeanSelector(MBeanSelector first, MBeanSelector second) {
         mergedValues.addAll(second.getValuesAsList());
         values = mergedValues.toArray(new String[0]);
 
-        nestedSelectors = new HashMap<>();
+        nestedSelectors = new LinkedHashMap<>();
         nestedSelectors.putAll(first.nestedSelectors);
         for (String key : second.nestedSelectors.keySet()) {
             if (!nestedSelectors.containsKey(key))

wls-exporter-core/src/test/java/com/oracle/wls/exporter/WebClientTestBase.java

@@ -10,6 +10,7 @@
 import java.util.function.Supplier;
 
 import com.google.gson.Gson;
+import com.google.gson.JsonParser;
 import com.meterware.pseudoserver.PseudoServer;
 import com.meterware.pseudoserver.PseudoServlet;
 import com.meterware.pseudoserver.WebResource;
@@ -138,7 +139,9 @@ public WebResource getPutResponse() {
 
         withWebClient("unprotected_put").doPutRequest(QUERY);
 
-        assertThat(sentInfo, equalTo(QUERY.getAsJson()));
+        JsonParser parser = new JsonParser();
+
+        assertThat(parser.parse(sentInfo), equalTo(parser.parse(QUERY.getAsJson())));
     }
 
     @SuppressWarnings({"FieldCanBeLocal", "unused"})

wls-exporter-core/src/test/java/com/oracle/wls/exporter/domain/MBeanSelectorTest.java

@@ -10,6 +10,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.gson.Gson;
+import com.google.gson.JsonParser;
 import org.junit.jupiter.api.Test;
 
 import static com.oracle.wls.exporter.domain.JsonPathMatcher.hasJsonPath;
@@ -311,8 +312,9 @@ public void whenSelectorsHaveDeeplyNestedElementsWithDifferentName_merge() {
     @Test
     public void generateJsonRequest() {
         MBeanSelector selector = MBeanSelector.create(ImmutableMap.of("applicationRuntimes", getApplicationMap()));
+        JsonParser parser = new JsonParser();
 
-        assertThat(selector.getRequest(), equalTo(compressedJsonForm(EXPECTED_JSON_REQUEST)));
+        assertThat(parser.parse(selector.getRequest()), equalTo(parser.parse(compressedJsonForm(EXPECTED_JSON_REQUEST))));
     }
 
     private Map<String, Object> getApplicationMap() {
@@ -374,8 +376,9 @@ else if (!Character.isWhitespace(c))
     @Test
     public void whenNoValuesListedForSerlvets_generateJsonRequest() {
         MBeanSelector selector = MBeanSelector.create(ImmutableMap.of("applicationRuntimes", getNoServletValuesApplicationMap()));
+        JsonParser parser = new JsonParser();
 
-        assertThat(selector.getRequest(), equalTo(compressedJsonForm(EXPECTED_ALL_SERVLET_VALUES_JSON_REQUEST)));
+        assertThat(parser.parse(selector.getRequest()), equalTo(parser.parse(compressedJsonForm(EXPECTED_ALL_SERVLET_VALUES_JSON_REQUEST))));
     }
 
     private Map<String, Object> getNoServletValuesApplicationMap() {