You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2019/11/02 15:08:37 UTC
[juneau] branch master updated: Minor API additions.
This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 7af22cc Minor API additions.
7af22cc is described below
commit 7af22cc122c110d050f534cd3fc95fdf8005adb1
Author: JamesBognar <ja...@apache.org>
AuthorDate: Sat Nov 2 11:08:15 2019 -0400
Minor API additions.
---
.../main/java/org/apache/juneau/ObjectList.java | 11 ++++++
.../src/main/java/org/apache/juneau/ObjectMap.java | 11 ++++++
.../org/apache/juneau/marshall/CharMarshall.java | 4 +-
.../org/apache/juneau/marshall/StreamMarshall.java | 4 +-
juneau-doc/docs/ReleaseNotes/8.1.2.html | 44 ++++++++++++++++++++++
5 files changed, 70 insertions(+), 4 deletions(-)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ObjectList.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ObjectList.java
index 34dbd23..8d64b17 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ObjectList.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ObjectList.java
@@ -135,6 +135,17 @@ public class ObjectList extends LinkedList<Object> {
};
/**
+ * Static constructor from JSON string.
+ *
+ * @param s JSON initialization string. Can be <jk>null</jk>.
+ * @return A new {@link ObjectList} object, or <jk>null</jk> if the input is <jk>null</jk>.
+ * @throws ParseException Invalid JSON string.
+ */
+ public static ObjectList create(CharSequence s) throws ParseException {
+ return s == null ? null : new ObjectList(s);
+ }
+
+ /**
* Construct a JSON array directly from text using the specified parser.
*
* @param s The string being parsed.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ObjectMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ObjectMap.java
index 490d98a..d56a6cf 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ObjectMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ObjectMap.java
@@ -156,6 +156,17 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
}
/**
+ * Static constructor from JSON string.
+ *
+ * @param s JSON initialization string. Can be <jk>null</jk>.
+ * @return A new {@link ObjectMap} object, or <jk>null</jk> if the input is <jk>null</jk>.
+ * @throws ParseException Invalid JSON string.
+ */
+ public static ObjectMap create(CharSequence s) throws ParseException {
+ return s == null ? null : new ObjectMap(s);
+ }
+
+ /**
* Shortcut for <code><jk>new</jk> ObjectMap(string,JsonParser.<jsf>DEFAULT</jsf>);</code>
*
* @param s The JSON text to parse.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/CharMarshall.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/CharMarshall.java
index 5ba311f..6604915 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/CharMarshall.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/CharMarshall.java
@@ -22,7 +22,7 @@ import org.apache.juneau.serializer.*;
* <li class='link'>{@doc juneau-marshall.Marshalls}
* </ul>
*/
-public abstract class CharMarshall extends Marshall {
+public class CharMarshall extends Marshall {
private final WriterSerializer s;
@@ -36,7 +36,7 @@ public abstract class CharMarshall extends Marshall {
* The parser to use for parsing input.
* <br>Must not be <jk>null</jk>.
*/
- protected CharMarshall(WriterSerializer s, ReaderParser p) {
+ public CharMarshall(WriterSerializer s, ReaderParser p) {
super(s, p);
this.s = s;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/StreamMarshall.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/StreamMarshall.java
index e446f85..cae307a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/StreamMarshall.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/StreamMarshall.java
@@ -22,7 +22,7 @@ import org.apache.juneau.serializer.*;
* <li class='link'>{@doc juneau-marshall.Marshalls}
* </ul>
*/
-public abstract class StreamMarshall extends Marshall {
+public class StreamMarshall extends Marshall {
private final OutputStreamSerializer s;
@@ -36,7 +36,7 @@ public abstract class StreamMarshall extends Marshall {
* The parser to use for parsing input.
* <br>Must not be <jk>null</jk>.
*/
- protected StreamMarshall(OutputStreamSerializer s, InputStreamParser p) {
+ public StreamMarshall(OutputStreamSerializer s, InputStreamParser p) {
super(s, p);
this.s = s;
}
diff --git a/juneau-doc/docs/ReleaseNotes/8.1.2.html b/juneau-doc/docs/ReleaseNotes/8.1.2.html
new file mode 100644
index 0000000..8f1f16c
--- /dev/null
+++ b/juneau-doc/docs/ReleaseNotes/8.1.2.html
@@ -0,0 +1,44 @@
+<!--
+/***************************************************************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ ***************************************************************************************************************************/
+ -->
+
+8.1.2 (TBD)
+
+<p>
+ Juneau 8.1.2 is ...
+</p>
+
+<h5 class='topic w800'>juneau-marshall</h5>
+<ul class='spaced-list'>
+ <li>
+ New convenience methods:
+ <ul>
+ <li class='jm'>{@link oaj.ObjectMap.create(String)}
+ <li class='jm'>{@link oaj.ObjectList.create(String)}
+ </ul>
+ <li>
+ {@link oaj.marshall.CharMarshall} and {@link oaj.marshall.StreamMarshall} now have public constructors.
+</ul>
+
+<h5 class='topic w800'>juneau-rest-server</h5>
+<ul class='spaced-list'>
+</ul>
+
+<h5 class='topic w800'>juneau-rest-client</h5>
+<ul class='spaced-list'>
+</ul>
+
+<h5 class='topic w800'>juneau-examples</h5>
+<ul class='spaced-list'>
+</ul>