update deps to prepare for release and fix some bad code

Author: markxnelson

pom.xml

@@ -107,7 +107,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13-beta-2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -116,16 +116,10 @@
             <version>2.0.0.0</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.meterware.simplestub</groupId>
-            <artifactId>simplestub</artifactId>
-            <version>1.2.8</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.19</version>
+            <version>1.24</version>
         </dependency>
     </dependencies>
 </project>

src/main/java/weblogic/logging/exporter/LogExportHandler.java

@@ -179,8 +179,6 @@ private Result executePutOrPostOnUrl(String url, String payload, boolean post) {
 
   private String recordToPayload(WLLogRecord wlLogRecord) {
     return "{"
-        + dataAsJson("domainUID", domainUID)
-        + ","
         + dataAsJson("messageID", wlLogRecord.getId())
         + ","
         + dataAsJson("message", wlLogRecord.getMessage())
@@ -210,6 +208,8 @@ private String recordToPayload(WLLogRecord wlLogRecord) {
         + dataAsJson("diagnosticContextId", wlLogRecord.getDiagnosticContextId())
         + ","
         + dataAsJson("sequenceNumber", wlLogRecord.getSequenceNumber())
+        + ","
+        + dataAsJson("domainUID", domainUID)
         + "}";
   }
 
@@ -240,9 +240,6 @@ private void createMappings() {
             + DOC_TYPE
             + "\": {"
             + "      \"properties\": {"
-            + "        \"domainUID\": {"
-            + "\"type\": \"keyword\" "
-            + "},"
             + "        \"timestamp\": {"
             + "\"type\": \"date\" "
             + "},"
@@ -278,6 +275,9 @@ private void createMappings() {
             + "},"
             + "        \"messageID\": {"
             + "\"type\": \"keyword\" "
+            + "},"
+            + "        \"domainUID\": {"
+            + "\"type\": \"keyword\" "
             + "}"
             + "      }"
             + "    }"

src/main/java/weblogic/logging/exporter/config/MapUtils.java

@@ -55,15 +55,22 @@ static Integer getIntegerValue(Map<String, Object> map, String key) {
   @SuppressWarnings("unchecked")
   static String[] getStringArray(Map<String, Object> map, String key) {
     Object value = map.get(key);
-    if (value instanceof List) return toStringArray((List<Object>) value);
-    else if (!value.getClass().isArray()) return new String[] {value.toString()};
-    else if (value.getClass().getComponentType() == String.class) return (String[]) value;
-    else throw createBadTypeException(key, value, "an array of strings");
+    if (value instanceof List) {
+      return toStringArray((List<Object>) value);
+    } else if (!value.getClass().isArray()) {
+      return new String[] {value.toString()};
+    } else if (value.getClass().getComponentType() == String.class) {
+      return (String[]) value;
+    } else {
+      throw createBadTypeException(key, value, "an array of strings");
+    }
   }
 
   private static String[] toStringArray(List<Object> list) {
     String[] result = new String[list.size()];
-    for (int i = 0; i < result.length; i++) result[i] = list.get(i).toString();
+    for (int i = 0; i < result.length; i++) {
+      result[i] = list.get(i).toString();
+    }
     return result;
   }
 
@@ -77,19 +84,28 @@ private static String[] toStringArray(List<Object> list) {
    */
   static Boolean getBooleanValue(Map<String, Object> map, String key) {
     Object value = map.get(key);
-    if (value instanceof Boolean) return (Boolean) value;
+    if (value instanceof Boolean) {
+      return (Boolean) value;
+    }
 
-    if (inValues(value, TRUE_VALUES)) return true;
-    if (inValues(value, FALSE_VALUES)) return false;
+    if (inValues(value, TRUE_VALUES)) {
+      return true;
+    }
+    if (inValues(value, FALSE_VALUES)) {
+      return false;
+    }
     throw new ConfigurationException("Unable to interpret '" + value + "' as a boolean value");
   }
 
   private static final String[] TRUE_VALUES = {"true", "t", "yes", "on", "y"};
   private static final String[] FALSE_VALUES = {"false", "f", "no", "off", "n"};
 
   private static boolean inValues(Object candidate, String... matches) {
-    for (String match : matches) if (candidate.toString().equalsIgnoreCase(match)) return true;
-
+    for (String match : matches) {
+      if (candidate.toString().equalsIgnoreCase(match)) {
+        return true;
+      }
+    }
     return false;
   }