PR feedback: simplify scan serialization

Author: Ray Mattingly

hbase-client/src/main/java/org/apache/hadoop/hbase/client/OnlineLogRecord.java

@@ -17,7 +17,6 @@
  */
 package org.apache.hadoop.hbase.client;
 
-import java.io.IOException;
 import java.util.Optional;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
@@ -30,7 +29,6 @@
 
 import org.apache.hbase.thirdparty.com.google.gson.Gson;
 import org.apache.hbase.thirdparty.com.google.gson.JsonObject;
-import org.apache.hbase.thirdparty.com.google.gson.JsonParser;
 import org.apache.hbase.thirdparty.com.google.gson.JsonSerializer;
 
 /**
@@ -60,11 +58,7 @@ final public class OnlineLogRecord extends LogEntry {
           jsonObj.remove("multiServiceCalls");
         }
         if (slowLogPayload.getScan().isPresent()) {
-          try {
-            jsonObj.add("scan", JsonParser.parseString(slowLogPayload.getScan().get().toJSON()));
-          } catch (IOException e) {
-            LOG.warn("Failed to serialize scan {}", slowLogPayload.getScan().get(), e);
-          }
+          jsonObj.add("scan", gson.toJsonTree(slowLogPayload.getScan().get().toMap()));
         } else {
           jsonObj.remove("scan");
         }

hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestOnlineLogRecord.java

@@ -44,12 +44,13 @@ public void itSerializesScan() {
       + "    \"startRow\": \"\\\\x00\\\\x00\\\\x00{\",\n"
       + "    \"stopRow\": \"\\\\x00\\\\x00\\\\x01\\\\xC8\",\n" + "    \"batch\": -1,\n"
       + "    \"cacheBlocks\": true,\n" + "    \"totalColumns\": 0,\n"
-      + "    \"maxResultSize\": \"-1\",\n" + "    \"families\": {},\n" + "    \"caching\": -1,\n"
-      + "    \"maxVersions\": 1,\n" + "    \"timeRange\": [\n" + "      \"0\",\n"
-      + "      \"9223372036854775807\"\n" + "    ]\n" + "  }\n" + "}";
+      + "    \"maxResultSize\": -1,\n" + "    \"families\": {},\n" + "    \"caching\": -1,\n"
+      + "    \"maxVersions\": 1,\n" + "    \"timeRange\": [\n" + "      0,\n"
+      + "      9223372036854775807\n" + "    ]\n" + "  }\n" + "}";
     OnlineLogRecord o =
       new OnlineLogRecord(1, 2, 3, 4, 5, null, null, null, null, null, null, null, 6, 7, 0, scan);
     String actualOutput = o.toJsonPrettyPrint();
+    System.out.println(actualOutput);
     Assert.assertEquals(actualOutput, expectedOutput);
   }
 }