http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClient.html
----------------------------------------------------------------------
diff --git
a/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClient.html
b/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClient.html
index e8a0896..8605428 100644
---
a/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClient.html
+++
b/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClient.html
@@ -482,229 +482,244 @@
<span class="sourceLineNo">474</span> * .build()<a
name="line.474"></a>
<span class="sourceLineNo">475</span> *
.getRemoteableProxy(MyInterface3.<jk>class</jk>);<a
name="line.475"></a>
<span class="sourceLineNo">476</span> * </p><a name="line.476"></a>
-<span class="sourceLineNo">477</span> *<a name="line.477"></a>
-<span class="sourceLineNo">478</span> * @param interfaceClass The interface
to create a proxy for.<a name="line.478"></a>
-<span class="sourceLineNo">479</span> * @return The new proxy interface.<a
name="line.479"></a>
-<span class="sourceLineNo">480</span> * @throws RemoteableMetadataException
If the REST URI cannot be determined based on the information given.<a
name="line.480"></a>
-<span class="sourceLineNo">481</span> */<a name="line.481"></a>
-<span class="sourceLineNo">482</span> public <T> T
getRemoteableProxy(final Class<T> interfaceClass) {<a name="line.482"></a>
-<span class="sourceLineNo">483</span> return
getRemoteableProxy(interfaceClass, null);<a name="line.483"></a>
-<span class="sourceLineNo">484</span> }<a name="line.484"></a>
-<span class="sourceLineNo">485</span><a name="line.485"></a>
-<span class="sourceLineNo">486</span> /**<a name="line.486"></a>
-<span class="sourceLineNo">487</span> * Same as {@link
#getRemoteableProxy(Class)} except explicitly specifies the URL of the REST
interface.<a name="line.487"></a>
-<span class="sourceLineNo">488</span> *<a name="line.488"></a>
-<span class="sourceLineNo">489</span> * @param interfaceClass The interface
to create a proxy for.<a name="line.489"></a>
-<span class="sourceLineNo">490</span> * @param restUrl The URL of the REST
interface.<a name="line.490"></a>
-<span class="sourceLineNo">491</span> * @return The new proxy interface.<a
name="line.491"></a>
-<span class="sourceLineNo">492</span> */<a name="line.492"></a>
-<span class="sourceLineNo">493</span> public <T> T
getRemoteableProxy(final Class<T> interfaceClass, final Object restUrl)
{<a name="line.493"></a>
-<span class="sourceLineNo">494</span> return
getRemoteableProxy(interfaceClass, restUrl, serializer, parser);<a
name="line.494"></a>
-<span class="sourceLineNo">495</span> }<a name="line.495"></a>
-<span class="sourceLineNo">496</span><a name="line.496"></a>
-<span class="sourceLineNo">497</span> /**<a name="line.497"></a>
-<span class="sourceLineNo">498</span> * Same as {@link
#getRemoteableProxy(Class, Object)} but allows you to override the serializer
and parser used.<a name="line.498"></a>
-<span class="sourceLineNo">499</span> *<a name="line.499"></a>
-<span class="sourceLineNo">500</span> * @param interfaceClass The interface
to create a proxy for.<a name="line.500"></a>
-<span class="sourceLineNo">501</span> * @param restUrl The URL of the REST
interface.<a name="line.501"></a>
-<span class="sourceLineNo">502</span> * @param serializer The serializer
used to serialize POJOs to the body of the HTTP request.<a name="line.502"></a>
-<span class="sourceLineNo">503</span> * @param parser The parser used to
parse POJOs from the body of the HTTP response.<a name="line.503"></a>
-<span class="sourceLineNo">504</span> * @return The new proxy interface.<a
name="line.504"></a>
-<span class="sourceLineNo">505</span> */<a name="line.505"></a>
-<span class="sourceLineNo">506</span> @SuppressWarnings({ "unchecked",
"hiding" })<a name="line.506"></a>
-<span class="sourceLineNo">507</span> public <T> T
getRemoteableProxy(final Class<T> interfaceClass, Object restUrl, final
Serializer serializer, final Parser parser) {<a name="line.507"></a>
-<span class="sourceLineNo">508</span><a name="line.508"></a>
-<span class="sourceLineNo">509</span> if (restUrl == null) {<a
name="line.509"></a>
-<span class="sourceLineNo">510</span> Remoteable r =
ReflectionUtils.getAnnotation(Remoteable.class, interfaceClass);<a
name="line.510"></a>
-<span class="sourceLineNo">511</span><a name="line.511"></a>
-<span class="sourceLineNo">512</span> String path = r == null ? "" :
trimSlashes(r.path());<a name="line.512"></a>
-<span class="sourceLineNo">513</span> if (path.indexOf("://") == -1)
{<a name="line.513"></a>
-<span class="sourceLineNo">514</span> if (path.isEmpty())<a
name="line.514"></a>
-<span class="sourceLineNo">515</span> path =
interfaceClass.getName();<a name="line.515"></a>
-<span class="sourceLineNo">516</span> if (rootUrl == null)<a
name="line.516"></a>
-<span class="sourceLineNo">517</span> throw new
RemoteableMetadataException(interfaceClass, "Root URI has not been specified.
Cannot construct absolute path to remoteable proxy.");<a name="line.517"></a>
-<span class="sourceLineNo">518</span> path = trimSlashes(rootUrl) +
'/' + path;<a name="line.518"></a>
-<span class="sourceLineNo">519</span> }<a name="line.519"></a>
-<span class="sourceLineNo">520</span> restUrl = path;<a
name="line.520"></a>
-<span class="sourceLineNo">521</span> }<a name="line.521"></a>
-<span class="sourceLineNo">522</span><a name="line.522"></a>
-<span class="sourceLineNo">523</span> final String restUrl2 =
restUrl.toString();<a name="line.523"></a>
-<span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span> try {<a name="line.525"></a>
-<span class="sourceLineNo">526</span> return
(T)Proxy.newProxyInstance(<a name="line.526"></a>
-<span class="sourceLineNo">527</span>
interfaceClass.getClassLoader(),<a name="line.527"></a>
-<span class="sourceLineNo">528</span> new Class[] { interfaceClass
},<a name="line.528"></a>
-<span class="sourceLineNo">529</span> new InvocationHandler() {<a
name="line.529"></a>
+<span class="sourceLineNo">477</span> * <h5
class='section'>Notes:</h5><a name="line.477"></a>
+<span class="sourceLineNo">478</span> * <ul><a name="line.478"></a>
+<span class="sourceLineNo">479</span> * <li>If you plan on using
your proxy in a multi-threaded environment, you'll want to use an underlying<a
name="line.479"></a>
+<span class="sourceLineNo">480</span> * pooling client connection
manager. The easiest way to do this is to use the {@link
RestClientBuilder#pooled()}<a name="line.480"></a>
+<span class="sourceLineNo">481</span> * method. If you don't do
this, you may end up seeing "Connection still allocated" exceptions.<a
name="line.481"></a>
+<span class="sourceLineNo">482</span> * </ul><a name="line.482"></a>
+<span class="sourceLineNo">483</span> *<a name="line.483"></a>
+<span class="sourceLineNo">484</span> * @param interfaceClass The interface
to create a proxy for.<a name="line.484"></a>
+<span class="sourceLineNo">485</span> * @return The new proxy interface.<a
name="line.485"></a>
+<span class="sourceLineNo">486</span> * @throws RemoteableMetadataException
If the REST URI cannot be determined based on the information given.<a
name="line.486"></a>
+<span class="sourceLineNo">487</span> */<a name="line.487"></a>
+<span class="sourceLineNo">488</span> public <T> T
getRemoteableProxy(final Class<T> interfaceClass) {<a name="line.488"></a>
+<span class="sourceLineNo">489</span> return
getRemoteableProxy(interfaceClass, null);<a name="line.489"></a>
+<span class="sourceLineNo">490</span> }<a name="line.490"></a>
+<span class="sourceLineNo">491</span><a name="line.491"></a>
+<span class="sourceLineNo">492</span> /**<a name="line.492"></a>
+<span class="sourceLineNo">493</span> * Same as {@link
#getRemoteableProxy(Class)} except explicitly specifies the URL of the REST
interface.<a name="line.493"></a>
+<span class="sourceLineNo">494</span> *<a name="line.494"></a>
+<span class="sourceLineNo">495</span> * @param interfaceClass The interface
to create a proxy for.<a name="line.495"></a>
+<span class="sourceLineNo">496</span> * @param restUrl The URL of the REST
interface.<a name="line.496"></a>
+<span class="sourceLineNo">497</span> * @return The new proxy interface.<a
name="line.497"></a>
+<span class="sourceLineNo">498</span> */<a name="line.498"></a>
+<span class="sourceLineNo">499</span> public <T> T
getRemoteableProxy(final Class<T> interfaceClass, final Object restUrl)
{<a name="line.499"></a>
+<span class="sourceLineNo">500</span> return
getRemoteableProxy(interfaceClass, restUrl, serializer, parser);<a
name="line.500"></a>
+<span class="sourceLineNo">501</span> }<a name="line.501"></a>
+<span class="sourceLineNo">502</span><a name="line.502"></a>
+<span class="sourceLineNo">503</span> /**<a name="line.503"></a>
+<span class="sourceLineNo">504</span> * Same as {@link
#getRemoteableProxy(Class, Object)} but allows you to override the serializer
and parser used.<a name="line.504"></a>
+<span class="sourceLineNo">505</span> *<a name="line.505"></a>
+<span class="sourceLineNo">506</span> * @param interfaceClass The interface
to create a proxy for.<a name="line.506"></a>
+<span class="sourceLineNo">507</span> * @param restUrl The URL of the REST
interface.<a name="line.507"></a>
+<span class="sourceLineNo">508</span> * @param serializer The serializer
used to serialize POJOs to the body of the HTTP request.<a name="line.508"></a>
+<span class="sourceLineNo">509</span> * @param parser The parser used to
parse POJOs from the body of the HTTP response.<a name="line.509"></a>
+<span class="sourceLineNo">510</span> * @return The new proxy interface.<a
name="line.510"></a>
+<span class="sourceLineNo">511</span> */<a name="line.511"></a>
+<span class="sourceLineNo">512</span> @SuppressWarnings({ "unchecked",
"hiding" })<a name="line.512"></a>
+<span class="sourceLineNo">513</span> public <T> T
getRemoteableProxy(final Class<T> interfaceClass, Object restUrl, final
Serializer serializer, final Parser parser) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span><a name="line.514"></a>
+<span class="sourceLineNo">515</span> if (restUrl == null) {<a
name="line.515"></a>
+<span class="sourceLineNo">516</span> Remoteable r =
ReflectionUtils.getAnnotation(Remoteable.class, interfaceClass);<a
name="line.516"></a>
+<span class="sourceLineNo">517</span><a name="line.517"></a>
+<span class="sourceLineNo">518</span> String path = r == null ? "" :
trimSlashes(r.path());<a name="line.518"></a>
+<span class="sourceLineNo">519</span> if (path.indexOf("://") == -1)
{<a name="line.519"></a>
+<span class="sourceLineNo">520</span> if (path.isEmpty())<a
name="line.520"></a>
+<span class="sourceLineNo">521</span> path =
interfaceClass.getName();<a name="line.521"></a>
+<span class="sourceLineNo">522</span> if (rootUrl == null)<a
name="line.522"></a>
+<span class="sourceLineNo">523</span> throw new
RemoteableMetadataException(interfaceClass, "Root URI has not been specified.
Cannot construct absolute path to remoteable proxy.");<a name="line.523"></a>
+<span class="sourceLineNo">524</span> path = trimSlashes(rootUrl) +
'/' + path;<a name="line.524"></a>
+<span class="sourceLineNo">525</span> }<a name="line.525"></a>
+<span class="sourceLineNo">526</span> restUrl = path;<a
name="line.526"></a>
+<span class="sourceLineNo">527</span> }<a name="line.527"></a>
+<span class="sourceLineNo">528</span><a name="line.528"></a>
+<span class="sourceLineNo">529</span> final String restUrl2 =
restUrl.toString();<a name="line.529"></a>
<span class="sourceLineNo">530</span><a name="line.530"></a>
-<span class="sourceLineNo">531</span> final RemoteableMeta rm =
new RemoteableMeta(interfaceClass, restUrl2);<a name="line.531"></a>
-<span class="sourceLineNo">532</span><a name="line.532"></a>
-<span class="sourceLineNo">533</span> @Override /*
InvocationHandler */<a name="line.533"></a>
-<span class="sourceLineNo">534</span> public Object
invoke(Object proxy, Method method, Object[] args) throws Throwable {<a
name="line.534"></a>
-<span class="sourceLineNo">535</span> RemoteableMethodMeta
rmm = rm.getMethodMeta(method);<a name="line.535"></a>
+<span class="sourceLineNo">531</span> try {<a name="line.531"></a>
+<span class="sourceLineNo">532</span> return
(T)Proxy.newProxyInstance(<a name="line.532"></a>
+<span class="sourceLineNo">533</span>
interfaceClass.getClassLoader(),<a name="line.533"></a>
+<span class="sourceLineNo">534</span> new Class[] { interfaceClass
},<a name="line.534"></a>
+<span class="sourceLineNo">535</span> new InvocationHandler() {<a
name="line.535"></a>
<span class="sourceLineNo">536</span><a name="line.536"></a>
-<span class="sourceLineNo">537</span> if (rmm == null)<a
name="line.537"></a>
-<span class="sourceLineNo">538</span> throw new
RuntimeException("Method is not exposed as a remoteable method.");<a
name="line.538"></a>
-<span class="sourceLineNo">539</span><a name="line.539"></a>
-<span class="sourceLineNo">540</span> try {<a
name="line.540"></a>
-<span class="sourceLineNo">541</span> String url =
rmm.getUrl();<a name="line.541"></a>
-<span class="sourceLineNo">542</span> String httpMethod =
rmm.getHttpMethod();<a name="line.542"></a>
-<span class="sourceLineNo">543</span> RestCall rc =
(httpMethod.equals("POST") ? doPost(url) : doGet(url));<a name="line.543"></a>
-<span class="sourceLineNo">544</span>
rc.serializer(serializer).parser(parser);<a name="line.544"></a>
+<span class="sourceLineNo">537</span> final RemoteableMeta rm =
new RemoteableMeta(interfaceClass, restUrl2);<a name="line.537"></a>
+<span class="sourceLineNo">538</span><a name="line.538"></a>
+<span class="sourceLineNo">539</span> @Override /*
InvocationHandler */<a name="line.539"></a>
+<span class="sourceLineNo">540</span> public Object
invoke(Object proxy, Method method, Object[] args) throws Throwable {<a
name="line.540"></a>
+<span class="sourceLineNo">541</span> RemoteableMethodMeta
rmm = rm.getMethodMeta(method);<a name="line.541"></a>
+<span class="sourceLineNo">542</span><a name="line.542"></a>
+<span class="sourceLineNo">543</span> if (rmm == null)<a
name="line.543"></a>
+<span class="sourceLineNo">544</span> throw new
RuntimeException("Method is not exposed as a remoteable method.");<a
name="line.544"></a>
<span class="sourceLineNo">545</span><a name="line.545"></a>
-<span class="sourceLineNo">546</span> for (RemoteMethodArg
a : rmm.getPathArgs())<a name="line.546"></a>
-<span class="sourceLineNo">547</span> rc.path(a.name,
args[a.index], a.serializer);<a name="line.547"></a>
-<span class="sourceLineNo">548</span><a name="line.548"></a>
-<span class="sourceLineNo">549</span> for (RemoteMethodArg
a : rmm.getQueryArgs())<a name="line.549"></a>
-<span class="sourceLineNo">550</span> rc.query(a.name,
args[a.index], a.skipIfNE, a.serializer);<a name="line.550"></a>
+<span class="sourceLineNo">546</span> try {<a
name="line.546"></a>
+<span class="sourceLineNo">547</span> String url =
rmm.getUrl();<a name="line.547"></a>
+<span class="sourceLineNo">548</span> String httpMethod =
rmm.getHttpMethod();<a name="line.548"></a>
+<span class="sourceLineNo">549</span> RestCall rc =
(httpMethod.equals("POST") ? doPost(url) : doGet(url));<a name="line.549"></a>
+<span class="sourceLineNo">550</span>
rc.serializer(serializer).parser(parser);<a name="line.550"></a>
<span class="sourceLineNo">551</span><a name="line.551"></a>
-<span class="sourceLineNo">552</span> for (RemoteMethodArg
a : rmm.getFormDataArgs())<a name="line.552"></a>
-<span class="sourceLineNo">553</span>
rc.formData(a.name, args[a.index], a.skipIfNE, a.serializer);<a
name="line.553"></a>
+<span class="sourceLineNo">552</span> for (RemoteMethodArg
a : rmm.getPathArgs())<a name="line.552"></a>
+<span class="sourceLineNo">553</span> rc.path(a.name,
args[a.index], a.serializer);<a name="line.553"></a>
<span class="sourceLineNo">554</span><a name="line.554"></a>
-<span class="sourceLineNo">555</span> for (RemoteMethodArg
a : rmm.getHeaderArgs())<a name="line.555"></a>
-<span class="sourceLineNo">556</span> rc.header(a.name,
args[a.index], a.skipIfNE, a.serializer);<a name="line.556"></a>
+<span class="sourceLineNo">555</span> for (RemoteMethodArg
a : rmm.getQueryArgs())<a name="line.555"></a>
+<span class="sourceLineNo">556</span> rc.query(a.name,
args[a.index], a.skipIfNE, a.serializer);<a name="line.556"></a>
<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span> if (rmm.getBodyArg()
!= null)<a name="line.558"></a>
-<span class="sourceLineNo">559</span>
rc.input(args[rmm.getBodyArg()]);<a name="line.559"></a>
+<span class="sourceLineNo">558</span> for (RemoteMethodArg
a : rmm.getFormDataArgs())<a name="line.558"></a>
+<span class="sourceLineNo">559</span>
rc.formData(a.name, args[a.index], a.skipIfNE, a.serializer);<a
name="line.559"></a>
<span class="sourceLineNo">560</span><a name="line.560"></a>
-<span class="sourceLineNo">561</span> if
(rmm.getRequestBeanArgs().length > 0) {<a name="line.561"></a>
-<span class="sourceLineNo">562</span> BeanSession bs =
getBeanContext().createSession();<a name="line.562"></a>
+<span class="sourceLineNo">561</span> for (RemoteMethodArg
a : rmm.getHeaderArgs())<a name="line.561"></a>
+<span class="sourceLineNo">562</span> rc.header(a.name,
args[a.index], a.skipIfNE, a.serializer);<a name="line.562"></a>
<span class="sourceLineNo">563</span><a name="line.563"></a>
-<span class="sourceLineNo">564</span> for (Integer i :
rmm.getRequestBeanArgs()) {<a name="line.564"></a>
-<span class="sourceLineNo">565</span>
BeanMap<?> bm = bs.toBeanMap(args[i]);<a name="line.565"></a>
-<span class="sourceLineNo">566</span> for
(BeanPropertyValue bpv : bm.getValues(true)) {<a name="line.566"></a>
-<span class="sourceLineNo">567</span>
BeanPropertyMeta pMeta = bpv.getMeta();<a name="line.567"></a>
-<span class="sourceLineNo">568</span> Object val
= bpv.getValue();<a name="line.568"></a>
+<span class="sourceLineNo">564</span> if (rmm.getBodyArg()
!= null)<a name="line.564"></a>
+<span class="sourceLineNo">565</span>
rc.input(args[rmm.getBodyArg()]);<a name="line.565"></a>
+<span class="sourceLineNo">566</span><a name="line.566"></a>
+<span class="sourceLineNo">567</span> if
(rmm.getRequestBeanArgs().length > 0) {<a name="line.567"></a>
+<span class="sourceLineNo">568</span> BeanSession bs =
getBeanContext().createSession();<a name="line.568"></a>
<span class="sourceLineNo">569</span><a name="line.569"></a>
-<span class="sourceLineNo">570</span> Path p =
pMeta.getAnnotation(Path.class);<a name="line.570"></a>
-<span class="sourceLineNo">571</span> if (p !=
null)<a name="line.571"></a>
-<span class="sourceLineNo">572</span>
rc.path(getName(p.value(), pMeta), val, getPartSerializer(p.serializer()));<a
name="line.572"></a>
-<span class="sourceLineNo">573</span><a name="line.573"></a>
-<span class="sourceLineNo">574</span> Query q1 =
pMeta.getAnnotation(Query.class);<a name="line.574"></a>
-<span class="sourceLineNo">575</span> if (q1 !=
null)<a name="line.575"></a>
-<span class="sourceLineNo">576</span>
rc.query(getName(q1.value(), pMeta), val, false,
getPartSerializer(q1.serializer()));<a name="line.576"></a>
-<span class="sourceLineNo">577</span><a name="line.577"></a>
-<span class="sourceLineNo">578</span> QueryIfNE
q2 = pMeta.getAnnotation(QueryIfNE.class);<a name="line.578"></a>
-<span class="sourceLineNo">579</span> if (q2 !=
null)<a name="line.579"></a>
-<span class="sourceLineNo">580</span>
rc.query(getName(q2.value(), pMeta), val, true,
getPartSerializer(q2.serializer()));<a name="line.580"></a>
-<span class="sourceLineNo">581</span><a name="line.581"></a>
-<span class="sourceLineNo">582</span> FormData f1
= pMeta.getAnnotation(FormData.class);<a name="line.582"></a>
-<span class="sourceLineNo">583</span> if (f1 !=
null)<a name="line.583"></a>
-<span class="sourceLineNo">584</span>
rc.formData(getName(f1.value(), pMeta), val, false,
getPartSerializer(f1.serializer()));<a name="line.584"></a>
+<span class="sourceLineNo">570</span> for
(RemoteMethodArg rma : rmm.getRequestBeanArgs()) {<a name="line.570"></a>
+<span class="sourceLineNo">571</span>
BeanMap<?> bm = bs.toBeanMap(args[rma.index]);<a name="line.571"></a>
+<span class="sourceLineNo">572</span><a name="line.572"></a>
+<span class="sourceLineNo">573</span> for
(BeanPropertyValue bpv : bm.getValues(false)) {<a name="line.573"></a>
+<span class="sourceLineNo">574</span>
BeanPropertyMeta pMeta = bpv.getMeta();<a name="line.574"></a>
+<span class="sourceLineNo">575</span> Object val
= bpv.getValue();<a name="line.575"></a>
+<span class="sourceLineNo">576</span><a name="line.576"></a>
+<span class="sourceLineNo">577</span> Path p =
pMeta.getAnnotation(Path.class);<a name="line.577"></a>
+<span class="sourceLineNo">578</span> if (p !=
null)<a name="line.578"></a>
+<span class="sourceLineNo">579</span>
rc.path(getName(p.name(), p.value(), pMeta), val,
getPartSerializer(p.serializer(), rma.serializer));<a name="line.579"></a>
+<span class="sourceLineNo">580</span><a name="line.580"></a>
+<span class="sourceLineNo">581</span> if (val !=
null) {<a name="line.581"></a>
+<span class="sourceLineNo">582</span> Query q1
= pMeta.getAnnotation(Query.class);<a name="line.582"></a>
+<span class="sourceLineNo">583</span> if (q1
!= null)<a name="line.583"></a>
+<span class="sourceLineNo">584</span>
rc.query(getName(q1.name(), q1.value(), pMeta), val, q1.skipIfEmpty(),
getPartSerializer(q1.serializer(), rma.serializer));<a name="line.584"></a>
<span class="sourceLineNo">585</span><a name="line.585"></a>
-<span class="sourceLineNo">586</span>
FormDataIfNE f2 = pMeta.getAnnotation(FormDataIfNE.class);<a
name="line.586"></a>
-<span class="sourceLineNo">587</span> if (f2 !=
null)<a name="line.587"></a>
-<span class="sourceLineNo">588</span>
rc.formData(getName(f2.value(), pMeta), val, true,
getPartSerializer(f2.serializer()));<a name="line.588"></a>
+<span class="sourceLineNo">586</span>
QueryIfNE q2 = pMeta.getAnnotation(QueryIfNE.class);<a name="line.586"></a>
+<span class="sourceLineNo">587</span> if (q2
!= null)<a name="line.587"></a>
+<span class="sourceLineNo">588</span>
rc.query(getName(q2.name(), q2.value(), pMeta), val, true,
getPartSerializer(q2.serializer(), rma.serializer));<a name="line.588"></a>
<span class="sourceLineNo">589</span><a name="line.589"></a>
-<span class="sourceLineNo">590</span>
org.apache.juneau.remoteable.Header h1 =
pMeta.getAnnotation(org.apache.juneau.remoteable.Header.class);<a
name="line.590"></a>
-<span class="sourceLineNo">591</span> if (h1 !=
null)<a name="line.591"></a>
-<span class="sourceLineNo">592</span>
rc.header(getName(h1.value(), pMeta), val, false,
getPartSerializer(h1.serializer()));<a name="line.592"></a>
+<span class="sourceLineNo">590</span> FormData
f1 = pMeta.getAnnotation(FormData.class);<a name="line.590"></a>
+<span class="sourceLineNo">591</span> if (f1
!= null)<a name="line.591"></a>
+<span class="sourceLineNo">592</span>
rc.formData(getName(f1.name(), f1.value(), pMeta), val, f1.skipIfEmpty(),
getPartSerializer(f1.serializer(), rma.serializer));<a name="line.592"></a>
<span class="sourceLineNo">593</span><a name="line.593"></a>
-<span class="sourceLineNo">594</span> HeaderIfNE
h2 = pMeta.getAnnotation(HeaderIfNE.class);<a name="line.594"></a>
-<span class="sourceLineNo">595</span> if (h2 !=
null)<a name="line.595"></a>
-<span class="sourceLineNo">596</span>
rc.header(getName(h2.value(), pMeta), val, true,
getPartSerializer(h2.serializer()));<a name="line.596"></a>
-<span class="sourceLineNo">597</span> }<a
name="line.597"></a>
-<span class="sourceLineNo">598</span> }<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>
-<span class="sourceLineNo">601</span> if
(rmm.getOtherArgs().length > 0) {<a name="line.601"></a>
-<span class="sourceLineNo">602</span> Object[]
otherArgs = new Object[rmm.getOtherArgs().length];<a name="line.602"></a>
-<span class="sourceLineNo">603</span> int i = 0;<a
name="line.603"></a>
-<span class="sourceLineNo">604</span> for (Integer
otherArg : rmm.getOtherArgs())<a name="line.604"></a>
-<span class="sourceLineNo">605</span> otherArgs[i++]
= args[otherArg];<a name="line.605"></a>
-<span class="sourceLineNo">606</span>
rc.input(otherArgs);<a name="line.606"></a>
-<span class="sourceLineNo">607</span> }<a
name="line.607"></a>
-<span class="sourceLineNo">608</span><a name="line.608"></a>
-<span class="sourceLineNo">609</span> return
rc.getResponse(method.getGenericReturnType());<a name="line.609"></a>
-<span class="sourceLineNo">610</span><a name="line.610"></a>
-<span class="sourceLineNo">611</span> } catch
(RestCallException e) {<a name="line.611"></a>
-<span class="sourceLineNo">612</span> // Try to throw
original exception if possible.<a name="line.612"></a>
-<span class="sourceLineNo">613</span>
e.throwServerException(interfaceClass.getClassLoader());<a name="line.613"></a>
-<span class="sourceLineNo">614</span> throw new
RuntimeException(e);<a name="line.614"></a>
-<span class="sourceLineNo">615</span> } catch (Exception e)
{<a name="line.615"></a>
-<span class="sourceLineNo">616</span> throw new
RuntimeException(e);<a name="line.616"></a>
-<span class="sourceLineNo">617</span> }<a name="line.617"></a>
-<span class="sourceLineNo">618</span> }<a name="line.618"></a>
-<span class="sourceLineNo">619</span> });<a name="line.619"></a>
-<span class="sourceLineNo">620</span> } catch (Exception e) {<a
name="line.620"></a>
-<span class="sourceLineNo">621</span> throw new RuntimeException(e);<a
name="line.621"></a>
-<span class="sourceLineNo">622</span> }<a name="line.622"></a>
-<span class="sourceLineNo">623</span> }<a name="line.623"></a>
-<span class="sourceLineNo">624</span><a name="line.624"></a>
-<span class="sourceLineNo">625</span> private static String getName(String
name, BeanPropertyMeta pMeta) {<a name="line.625"></a>
-<span class="sourceLineNo">626</span> if ("*".equals(name) && !
pMeta.getClassMeta().isMapOrBean())<a name="line.626"></a>
-<span class="sourceLineNo">627</span> name = pMeta.getName();<a
name="line.627"></a>
-<span class="sourceLineNo">628</span> return name;<a name="line.628"></a>
-<span class="sourceLineNo">629</span> }<a name="line.629"></a>
-<span class="sourceLineNo">630</span><a name="line.630"></a>
-<span class="sourceLineNo">631</span> private static PartSerializer
getPartSerializer(Class c) {<a name="line.631"></a>
-<span class="sourceLineNo">632</span> if (c ==
UrlEncodingSerializer.class)<a name="line.632"></a>
-<span class="sourceLineNo">633</span> return null;<a
name="line.633"></a>
-<span class="sourceLineNo">634</span> PartSerializer pf =
partSerializerCache.get(c);<a name="line.634"></a>
-<span class="sourceLineNo">635</span> if (pf == null) {<a
name="line.635"></a>
-<span class="sourceLineNo">636</span> try {<a name="line.636"></a>
-<span class="sourceLineNo">637</span>
partSerializerCache.putIfAbsent(c, (PartSerializer)c.newInstance());<a
name="line.637"></a>
-<span class="sourceLineNo">638</span> } catch (Exception e) {<a
name="line.638"></a>
-<span class="sourceLineNo">639</span> throw new
RuntimeException(e);<a name="line.639"></a>
-<span class="sourceLineNo">640</span> }<a name="line.640"></a>
-<span class="sourceLineNo">641</span> pf =
partSerializerCache.get(c);<a name="line.641"></a>
-<span class="sourceLineNo">642</span> }<a name="line.642"></a>
-<span class="sourceLineNo">643</span> return pf;<a name="line.643"></a>
-<span class="sourceLineNo">644</span> }<a name="line.644"></a>
-<span class="sourceLineNo">645</span><a name="line.645"></a>
-<span class="sourceLineNo">646</span> private Pattern absUrlPattern =
Pattern.compile("^\\w+\\:\\/\\/.*");<a name="line.646"></a>
-<span class="sourceLineNo">647</span><a name="line.647"></a>
-<span class="sourceLineNo">648</span> PartSerializer getPartSerializer() {<a
name="line.648"></a>
-<span class="sourceLineNo">649</span> return partSerializer;<a
name="line.649"></a>
-<span class="sourceLineNo">650</span> }<a name="line.650"></a>
-<span class="sourceLineNo">651</span><a name="line.651"></a>
-<span class="sourceLineNo">652</span> URI toURI(Object url) throws
URISyntaxException {<a name="line.652"></a>
-<span class="sourceLineNo">653</span> if (url instanceof URI)<a
name="line.653"></a>
-<span class="sourceLineNo">654</span> return (URI)url;<a
name="line.654"></a>
-<span class="sourceLineNo">655</span> if (url instanceof URL)<a
name="line.655"></a>
-<span class="sourceLineNo">656</span> ((URL)url).toURI();<a
name="line.656"></a>
-<span class="sourceLineNo">657</span> if (url instanceof URIBuilder)<a
name="line.657"></a>
-<span class="sourceLineNo">658</span> return
((URIBuilder)url).build();<a name="line.658"></a>
-<span class="sourceLineNo">659</span> String s = url == null ? "" :
url.toString();<a name="line.659"></a>
-<span class="sourceLineNo">660</span> if (rootUrl != null && !
absUrlPattern.matcher(s).matches()) {<a name="line.660"></a>
-<span class="sourceLineNo">661</span> if (s.isEmpty())<a
name="line.661"></a>
-<span class="sourceLineNo">662</span> s = rootUrl;<a
name="line.662"></a>
-<span class="sourceLineNo">663</span> else {<a name="line.663"></a>
-<span class="sourceLineNo">664</span> StringBuilder sb = new
StringBuilder(rootUrl);<a name="line.664"></a>
-<span class="sourceLineNo">665</span> if (! s.startsWith("/"))<a
name="line.665"></a>
-<span class="sourceLineNo">666</span> sb.append('/');<a
name="line.666"></a>
-<span class="sourceLineNo">667</span> sb.append(s);<a
name="line.667"></a>
-<span class="sourceLineNo">668</span> s = sb.toString();<a
name="line.668"></a>
-<span class="sourceLineNo">669</span> }<a name="line.669"></a>
-<span class="sourceLineNo">670</span> }<a name="line.670"></a>
-<span class="sourceLineNo">671</span> if (s.indexOf('{') != -1)<a
name="line.671"></a>
-<span class="sourceLineNo">672</span> s = s.replace("{",
"%7B").replace("}", "%7D");<a name="line.672"></a>
-<span class="sourceLineNo">673</span> return new URI(s);<a
name="line.673"></a>
-<span class="sourceLineNo">674</span> }<a name="line.674"></a>
-<span class="sourceLineNo">675</span><a name="line.675"></a>
-<span class="sourceLineNo">676</span> ExecutorService
getExecutorService(boolean create) {<a name="line.676"></a>
-<span class="sourceLineNo">677</span> if (executorService != null || !
create)<a name="line.677"></a>
-<span class="sourceLineNo">678</span> return executorService;<a
name="line.678"></a>
-<span class="sourceLineNo">679</span> synchronized(this) {<a
name="line.679"></a>
-<span class="sourceLineNo">680</span> if (executorService == null)<a
name="line.680"></a>
-<span class="sourceLineNo">681</span> executorService = new
ThreadPoolExecutor(1, 1, 30, TimeUnit.SECONDS, new
ArrayBlockingQueue<Runnable>(10));<a name="line.681"></a>
-<span class="sourceLineNo">682</span> return executorService;<a
name="line.682"></a>
-<span class="sourceLineNo">683</span> }<a name="line.683"></a>
-<span class="sourceLineNo">684</span> }<a name="line.684"></a>
-<span class="sourceLineNo">685</span><a name="line.685"></a>
-<span class="sourceLineNo">686</span> @Override<a name="line.686"></a>
-<span class="sourceLineNo">687</span> protected void finalize() throws
Throwable {<a name="line.687"></a>
-<span class="sourceLineNo">688</span> if (! isClosed && !
keepHttpClientOpen) {<a name="line.688"></a>
-<span class="sourceLineNo">689</span> System.err.println("WARNING:
RestClient garbage collected before it was finalized.");<a name="line.689"></a>
-<span class="sourceLineNo">690</span> if (creationStack != null) {<a
name="line.690"></a>
-<span class="sourceLineNo">691</span> System.err.println("Creation
Stack:");<a name="line.691"></a>
-<span class="sourceLineNo">692</span> for (StackTraceElement e :
creationStack)<a name="line.692"></a>
-<span class="sourceLineNo">693</span> System.err.println(e);<a
name="line.693"></a>
-<span class="sourceLineNo">694</span> } else {<a name="line.694"></a>
-<span class="sourceLineNo">695</span> System.err.println("Creation
stack traces can be displayed by setting the system property
'org.apache.juneau.rest.client.RestClient.trackLifecycle' to true.");<a
name="line.695"></a>
-<span class="sourceLineNo">696</span> }<a name="line.696"></a>
-<span class="sourceLineNo">697</span> }<a name="line.697"></a>
-<span class="sourceLineNo">698</span> }<a name="line.698"></a>
-<span class="sourceLineNo">699</span>}<a name="line.699"></a>
+<span class="sourceLineNo">594</span>
FormDataIfNE f2 = pMeta.getAnnotation(FormDataIfNE.class);<a
name="line.594"></a>
+<span class="sourceLineNo">595</span> if (f2
!= null)<a name="line.595"></a>
+<span class="sourceLineNo">596</span>
rc.formData(getName(f2.name(), f2.value(), pMeta), val, true,
getPartSerializer(f2.serializer(), rma.serializer));<a name="line.596"></a>
+<span class="sourceLineNo">597</span><a name="line.597"></a>
+<span class="sourceLineNo">598</span>
org.apache.juneau.remoteable.Header h1 =
pMeta.getAnnotation(org.apache.juneau.remoteable.Header.class);<a
name="line.598"></a>
+<span class="sourceLineNo">599</span> if (h1
!= null)<a name="line.599"></a>
+<span class="sourceLineNo">600</span>
rc.header(getName(h1.name(), h1.value(), pMeta), val, h1.skipIfEmpty(),
getPartSerializer(h1.serializer(), rma.serializer));<a name="line.600"></a>
+<span class="sourceLineNo">601</span><a name="line.601"></a>
+<span class="sourceLineNo">602</span>
HeaderIfNE h2 = pMeta.getAnnotation(HeaderIfNE.class);<a name="line.602"></a>
+<span class="sourceLineNo">603</span> if (h2
!= null)<a name="line.603"></a>
+<span class="sourceLineNo">604</span>
rc.header(getName(h2.name(), h2.value(), pMeta), val, true,
getPartSerializer(h2.serializer(), rma.serializer));<a name="line.604"></a>
+<span class="sourceLineNo">605</span> }<a
name="line.605"></a>
+<span class="sourceLineNo">606</span> }<a
name="line.606"></a>
+<span class="sourceLineNo">607</span> }<a
name="line.607"></a>
+<span class="sourceLineNo">608</span> }<a
name="line.608"></a>
+<span class="sourceLineNo">609</span><a name="line.609"></a>
+<span class="sourceLineNo">610</span> if
(rmm.getOtherArgs().length > 0) {<a name="line.610"></a>
+<span class="sourceLineNo">611</span> Object[]
otherArgs = new Object[rmm.getOtherArgs().length];<a name="line.611"></a>
+<span class="sourceLineNo">612</span> int i = 0;<a
name="line.612"></a>
+<span class="sourceLineNo">613</span> for (Integer
otherArg : rmm.getOtherArgs())<a name="line.613"></a>
+<span class="sourceLineNo">614</span> otherArgs[i++]
= args[otherArg];<a name="line.614"></a>
+<span class="sourceLineNo">615</span>
rc.input(otherArgs);<a name="line.615"></a>
+<span class="sourceLineNo">616</span> }<a
name="line.616"></a>
+<span class="sourceLineNo">617</span><a name="line.617"></a>
+<span class="sourceLineNo">618</span> return
rc.getResponse(method.getGenericReturnType());<a name="line.618"></a>
+<span class="sourceLineNo">619</span><a name="line.619"></a>
+<span class="sourceLineNo">620</span> } catch
(RestCallException e) {<a name="line.620"></a>
+<span class="sourceLineNo">621</span> // Try to throw
original exception if possible.<a name="line.621"></a>
+<span class="sourceLineNo">622</span>
e.throwServerException(interfaceClass.getClassLoader());<a name="line.622"></a>
+<span class="sourceLineNo">623</span> throw new
RuntimeException(e);<a name="line.623"></a>
+<span class="sourceLineNo">624</span> } catch (Exception e)
{<a name="line.624"></a>
+<span class="sourceLineNo">625</span> throw new
RuntimeException(e);<a name="line.625"></a>
+<span class="sourceLineNo">626</span> }<a name="line.626"></a>
+<span class="sourceLineNo">627</span> }<a name="line.627"></a>
+<span class="sourceLineNo">628</span> });<a name="line.628"></a>
+<span class="sourceLineNo">629</span> } catch (Exception e) {<a
name="line.629"></a>
+<span class="sourceLineNo">630</span> throw new RuntimeException(e);<a
name="line.630"></a>
+<span class="sourceLineNo">631</span> }<a name="line.631"></a>
+<span class="sourceLineNo">632</span> }<a name="line.632"></a>
+<span class="sourceLineNo">633</span><a name="line.633"></a>
+<span class="sourceLineNo">634</span> private static String getName(String
name1, String name2, BeanPropertyMeta pMeta) {<a name="line.634"></a>
+<span class="sourceLineNo">635</span> String n = name1.isEmpty() ? name2
: name1;<a name="line.635"></a>
+<span class="sourceLineNo">636</span> ClassMeta<?> cm =
pMeta.getClassMeta();<a name="line.636"></a>
+<span class="sourceLineNo">637</span> if (n.isEmpty() &&
(cm.isMapOrBean() || cm.isReader() || cm.isInstanceOf(NameValuePairs.class)))<a
name="line.637"></a>
+<span class="sourceLineNo">638</span> n = "*";<a name="line.638"></a>
+<span class="sourceLineNo">639</span> if (n.isEmpty())<a
name="line.639"></a>
+<span class="sourceLineNo">640</span> n = pMeta.getName();<a
name="line.640"></a>
+<span class="sourceLineNo">641</span> return n;<a name="line.641"></a>
+<span class="sourceLineNo">642</span> }<a name="line.642"></a>
+<span class="sourceLineNo">643</span><a name="line.643"></a>
+<span class="sourceLineNo">644</span> private static PartSerializer
getPartSerializer(Class c, PartSerializer c2) {<a name="line.644"></a>
+<span class="sourceLineNo">645</span> if (c2 != null)<a
name="line.645"></a>
+<span class="sourceLineNo">646</span> return c2;<a name="line.646"></a>
+<span class="sourceLineNo">647</span> if (c == PartSerializer.class)<a
name="line.647"></a>
+<span class="sourceLineNo">648</span> return null;<a
name="line.648"></a>
+<span class="sourceLineNo">649</span> PartSerializer pf =
partSerializerCache.get(c);<a name="line.649"></a>
+<span class="sourceLineNo">650</span> if (pf == null) {<a
name="line.650"></a>
+<span class="sourceLineNo">651</span> try {<a name="line.651"></a>
+<span class="sourceLineNo">652</span>
partSerializerCache.putIfAbsent(c, (PartSerializer)c.newInstance());<a
name="line.652"></a>
+<span class="sourceLineNo">653</span> } catch (Exception e) {<a
name="line.653"></a>
+<span class="sourceLineNo">654</span> throw new
RuntimeException(e);<a name="line.654"></a>
+<span class="sourceLineNo">655</span> }<a name="line.655"></a>
+<span class="sourceLineNo">656</span> pf =
partSerializerCache.get(c);<a name="line.656"></a>
+<span class="sourceLineNo">657</span> }<a name="line.657"></a>
+<span class="sourceLineNo">658</span> return pf;<a name="line.658"></a>
+<span class="sourceLineNo">659</span> }<a name="line.659"></a>
+<span class="sourceLineNo">660</span><a name="line.660"></a>
+<span class="sourceLineNo">661</span> private Pattern absUrlPattern =
Pattern.compile("^\\w+\\:\\/\\/.*");<a name="line.661"></a>
+<span class="sourceLineNo">662</span><a name="line.662"></a>
+<span class="sourceLineNo">663</span> PartSerializer getPartSerializer() {<a
name="line.663"></a>
+<span class="sourceLineNo">664</span> return partSerializer;<a
name="line.664"></a>
+<span class="sourceLineNo">665</span> }<a name="line.665"></a>
+<span class="sourceLineNo">666</span><a name="line.666"></a>
+<span class="sourceLineNo">667</span> URI toURI(Object url) throws
URISyntaxException {<a name="line.667"></a>
+<span class="sourceLineNo">668</span> if (url instanceof URI)<a
name="line.668"></a>
+<span class="sourceLineNo">669</span> return (URI)url;<a
name="line.669"></a>
+<span class="sourceLineNo">670</span> if (url instanceof URL)<a
name="line.670"></a>
+<span class="sourceLineNo">671</span> ((URL)url).toURI();<a
name="line.671"></a>
+<span class="sourceLineNo">672</span> if (url instanceof URIBuilder)<a
name="line.672"></a>
+<span class="sourceLineNo">673</span> return
((URIBuilder)url).build();<a name="line.673"></a>
+<span class="sourceLineNo">674</span> String s = url == null ? "" :
url.toString();<a name="line.674"></a>
+<span class="sourceLineNo">675</span> if (rootUrl != null && !
absUrlPattern.matcher(s).matches()) {<a name="line.675"></a>
+<span class="sourceLineNo">676</span> if (s.isEmpty())<a
name="line.676"></a>
+<span class="sourceLineNo">677</span> s = rootUrl;<a
name="line.677"></a>
+<span class="sourceLineNo">678</span> else {<a name="line.678"></a>
+<span class="sourceLineNo">679</span> StringBuilder sb = new
StringBuilder(rootUrl);<a name="line.679"></a>
+<span class="sourceLineNo">680</span> if (! s.startsWith("/"))<a
name="line.680"></a>
+<span class="sourceLineNo">681</span> sb.append('/');<a
name="line.681"></a>
+<span class="sourceLineNo">682</span> sb.append(s);<a
name="line.682"></a>
+<span class="sourceLineNo">683</span> s = sb.toString();<a
name="line.683"></a>
+<span class="sourceLineNo">684</span> }<a name="line.684"></a>
+<span class="sourceLineNo">685</span> }<a name="line.685"></a>
+<span class="sourceLineNo">686</span> if (s.indexOf('{') != -1)<a
name="line.686"></a>
+<span class="sourceLineNo">687</span> s = s.replace("{",
"%7B").replace("}", "%7D");<a name="line.687"></a>
+<span class="sourceLineNo">688</span> return new URI(s);<a
name="line.688"></a>
+<span class="sourceLineNo">689</span> }<a name="line.689"></a>
+<span class="sourceLineNo">690</span><a name="line.690"></a>
+<span class="sourceLineNo">691</span> ExecutorService
getExecutorService(boolean create) {<a name="line.691"></a>
+<span class="sourceLineNo">692</span> if (executorService != null || !
create)<a name="line.692"></a>
+<span class="sourceLineNo">693</span> return executorService;<a
name="line.693"></a>
+<span class="sourceLineNo">694</span> synchronized(this) {<a
name="line.694"></a>
+<span class="sourceLineNo">695</span> if (executorService == null)<a
name="line.695"></a>
+<span class="sourceLineNo">696</span> executorService = new
ThreadPoolExecutor(1, 1, 30, TimeUnit.SECONDS, new
ArrayBlockingQueue<Runnable>(10));<a name="line.696"></a>
+<span class="sourceLineNo">697</span> return executorService;<a
name="line.697"></a>
+<span class="sourceLineNo">698</span> }<a name="line.698"></a>
+<span class="sourceLineNo">699</span> }<a name="line.699"></a>
+<span class="sourceLineNo">700</span><a name="line.700"></a>
+<span class="sourceLineNo">701</span> @Override<a name="line.701"></a>
+<span class="sourceLineNo">702</span> protected void finalize() throws
Throwable {<a name="line.702"></a>
+<span class="sourceLineNo">703</span> if (! isClosed && !
keepHttpClientOpen) {<a name="line.703"></a>
+<span class="sourceLineNo">704</span> System.err.println("WARNING:
RestClient garbage collected before it was finalized.");<a name="line.704"></a>
+<span class="sourceLineNo">705</span> if (creationStack != null) {<a
name="line.705"></a>
+<span class="sourceLineNo">706</span> System.err.println("Creation
Stack:");<a name="line.706"></a>
+<span class="sourceLineNo">707</span> for (StackTraceElement e :
creationStack)<a name="line.707"></a>
+<span class="sourceLineNo">708</span> System.err.println(e);<a
name="line.708"></a>
+<span class="sourceLineNo">709</span> } else {<a name="line.709"></a>
+<span class="sourceLineNo">710</span> System.err.println("Creation
stack traces can be displayed by setting the system property
'org.apache.juneau.rest.client.RestClient.trackLifecycle' to true.");<a
name="line.710"></a>
+<span class="sourceLineNo">711</span> }<a name="line.711"></a>
+<span class="sourceLineNo">712</span> }<a name="line.712"></a>
+<span class="sourceLineNo">713</span> }<a name="line.713"></a>
+<span class="sourceLineNo">714</span>}<a name="line.714"></a>
