geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [13/32] geode git commit: GEODE-2329: Refactor JSONFormatter fromJSON code to reduce duplicate code
Date Fri, 03 Feb 2017 18:35:42 GMT
GEODE-2329: Refactor JSONFormatter fromJSON code to reduce duplicate code


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/43e60587
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/43e60587
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/43e60587

Branch: refs/heads/feature/GEODE-1930-2
Commit: 43e60587d285dfb506fe25c5a1a047e7e01740b1
Parents: e606f3e
Author: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Authored: Thu Jan 19 16:04:40 2017 -0800
Committer: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Committed: Wed Feb 1 13:50:53 2017 -0800

----------------------------------------------------------------------
 .../org/apache/geode/pdx/JSONFormatter.java     | 55 ++++++++++----------
 1 file changed, 28 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/43e60587/geode-core/src/main/java/org/apache/geode/pdx/JSONFormatter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/JSONFormatter.java b/geode-core/src/main/java/org/apache/geode/pdx/JSONFormatter.java
index 9ee32c9..65e87db 100755
--- a/geode-core/src/main/java/org/apache/geode/pdx/JSONFormatter.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/JSONFormatter.java
@@ -14,26 +14,23 @@
  */
 package org.apache.geode.pdx;
 
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Properties;
-
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonParser.Feature;
 import com.fasterxml.jackson.core.JsonParser.NumberType;
 import com.fasterxml.jackson.core.JsonToken;
-
 import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.pdx.PdxInstance;
 import org.apache.geode.pdx.internal.json.JSONToPdxMapper;
 import org.apache.geode.pdx.internal.json.PdxInstanceHelper;
 import org.apache.geode.pdx.internal.json.PdxInstanceSortedHelper;
 import org.apache.geode.pdx.internal.json.PdxListHelper;
 import org.apache.geode.pdx.internal.json.PdxToJSON;
 
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
 
 /**
  * <p>
@@ -108,7 +105,9 @@ public class JSONFormatter {
 
   enum states {
     NONE, ObJECT_START, FIELD_NAME, SCALER_FOUND, LIST_FOUND, LIST_ENDS, OBJECT_ENDS
-  };
+  }
+
+  ;
 
   private JSONFormatter() {}
 
@@ -119,20 +118,7 @@ public class JSONFormatter {
    * @throws JSONFormatterException if unable to parse the JSON document
    */
   public static PdxInstance fromJSON(String jsonString) {
-    JsonParser jp = null;
-    try {
-      jp = new JsonFactory().createParser(jsonString);
-      enableJSONParserFeature(jp);
-      return new JSONFormatter().getPdxInstance(jp, states.NONE, null).getPdxInstance();
-    } catch (JsonParseException jpe) {
-      throw new JSONFormatterException("Could not parse JSON document ", jpe);
-    } catch (IOException e) {
-      throw new JSONFormatterException("Could not parse JSON document: " + jp.getCurrentLocation(),
-          e);
-    } catch (Exception e) {
-      throw new JSONFormatterException("Could not parse JSON document: " + jp.getCurrentLocation(),
-          e);
-    }
+    return getPdxInstanceFromJson(jsonString);
   }
 
   /**
@@ -142,9 +128,20 @@ public class JSONFormatter {
    * @throws JSONFormatterException if unable to parse the JSON document
    */
   public static PdxInstance fromJSON(byte[] jsonByteArray) {
+    return getPdxInstanceFromJson(jsonByteArray);
+  }
+
+  private static PdxInstance getPdxInstanceFromJson(Object json) {
     JsonParser jp = null;
     try {
-      jp = new JsonFactory().createParser(jsonByteArray);
+      if (json instanceof String) {
+        jp = new JsonFactory().createParser((byte[]) json);
+
+      } else if (json instanceof byte[]) {
+        jp = new JsonFactory().createParser((byte[]) json);
+      } else {
+        new JSONFormatterException("Could not parse the " + json.getClass() + " type");
+      }
       enableJSONParserFeature(jp);
       return new JSONFormatter().getPdxInstance(jp, states.NONE, null).getPdxInstance();
     } catch (JsonParseException jpe) {
@@ -204,8 +201,9 @@ public class JSONFormatter {
   private JSONToPdxMapper getPdxInstance(JsonParser jp, states currentState,
       JSONToPdxMapper currentPdxInstance) throws JsonParseException, IOException {
     String currentFieldName = null;
-    if (currentState == states.ObJECT_START && currentPdxInstance == null)
+    if (currentState == states.ObJECT_START && currentPdxInstance == null) {
       currentPdxInstance = createJSONToPdxMapper(null, null);// from getlist
+    }
     while (true) {
       JsonToken nt = jp.nextToken();
 
@@ -228,8 +226,9 @@ public class JSONFormatter {
           objectEnds(currentState);
           currentState = states.OBJECT_ENDS;
           currentPdxInstance.endObjectField("endobject");
-          if (currentPdxInstance.getParent() == null)
+          if (currentPdxInstance.getParent() == null) {
             return currentPdxInstance;// inner pdxinstance in list
+          }
           JSONToPdxMapper tmp = currentPdxInstance;
           currentPdxInstance = currentPdxInstance.getParent();
           currentPdxInstance.addObjectField(tmp.getPdxFieldName(), tmp.getPdxInstance());
@@ -238,8 +237,9 @@ public class JSONFormatter {
         case FIELD_NAME: {
           fieldFound(currentState);
           // field name(object name, value may be object, string, array number etc)
-          if (currentState == states.ObJECT_START)
+          if (currentState == states.ObJECT_START) {
             currentPdxInstance.setPdxFieldName(currentFieldName);
+          }
 
           currentFieldName = jp.getText();// not a object name
           currentState = states.FIELD_NAME;
@@ -461,8 +461,9 @@ public class JSONFormatter {
           // array is end
           arrayEnds(currentState);
           currentState = states.LIST_ENDS;
-          if (currentPdxList.getParent() == null)
+          if (currentPdxList.getParent() == null) {
             return currentPdxList;
+          }
           currentPdxList = currentPdxList.getParent();
           break;
         }


Mime
View raw message