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:43 UTC
[1/5] jena git commit: Minor JUL control clean-up.
Repository: jena
Updated Branches:
refs/heads/master a2cc66c2e -> 16da6c34c
Minor JUL control clean-up.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/12f194ad
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/12f194ad
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/12f194ad
Branch: refs/heads/master
Commit: 12f194ad4da8e3108531a1d3af7530718921a2f8
Parents: a2cc66c
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Jul 30 22:03:08 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Jul 30 22:18:19 2016 +0100
----------------------------------------------------------------------
.../org/apache/jena/atlas/logging/LogCtl.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/12f194ad/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java b/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java
index 732d37b..cd40d9c 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java
@@ -192,14 +192,6 @@ public class LogCtl {
, "log4j.additivity.org.apache.jena.riot=false"
, "log4j.logger.org.apache.jena.riot=INFO, jena.plainlevel"
) ;
- // ---- java.util.logging - because that's always present.
- static String defaultProperties = StrUtils.strjoinNL
- ("handlers=org.apache.jena.atlas.logging.java.ConsoleHandlerStdout"
- ,"org.apache.atlas.jena.logging.java.ConsoleHandlerStdout.level=INFO"
- ,"org.apache.jena.atlas.logging.java.ConsoleHandlerStdout.formatter=org.apache.jena.atlas.logging.java.TextFormatter"
- //,"java.util.logging.ConsoleHandler.formatter=org.apache.jena.atlas.logging.java.TextFormatter"
- ) ;
-
/**
* Set logging
* <ol>
@@ -255,12 +247,21 @@ public class LogCtl {
System.setProperty("log4j.configuration", "set") ;
}
+ // ---- java.util.logging - because that's always present.
+ // Need: org.slf4j:slf4j-jdk14
+ private static String defaultProperties = StrUtils.strjoinNL
+ ("handlers=org.apache.jena.atlas.logging.java.ConsoleHandlerStream"
+ // These are the defaults.
+ //,"org.apache.atlas.jena.logging.java.ConsoleHandlerStream.level=INFO"
+ //,"org.apache.jena.atlas.logging.java.ConsoleHandlerStream.formatter=org.apache.jena.atlas.logging.java.TextFormatter"
+ //,"org.apache.jena.atlas.logging.java.TextFormatter.format=%5$tT %3$-5s %2$-20s :: %6$s"
+ ) ;
private static String JUL_LOGGING = "logging.properties" ;
public static void setJavaLogging() {
Path p = Paths.get(JUL_LOGGING) ;
if ( Files.exists(p) )
- setJavaLogging("logging.properties") ;
+ setJavaLogging(JUL_LOGGING) ;
else
setJavaLoggingDft();
}
[2/5] jena git commit: Reformat and tidy.
Posted by an...@apache.org.
Reformat and tidy.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/86f2217a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/86f2217a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/86f2217a
Branch: refs/heads/master
Commit: 86f2217a8b09a20d9d0b93c83c858c83e1a974ac
Parents: 12f194a
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jul 31 14:41:46 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Jul 31 14:41:46 2016 +0100
----------------------------------------------------------------------
.../org/apache/jena/atlas/json/JsonArray.java | 86 ++++++++------------
.../org/apache/jena/atlas/json/JsonBuilder.java | 6 +-
.../apache/jena/riot/system/IRIResolver.java | 2 +-
.../org/apache/jena/atlas/json/TestJson.java | 66 +++++++--------
4 files changed, 66 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/86f2217a/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonArray.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonArray.java b/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonArray.java
index 023004c..7237314 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonArray.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonArray.java
@@ -52,151 +52,129 @@ public class JsonArray extends JsonValue implements List<JsonValue>
{ visitor.visit(this) ; }
@Override
- public boolean add(JsonValue e)
- {
+ public boolean add(JsonValue e) {
return array.add(e) ;
}
- public boolean add(String e)
- {
+ public boolean add(String e) {
return array.add(new JsonString(e)) ;
}
- public boolean add(long val)
- {
+ public boolean add(long val) {
return array.add(JsonNumber.value(val)) ;
}
- public boolean add(boolean b)
- {
+ public boolean add(boolean b) {
return array.add(new JsonBoolean(b)) ;
}
@Override
- public void add(int index, JsonValue element)
- { array.add(index, element) ; }
+ public void add(int index, JsonValue element) {
+ array.add(index, element) ;
+ }
@Override
- public boolean addAll(Collection< ? extends JsonValue> c)
- {
+ public boolean addAll(Collection<? extends JsonValue> c) {
return array.addAll(c) ;
}
@Override
- public boolean addAll(int index, Collection< ? extends JsonValue> c)
- {
+ public boolean addAll(int index, Collection<? extends JsonValue> c) {
return array.addAll(index, c) ;
}
@Override
- public void clear()
- { array.clear() ; }
+ public void clear() {
+ array.clear() ;
+ }
@Override
- public boolean contains(Object object)
- {
+ public boolean contains(Object object) {
return array.contains(object) ;
}
@Override
- public boolean containsAll(Collection< ? > c)
- {
+ public boolean containsAll(Collection<? > c) {
return array.containsAll(c) ;
}
@Override
- public JsonValue get(int index)
- {
+ public JsonValue get(int index) {
return array.get(index) ;
}
@Override
- public int indexOf(Object o)
- {
+ public int indexOf(Object o) {
return array.indexOf(o) ;
}
@Override
- public boolean isEmpty()
- {
+ public boolean isEmpty() {
return array.isEmpty() ;
}
@Override
- public Iterator<JsonValue> iterator()
- {
+ public Iterator<JsonValue> iterator() {
return array.iterator() ;
}
@Override
- public int lastIndexOf(Object o)
- {
+ public int lastIndexOf(Object o) {
return array.lastIndexOf(o) ;
}
@Override
- public ListIterator<JsonValue> listIterator()
- {
+ public ListIterator<JsonValue> listIterator() {
return array.listIterator() ;
}
@Override
- public ListIterator<JsonValue> listIterator(int index)
- {
+ public ListIterator<JsonValue> listIterator(int index) {
return array.listIterator(index) ;
}
@Override
- public boolean remove(Object o)
- {
+ public boolean remove(Object o) {
return array.remove(o) ;
}
@Override
- public JsonValue remove(int index)
- {
+ public JsonValue remove(int index) {
return array.remove(index) ;
}
@Override
- public boolean removeAll(Collection< ? > c)
- {
+ public boolean removeAll(Collection<? > c) {
return array.removeAll(c) ;
}
@Override
- public boolean retainAll(Collection< ? > c)
- {
- return array.retainAll(c) ;
+ public boolean retainAll(Collection<? > c) {
+ return array.retainAll(c) ;
}
@Override
- public JsonValue set(int index, JsonValue element)
- {
+ public JsonValue set(int index, JsonValue element) {
return array.set(index, element) ;
}
@Override
- public int size()
- {
+ public int size() {
return array.size() ;
}
@Override
- public List<JsonValue> subList(int fromIndex, int toIndex)
- {
- return array.subList(fromIndex, toIndex) ;
+ public List<JsonValue> subList(int fromIndex, int toIndex) {
+ return array.subList(fromIndex, toIndex) ;
}
@Override
- public Object[] toArray()
- {
+ public Object[] toArray() {
return array.toArray() ;
}
@Override
- public <T> T[] toArray(T[] a)
- {
+ public <T> T[] toArray(T[] a) {
return array.toArray(a) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/86f2217a/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonBuilder.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonBuilder.java b/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonBuilder.java
index 50336f1..d5f1ff1 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonBuilder.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonBuilder.java
@@ -45,7 +45,7 @@ public class JsonBuilder {
// The depth of this stack is the object depth. key: { key: ... }
private Deque<String> keys = new ArrayDeque<>() ;
- static JsonBuilder create() { return new JsonBuilder() ; }
+ public static JsonBuilder create() { return new JsonBuilder() ; }
public JsonBuilder() {
@@ -81,7 +81,7 @@ public class JsonBuilder {
public JsonBuilder finishObject(String finishMarker) {
if ( stack.isEmpty() )
- throw new JsonException("Alignment error : already built outer most object or array") ;
+ throw new JsonException("Alignment error : already built outer-most object or array") ;
State state = stack.pop() ;
if ( state != State.OBJECT )
throw new JsonException("JSON build error : not in an object") ;
@@ -103,7 +103,7 @@ public class JsonBuilder {
public JsonBuilder finishArray() {
if ( stack.isEmpty() )
- throw new JsonException("Alignment error : already built outer most object or array") ;
+ throw new JsonException("Alignment error : already built outer-most object or array") ;
State state = stack.pop() ;
if ( state != State.ARRAY )
http://git-wip-us.apache.org/repos/asf/jena/blob/86f2217a/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java b/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
index 73fd775..7a199e1 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
@@ -96,7 +96,7 @@ public abstract class IRIResolver
// ---- Initialization support
- /** Set the error/warnign state of a violation code.
+ /** Set the error/warning state of a violation code.
* @param factory IRIFactory
* @param code ViolationCodes constant
* @param isError Whether it is to be treated an error.
http://git-wip-us.apache.org/repos/asf/jena/blob/86f2217a/jena-arq/src/test/java/org/apache/jena/atlas/json/TestJson.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/atlas/json/TestJson.java b/jena-arq/src/test/java/org/apache/jena/atlas/json/TestJson.java
index 60eb248..3b6398d 100644
--- a/jena-arq/src/test/java/org/apache/jena/atlas/json/TestJson.java
+++ b/jena-arq/src/test/java/org/apache/jena/atlas/json/TestJson.java
@@ -24,81 +24,75 @@ import org.junit.Test ;
public class TestJson extends BaseTest
{
- @Test public void js_value_1()
- {
+ @Test
+ public void js_value_1() {
read("\"abc\"", new JsonString("abc")) ;
}
-
- @Test public void js_value_2()
- {
+
+ @Test
+ public void js_value_2() {
read("123", JsonNumber.value(123)) ;
}
-
- @Test public void js_value_3()
- {
+
+ @Test
+ public void js_value_3() {
read("true", new JsonBoolean(true)) ;
}
- @Test public void js_value_4()
- {
+ @Test
+ public void js_value_4() {
read("{}", new JsonObject()) ;
}
- @Test public void js_value_5()
- {
+ @Test
+ public void js_value_5() {
JsonObject obj = new JsonObject() ;
obj.put("a", JsonNumber.value(123)) ;
read("{ \"a\": 123 }", obj) ;
}
-
- @Test public void js_value_6()
- {
+ @Test
+ public void js_value_6() {
JsonArray array = new JsonArray() ;
read("[ ]", array) ;
}
- @Test public void js_value_7()
- {
+ @Test
+ public void js_value_7() {
JsonArray array = new JsonArray() ;
array.add(JsonNumber.value(123)) ;
read("[ 123 ]", array) ;
}
-
- @Test public void js_value_8()
- {
+
+ @Test
+ public void js_value_8() {
JsonObject obj = new JsonObject() ;
JsonArray array = new JsonArray() ;
array.add(JsonNumber.value(123)) ;
obj.put("a", array) ;
- read("{ \"a\" : [ 123 ] }", obj) ;
+ read("{ \"a\" : [ 123 ] }", obj) ;
}
-
- @Test(expected=JsonParseException.class)
- public void js_value_9()
- {
+ @Test(expected = JsonParseException.class)
+ public void js_value_9() {
JSON.parse("[1 2 3]") ;
}
-
- @Test(expected=JsonParseException.class)
- public void js_value_10()
- {
+
+ @Test(expected = JsonParseException.class)
+ public void js_value_10() {
JSON.parse("1") ;
}
- @Test(expected=JsonParseException.class)
- public void js_value_11()
- {
+ @Test(expected = JsonParseException.class)
+ public void js_value_11() {
JSON.parse("\"foo\"") ;
}
-
+
@Test()
- public void js_value_12()
- {
+ public void js_value_12() {
JSON.parse("{}") ;
}
-
+
@Test
public void js_value_13() {
read("\"abc\\bd\"", new JsonString("abc\bd")) ;
[5/5] jena git commit: JENA-1218: Don't use log_daemon_msg inside
exec'ed process
Posted by an...@apache.org.
JENA-1218: Don't use log_daemon_msg inside exec'ed process
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/16da6c34
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/16da6c34
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/16da6c34
Branch: refs/heads/master
Commit: 16da6c34cfede40475387eb031e647869506af86
Parents: f65b2a3
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jul 31 20:52:31 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Jul 31 20:52:31 2016 +0100
----------------------------------------------------------------------
jena-fuseki2/apache-jena-fuseki/fuseki | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/16da6c34/jena-fuseki2/apache-jena-fuseki/fuseki
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/fuseki b/jena-fuseki2/apache-jena-fuseki/fuseki
index f3f1666..f56064d 100755
--- a/jena-fuseki2/apache-jena-fuseki/fuseki
+++ b/jena-fuseki2/apache-jena-fuseki/fuseki
@@ -392,13 +392,15 @@ start() {
then
touch "$FUSEKI_PID"
chown "$FUSEKI_USER" "$FUSEKI_PID"
+## if [ "$FUSEKI_LOGS_STDERROUT" != "$FUSEKI_LOGS/stderrout.log" ]]
+## then
+## log_daemon_msg "Redirecting Fuseki stderr/stdout to $FUSEKI_LOGS_STDERROUT"
+## fi
su - "$FUSEKI_USER" -c "
- log_daemon_msg "Redirecting Fuseki stderr/stdout to $FUSEKI_LOGS_STDERROUT"
exec ${RUN_CMD[*]} &> '$FUSEKI_LOGS_STDERROUT' &
disown \$!
echo \$! > '$FUSEKI_PID'"
else
- #log_daemon_msg "Redirecting Fuseki stderr/stdout to $FUSEKI_LOGS_STDERROUT"
exec "${RUN_CMD[@]}" &> "$FUSEKI_LOGS_STDERROUT" &
disown $!
echo $! > "$FUSEKI_PID"
[4/5] jena git commit: Add JSON.toString, JSON.toStringFlat
Posted by an...@apache.org.
Add JSON.toString, JSON.toStringFlat
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f65b2a39
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f65b2a39
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f65b2a39
Branch: refs/heads/master
Commit: f65b2a39c8bb9d85b7f8e7f6805033fff0b81674
Parents: 5ca4d94
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jul 31 14:43:18 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Jul 31 14:43:18 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/atlas/json/JSON.java | 117 +++++++++----------
1 file changed, 58 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f65b2a39/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java b/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java
index df3727f..633507d 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java
@@ -21,6 +21,7 @@ package org.apache.jena.atlas.json;
import java.io.* ;
import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.io.IndentedLineBuffer ;
import org.apache.jena.atlas.io.IndentedWriter ;
import org.apache.jena.atlas.json.io.JSONMaker ;
import org.apache.jena.atlas.json.io.JsonWriter ;
@@ -30,37 +31,32 @@ import org.apache.jena.atlas.json.io.parserjavacc.JSONParserJavaCC ;
/** A class that is the front door to the JSON subsystem */
public class JSON
{
- /** Parse a complete JSON object */
- public static JsonObject parse(InputStream input)
- {
- JSONMaker maker = new JSONMaker();
+ /** Parse a complete JSON object */
+ public static JsonObject parse(InputStream input) {
+ JSONMaker maker = new JSONMaker() ;
_parse(input, maker) ;
return (JsonObject)maker.jsonValue() ;
}
-
- /** Parse a complete JSON object */
- public static JsonObject parse(String string)
- {
+
+ /** Parse a complete JSON object */
+ public static JsonObject parse(String string) {
return _parse(new StringReader(string)) ;
}
- /** Parse any JSON value, not just an object, from an input stream */
- public static JsonValue parseAny(InputStream input)
- {
- JSONMaker maker = new JSONMaker();
+ /** Parse any JSON value, not just an object, from an input stream */
+ public static JsonValue parseAny(InputStream input) {
+ JSONMaker maker = new JSONMaker() ;
_parseAny(input, maker) ;
return maker.jsonValue() ;
}
- /** Parse any JSON value, not just an object, from a file */
- public static JsonValue parseAny(String string)
- {
+ /** Parse any JSON value, not just an object, from a file */
+ public static JsonValue parseAny(String string) {
return _parseAny(new StringReader(string)) ;
}
- /** Read a JSON object from a file */
- public static JsonObject read(String filename)
- {
+ /** Read a JSON object from a file */
+ public static JsonObject read(String filename) {
try (InputStream in = IO.openFileEx(filename)) {
return JSON.parse(in) ;
}
@@ -73,92 +69,96 @@ public class JSON
return null ;
}
}
-
- /** Read any JSON value, not just an object, from a file */
- public static JsonValue readAny(String filename)
- {
- try
- {
- try (InputStream in = IO.openFileEx( filename ))
- {
- return JSON.parseAny( in );
+
+ /** Read any JSON value, not just an object, from a file */
+ public static JsonValue readAny(String filename) {
+ try {
+ try (InputStream in = IO.openFileEx(filename)) {
+ return JSON.parseAny(in) ;
}
}
- catch (FileNotFoundException ex)
- {
- throw new RuntimeException("File not found: "+filename, ex) ;
+ catch (FileNotFoundException ex) {
+ throw new RuntimeException("File not found: " + filename, ex) ;
}
- catch (IOException ex)
- {
- IO.exception("IOException: "+filename, ex);
+ catch (IOException ex) {
+ IO.exception("IOException: " + filename, ex) ;
return null ;
}
}
-
- // Hide the reader versions - not encouraged due to charset problems.
- private static JsonObject _parse(Reader r)
- {
- JSONMaker maker = new JSONMaker();
+ // Hide the reader versions - not encouraged due to charset problems.
+
+ private static JsonObject _parse(Reader r) {
+ JSONMaker maker = new JSONMaker() ;
_parse(r, maker) ;
return (JsonObject)maker.jsonValue() ;
}
-
- private static JsonValue _parseAny(Reader r)
- {
- JSONMaker maker = new JSONMaker();
+
+ private static JsonValue _parseAny(Reader r) {
+ JSONMaker maker = new JSONMaker() ;
_parseAny(r, maker) ;
return maker.jsonValue() ;
}
-
+
// PARSER CHOICES
// Switch on parser choice.
- private static final boolean useJavaCC = false ;
+ private static final boolean useJavaCC = false ;
- private static void _parse(Reader r, JSONMaker maker)
- {
+ private static void _parse(Reader r, JSONMaker maker) {
if ( useJavaCC )
JSONParserJavaCC.parse(r, maker) ;
else
JSONParser.parse(r, maker) ;
}
- private static void _parseAny(Reader r, JSONMaker maker)
- {
+ private static void _parseAny(Reader r, JSONMaker maker) {
if ( useJavaCC )
JSONParserJavaCC.parseAny(r, maker) ;
else
JSONParser.parseAny(r, maker) ;
}
- private static void _parse(InputStream r, JSONMaker maker)
- {
+ private static void _parse(InputStream r, JSONMaker maker) {
if ( useJavaCC )
JSONParserJavaCC.parse(r, maker) ;
else
JSONParser.parse(r, maker) ;
}
- private static void _parseAny(InputStream r, JSONMaker maker)
- {
+ private static void _parseAny(InputStream r, JSONMaker maker) {
if ( useJavaCC )
JSONParserJavaCC.parseAny(r, maker) ;
else
JSONParser.parseAny(r, maker) ;
}
+ /** JsonValue to a formatted, multiline string */
+ public static String toString(JsonValue jValue) {
+ try ( IndentedLineBuffer b = new IndentedLineBuffer() ) {
+ JSON.write(b, jValue);
+ return b.asString() ;
+ }
+ }
+
+ /** JsonValue to a string with no newlines */
+ public static String toStringFlat(JsonValue jValue) {
+ try ( IndentedLineBuffer b = new IndentedLineBuffer() ) {
+ b.setFlatMode(true);
+ JSON.write(b, jValue);
+ return b.asString() ;
+ }
+ }
+
/** Write out a JSON value - pass a JSON Object to get legal exchangeable JSON */
- public static void write(OutputStream output, JsonValue jValue)
- {
+ public static void write(OutputStream output, JsonValue jValue) {
IndentedWriter iOut = new IndentedWriter(output) ;
write(iOut, jValue) ;
iOut.flush() ;
}
-
+
/** Write out a JSON value - pass a JSON Object to get legal exchangeable JSON */
- public static void write(IndentedWriter output, JsonValue jValue)
- {
+ public static void write(IndentedWriter output, JsonValue jValue) {
JsonWriter w = new JsonWriter(output) ;
w.startOutput() ;
jValue.visit(w) ;
@@ -166,8 +166,7 @@ public class JSON
}
/** Write out a JSON value to - pass a JSON Object to get legal exchangeable JSON */
- public static void write(JsonValue jValue)
- {
+ public static void write(JsonValue jValue) {
write(IndentedWriter.stdout, jValue) ;
}
}
[3/5] jena git commit: Add "forEach"
Posted by an...@apache.org.
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() ;
}
}