You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by sa...@apache.org on 2014/10/07 20:26:56 UTC
[4/4] git commit: Catching exceptions is not nice and does not
perform very well
Catching exceptions is not nice and does not perform very well
Project: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/commit/5bea2c86
Tree: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/tree/5bea2c86
Diff: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/diff/5bea2c86
Branch: refs/heads/master
Commit: 5bea2c866497f12f9e60499919c7d5dba97f1bc8
Parents: 4edb4e3
Author: salyh <he...@gmail.com>
Authored: Tue Oct 7 20:25:25 2014 +0200
Committer: salyh <he...@gmail.com>
Committed: Tue Oct 7 20:25:25 2014 +0200
----------------------------------------------------------------------
.../org/apache/johnzon/core/JsonArrayImpl.java | 79 +++++++++++++++-----
.../org/apache/johnzon/core/JsonObjectImpl.java | 59 ++++++++++-----
2 files changed, 98 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/5bea2c86/johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayImpl.java
----------------------------------------------------------------------
diff --git a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayImpl.java
index 809d709..fee44ce 100644
--- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayImpl.java
@@ -32,22 +32,19 @@ import javax.json.JsonValue;
class JsonArrayImpl extends AbstractList<JsonValue> implements JsonArray, Serializable {
private Integer hashCode = null;
private final List<JsonValue> unmodifieableBackingList;
+ private int size = -1;
- JsonArrayImpl(List<JsonValue> backingList) {
+ JsonArrayImpl(final List<JsonValue> backingList) {
super();
this.unmodifieableBackingList = backingList;
}
-
-
private <T> T value(final int idx, final Class<T> type) {
if (idx > unmodifieableBackingList.size()) {
throw new IndexOutOfBoundsException(idx + "/" + unmodifieableBackingList.size());
}
return type.cast(unmodifieableBackingList.get(idx));
}
-
-
@Override
public JsonObject getJsonObject(final int index) {
@@ -81,10 +78,18 @@ class JsonArrayImpl extends AbstractList<JsonValue> implements JsonArray, Serial
@Override
public String getString(final int index, final String defaultValue) {
- try {
- return getString(index);
- } catch (final IndexOutOfBoundsException ioobe) {
+ JsonValue val = null;
+ int s = size;
+
+ if (s == -1) {
+ s = unmodifieableBackingList.size();
+ size = s;
+ }
+
+ if (index > s - 1 || !((val = get(index)) instanceof JsonString)) {
return defaultValue;
+ } else {
+ return JsonString.class.cast(val).getString();
}
}
@@ -95,25 +100,59 @@ class JsonArrayImpl extends AbstractList<JsonValue> implements JsonArray, Serial
@Override
public int getInt(final int index, final int defaultValue) {
- try {
- return getInt(index);
- } catch (final IndexOutOfBoundsException ioobe) {
+ JsonValue val = null;
+ int s = size;
+
+ if (s == -1) {
+ s = unmodifieableBackingList.size();
+ size = s;
+ }
+
+ if (index > s - 1 || !((val = get(index)) instanceof JsonNumber)) {
return defaultValue;
+ } else {
+ return JsonNumber.class.cast(val).intValue();
}
}
@Override
public boolean getBoolean(final int index) {
- return value(index, JsonValue.class) == JsonValue.TRUE;
+ final JsonValue val = value(index, JsonValue.class);
+
+ if (val == JsonValue.TRUE) {
+ return true;
+ } else if (val == JsonValue.FALSE) {
+ return false;
+ } else {
+ throw new ClassCastException();
+ }
+
}
@Override
public boolean getBoolean(final int index, final boolean defaultValue) {
- try {
- return getBoolean(index);
- } catch (final IndexOutOfBoundsException ioobe) {
+
+ int s = size;
+
+ if (s == -1) {
+ s = unmodifieableBackingList.size();
+ size = s;
+ }
+
+ if (index > s - 1) {
return defaultValue;
}
+
+ final JsonValue val = get(index);
+
+ if (val == JsonValue.TRUE) {
+ return true;
+ } else if (val == JsonValue.FALSE) {
+ return false;
+ } else {
+ return defaultValue;
+ }
+
}
@Override
@@ -148,22 +187,22 @@ class JsonArrayImpl extends AbstractList<JsonValue> implements JsonArray, Serial
@Override
public boolean equals(final Object obj) {
- return JsonArrayImpl.class.isInstance(obj) && unmodifieableBackingList.equals(JsonArrayImpl.class.cast(obj).unmodifieableBackingList);
+ return JsonArrayImpl.class.isInstance(obj)
+ && unmodifieableBackingList.equals(JsonArrayImpl.class.cast(obj).unmodifieableBackingList);
}
-
@Override
public int hashCode() {
- Integer h=hashCode;
+ Integer h = hashCode;
if (h == null) {
h = unmodifieableBackingList.hashCode();
- h=hashCode;
+ hashCode = h;
}
return h;
}
@Override
- public JsonValue get(int index) {
+ public JsonValue get(final int index) {
return unmodifieableBackingList.get(index);
}
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/5bea2c86/johnzon-core/src/main/java/org/apache/johnzon/core/JsonObjectImpl.java
----------------------------------------------------------------------
diff --git a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonObjectImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonObjectImpl.java
index 863f173..d7912cb 100644
--- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonObjectImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonObjectImpl.java
@@ -30,7 +30,8 @@ import javax.json.JsonObject;
import javax.json.JsonString;
import javax.json.JsonValue;
-public final class JsonObjectImpl extends AbstractMap<String, JsonValue> implements JsonObject, Serializable {
+
+final class JsonObjectImpl extends AbstractMap<String, JsonValue> implements JsonObject, Serializable {
private Integer hashCode = null;
private final Map<String, JsonValue> unmodifieableBackingMap;
@@ -41,13 +42,12 @@ public final class JsonObjectImpl extends AbstractMap<String, JsonValue> impleme
}
throw new NullPointerException("no mapping for " + name);
}
-
- public JsonObjectImpl(Map<String, JsonValue> backingMap) {
+
+ JsonObjectImpl(final Map<String, JsonValue> backingMap) {
super();
this.unmodifieableBackingMap = backingMap;
}
-
@Override
public JsonArray getJsonArray(final String name) {
return value(name, JsonArray.class);
@@ -70,17 +70,22 @@ public final class JsonObjectImpl extends AbstractMap<String, JsonValue> impleme
@Override
public String getString(final String name) {
- final JsonString str = getJsonString(name);
- return str != null ? str.getString() : null;
+ return getJsonString(name).getString();
}
@Override
public String getString(final String name, final String defaultValue) {
- try {
- return getJsonString(name).getString();
- } catch (final NullPointerException npe) {
+ final Object v = unmodifieableBackingMap.get(name);
+ if (v != null) {
+ if (v instanceof JsonString) {
+ return JsonString.class.cast(v).getString();
+ } else {
+ return defaultValue;
+ }
+ } else {
return defaultValue;
}
+
}
@Override
@@ -90,9 +95,14 @@ public final class JsonObjectImpl extends AbstractMap<String, JsonValue> impleme
@Override
public int getInt(final String name, final int defaultValue) {
- try {
- return getJsonNumber(name).intValue();
- } catch (final NullPointerException npe) {
+ final Object v = unmodifieableBackingMap.get(name);
+ if (v != null) {
+ if (v instanceof JsonNumber) {
+ return JsonNumber.class.cast(v).intValue();
+ } else {
+ return defaultValue;
+ }
+ } else {
return defaultValue;
}
}
@@ -104,9 +114,16 @@ public final class JsonObjectImpl extends AbstractMap<String, JsonValue> impleme
@Override
public boolean getBoolean(final String name, final boolean defaultValue) {
- try {
- return getBoolean(name);
- } catch (final NullPointerException npe) {
+ final Object v = unmodifieableBackingMap.get(name);
+ if (v != null) {
+ if (v == JsonValue.TRUE) {
+ return true;
+ } else if (v == JsonValue.FALSE) {
+ return false;
+ } else {
+ return defaultValue;
+ }
+ } else {
return defaultValue;
}
}
@@ -148,16 +165,18 @@ public final class JsonObjectImpl extends AbstractMap<String, JsonValue> impleme
@Override
public boolean equals(final Object obj) {
- return JsonObjectImpl.class.isInstance(obj) && unmodifieableBackingMap.equals(JsonObjectImpl.class.cast(obj).unmodifieableBackingMap);
+ return JsonObjectImpl.class.isInstance(obj)
+ && unmodifieableBackingMap.equals(JsonObjectImpl.class.cast(obj).unmodifieableBackingMap);
}
-
@Override
public int hashCode() {
- if (hashCode == null) {
- hashCode = unmodifieableBackingMap.hashCode();
+ Integer h = hashCode;
+ if (h == null) {
+ h = unmodifieableBackingMap.hashCode();
+ hashCode = h;
}
- return hashCode;
+ return h;
}
@Override