http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/236aea45/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html index 1a84af7..0cc3fc0 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html +++ b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html @@ -120,9 +120,9 @@ <span class="sourceLineNo">112</span> o = session.cast(m, null, eType);<a name="line.112"></a> <span class="sourceLineNo">113</span> else if (m.containsKey("_value"))<a name="line.113"></a> <span class="sourceLineNo">114</span> o = session.convertToType(m.get("_value"), sType);<a name="line.114"></a> -<span class="sourceLineNo">115</span> else if (sType.isCollection()) {<a name="line.115"></a> +<span class="sourceLineNo">115</span> else if (sType.isCollection() || sType.isArray()) {<a name="line.115"></a> <span class="sourceLineNo">116</span> // ?1=foo&2=bar...<a name="line.116"></a> -<span class="sourceLineNo">117</span> Collection c2 = sType.canCreateNewInstance() ? (Collection)sType.newInstance() : new ObjectList(session);<a name="line.117"></a> +<span class="sourceLineNo">117</span> Collection c2 = (sType.isArray() || ! sType.canCreateNewInstance(outer)) ? new ObjectList(session) : (Collection)sType.newInstance();<a name="line.117"></a> <span class="sourceLineNo">118</span> Map<Integer,Object> t = new TreeMap<Integer,Object>();<a name="line.118"></a> <span class="sourceLineNo">119</span> for (Map.Entry<String,Object> e : m.entrySet()) {<a name="line.119"></a> <span class="sourceLineNo">120</span> String k = e.getKey();<a name="line.120"></a> @@ -130,7 +130,7 @@ <span class="sourceLineNo">122</span> t.put(Integer.valueOf(k), session.convertToType(e.getValue(), sType.getElementType()));<a name="line.122"></a> <span class="sourceLineNo">123</span> }<a name="line.123"></a> <span class="sourceLineNo">124</span> c2.addAll(t.values());<a name="line.124"></a> -<span class="sourceLineNo">125</span> o = c2;<a name="line.125"></a> +<span class="sourceLineNo">125</span> o = (sType.isArray() ? ArrayUtils.toArray(c2, sType.getElementType().getInnerClass()) : c2);<a name="line.125"></a> <span class="sourceLineNo">126</span> } else {<a name="line.126"></a> <span class="sourceLineNo">127</span> if (sType.getNotABeanReason() != null)<a name="line.127"></a> <span class="sourceLineNo">128</span> throw new ParseException(session, "Class ''{0}'' could not be instantiated as application/x-www-form-urlencoded. Reason: ''{1}''", sType, sType.getNotABeanReason());<a name="line.128"></a> @@ -421,133 +421,191 @@ <span class="sourceLineNo">413</span> }<a name="line.413"></a> <span class="sourceLineNo">414</span><a name="line.414"></a> <span class="sourceLineNo">415</span> private Object[] parseArgs(UrlEncodingParserSession session, ParserReader r, ClassMeta<?>[] argTypes) throws Exception {<a name="line.415"></a> -<span class="sourceLineNo">416</span> // TODO - This can be made more efficient.<a name="line.416"></a> -<span class="sourceLineNo">417</span> ClassMeta<TreeMap<Integer,String>> cm = session.getClassMeta(TreeMap.class, Integer.class, String.class);<a name="line.417"></a> -<span class="sourceLineNo">418</span> TreeMap<Integer,String> m = parseAnything(session, cm, r, session.getOuter());<a name="line.418"></a> -<span class="sourceLineNo">419</span> Object[] vals = m.values().toArray(new Object[m.size()]);<a name="line.419"></a> -<span class="sourceLineNo">420</span> if (vals.length != argTypes.length)<a name="line.420"></a> -<span class="sourceLineNo">421</span> throw new ParseException(session, "Argument lengths don't match. vals={0}, argTypes={1}", vals.length, argTypes.length);<a name="line.421"></a> -<span class="sourceLineNo">422</span> for (int i = 0; i < vals.length; i++) {<a name="line.422"></a> -<span class="sourceLineNo">423</span> String s = String.valueOf(vals[i]);<a name="line.423"></a> -<span class="sourceLineNo">424</span> vals[i] = super.parseAnything(session, argTypes[i], new UonReader(s, false), session.getOuter(), true, null);<a name="line.424"></a> -<span class="sourceLineNo">425</span> }<a name="line.425"></a> -<span class="sourceLineNo">426</span><a name="line.426"></a> -<span class="sourceLineNo">427</span> return vals;<a name="line.427"></a> -<span class="sourceLineNo">428</span> }<a name="line.428"></a> -<span class="sourceLineNo">429</span><a name="line.429"></a> -<span class="sourceLineNo">430</span> /**<a name="line.430"></a> -<span class="sourceLineNo">431</span> * Parses a single query parameter value into the specified class type.<a name="line.431"></a> -<span class="sourceLineNo">432</span> *<a name="line.432"></a> -<span class="sourceLineNo">433</span> * @param in The input query string value.<a name="line.433"></a> -<span class="sourceLineNo">434</span> * @param type The object type to create.<a name="line.434"></a> -<span class="sourceLineNo">435</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.435"></a> -<span class="sourceLineNo">436</span> * @param args The type arguments of the class if it's a collection or map.<a name="line.436"></a> -<span class="sourceLineNo">437</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.437"></a> -<span class="sourceLineNo">438</span> * <br>Ignored if the main type is not a map or collection.<a name="line.438"></a> -<span class="sourceLineNo">439</span> * @return A new instance of the specified type.<a name="line.439"></a> -<span class="sourceLineNo">440</span> * @throws ParseException<a name="line.440"></a> -<span class="sourceLineNo">441</span> */<a name="line.441"></a> -<span class="sourceLineNo">442</span> public <T> T parseParameter(CharSequence in, Type type, Type...args) throws ParseException {<a name="line.442"></a> -<span class="sourceLineNo">443</span> if (in == null)<a name="line.443"></a> -<span class="sourceLineNo">444</span> return null;<a name="line.444"></a> -<span class="sourceLineNo">445</span> UonParserSession session = createParameterSession(in);<a name="line.445"></a> -<span class="sourceLineNo">446</span> try {<a name="line.446"></a> -<span class="sourceLineNo">447</span> UonReader r = session.getReader();<a name="line.447"></a> -<span class="sourceLineNo">448</span> return (T)super.parseAnything(session, session.getClassMeta(type, args), r, null, true, null);<a name="line.448"></a> -<span class="sourceLineNo">449</span> } catch (ParseException e) {<a name="line.449"></a> -<span class="sourceLineNo">450</span> throw e;<a name="line.450"></a> -<span class="sourceLineNo">451</span> } catch (Exception e) {<a name="line.451"></a> -<span class="sourceLineNo">452</span> throw new ParseException(session, e);<a name="line.452"></a> -<span class="sourceLineNo">453</span> } finally {<a name="line.453"></a> -<span class="sourceLineNo">454</span> session.close();<a name="line.454"></a> -<span class="sourceLineNo">455</span> }<a name="line.455"></a> -<span class="sourceLineNo">456</span> }<a name="line.456"></a> -<span class="sourceLineNo">457</span><a name="line.457"></a> -<span class="sourceLineNo">458</span> /**<a name="line.458"></a> -<span class="sourceLineNo">459</span> * Parses a single query parameter value into the specified class type.<a name="line.459"></a> -<span class="sourceLineNo">460</span> *<a name="line.460"></a> -<span class="sourceLineNo">461</span> * @param in The input query string value.<a name="line.461"></a> -<span class="sourceLineNo">462</span> * @param type The class type of the object to create.<a name="line.462"></a> -<span class="sourceLineNo">463</span> * @return A new instance of the specified type.<a name="line.463"></a> -<span class="sourceLineNo">464</span> * @throws ParseException<a name="line.464"></a> -<span class="sourceLineNo">465</span> */<a name="line.465"></a> -<span class="sourceLineNo">466</span> public <T> T parseParameter(CharSequence in, Class<T> type) throws ParseException {<a name="line.466"></a> -<span class="sourceLineNo">467</span> if (in == null)<a name="line.467"></a> -<span class="sourceLineNo">468</span> return null;<a name="line.468"></a> -<span class="sourceLineNo">469</span> UonParserSession session = createParameterSession(in);<a name="line.469"></a> -<span class="sourceLineNo">470</span> try {<a name="line.470"></a> -<span class="sourceLineNo">471</span> UonReader r = session.getReader();<a name="line.471"></a> -<span class="sourceLineNo">472</span> return super.parseAnything(session, session.getClassMeta(type), r, null, true, null);<a name="line.472"></a> -<span class="sourceLineNo">473</span> } catch (ParseException e) {<a name="line.473"></a> -<span class="sourceLineNo">474</span> throw e;<a name="line.474"></a> -<span class="sourceLineNo">475</span> } catch (Exception e) {<a name="line.475"></a> -<span class="sourceLineNo">476</span> throw new ParseException(session, e);<a name="line.476"></a> -<span class="sourceLineNo">477</span> } finally {<a name="line.477"></a> -<span class="sourceLineNo">478</span> session.close();<a name="line.478"></a> -<span class="sourceLineNo">479</span> }<a name="line.479"></a> -<span class="sourceLineNo">480</span> }<a name="line.480"></a> -<span class="sourceLineNo">481</span><a name="line.481"></a> -<span class="sourceLineNo">482</span> /**<a name="line.482"></a> -<span class="sourceLineNo">483</span> * Same as {@link #parseParameter(CharSequence, Type, Type...)} except the type has already<a name="line.483"></a> -<span class="sourceLineNo">484</span> * been converted to a {@link ClassMeta} object.<a name="line.484"></a> -<span class="sourceLineNo">485</span> *<a name="line.485"></a> -<span class="sourceLineNo">486</span> * @param in The input query string value.<a name="line.486"></a> -<span class="sourceLineNo">487</span> * @param type The class type of the object to create.<a name="line.487"></a> -<span class="sourceLineNo">488</span> * @return A new instance of the specified type.<a name="line.488"></a> -<span class="sourceLineNo">489</span> * @throws ParseException<a name="line.489"></a> -<span class="sourceLineNo">490</span> */<a name="line.490"></a> -<span class="sourceLineNo">491</span> public <T> T parseParameter(CharSequence in, ClassMeta<T> type) throws ParseException {<a name="line.491"></a> -<span class="sourceLineNo">492</span> if (in == null)<a name="line.492"></a> -<span class="sourceLineNo">493</span> return null;<a name="line.493"></a> -<span class="sourceLineNo">494</span> UonParserSession session = createParameterSession(in);<a name="line.494"></a> -<span class="sourceLineNo">495</span> try {<a name="line.495"></a> -<span class="sourceLineNo">496</span> UonReader r = session.getReader();<a name="line.496"></a> -<span class="sourceLineNo">497</span> return super.parseAnything(session, type, r, null, true, null);<a name="line.497"></a> -<span class="sourceLineNo">498</span> } catch (ParseException e) {<a name="line.498"></a> -<span class="sourceLineNo">499</span> throw e;<a name="line.499"></a> -<span class="sourceLineNo">500</span> } catch (Exception e) {<a name="line.500"></a> -<span class="sourceLineNo">501</span> throw new ParseException(session, e);<a name="line.501"></a> -<span class="sourceLineNo">502</span> } finally {<a name="line.502"></a> -<span class="sourceLineNo">503</span> session.close();<a name="line.503"></a> -<span class="sourceLineNo">504</span> }<a name="line.504"></a> -<span class="sourceLineNo">505</span> }<a name="line.505"></a> -<span class="sourceLineNo">506</span><a name="line.506"></a> -<span class="sourceLineNo">507</span><a name="line.507"></a> -<span class="sourceLineNo">508</span> //--------------------------------------------------------------------------------<a name="line.508"></a> -<span class="sourceLineNo">509</span> // Entry point methods<a name="line.509"></a> -<span class="sourceLineNo">510</span> //--------------------------------------------------------------------------------<a name="line.510"></a> -<span class="sourceLineNo">511</span><a name="line.511"></a> -<span class="sourceLineNo">512</span> @Override /* Parser */<a name="line.512"></a> -<span class="sourceLineNo">513</span> public UrlEncodingParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.513"></a> -<span class="sourceLineNo">514</span> return new UrlEncodingParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType);<a name="line.514"></a> -<span class="sourceLineNo">515</span> }<a name="line.515"></a> -<span class="sourceLineNo">516</span><a name="line.516"></a> -<span class="sourceLineNo">517</span> @Override /* Parser */<a name="line.517"></a> -<span class="sourceLineNo">518</span> protected <T> T doParse(ParserSession session, ClassMeta<T> type) throws Exception {<a name="line.518"></a> -<span class="sourceLineNo">519</span> UrlEncodingParserSession s = (UrlEncodingParserSession)session;<a name="line.519"></a> -<span class="sourceLineNo">520</span> UonReader r = s.getReader();<a name="line.520"></a> -<span class="sourceLineNo">521</span> T o = parseAnything(s, type, r, s.getOuter());<a name="line.521"></a> -<span class="sourceLineNo">522</span> return o;<a name="line.522"></a> -<span class="sourceLineNo">523</span> }<a name="line.523"></a> -<span class="sourceLineNo">524</span><a name="line.524"></a> -<span class="sourceLineNo">525</span> @Override /* ReaderParser */<a name="line.525"></a> -<span class="sourceLineNo">526</span> protected Object[] doParseArgs(ParserSession session, ClassMeta<?>[] argTypes) throws Exception {<a name="line.526"></a> -<span class="sourceLineNo">527</span> UrlEncodingParserSession uctx = (UrlEncodingParserSession)session;<a name="line.527"></a> -<span class="sourceLineNo">528</span> UonReader r = uctx.getReader();<a name="line.528"></a> -<span class="sourceLineNo">529</span> Object[] a = parseArgs(uctx, r, argTypes);<a name="line.529"></a> -<span class="sourceLineNo">530</span> return a;<a name="line.530"></a> -<span class="sourceLineNo">531</span> }<a name="line.531"></a> -<span class="sourceLineNo">532</span><a name="line.532"></a> -<span class="sourceLineNo">533</span> @Override /* ReaderParser */<a name="line.533"></a> -<span class="sourceLineNo">534</span> protected <K,V> Map<K,V> doParseIntoMap(ParserSession session, Map<K,V> m, Type keyType, Type valueType) throws Exception {<a name="line.534"></a> -<span class="sourceLineNo">535</span> UrlEncodingParserSession s = (UrlEncodingParserSession)session;<a name="line.535"></a> -<span class="sourceLineNo">536</span> UonReader r = s.getReader();<a name="line.536"></a> -<span class="sourceLineNo">537</span> if (r.peekSkipWs() == '?')<a name="line.537"></a> -<span class="sourceLineNo">538</span> r.read();<a name="line.538"></a> -<span class="sourceLineNo">539</span> m = parseIntoMap(s, r, m, (ClassMeta<K>)session.getClassMeta(keyType), (ClassMeta<V>)session.getClassMeta(valueType));<a name="line.539"></a> -<span class="sourceLineNo">540</span> return m;<a name="line.540"></a> -<span class="sourceLineNo">541</span> }<a name="line.541"></a> -<span class="sourceLineNo">542</span>}<a name="line.542"></a> +<span class="sourceLineNo">416</span><a name="line.416"></a> +<span class="sourceLineNo">417</span> int c = r.peekSkipWs();<a name="line.417"></a> +<span class="sourceLineNo">418</span> if (c == '?')<a name="line.418"></a> +<span class="sourceLineNo">419</span> r.read();<a name="line.419"></a> +<span class="sourceLineNo">420</span><a name="line.420"></a> +<span class="sourceLineNo">421</span> Object[] vals = new Object[argTypes.length];<a name="line.421"></a> +<span class="sourceLineNo">422</span><a name="line.422"></a> +<span class="sourceLineNo">423</span> final int S1=1; // Looking for attrName start.<a name="line.423"></a> +<span class="sourceLineNo">424</span> final int S2=2; // Found attrName end, looking for =.<a name="line.424"></a> +<span class="sourceLineNo">425</span> final int S3=3; // Found =, looking for valStart.<a name="line.425"></a> +<span class="sourceLineNo">426</span> final int S4=4; // Looking for & or end.<a name="line.426"></a> +<span class="sourceLineNo">427</span> boolean isInEscape = false;<a name="line.427"></a> +<span class="sourceLineNo">428</span><a name="line.428"></a> +<span class="sourceLineNo">429</span> int state = S1;<a name="line.429"></a> +<span class="sourceLineNo">430</span> Integer currIdx = 0;<a name="line.430"></a> +<span class="sourceLineNo">431</span> while (c != -1) {<a name="line.431"></a> +<span class="sourceLineNo">432</span> c = r.read();<a name="line.432"></a> +<span class="sourceLineNo">433</span> if (! isInEscape) {<a name="line.433"></a> +<span class="sourceLineNo">434</span> if (state == S1) {<a name="line.434"></a> +<span class="sourceLineNo">435</span> if (c == -1)<a name="line.435"></a> +<span class="sourceLineNo">436</span> return vals;<a name="line.436"></a> +<span class="sourceLineNo">437</span> r.unread();<a name="line.437"></a> +<span class="sourceLineNo">438</span> Object attr = parseAttr(session, r, true);<a name="line.438"></a> +<span class="sourceLineNo">439</span> currIdx = Integer.parseInt(attr.toString());<a name="line.439"></a> +<span class="sourceLineNo">440</span> if (currIdx >= vals.length)<a name="line.440"></a> +<span class="sourceLineNo">441</span> throw new ParseException(session, "Out-of-range index encountered. args length={0}, index={1}", vals.length, currIdx);<a name="line.441"></a> +<span class="sourceLineNo">442</span> state = S2;<a name="line.442"></a> +<span class="sourceLineNo">443</span> c = 0; // Avoid isInEscape if c was '\'<a name="line.443"></a> +<span class="sourceLineNo">444</span> } else if (state == S2) {<a name="line.444"></a> +<span class="sourceLineNo">445</span> if (c == '\u0002')<a name="line.445"></a> +<span class="sourceLineNo">446</span> state = S3;<a name="line.446"></a> +<span class="sourceLineNo">447</span> else if (c == -1 || c == '\u0001') {<a name="line.447"></a> +<span class="sourceLineNo">448</span> vals[currIdx] = null;<a name="line.448"></a> +<span class="sourceLineNo">449</span> if (c == -1)<a name="line.449"></a> +<span class="sourceLineNo">450</span> return vals;<a name="line.450"></a> +<span class="sourceLineNo">451</span> state = S1;<a name="line.451"></a> +<span class="sourceLineNo">452</span> }<a name="line.452"></a> +<span class="sourceLineNo">453</span> } else if (state == S3) {<a name="line.453"></a> +<span class="sourceLineNo">454</span> if (c == -1 || c == '\u0001') {<a name="line.454"></a> +<span class="sourceLineNo">455</span> vals[currIdx] = convertAttrToType(session, null, "", argTypes[currIdx]);<a name="line.455"></a> +<span class="sourceLineNo">456</span> if (c == -1)<a name="line.456"></a> +<span class="sourceLineNo">457</span> return vals;<a name="line.457"></a> +<span class="sourceLineNo">458</span> state = S1;<a name="line.458"></a> +<span class="sourceLineNo">459</span> } else {<a name="line.459"></a> +<span class="sourceLineNo">460</span> // For performance, we bypass parseAnything for string values.<a name="line.460"></a> +<span class="sourceLineNo">461</span> vals[currIdx] = argTypes[currIdx].isString() ? super.parseString(session, r.unread(), true) : super.parseAnything(session, argTypes[currIdx], r.unread(), null, true, null);<a name="line.461"></a> +<span class="sourceLineNo">462</span><a name="line.462"></a> +<span class="sourceLineNo">463</span> state = S4;<a name="line.463"></a> +<span class="sourceLineNo">464</span> c = 0; // Avoid isInEscape if c was '\'<a name="line.464"></a> +<span class="sourceLineNo">465</span> }<a name="line.465"></a> +<span class="sourceLineNo">466</span> } else if (state == S4) {<a name="line.466"></a> +<span class="sourceLineNo">467</span> if (c == '\u0001')<a name="line.467"></a> +<span class="sourceLineNo">468</span> state = S1;<a name="line.468"></a> +<span class="sourceLineNo">469</span> else if (c == -1) {<a name="line.469"></a> +<span class="sourceLineNo">470</span> return vals;<a name="line.470"></a> +<span class="sourceLineNo">471</span> }<a name="line.471"></a> +<span class="sourceLineNo">472</span> }<a name="line.472"></a> +<span class="sourceLineNo">473</span> }<a name="line.473"></a> +<span class="sourceLineNo">474</span> isInEscape = (c == '\\' && ! isInEscape);<a name="line.474"></a> +<span class="sourceLineNo">475</span> }<a name="line.475"></a> +<span class="sourceLineNo">476</span> if (state == S1)<a name="line.476"></a> +<span class="sourceLineNo">477</span> throw new ParseException(session, "Could not find attribute name on object.");<a name="line.477"></a> +<span class="sourceLineNo">478</span> if (state == S2)<a name="line.478"></a> +<span class="sourceLineNo">479</span> throw new ParseException(session, "Could not find '=' following attribute name on object.");<a name="line.479"></a> +<span class="sourceLineNo">480</span> if (state == S3)<a name="line.480"></a> +<span class="sourceLineNo">481</span> throw new ParseException(session, "Dangling '=' found in object entry");<a name="line.481"></a> +<span class="sourceLineNo">482</span> if (state == S4)<a name="line.482"></a> +<span class="sourceLineNo">483</span> throw new ParseException(session, "Could not find end of object.");<a name="line.483"></a> +<span class="sourceLineNo">484</span><a name="line.484"></a> +<span class="sourceLineNo">485</span> return null; // Unreachable.<a name="line.485"></a> +<span class="sourceLineNo">486</span> }<a name="line.486"></a> +<span class="sourceLineNo">487</span><a name="line.487"></a> +<span class="sourceLineNo">488</span> /**<a name="line.488"></a> +<span class="sourceLineNo">489</span> * Parses a single query parameter value into the specified class type.<a name="line.489"></a> +<span class="sourceLineNo">490</span> *<a name="line.490"></a> +<span class="sourceLineNo">491</span> * @param in The input query string value.<a name="line.491"></a> +<span class="sourceLineNo">492</span> * @param type The object type to create.<a name="line.492"></a> +<span class="sourceLineNo">493</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.493"></a> +<span class="sourceLineNo">494</span> * @param args The type arguments of the class if it's a collection or map.<a name="line.494"></a> +<span class="sourceLineNo">495</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.495"></a> +<span class="sourceLineNo">496</span> * <br>Ignored if the main type is not a map or collection.<a name="line.496"></a> +<span class="sourceLineNo">497</span> * @return A new instance of the specified type.<a name="line.497"></a> +<span class="sourceLineNo">498</span> * @throws ParseException<a name="line.498"></a> +<span class="sourceLineNo">499</span> */<a name="line.499"></a> +<span class="sourceLineNo">500</span> public <T> T parseParameter(CharSequence in, Type type, Type...args) throws ParseException {<a name="line.500"></a> +<span class="sourceLineNo">501</span> if (in == null)<a name="line.501"></a> +<span class="sourceLineNo">502</span> return null;<a name="line.502"></a> +<span class="sourceLineNo">503</span> UonParserSession session = createParameterSession(in);<a name="line.503"></a> +<span class="sourceLineNo">504</span> try {<a name="line.504"></a> +<span class="sourceLineNo">505</span> UonReader r = session.getReader();<a name="line.505"></a> +<span class="sourceLineNo">506</span> return (T)super.parseAnything(session, session.getClassMeta(type, args), r, null, true, null);<a name="line.506"></a> +<span class="sourceLineNo">507</span> } catch (ParseException e) {<a name="line.507"></a> +<span class="sourceLineNo">508</span> throw e;<a name="line.508"></a> +<span class="sourceLineNo">509</span> } catch (Exception e) {<a name="line.509"></a> +<span class="sourceLineNo">510</span> throw new ParseException(session, e);<a name="line.510"></a> +<span class="sourceLineNo">511</span> } finally {<a name="line.511"></a> +<span class="sourceLineNo">512</span> session.close();<a name="line.512"></a> +<span class="sourceLineNo">513</span> }<a name="line.513"></a> +<span class="sourceLineNo">514</span> }<a name="line.514"></a> +<span class="sourceLineNo">515</span><a name="line.515"></a> +<span class="sourceLineNo">516</span> /**<a name="line.516"></a> +<span class="sourceLineNo">517</span> * Parses a single query parameter value into the specified class type.<a name="line.517"></a> +<span class="sourceLineNo">518</span> *<a name="line.518"></a> +<span class="sourceLineNo">519</span> * @param in The input query string value.<a name="line.519"></a> +<span class="sourceLineNo">520</span> * @param type The class type of the object to create.<a name="line.520"></a> +<span class="sourceLineNo">521</span> * @return A new instance of the specified type.<a name="line.521"></a> +<span class="sourceLineNo">522</span> * @throws ParseException<a name="line.522"></a> +<span class="sourceLineNo">523</span> */<a name="line.523"></a> +<span class="sourceLineNo">524</span> public <T> T parseParameter(CharSequence in, Class<T> type) throws ParseException {<a name="line.524"></a> +<span class="sourceLineNo">525</span> if (in == null)<a name="line.525"></a> +<span class="sourceLineNo">526</span> return null;<a name="line.526"></a> +<span class="sourceLineNo">527</span> UonParserSession session = createParameterSession(in);<a name="line.527"></a> +<span class="sourceLineNo">528</span> try {<a name="line.528"></a> +<span class="sourceLineNo">529</span> UonReader r = session.getReader();<a name="line.529"></a> +<span class="sourceLineNo">530</span> return super.parseAnything(session, session.getClassMeta(type), r, null, true, null);<a name="line.530"></a> +<span class="sourceLineNo">531</span> } catch (ParseException e) {<a name="line.531"></a> +<span class="sourceLineNo">532</span> throw e;<a name="line.532"></a> +<span class="sourceLineNo">533</span> } catch (Exception e) {<a name="line.533"></a> +<span class="sourceLineNo">534</span> throw new ParseException(session, e);<a name="line.534"></a> +<span class="sourceLineNo">535</span> } finally {<a name="line.535"></a> +<span class="sourceLineNo">536</span> session.close();<a name="line.536"></a> +<span class="sourceLineNo">537</span> }<a name="line.537"></a> +<span class="sourceLineNo">538</span> }<a name="line.538"></a> +<span class="sourceLineNo">539</span><a name="line.539"></a> +<span class="sourceLineNo">540</span> /**<a name="line.540"></a> +<span class="sourceLineNo">541</span> * Same as {@link #parseParameter(CharSequence, Type, Type...)} except the type has already<a name="line.541"></a> +<span class="sourceLineNo">542</span> * been converted to a {@link ClassMeta} object.<a name="line.542"></a> +<span class="sourceLineNo">543</span> *<a name="line.543"></a> +<span class="sourceLineNo">544</span> * @param in The input query string value.<a name="line.544"></a> +<span class="sourceLineNo">545</span> * @param type The class type of the object to create.<a name="line.545"></a> +<span class="sourceLineNo">546</span> * @return A new instance of the specified type.<a name="line.546"></a> +<span class="sourceLineNo">547</span> * @throws ParseException<a name="line.547"></a> +<span class="sourceLineNo">548</span> */<a name="line.548"></a> +<span class="sourceLineNo">549</span> public <T> T parseParameter(CharSequence in, ClassMeta<T> type) throws ParseException {<a name="line.549"></a> +<span class="sourceLineNo">550</span> if (in == null)<a name="line.550"></a> +<span class="sourceLineNo">551</span> return null;<a name="line.551"></a> +<span class="sourceLineNo">552</span> UonParserSession session = createParameterSession(in);<a name="line.552"></a> +<span class="sourceLineNo">553</span> try {<a name="line.553"></a> +<span class="sourceLineNo">554</span> UonReader r = session.getReader();<a name="line.554"></a> +<span class="sourceLineNo">555</span> return super.parseAnything(session, type, r, null, true, null);<a name="line.555"></a> +<span class="sourceLineNo">556</span> } catch (ParseException e) {<a name="line.556"></a> +<span class="sourceLineNo">557</span> throw e;<a name="line.557"></a> +<span class="sourceLineNo">558</span> } catch (Exception e) {<a name="line.558"></a> +<span class="sourceLineNo">559</span> throw new ParseException(session, e);<a name="line.559"></a> +<span class="sourceLineNo">560</span> } finally {<a name="line.560"></a> +<span class="sourceLineNo">561</span> session.close();<a name="line.561"></a> +<span class="sourceLineNo">562</span> }<a name="line.562"></a> +<span class="sourceLineNo">563</span> }<a name="line.563"></a> +<span class="sourceLineNo">564</span><a name="line.564"></a> +<span class="sourceLineNo">565</span><a name="line.565"></a> +<span class="sourceLineNo">566</span> //--------------------------------------------------------------------------------<a name="line.566"></a> +<span class="sourceLineNo">567</span> // Entry point methods<a name="line.567"></a> +<span class="sourceLineNo">568</span> //--------------------------------------------------------------------------------<a name="line.568"></a> +<span class="sourceLineNo">569</span><a name="line.569"></a> +<span class="sourceLineNo">570</span> @Override /* Parser */<a name="line.570"></a> +<span class="sourceLineNo">571</span> public UrlEncodingParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.571"></a> +<span class="sourceLineNo">572</span> return new UrlEncodingParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType);<a name="line.572"></a> +<span class="sourceLineNo">573</span> }<a name="line.573"></a> +<span class="sourceLineNo">574</span><a name="line.574"></a> +<span class="sourceLineNo">575</span> @Override /* Parser */<a name="line.575"></a> +<span class="sourceLineNo">576</span> protected <T> T doParse(ParserSession session, ClassMeta<T> type) throws Exception {<a name="line.576"></a> +<span class="sourceLineNo">577</span> UrlEncodingParserSession s = (UrlEncodingParserSession)session;<a name="line.577"></a> +<span class="sourceLineNo">578</span> UonReader r = s.getReader();<a name="line.578"></a> +<span class="sourceLineNo">579</span> T o = parseAnything(s, type, r, s.getOuter());<a name="line.579"></a> +<span class="sourceLineNo">580</span> return o;<a name="line.580"></a> +<span class="sourceLineNo">581</span> }<a name="line.581"></a> +<span class="sourceLineNo">582</span><a name="line.582"></a> +<span class="sourceLineNo">583</span> @Override /* ReaderParser */<a name="line.583"></a> +<span class="sourceLineNo">584</span> protected Object[] doParseArgs(ParserSession session, ClassMeta<?>[] argTypes) throws Exception {<a name="line.584"></a> +<span class="sourceLineNo">585</span> UrlEncodingParserSession uctx = (UrlEncodingParserSession)session;<a name="line.585"></a> +<span class="sourceLineNo">586</span> UonReader r = uctx.getReader();<a name="line.586"></a> +<span class="sourceLineNo">587</span> Object[] a = parseArgs(uctx, r, argTypes);<a name="line.587"></a> +<span class="sourceLineNo">588</span> return a;<a name="line.588"></a> +<span class="sourceLineNo">589</span> }<a name="line.589"></a> +<span class="sourceLineNo">590</span><a name="line.590"></a> +<span class="sourceLineNo">591</span> @Override /* ReaderParser */<a name="line.591"></a> +<span class="sourceLineNo">592</span> protected <K,V> Map<K,V> doParseIntoMap(ParserSession session, Map<K,V> m, Type keyType, Type valueType) throws Exception {<a name="line.592"></a> +<span class="sourceLineNo">593</span> UrlEncodingParserSession s = (UrlEncodingParserSession)session;<a name="line.593"></a> +<span class="sourceLineNo">594</span> UonReader r = s.getReader();<a name="line.594"></a> +<span class="sourceLineNo">595</span> if (r.peekSkipWs() == '?')<a name="line.595"></a> +<span class="sourceLineNo">596</span> r.read();<a name="line.596"></a> +<span class="sourceLineNo">597</span> m = parseIntoMap(s, r, m, (ClassMeta<K>)session.getClassMeta(keyType), (ClassMeta<V>)session.getClassMeta(valueType));<a name="line.597"></a> +<span class="sourceLineNo">598</span> return m;<a name="line.598"></a> +<span class="sourceLineNo">599</span> }<a name="line.599"></a> +<span class="sourceLineNo">600</span>}<a name="line.600"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/236aea45/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html index 1ee1931..122c8c0 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html +++ b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html @@ -247,160 +247,189 @@ <span class="sourceLineNo">239</span> serializeMap(session, out, (Map)o, sType);<a name="line.239"></a> <span class="sourceLineNo">240</span> } else if (sType.isBean()) {<a name="line.240"></a> <span class="sourceLineNo">241</span> serializeBeanMap(session, out, session.toBeanMap(o), typeName);<a name="line.241"></a> -<span class="sourceLineNo">242</span> } else if (sType.isCollection()) {<a name="line.242"></a> -<span class="sourceLineNo">243</span> serializeMap(session, out, getCollectionMap((Collection)o), session.getClassMeta(Map.class, Integer.class, sType.getElementType()));<a name="line.243"></a> -<span class="sourceLineNo">244</span> } else {<a name="line.244"></a> -<span class="sourceLineNo">245</span> // All other types can't be serialized as key/value pairs, so we create a<a name="line.245"></a> -<span class="sourceLineNo">246</span> // mock key/value pair with a "_value" key.<a name="line.246"></a> -<span class="sourceLineNo">247</span> out.append("_value=");<a name="line.247"></a> -<span class="sourceLineNo">248</span> super.serializeAnything(session, out, o, null, null, null);<a name="line.248"></a> -<span class="sourceLineNo">249</span> }<a name="line.249"></a> -<span class="sourceLineNo">250</span><a name="line.250"></a> -<span class="sourceLineNo">251</span> session.pop();<a name="line.251"></a> -<span class="sourceLineNo">252</span> return out;<a name="line.252"></a> -<span class="sourceLineNo">253</span> }<a name="line.253"></a> -<span class="sourceLineNo">254</span><a name="line.254"></a> -<span class="sourceLineNo">255</span> private static Map<Integer,Object> getCollectionMap(Collection<?> c) {<a name="line.255"></a> -<span class="sourceLineNo">256</span> Map<Integer,Object> m = new TreeMap<Integer,Object>();<a name="line.256"></a> -<span class="sourceLineNo">257</span> int i = 0;<a name="line.257"></a> -<span class="sourceLineNo">258</span> for (Object o : c)<a name="line.258"></a> -<span class="sourceLineNo">259</span> m.put(i++, o);<a name="line.259"></a> -<span class="sourceLineNo">260</span> return m;<a name="line.260"></a> -<span class="sourceLineNo">261</span> }<a name="line.261"></a> -<span class="sourceLineNo">262</span><a name="line.262"></a> -<span class="sourceLineNo">263</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.263"></a> -<span class="sourceLineNo">264</span> private SerializerWriter serializeMap(UrlEncodingSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.264"></a> -<span class="sourceLineNo">265</span><a name="line.265"></a> -<span class="sourceLineNo">266</span> m = session.sort(m);<a name="line.266"></a> -<span class="sourceLineNo">267</span><a name="line.267"></a> -<span class="sourceLineNo">268</span> ClassMeta<?> keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.268"></a> -<span class="sourceLineNo">269</span><a name="line.269"></a> -<span class="sourceLineNo">270</span> int depth = session.getIndent();<a name="line.270"></a> -<span class="sourceLineNo">271</span> boolean addAmp = false;<a name="line.271"></a> -<span class="sourceLineNo">272</span><a name="line.272"></a> -<span class="sourceLineNo">273</span> Iterator mapEntries = m.entrySet().iterator();<a name="line.273"></a> -<span class="sourceLineNo">274</span><a name="line.274"></a> -<span class="sourceLineNo">275</span> while (mapEntries.hasNext()) {<a name="line.275"></a> -<span class="sourceLineNo">276</span> Map.Entry e = (Map.Entry) mapEntries.next();<a name="line.276"></a> -<span class="sourceLineNo">277</span> Object value = e.getValue();<a name="line.277"></a> -<span class="sourceLineNo">278</span> Object key = session.generalize(e.getKey(), keyType);<a name="line.278"></a> +<span class="sourceLineNo">242</span> } else if (sType.isCollection() || sType.isArray()) {<a name="line.242"></a> +<span class="sourceLineNo">243</span> Map m = sType.isCollection() ? getCollectionMap((Collection)o) : getCollectionMap(o);<a name="line.243"></a> +<span class="sourceLineNo">244</span> serializeCollectionMap(session, out, m, session.getClassMeta(Map.class, Integer.class, Object.class));<a name="line.244"></a> +<span class="sourceLineNo">245</span> } else {<a name="line.245"></a> +<span class="sourceLineNo">246</span> // All other types can't be serialized as key/value pairs, so we create a<a name="line.246"></a> +<span class="sourceLineNo">247</span> // mock key/value pair with a "_value" key.<a name="line.247"></a> +<span class="sourceLineNo">248</span> out.append("_value=");<a name="line.248"></a> +<span class="sourceLineNo">249</span> super.serializeAnything(session, out, o, null, null, null);<a name="line.249"></a> +<span class="sourceLineNo">250</span> }<a name="line.250"></a> +<span class="sourceLineNo">251</span><a name="line.251"></a> +<span class="sourceLineNo">252</span> session.pop();<a name="line.252"></a> +<span class="sourceLineNo">253</span> return out;<a name="line.253"></a> +<span class="sourceLineNo">254</span> }<a name="line.254"></a> +<span class="sourceLineNo">255</span><a name="line.255"></a> +<span class="sourceLineNo">256</span> /**<a name="line.256"></a> +<span class="sourceLineNo">257</span> * Converts a Collection into an integer-indexed map.<a name="line.257"></a> +<span class="sourceLineNo">258</span> */<a name="line.258"></a> +<span class="sourceLineNo">259</span> private static Map<Integer,Object> getCollectionMap(Collection<?> c) {<a name="line.259"></a> +<span class="sourceLineNo">260</span> Map<Integer,Object> m = new TreeMap<Integer,Object>();<a name="line.260"></a> +<span class="sourceLineNo">261</span> int i = 0;<a name="line.261"></a> +<span class="sourceLineNo">262</span> for (Object o : c)<a name="line.262"></a> +<span class="sourceLineNo">263</span> m.put(i++, o);<a name="line.263"></a> +<span class="sourceLineNo">264</span> return m;<a name="line.264"></a> +<span class="sourceLineNo">265</span> }<a name="line.265"></a> +<span class="sourceLineNo">266</span><a name="line.266"></a> +<span class="sourceLineNo">267</span> /**<a name="line.267"></a> +<span class="sourceLineNo">268</span> * Converts an array into an integer-indexed map.<a name="line.268"></a> +<span class="sourceLineNo">269</span> */<a name="line.269"></a> +<span class="sourceLineNo">270</span> private static Map<Integer,Object> getCollectionMap(Object array) {<a name="line.270"></a> +<span class="sourceLineNo">271</span> Map<Integer,Object> m = new TreeMap<Integer,Object>();<a name="line.271"></a> +<span class="sourceLineNo">272</span> for (int i = 0; i < Array.getLength(array); i++)<a name="line.272"></a> +<span class="sourceLineNo">273</span> m.put(i, Array.get(array, i));<a name="line.273"></a> +<span class="sourceLineNo">274</span> return m;<a name="line.274"></a> +<span class="sourceLineNo">275</span> }<a name="line.275"></a> +<span class="sourceLineNo">276</span><a name="line.276"></a> +<span class="sourceLineNo">277</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.277"></a> +<span class="sourceLineNo">278</span> private SerializerWriter serializeMap(UrlEncodingSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.278"></a> <span class="sourceLineNo">279</span><a name="line.279"></a> -<span class="sourceLineNo">280</span><a name="line.280"></a> -<span class="sourceLineNo">281</span> if (session.shouldUseExpandedParams(value)) {<a name="line.281"></a> -<span class="sourceLineNo">282</span> Iterator i = value instanceof Collection ? ((Collection)value).iterator() : ArrayUtils.iterator(value);<a name="line.282"></a> -<span class="sourceLineNo">283</span> while (i.hasNext()) {<a name="line.283"></a> -<span class="sourceLineNo">284</span> if (addAmp)<a name="line.284"></a> -<span class="sourceLineNo">285</span> out.cr(depth).append('&');<a name="line.285"></a> -<span class="sourceLineNo">286</span> out.appendObject(key, true).append('=');<a name="line.286"></a> -<span class="sourceLineNo">287</span> super.serializeAnything(session, out, i.next(), null, (key == null ? null : key.toString()), null);<a name="line.287"></a> -<span class="sourceLineNo">288</span> addAmp = true;<a name="line.288"></a> -<span class="sourceLineNo">289</span> }<a name="line.289"></a> -<span class="sourceLineNo">290</span> } else {<a name="line.290"></a> -<span class="sourceLineNo">291</span> if (addAmp)<a name="line.291"></a> -<span class="sourceLineNo">292</span> out.cr(depth).append('&');<a name="line.292"></a> -<span class="sourceLineNo">293</span> out.appendObject(key, true).append('=');<a name="line.293"></a> -<span class="sourceLineNo">294</span> super.serializeAnything(session, out, value, valueType, (key == null ? null : key.toString()), null);<a name="line.294"></a> -<span class="sourceLineNo">295</span> addAmp = true;<a name="line.295"></a> -<span class="sourceLineNo">296</span> }<a name="line.296"></a> -<span class="sourceLineNo">297</span> }<a name="line.297"></a> -<span class="sourceLineNo">298</span><a name="line.298"></a> -<span class="sourceLineNo">299</span> return out;<a name="line.299"></a> -<span class="sourceLineNo">300</span> }<a name="line.300"></a> -<span class="sourceLineNo">301</span><a name="line.301"></a> -<span class="sourceLineNo">302</span> @SuppressWarnings({ "rawtypes" })<a name="line.302"></a> -<span class="sourceLineNo">303</span> private SerializerWriter serializeBeanMap(UrlEncodingSerializerSession session, UonWriter out, BeanMap<?> m, String typeName) throws Exception {<a name="line.303"></a> -<span class="sourceLineNo">304</span> int depth = session.getIndent();<a name="line.304"></a> -<span class="sourceLineNo">305</span><a name="line.305"></a> -<span class="sourceLineNo">306</span> boolean addAmp = false;<a name="line.306"></a> -<span class="sourceLineNo">307</span><a name="line.307"></a> -<span class="sourceLineNo">308</span> for (BeanPropertyValue p : m.getValues(session.isTrimNulls(), typeName != null ? session.createBeanTypeNameProperty(m, typeName) : null)) {<a name="line.308"></a> -<span class="sourceLineNo">309</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.309"></a> -<span class="sourceLineNo">310</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.310"></a> +<span class="sourceLineNo">280</span> m = session.sort(m);<a name="line.280"></a> +<span class="sourceLineNo">281</span><a name="line.281"></a> +<span class="sourceLineNo">282</span> ClassMeta<?> keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.282"></a> +<span class="sourceLineNo">283</span><a name="line.283"></a> +<span class="sourceLineNo">284</span> int depth = session.getIndent();<a name="line.284"></a> +<span class="sourceLineNo">285</span> boolean addAmp = false;<a name="line.285"></a> +<span class="sourceLineNo">286</span><a name="line.286"></a> +<span class="sourceLineNo">287</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.287"></a> +<span class="sourceLineNo">288</span> Object key = session.generalize(e.getKey(), keyType);<a name="line.288"></a> +<span class="sourceLineNo">289</span> Object value = e.getValue();<a name="line.289"></a> +<span class="sourceLineNo">290</span><a name="line.290"></a> +<span class="sourceLineNo">291</span> if (session.shouldUseExpandedParams(value)) {<a name="line.291"></a> +<span class="sourceLineNo">292</span> Iterator i = value instanceof Collection ? ((Collection)value).iterator() : ArrayUtils.iterator(value);<a name="line.292"></a> +<span class="sourceLineNo">293</span> while (i.hasNext()) {<a name="line.293"></a> +<span class="sourceLineNo">294</span> if (addAmp)<a name="line.294"></a> +<span class="sourceLineNo">295</span> out.cr(depth).append('&');<a name="line.295"></a> +<span class="sourceLineNo">296</span> out.appendObject(key, true).append('=');<a name="line.296"></a> +<span class="sourceLineNo">297</span> super.serializeAnything(session, out, i.next(), null, (key == null ? null : key.toString()), null);<a name="line.297"></a> +<span class="sourceLineNo">298</span> addAmp = true;<a name="line.298"></a> +<span class="sourceLineNo">299</span> }<a name="line.299"></a> +<span class="sourceLineNo">300</span> } else {<a name="line.300"></a> +<span class="sourceLineNo">301</span> if (addAmp)<a name="line.301"></a> +<span class="sourceLineNo">302</span> out.cr(depth).append('&');<a name="line.302"></a> +<span class="sourceLineNo">303</span> out.appendObject(key, true).append('=');<a name="line.303"></a> +<span class="sourceLineNo">304</span> super.serializeAnything(session, out, value, valueType, (key == null ? null : key.toString()), null);<a name="line.304"></a> +<span class="sourceLineNo">305</span> addAmp = true;<a name="line.305"></a> +<span class="sourceLineNo">306</span> }<a name="line.306"></a> +<span class="sourceLineNo">307</span> }<a name="line.307"></a> +<span class="sourceLineNo">308</span><a name="line.308"></a> +<span class="sourceLineNo">309</span> return out;<a name="line.309"></a> +<span class="sourceLineNo">310</span> }<a name="line.310"></a> <span class="sourceLineNo">311</span><a name="line.311"></a> -<span class="sourceLineNo">312</span> String key = p.getName();<a name="line.312"></a> -<span class="sourceLineNo">313</span> Object value = p.getValue();<a name="line.313"></a> -<span class="sourceLineNo">314</span> Throwable t = p.getThrown();<a name="line.314"></a> -<span class="sourceLineNo">315</span> if (t != null)<a name="line.315"></a> -<span class="sourceLineNo">316</span> session.addBeanGetterWarning(pMeta, t);<a name="line.316"></a> -<span class="sourceLineNo">317</span><a name="line.317"></a> -<span class="sourceLineNo">318</span> if (session.canIgnoreValue(cMeta, key, value))<a name="line.318"></a> -<span class="sourceLineNo">319</span> continue;<a name="line.319"></a> -<span class="sourceLineNo">320</span><a name="line.320"></a> -<span class="sourceLineNo">321</span> if (value != null && session.shouldUseExpandedParams(pMeta)) {<a name="line.321"></a> -<span class="sourceLineNo">322</span> // Transformed object array bean properties may be transformed resulting in ArrayLists,<a name="line.322"></a> -<span class="sourceLineNo">323</span> // so we need to check type if we think it's an array.<a name="line.323"></a> -<span class="sourceLineNo">324</span> Iterator i = (cMeta.isCollection() || value instanceof Collection) ? ((Collection)value).iterator() : ArrayUtils.iterator(value);<a name="line.324"></a> -<span class="sourceLineNo">325</span> while (i.hasNext()) {<a name="line.325"></a> -<span class="sourceLineNo">326</span> if (addAmp)<a name="line.326"></a> -<span class="sourceLineNo">327</span> out.cr(depth).append('&');<a name="line.327"></a> -<span class="sourceLineNo">328</span><a name="line.328"></a> -<span class="sourceLineNo">329</span> out.appendObject(key, true).append('=');<a name="line.329"></a> +<span class="sourceLineNo">312</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.312"></a> +<span class="sourceLineNo">313</span> private SerializerWriter serializeCollectionMap(UrlEncodingSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.313"></a> +<span class="sourceLineNo">314</span><a name="line.314"></a> +<span class="sourceLineNo">315</span> ClassMeta<?> valueType = type.getValueType();<a name="line.315"></a> +<span class="sourceLineNo">316</span><a name="line.316"></a> +<span class="sourceLineNo">317</span> int depth = session.getIndent();<a name="line.317"></a> +<span class="sourceLineNo">318</span> boolean addAmp = false;<a name="line.318"></a> +<span class="sourceLineNo">319</span><a name="line.319"></a> +<span class="sourceLineNo">320</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.320"></a> +<span class="sourceLineNo">321</span> if (addAmp)<a name="line.321"></a> +<span class="sourceLineNo">322</span> out.cr(depth).append('&');<a name="line.322"></a> +<span class="sourceLineNo">323</span> out.append(e.getKey()).append('=');<a name="line.323"></a> +<span class="sourceLineNo">324</span> super.serializeAnything(session, out, e.getValue(), valueType, null, null);<a name="line.324"></a> +<span class="sourceLineNo">325</span> addAmp = true;<a name="line.325"></a> +<span class="sourceLineNo">326</span> }<a name="line.326"></a> +<span class="sourceLineNo">327</span><a name="line.327"></a> +<span class="sourceLineNo">328</span> return out;<a name="line.328"></a> +<span class="sourceLineNo">329</span> }<a name="line.329"></a> <span class="sourceLineNo">330</span><a name="line.330"></a> -<span class="sourceLineNo">331</span> super.serializeAnything(session, out, i.next(), cMeta.getElementType(), key, pMeta);<a name="line.331"></a> -<span class="sourceLineNo">332</span><a name="line.332"></a> -<span class="sourceLineNo">333</span> addAmp = true;<a name="line.333"></a> -<span class="sourceLineNo">334</span> }<a name="line.334"></a> -<span class="sourceLineNo">335</span> } else {<a name="line.335"></a> -<span class="sourceLineNo">336</span> if (addAmp)<a name="line.336"></a> -<span class="sourceLineNo">337</span> out.cr(depth).append('&');<a name="line.337"></a> -<span class="sourceLineNo">338</span><a name="line.338"></a> -<span class="sourceLineNo">339</span> out.appendObject(key, true).append('=');<a name="line.339"></a> +<span class="sourceLineNo">331</span> @SuppressWarnings({ "rawtypes" })<a name="line.331"></a> +<span class="sourceLineNo">332</span> private SerializerWriter serializeBeanMap(UrlEncodingSerializerSession session, UonWriter out, BeanMap<?> m, String typeName) throws Exception {<a name="line.332"></a> +<span class="sourceLineNo">333</span> int depth = session.getIndent();<a name="line.333"></a> +<span class="sourceLineNo">334</span><a name="line.334"></a> +<span class="sourceLineNo">335</span> boolean addAmp = false;<a name="line.335"></a> +<span class="sourceLineNo">336</span><a name="line.336"></a> +<span class="sourceLineNo">337</span> for (BeanPropertyValue p : m.getValues(session.isTrimNulls(), typeName != null ? session.createBeanTypeNameProperty(m, typeName) : null)) {<a name="line.337"></a> +<span class="sourceLineNo">338</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.338"></a> +<span class="sourceLineNo">339</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.339"></a> <span class="sourceLineNo">340</span><a name="line.340"></a> -<span class="sourceLineNo">341</span> super.serializeAnything(session, out, value, cMeta, key, pMeta);<a name="line.341"></a> -<span class="sourceLineNo">342</span><a name="line.342"></a> -<span class="sourceLineNo">343</span> addAmp = true;<a name="line.343"></a> -<span class="sourceLineNo">344</span> }<a name="line.344"></a> -<span class="sourceLineNo">345</span><a name="line.345"></a> -<span class="sourceLineNo">346</span> }<a name="line.346"></a> -<span class="sourceLineNo">347</span> return out;<a name="line.347"></a> -<span class="sourceLineNo">348</span> }<a name="line.348"></a> +<span class="sourceLineNo">341</span> String key = p.getName();<a name="line.341"></a> +<span class="sourceLineNo">342</span> Object value = p.getValue();<a name="line.342"></a> +<span class="sourceLineNo">343</span> Throwable t = p.getThrown();<a name="line.343"></a> +<span class="sourceLineNo">344</span> if (t != null)<a name="line.344"></a> +<span class="sourceLineNo">345</span> session.addBeanGetterWarning(pMeta, t);<a name="line.345"></a> +<span class="sourceLineNo">346</span><a name="line.346"></a> +<span class="sourceLineNo">347</span> if (session.canIgnoreValue(cMeta, key, value))<a name="line.347"></a> +<span class="sourceLineNo">348</span> continue;<a name="line.348"></a> <span class="sourceLineNo">349</span><a name="line.349"></a> -<span class="sourceLineNo">350</span><a name="line.350"></a> -<span class="sourceLineNo">351</span> //--------------------------------------------------------------------------------<a name="line.351"></a> -<span class="sourceLineNo">352</span> // Methods for constructing individual parameter values.<a name="line.352"></a> -<span class="sourceLineNo">353</span> //--------------------------------------------------------------------------------<a name="line.353"></a> -<span class="sourceLineNo">354</span><a name="line.354"></a> -<span class="sourceLineNo">355</span> /**<a name="line.355"></a> -<span class="sourceLineNo">356</span> * Converts the specified object to a string using this serializers {@link BeanSession#convertToType(Object, Class)} method<a name="line.356"></a> -<span class="sourceLineNo">357</span> * and runs {@link URLEncoder#encode(String,String)} against the results.<a name="line.357"></a> -<span class="sourceLineNo">358</span> * Useful for constructing URL parts.<a name="line.358"></a> -<span class="sourceLineNo">359</span> *<a name="line.359"></a> -<span class="sourceLineNo">360</span> * @param o The object to serialize.<a name="line.360"></a> -<span class="sourceLineNo">361</span> * @return The serialized object.<a name="line.361"></a> -<span class="sourceLineNo">362</span> */<a name="line.362"></a> -<span class="sourceLineNo">363</span> public String serializeUrlPart(Object o) {<a name="line.363"></a> -<span class="sourceLineNo">364</span> try {<a name="line.364"></a> -<span class="sourceLineNo">365</span> // Shortcut for simple types.<a name="line.365"></a> -<span class="sourceLineNo">366</span> ClassMeta<?> cm = getBeanContext().getClassMetaForObject(o);<a name="line.366"></a> -<span class="sourceLineNo">367</span> if (cm != null)<a name="line.367"></a> -<span class="sourceLineNo">368</span> if (cm.isCharSequence() || cm.isNumber() || cm.isBoolean())<a name="line.368"></a> -<span class="sourceLineNo">369</span> return o.toString();<a name="line.369"></a> -<span class="sourceLineNo">370</span><a name="line.370"></a> -<span class="sourceLineNo">371</span> StringWriter w = new StringWriter();<a name="line.371"></a> -<span class="sourceLineNo">372</span> UonSerializerSession s = createSession(w, null, null, null, null, MediaType.UON);<a name="line.372"></a> -<span class="sourceLineNo">373</span> super.doSerialize(s, o);<a name="line.373"></a> -<span class="sourceLineNo">374</span> return w.toString();<a name="line.374"></a> -<span class="sourceLineNo">375</span> } catch (Exception e) {<a name="line.375"></a> -<span class="sourceLineNo">376</span> throw new RuntimeException(e);<a name="line.376"></a> -<span class="sourceLineNo">377</span> }<a name="line.377"></a> -<span class="sourceLineNo">378</span> }<a name="line.378"></a> +<span class="sourceLineNo">350</span> if (value != null && session.shouldUseExpandedParams(pMeta)) {<a name="line.350"></a> +<span class="sourceLineNo">351</span> // Transformed object array bean properties may be transformed resulting in ArrayLists,<a name="line.351"></a> +<span class="sourceLineNo">352</span> // so we need to check type if we think it's an array.<a name="line.352"></a> +<span class="sourceLineNo">353</span> Iterator i = (cMeta.isCollection() || value instanceof Collection) ? ((Collection)value).iterator() : ArrayUtils.iterator(value);<a name="line.353"></a> +<span class="sourceLineNo">354</span> while (i.hasNext()) {<a name="line.354"></a> +<span class="sourceLineNo">355</span> if (addAmp)<a name="line.355"></a> +<span class="sourceLineNo">356</span> out.cr(depth).append('&');<a name="line.356"></a> +<span class="sourceLineNo">357</span><a name="line.357"></a> +<span class="sourceLineNo">358</span> out.appendObject(key, true).append('=');<a name="line.358"></a> +<span class="sourceLineNo">359</span><a name="line.359"></a> +<span class="sourceLineNo">360</span> super.serializeAnything(session, out, i.next(), cMeta.getElementType(), key, pMeta);<a name="line.360"></a> +<span class="sourceLineNo">361</span><a name="line.361"></a> +<span class="sourceLineNo">362</span> addAmp = true;<a name="line.362"></a> +<span class="sourceLineNo">363</span> }<a name="line.363"></a> +<span class="sourceLineNo">364</span> } else {<a name="line.364"></a> +<span class="sourceLineNo">365</span> if (addAmp)<a name="line.365"></a> +<span class="sourceLineNo">366</span> out.cr(depth).append('&');<a name="line.366"></a> +<span class="sourceLineNo">367</span><a name="line.367"></a> +<span class="sourceLineNo">368</span> out.appendObject(key, true).append('=');<a name="line.368"></a> +<span class="sourceLineNo">369</span><a name="line.369"></a> +<span class="sourceLineNo">370</span> super.serializeAnything(session, out, value, cMeta, key, pMeta);<a name="line.370"></a> +<span class="sourceLineNo">371</span><a name="line.371"></a> +<span class="sourceLineNo">372</span> addAmp = true;<a name="line.372"></a> +<span class="sourceLineNo">373</span> }<a name="line.373"></a> +<span class="sourceLineNo">374</span><a name="line.374"></a> +<span class="sourceLineNo">375</span> }<a name="line.375"></a> +<span class="sourceLineNo">376</span> return out;<a name="line.376"></a> +<span class="sourceLineNo">377</span> }<a name="line.377"></a> +<span class="sourceLineNo">378</span><a name="line.378"></a> <span class="sourceLineNo">379</span><a name="line.379"></a> -<span class="sourceLineNo">380</span><a name="line.380"></a> -<span class="sourceLineNo">381</span> //--------------------------------------------------------------------------------<a name="line.381"></a> -<span class="sourceLineNo">382</span> // Entry point methods<a name="line.382"></a> -<span class="sourceLineNo">383</span> //--------------------------------------------------------------------------------<a name="line.383"></a> -<span class="sourceLineNo">384</span><a name="line.384"></a> -<span class="sourceLineNo">385</span> @Override /* Serializer */<a name="line.385"></a> -<span class="sourceLineNo">386</span> public UrlEncodingSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.386"></a> -<span class="sourceLineNo">387</span> return new UrlEncodingSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.387"></a> -<span class="sourceLineNo">388</span> }<a name="line.388"></a> -<span class="sourceLineNo">389</span><a name="line.389"></a> -<span class="sourceLineNo">390</span> @Override /* Serializer */<a name="line.390"></a> -<span class="sourceLineNo">391</span> protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.391"></a> -<span class="sourceLineNo">392</span> UrlEncodingSerializerSession s = (UrlEncodingSerializerSession)session;<a name="line.392"></a> -<span class="sourceLineNo">393</span> serializeAnything(s, s.getWriter(), o);<a name="line.393"></a> -<span class="sourceLineNo">394</span> }<a name="line.394"></a> -<span class="sourceLineNo">395</span>}<a name="line.395"></a> +<span class="sourceLineNo">380</span> //--------------------------------------------------------------------------------<a name="line.380"></a> +<span class="sourceLineNo">381</span> // Methods for constructing individual parameter values.<a name="line.381"></a> +<span class="sourceLineNo">382</span> //--------------------------------------------------------------------------------<a name="line.382"></a> +<span class="sourceLineNo">383</span><a name="line.383"></a> +<span class="sourceLineNo">384</span> /**<a name="line.384"></a> +<span class="sourceLineNo">385</span> * Converts the specified object to a string using this serializers {@link BeanSession#convertToType(Object, Class)} method<a name="line.385"></a> +<span class="sourceLineNo">386</span> * and runs {@link URLEncoder#encode(String,String)} against the results.<a name="line.386"></a> +<span class="sourceLineNo">387</span> * Useful for constructing URL parts.<a name="line.387"></a> +<span class="sourceLineNo">388</span> *<a name="line.388"></a> +<span class="sourceLineNo">389</span> * @param o The object to serialize.<a name="line.389"></a> +<span class="sourceLineNo">390</span> * @return The serialized object.<a name="line.390"></a> +<span class="sourceLineNo">391</span> */<a name="line.391"></a> +<span class="sourceLineNo">392</span> public String serializeUrlPart(Object o) {<a name="line.392"></a> +<span class="sourceLineNo">393</span> try {<a name="line.393"></a> +<span class="sourceLineNo">394</span> // Shortcut for simple types.<a name="line.394"></a> +<span class="sourceLineNo">395</span> ClassMeta<?> cm = getBeanContext().getClassMetaForObject(o);<a name="line.395"></a> +<span class="sourceLineNo">396</span> if (cm != null)<a name="line.396"></a> +<span class="sourceLineNo">397</span> if (cm.isCharSequence() || cm.isNumber() || cm.isBoolean())<a name="line.397"></a> +<span class="sourceLineNo">398</span> return o.toString();<a name="line.398"></a> +<span class="sourceLineNo">399</span><a name="line.399"></a> +<span class="sourceLineNo">400</span> StringWriter w = new StringWriter();<a name="line.400"></a> +<span class="sourceLineNo">401</span> UonSerializerSession s = createSession(w, null, null, null, null, MediaType.UON);<a name="line.401"></a> +<span class="sourceLineNo">402</span> super.doSerialize(s, o);<a name="line.402"></a> +<span class="sourceLineNo">403</span> return w.toString();<a name="line.403"></a> +<span class="sourceLineNo">404</span> } catch (Exception e) {<a name="line.404"></a> +<span class="sourceLineNo">405</span> throw new RuntimeException(e);<a name="line.405"></a> +<span class="sourceLineNo">406</span> }<a name="line.406"></a> +<span class="sourceLineNo">407</span> }<a name="line.407"></a> +<span class="sourceLineNo">408</span><a name="line.408"></a> +<span class="sourceLineNo">409</span><a name="line.409"></a> +<span class="sourceLineNo">410</span> //--------------------------------------------------------------------------------<a name="line.410"></a> +<span class="sourceLineNo">411</span> // Entry point methods<a name="line.411"></a> +<span class="sourceLineNo">412</span> //--------------------------------------------------------------------------------<a name="line.412"></a> +<span class="sourceLineNo">413</span><a name="line.413"></a> +<span class="sourceLineNo">414</span> @Override /* Serializer */<a name="line.414"></a> +<span class="sourceLineNo">415</span> public UrlEncodingSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.415"></a> +<span class="sourceLineNo">416</span> return new UrlEncodingSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<a name="line.416"></a> +<span class="sourceLineNo">417</span> }<a name="line.417"></a> +<span class="sourceLineNo">418</span><a name="line.418"></a> +<span class="sourceLineNo">419</span> @Override /* Serializer */<a name="line.419"></a> +<span class="sourceLineNo">420</span> protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.420"></a> +<span class="sourceLineNo">421</span> UrlEncodingSerializerSession s = (UrlEncodingSerializerSession)session;<a name="line.421"></a> +<span class="sourceLineNo">422</span> serializeAnything(s, s.getWriter(), o);<a name="line.422"></a> +<span class="sourceLineNo">423</span> }<a name="line.423"></a> +<span class="sourceLineNo">424</span>}<a name="line.424"></a>
