Improved convenience implementations of getString() and getInt()

jfuerth · Feb 3, 2013 · dce612c · dce612c
1 parent 3944999
commit dce612c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/api/src/main/java/javax/json/JsonArrayBuilder.java b/api/src/main/java/javax/json/JsonArrayBuilder.java
@@ -266,11 +266,11 @@ public String getString(int index) {
 
         @Override
         public String getString(int index, String defaultValue) {
-            try {
-                return getString(index);
-            } catch (Exception e) {
-                return defaultValue;
+            JsonValue value = get(index);
+            if (value instanceof JsonString) {
+                return ((JsonString) value).getValue();
             }
+            return defaultValue;
         }
 
         @Override
@@ -280,11 +280,11 @@ public int getInt(int index) {
 
         @Override
         public int getInt(int index, int defaultValue) {
-            try {
-                return getInt(index);
-            } catch (Exception e) {
-                return defaultValue;
+            JsonValue value = get(index);
+            if (value instanceof JsonNumber) {
+                return ((JsonNumber) value).intValue();
             }
+            return defaultValue;
         }
 
         @Override
@@ -301,6 +301,8 @@ public boolean getBoolean(int index) {
 
         @Override
         public boolean getBoolean(int index, boolean defaultValue) {
+            // XXX this is not ideal for correctness or for speed.
+            // preferred approach would be to create a JsonBoolean type and test using instanceof
             try {
                 return getBoolean(index);
             } catch (Exception e) {

diff --git a/api/src/main/java/javax/json/JsonObjectBuilder.java b/api/src/main/java/javax/json/JsonObjectBuilder.java
@@ -43,7 +43,11 @@
 import java.io.StringWriter;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.util.*;
+import java.util.AbstractMap;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Builds a {@link JsonObject} from scratch. It uses builder pattern to build
@@ -314,11 +318,11 @@ public String getString(String name) {
 
         @Override
         public String getString(String name, String defaultValue) {
-            try {
-                return getString(name);
-            } catch (Exception e) {
-                return defaultValue;
+            JsonValue value = get(name);
+            if (value instanceof JsonString) {
+                return ((JsonString) value).getValue();
             }
+            return defaultValue;
         }
 
         @Override
@@ -328,11 +332,11 @@ public int getInt(String name) {
 
         @Override
         public int getInt(String name, int defaultValue) {
-            try {
-                return getInt(name);
-            } catch (Exception e) {
-                return defaultValue;
+            JsonValue value = get(name);
+            if (value instanceof JsonNumber) {
+                return ((JsonNumber) value).intValue();
             }
+            return defaultValue;
         }
 
         @Override
@@ -351,6 +355,8 @@ public boolean getBoolean(String name) {
 
         @Override
         public boolean getBoolean(String name, boolean defaultValue) {
+            // XXX this is not ideal for correctness or for speed.
+            // preferred approach would be to create a JsonBoolean type and test using instanceof
             try {
                 return getBoolean(name);
             } catch (Exception e) {