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 2017/03/29 19:19:59 UTC
incubator-juneau git commit: Fold doParseArgs() methods into
doParse().(2)
Repository: incubator-juneau
Updated Branches:
refs/heads/master 7ff5e8981 -> 2b2fd75b6
Fold doParseArgs() methods into doParse().(2)
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/2b2fd75b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/2b2fd75b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/2b2fd75b
Branch: refs/heads/master
Commit: 2b2fd75b69130261aa144cf3d0d47eb277c45775
Parents: 7ff5e89
Author: JamesBognar <ja...@apache.org>
Authored: Wed Mar 29 15:18:53 2017 -0400
Committer: JamesBognar <ja...@apache.org>
Committed: Wed Mar 29 15:19:56 2017 -0400
----------------------------------------------------------------------
.../main/java/org/apache/juneau/jena/RdfParser.java | 6 ------
.../java/org/apache/juneau/XmlValidatorParser.java | 5 -----
.../java/org/apache/juneau/html/HtmlParser.java | 6 ------
.../java/org/apache/juneau/json/JsonParser.java | 9 ---------
.../org/apache/juneau/msgpack/MsgPackParser.java | 8 --------
.../main/java/org/apache/juneau/parser/Parser.java | 16 +---------------
.../main/java/org/apache/juneau/uon/UonParser.java | 8 --------
.../juneau/urlencoding/UrlEncodingParser.java | 8 --------
.../main/java/org/apache/juneau/xml/XmlParser.java | 6 ------
9 files changed, 1 insertion(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2b2fd75b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
----------------------------------------------------------------------
diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
index 30042df..c3138dc 100644
--- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
+++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
@@ -477,10 +477,4 @@ public class RdfParser extends ReaderParser {
public RdfParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {
return new RdfParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType);
}
-
- @Override /* Parser */
- protected Object[] doParseArgs(ParserSession session, ClassMeta<Object[]> args) throws Exception {
- return doParse(session, args);
- }
-
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2b2fd75b/juneau-core-test/src/test/java/org/apache/juneau/XmlValidatorParser.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/XmlValidatorParser.java b/juneau-core-test/src/test/java/org/apache/juneau/XmlValidatorParser.java
index 29304a1..9bd8270 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/XmlValidatorParser.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/XmlValidatorParser.java
@@ -54,11 +54,6 @@ public class XmlValidatorParser extends XmlParser {
return (Collection<E>)validate(session.getReader());
}
- @Override /* ReaderParser */
- protected Object[] doParseArgs(ParserSession session, ClassMeta<Object[]> args) throws Exception {
- return (Object[])validate(session.getReader());
- }
-
protected XMLStreamReader getStaxReader(Reader in) throws Exception {
XMLInputFactory factory = XMLInputFactory.newInstance();
factory.setProperty("javax.xml.stream.isNamespaceAware", false);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2b2fd75b/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java b/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java
index fe85937..f04ad04 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java
@@ -575,10 +575,4 @@ public class HtmlParser extends XmlParser {
HtmlParserSession s = (HtmlParserSession)session;
return parseIntoCollection(s, s.getXmlStreamReader(), c, s.getClassMeta(elementType), null);
}
-
- @Override /* ReaderParser */
- protected Object[] doParseArgs(ParserSession session, ClassMeta<Object[]> args) throws Exception {
- HtmlParserSession s = (HtmlParserSession)session;
- return parseAnything(s, args, s.getXmlStreamReader(), s.getOuter(), true, null);
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2b2fd75b/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java b/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java
index 080e073..5a09de5 100644
--- a/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java
@@ -795,13 +795,4 @@ public class JsonParser extends ReaderParser {
validateEnd(s, r);
return c;
}
-
- @Override /* ReaderParser */
- protected Object[] doParseArgs(ParserSession session, ClassMeta<Object[]> args) throws Exception {
- JsonParserSession s = (JsonParserSession)session;
- ParserReader r = s.getReader();
- Object[] a = parseAnything(s, args, r, session.getOuter(), null);
- validateEnd(s, r);
- return a;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2b2fd75b/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java b/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
index 75dd45c..fc18351 100644
--- a/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
@@ -213,12 +213,4 @@ public class MsgPackParser extends InputStreamParser {
T o = parseAnything(s, type, is, s.getOuter(), null);
return o;
}
-
- @Override /* ReaderParser */
- protected Object[] doParseArgs(ParserSession session, ClassMeta<Object[]> args) throws Exception {
- MsgPackParserSession s = (MsgPackParserSession)session;
- MsgPackInputStream is = s.getInputStream();
- Object[] a = parseAnything(s, args, is, session.getOuter(), null);
- return a;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2b2fd75b/juneau-core/src/main/java/org/apache/juneau/parser/Parser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/parser/Parser.java b/juneau-core/src/main/java/org/apache/juneau/parser/Parser.java
index d338c97..389e224 100644
--- a/juneau-core/src/main/java/org/apache/juneau/parser/Parser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/parser/Parser.java
@@ -487,7 +487,7 @@ public abstract class Parser extends CoreObject {
return new Object[0];
ParserSession session = createSession(input);
try {
- return doParseArgs(session, session.getArgsClassMeta(argTypes));
+ return doParse(session, session.getArgsClassMeta(argTypes));
} catch (ParseException e) {
throw e;
} catch (Exception e) {
@@ -497,20 +497,6 @@ public abstract class Parser extends CoreObject {
}
}
- /**
- * Implementation method.
- * Default implementation throws an {@link UnsupportedOperationException}.
- * @param session The runtime session object returned by {@link #createSession(Object, ObjectMap, Method, Object, Locale, TimeZone, MediaType)}.
- * If <jk>null</jk>, one will be created using {@link #createSession(Object)}.
- * @param args Specifies the metadata on the type of objects to create for each entry in the array.
- *
- * @return An array of parsed objects.
- * @throws Exception If thrown from underlying stream, or if the input contains a syntax error or is malformed.
- */
- protected Object[] doParseArgs(ParserSession session, ClassMeta<Object[]> args) throws Exception {
- throw new UnsupportedOperationException("Parser '"+getClass().getName()+"' does not support this method.");
- }
-
//--------------------------------------------------------------------------------
// Other methods
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2b2fd75b/juneau-core/src/main/java/org/apache/juneau/uon/UonParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/uon/UonParser.java b/juneau-core/src/main/java/org/apache/juneau/uon/UonParser.java
index 707c759..63e2a7d 100644
--- a/juneau-core/src/main/java/org/apache/juneau/uon/UonParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/uon/UonParser.java
@@ -761,12 +761,4 @@ public class UonParser extends ReaderParser {
validateEnd(s, r);
return c;
}
-
- @Override /* ReaderParser */
- protected Object[] doParseArgs(ParserSession session, ClassMeta<Object[]> args) throws Exception {
- UonParserSession s = (UonParserSession)session;
- UonReader r = s.getReader();
- Object[] a = parseAnything(s, args, r, session.getOuter(), true, null);
- return a;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2b2fd75b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
index d4a8a65..9360dc2 100644
--- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
@@ -514,14 +514,6 @@ public class UrlEncodingParser extends UonParser {
}
@Override /* ReaderParser */
- protected Object[] doParseArgs(ParserSession session, ClassMeta<Object[]> args) throws Exception {
- UrlEncodingParserSession s = (UrlEncodingParserSession)session;
- UonReader r = s.getReader();
- Object[] a = parseAnything(s, args, r, session.getOuter());
- return a;
- }
-
- @Override /* ReaderParser */
protected <K,V> Map<K,V> doParseIntoMap(ParserSession session, Map<K,V> m, Type keyType, Type valueType) throws Exception {
UrlEncodingParserSession s = (UrlEncodingParserSession)session;
UonReader r = s.getReader();
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2b2fd75b/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java
index 1aba943..d0e592f 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java
@@ -518,10 +518,4 @@ public class XmlParser extends ReaderParser {
ClassMeta cm = session.getClassMeta(c.getClass(), elementType);
return parseIntoCollection(s,c, cm.getElementType());
}
-
- @Override /* ReaderParser */
- protected Object[] doParseArgs(ParserSession session, ClassMeta<Object[]> args) throws Exception {
- XmlParserSession s = (XmlParserSession)session;
- return parseAnything(s, args, null, s.getXmlStreamReader(), session.getOuter(), true, null);
- }
}