You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2016/07/31 20:06:45 UTC
[3/5] jena git commit: Add "forEach"
Add "forEach"
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5ca4d942
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5ca4d942
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5ca4d942
Branch: refs/heads/master
Commit: 5ca4d942e88cb2a167b90c4ee423bc1ea331883f
Parents: 86f2217
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jul 31 14:41:56 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Jul 31 14:41:56 2016 +0100
----------------------------------------------------------------------
.../org/apache/jena/atlas/json/JsonObject.java | 67 ++++++++------------
1 file changed, 27 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/5ca4d942/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonObject.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonObject.java b/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonObject.java
index 6c6d235..b83d1cb 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonObject.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonObject.java
@@ -20,6 +20,7 @@ package org.apache.jena.atlas.json;
import java.util.* ;
import java.util.Map.Entry ;
+import java.util.function.BiConsumer ;
public class JsonObject extends JsonValue
{
@@ -35,96 +36,82 @@ public class JsonObject extends JsonValue
{ visitor.visit(this) ; }
@Override
- public int hashCode()
- {
+ public int hashCode() {
return map.hashCode() ;
}
-
+
@Override
- public boolean equals(Object other)
- {
- if ( ! ( other instanceof JsonObject) ) return false ;
+ public boolean equals(Object other) {
+ if ( !(other instanceof JsonObject) )
+ return false ;
return map.equals(((JsonObject)other).map) ;
}
public void clear()
{ map.clear() ; }
- public boolean hasKey(Object key)
- {
+ public boolean hasKey(Object key) {
return map.containsKey(key) ;
}
// @Override
-// public boolean containsValue(Object value)
-// {
+// public boolean containsValue(Object value) {
// return map.containsValue(value) ;
// }
- public Set<String> keys()
- {
+ public Set<String> keys() {
return map.keySet() ;
}
-
- public Set<Entry<String, JsonValue>> entrySet()
- {
+ public Set<Entry<String, JsonValue>> entrySet() {
return map.entrySet() ;
}
-
- public JsonValue get(String key)
- {
+
+ public JsonValue get(String key) {
return map.get(key) ;
}
- public boolean isEmpty()
- {
+ public boolean isEmpty() {
return map.isEmpty() ;
}
- public Set<String> keySet()
- {
+ public Set<String> keySet() {
return map.keySet() ;
}
- public JsonValue put(String key, JsonValue value)
- {
+ public void forEach(BiConsumer<String, JsonValue> action) {
+ map.forEach(action) ;
+ }
+
+ public JsonValue put(String key, JsonValue value) {
return map.put(key, value) ;
}
-
- public JsonValue put(String key, String value)
- {
+ public JsonValue put(String key, String value) {
return map.put(key, new JsonString(value)) ;
}
- public JsonValue put(String key, long value)
- {
+ public JsonValue put(String key, long value) {
return map.put(key, JsonNumber.value(value)) ;
}
- public JsonValue put(String key, boolean b)
- {
+ public JsonValue put(String key, boolean b) {
return map.put(key, new JsonBoolean(b)) ;
}
- public void putAll(Map< ? extends String, ? extends JsonValue> m)
- {
+ public void putAll(Map<? extends String, ? extends JsonValue> m) {
map.putAll(m) ;
}
-
- public JsonValue remove(Object key)
- {
+
+ public JsonValue remove(Object key) {
return map.remove(key) ;
}
- public int size()
- {
+ public int size() {
return map.size() ;
}
- public Collection<JsonValue> values()
- {
+ public Collection<JsonValue> values() {
return map.values() ;
}
}