juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [juneau] branch master updated: Tests.
Date Sun, 20 May 2018 19:43:11 GMT
This is an automated email from the ASF dual-hosted git repository.

jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git


The following commit(s) were added to refs/heads/master by this push:
     new 4691232  Tests.
4691232 is described below

commit 4691232400ad03a3d995e6eacba5229546f630b3
Author: JamesBognar <jamesbognar@apache.org>
AuthorDate: Sun May 20 15:42:57 2018 -0400

    Tests.
---
 .../java/org/apache/juneau/rest/test/Root.java     |   1 -
 .../juneau/rest/test/client/InterfaceProxy.java    | 191 -----
 .../rest/test/client/InterfaceProxyResource.java   | 736 -----------------
 .../org/apache/juneau/rest/test/_TestSuite.java    |   1 +
 .../rest/test/client/InterfaceProxyTest.java       | 911 ++++++++++++++++++++-
 .../rest/client/mock/MockHttpClientConnection.java |   2 +-
 6 files changed, 905 insertions(+), 937 deletions(-)

diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/Root.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/Root.java
index 0482423..a780c80 100644
--- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/Root.java
+++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/Root.java
@@ -26,7 +26,6 @@ import org.apache.juneau.rest.test.client.*;
 		DebugResource.class,
 		LogsResource.class,
 		ConfigResource.class,
-		InterfaceProxyResource.class,
 		LargePojosResource.class,
 		RestClientResource.class,
 		ThirdPartyProxyResource.class,
diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/client/InterfaceProxy.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/client/InterfaceProxy.java
deleted file mode 100644
index 107be29..0000000
--- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/client/InterfaceProxy.java
+++ /dev/null
@@ -1,191 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.test.client;
-
-import java.util.*;
-
-import org.apache.juneau.remoteable.*;
-import org.apache.juneau.rest.testutils.*;
-
-/**
- * Interface proxy exposed in InterfaceProxyResource and tested in InterfaceProxyTest.
- */
-@Remoteable
-public interface InterfaceProxy {
-
-	public static final String SWAP = "swap-~!@#$%^&*()_+`-={}[]|:;\"<,>.?/";
-
-	//--------------------------------------------------------------------------------
-	// Test return types.
-	//--------------------------------------------------------------------------------
-
-	// Various primitives
-	void returnVoid();
-	int returnInt();
-	Integer returnInteger();
-	boolean returnBoolean();
-	float returnFloat();
-	Float returnFloatObject();
-	String returnString();
-	String returnNullString();
-	int[][][] returnInt3dArray();
-	Integer[][][] returnInteger3dArray();
-	String[][][] returnString3dArray();
-	List<Integer> returnIntegerList();
-	List<List<List<Integer>>> returnInteger3dList();
-	List<Integer[][][]> returnInteger1d3dList();
-	List<int[][][]> returnInt1d3dList();
-	List<String> returnStringList();
-
-	// Beans
-	ABean returnBean();
-	ABean[][][] returnBean3dArray();
-	List<ABean> returnBeanList();
-	List<ABean[][][]> returnBean1d3dList();
-	Map<String,ABean> returnBeanMap();
-	Map<String,List<ABean>> returnBeanListMap();
-	Map<String,List<ABean[][][]>> returnBean1d3dListMap();
-	Map<Integer,List<ABean>> returnBeanListMapIntegerKeys();
-
-	// Typed beans
-	TypedBean returnTypedBean();
-	TypedBean[][][] returnTypedBean3dArray();
-	List<TypedBean> returnTypedBeanList();
-	List<TypedBean[][][]> returnTypedBean1d3dList();
-	Map<String,TypedBean> returnTypedBeanMap();
-	Map<String,List<TypedBean>> returnTypedBeanListMap();
-	Map<String,List<TypedBean[][][]>> returnTypedBean1d3dListMap();
-	Map<Integer,List<TypedBean>> returnTypedBeanListMapIntegerKeys();
-
-	// Swapped POJOs
-	SwappedPojo returnSwappedPojo();
-	SwappedPojo[][][] returnSwappedPojo3dArray();
-	Map<SwappedPojo,SwappedPojo> returnSwappedPojoMap();
-	Map<SwappedPojo,SwappedPojo[][][]> returnSwappedPojo3dMap();
-
-	// Implicit swapped POJOs
-	ImplicitSwappedPojo returnImplicitSwappedPojo();
-	ImplicitSwappedPojo[][][] returnImplicitSwappedPojo3dArray();
-	Map<ImplicitSwappedPojo,ImplicitSwappedPojo> returnImplicitSwappedPojoMap();
-	Map<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> returnImplicitSwappedPojo3dMap();
-
-	// Enums
-	TestEnum returnEnum();
-	TestEnum[][][] returnEnum3d();
-	List<TestEnum> returnEnumList();
-	List<List<List<TestEnum>>> returnEnum3dList();
-	List<TestEnum[][][]> returnEnum1d3dList();
-	Map<TestEnum,TestEnum> returnEnumMap();
-	Map<TestEnum,TestEnum[][][]> returnEnum3dArrayMap();
-	Map<TestEnum,List<TestEnum[][][]>> returnEnum1d3dListMap();
-
-	//--------------------------------------------------------------------------------
-	// Test server-side exception serialization.
-	//--------------------------------------------------------------------------------
-
-	void throwException1() throws InterfaceProxyException1;
-	void throwException2() throws InterfaceProxyException2;
-
-	//--------------------------------------------------------------------------------
-	// Test parameters
-	//--------------------------------------------------------------------------------
-
-	// Various primitives
-	void setNothing();
-	void setInt(int x);
-	void setInteger(Integer x);
-	void setBoolean(boolean x);
-	void setFloat(float x);
-	void setFloatObject(Float x);
-	void setString(String x);
-	void setNullString(String x);
-	void setInt3dArray(int[][][] x);
-	void setInteger3dArray(Integer[][][] x);
-	void setString3dArray(String[][][] x);
-	void setIntegerList(List<Integer> x);
-	void setInteger3dList(List<List<List<Integer>>> x);
-	void setInteger1d3dList(List<Integer[][][]> x);
-	void setInt1d3dList(List<int[][][]> x);
-	void setStringList(List<String> x);
-
-	// Beans
-	void setBean(ABean x);
-	void setBean3dArray(ABean[][][] x);
-	void setBeanList(List<ABean> x);
-	void setBean1d3dList(List<ABean[][][]> x);
-	void setBeanMap(Map<String,ABean> x);
-	void setBeanListMap(Map<String,List<ABean>> x);
-	void setBean1d3dListMap(Map<String,List<ABean[][][]>> x);
-	void setBeanListMapIntegerKeys(Map<Integer,List<ABean>> x);
-
-	// Typed beans
-	void setTypedBean(TypedBean x);
-	void setTypedBean3dArray(TypedBean[][][] x);
-	void setTypedBeanList(List<TypedBean> x);
-	void setTypedBean1d3dList(List<TypedBean[][][]> x);
-	void setTypedBeanMap(Map<String,TypedBean> x);
-	void setTypedBeanListMap(Map<String,List<TypedBean>> x);
-	void setTypedBean1d3dListMap(Map<String,List<TypedBean[][][]>> x);
-	void setTypedBeanListMapIntegerKeys(Map<Integer,List<TypedBean>> x);
-
-	// Swapped POJOs
-	void setSwappedPojo(SwappedPojo x);
-	void setSwappedPojo3dArray(SwappedPojo[][][] x);
-	void setSwappedPojoMap(Map<SwappedPojo,SwappedPojo> x);
-	void setSwappedPojo3dMap(Map<SwappedPojo,SwappedPojo[][][]> x);
-
-	// Implicit swapped POJOs
-	void setImplicitSwappedPojo(ImplicitSwappedPojo x);
-	void setImplicitSwappedPojo3dArray(ImplicitSwappedPojo[][][] x);
-	void setImplicitSwappedPojoMap(Map<ImplicitSwappedPojo,ImplicitSwappedPojo> x);
-	void setImplicitSwappedPojo3dMap(Map<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> x);
-
-	// Enums
-	void setEnum(TestEnum x);
-	void setEnum3d(TestEnum[][][] x);
-	void setEnumList(List<TestEnum> x);
-	void setEnum3dList(List<List<List<TestEnum>>> x);
-	void setEnum1d3dList(List<TestEnum[][][]> x);
-	void setEnumMap(Map<TestEnum,TestEnum> x);
-	void setEnum3dArrayMap(Map<TestEnum,TestEnum[][][]> x);
-	void setEnum1d3dListMap(Map<TestEnum,List<TestEnum[][][]>> x);
-
-	//--------------------------------------------------------------------------------
-	// Test multi-parameters
-	//--------------------------------------------------------------------------------
-
-	void setMultiParamsInts(int x1, int[][][] x2, int[][][] x2n, List<int[][][]> x3, List<int[][][]> x3n);
-	void setMultiParamsInteger(Integer x1, Integer x1n, Integer[][][] x2, Integer[][][] x2n, List<Integer[][][]> x3, List<Integer[][][]> x3n);
-	void setMultiParamsFloat(float x1, float[][][] x2, float[][][] x2n, List<float[][][]> x3, List<float[][][]> x3n);
-	void setMultiParamsFloatObject(Float x1, Float x1n, Float[][][] x2, Float[][][] x2n, List<Float[][][]> x3, List<Float[][][]> x3n);
-	void setMultiParamsString(String x1, String[][][] x2, String[][][] x2n, List<String[][][]> x3, List<String[][][]> x3n);
-	void setMultiParamsBean(ABean x1, ABean[][][] x2, ABean[][][] x2n, List<ABean[][][]> x3, List<ABean[][][]> x3n, Map<String,ABean> x4, Map<String,ABean> x4n, Map<String,List<ABean[][][]>> x5, Map<String,List<ABean[][][]>> x5n);
-	void setMultiParamsSwappedPojo(SwappedPojo x1, SwappedPojo[][][] x2, SwappedPojo[][][] x2n, List<SwappedPojo[][][]> x3, List<SwappedPojo[][][]> x3n, Map<SwappedPojo,SwappedPojo> x4, Map<SwappedPojo,SwappedPojo> x4n, Map<SwappedPojo,List<SwappedPojo[][][]>> x5, Map<SwappedPojo,List<SwappedPojo[][][]>> x5n);
-	void setMultiParamsImplicitSwappedPojo(ImplicitSwappedPojo x1, ImplicitSwappedPojo[][][] x2, ImplicitSwappedPojo[][][] x2n, List<ImplicitSwappedPojo[][][]> x3, List<ImplicitSwappedPojo[][][]> x3n, Map<ImplicitSwappedPojo,ImplicitSwappedPojo> x4, Map<ImplicitSwappedPojo,ImplicitSwappedPojo> x4n, Map<ImplicitSwappedPojo,List<ImplicitSwappedPojo[][][]>> x5, Map<ImplicitSwappedPojo,List<ImplicitSwappedPojo[][][]>> x5n);
-	void setMultiParamsEnum(TestEnum x1, TestEnum[][][] x2, TestEnum[][][] x2n, List<TestEnum[][][]> x3, List<TestEnum[][][]> x3n, Map<TestEnum,TestEnum> x4, Map<TestEnum,TestEnum> x4n, Map<TestEnum,List<TestEnum[][][]>> x5, Map<TestEnum,List<TestEnum[][][]>> x5n);
-
-	//--------------------------------------------------------------------------------
-	// Helper classes
-	//--------------------------------------------------------------------------------
-
-	@SuppressWarnings("serial")
-	public static class InterfaceProxyException1 extends Throwable {
-		public InterfaceProxyException1(String msg) {
-			super(msg);
-		}
-	}
-
-	@SuppressWarnings("serial")
-	public static class InterfaceProxyException2 extends Throwable {
-	}
-}
diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/client/InterfaceProxyResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/client/InterfaceProxyResource.java
deleted file mode 100644
index c38662c..0000000
--- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/client/InterfaceProxyResource.java
+++ /dev/null
@@ -1,736 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.rest.test.client;
-
-import static java.util.Arrays.*;
-import static org.junit.Assert.*;
-import static org.apache.juneau.http.HttpMethodName.*;
-import static org.apache.juneau.rest.testutils.TestUtils.*;
-
-import java.util.*;
-
-import org.apache.juneau.microservice.*;
-import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.testutils.*;
-import org.apache.juneau.serializer.*;
-import org.apache.juneau.utils.*;
-
-/**
- * Tests interface proxies exposed through <code>@RestMethod(name=PROXY)</code>
- */
-@RestResource(
-	path="/testInterfaceProxyResource",
-	flags={Serializer.SERIALIZER_addRootType, Serializer.SERIALIZER_addBeanTypes}
-)
-public class InterfaceProxyResource extends BasicRestServletJena {
-	private static final long serialVersionUID = 1L;
-
-	//====================================================================================================
-	// Test that Q-values are being resolved correctly.
-	//====================================================================================================
-	@RestMethod(name=PROXY, path="/proxy/*")
-	public InterfaceProxy getProxy() {
-		return new InterfaceProxy() {
-
-			//--------------------------------------------------------------------------------
-			// Test return types.
-			//--------------------------------------------------------------------------------
-
-			// Various primitives
-
-			@Override
-			public void returnVoid() {
-			}
-
-			@Override
-			public Integer returnInteger() {
-				return 1;
-			}
-
-			@Override
-			public int returnInt() {
-				return 1;
-			}
-
-			@Override
-			public boolean returnBoolean() {
-				return true;
-			}
-
-			@Override
-			public float returnFloat() {
-				return 1f;
-			}
-
-			@Override
-			public Float returnFloatObject() {
-				return 1f;
-			}
-
-			@Override
-			public String returnString() {
-				return "foobar";
-			}
-
-			@Override
-			public String returnNullString() {
-				return null;
-			}
-
-			@Override
-			public int[][][] returnInt3dArray() {
-				return new int[][][]{{{1,2},null},null};
-			}
-
-			@Override
-			public Integer[][][] returnInteger3dArray() {
-				return new Integer[][][]{{{1,null},null},null};
-			}
-
-			@Override
-			public String[][][] returnString3dArray() {
-				return new String[][][]{{{"foo","bar",null},null},null};
-			}
-
-			@Override
-			public List<Integer> returnIntegerList() {
-				return asList(new Integer[]{1,null});
-			}
-
-			@Override
-			public List<List<List<Integer>>> returnInteger3dList() {
-				return new AList<List<List<Integer>>>()
-				.append(
-					new AList<List<Integer>>()
-					.append(
-						new AList<Integer>().append(1).append(null)
-					)
-					.append(null)
-				)
-				.append(null);
-			}
-
-			@Override
-			public List<Integer[][][]> returnInteger1d3dList() {
-				return new AList<Integer[][][]>().append(new Integer[][][]{{{1,null},null},null}).append(null);
-			}
-
-			@Override
-			public List<int[][][]> returnInt1d3dList() {
-				return new AList<int[][][]>().append(new int[][][]{{{1,2},null},null}).append(null);
-			}
-
-			@Override
-			public List<String> returnStringList() {
-				return asList(new String[]{"foo","bar",null});
-			}
-
-			// Beans
-
-			@Override
-			public ABean returnBean() {
-				return new ABean().init();
-			}
-
-			@Override
-			public ABean[][][] returnBean3dArray() {
-				return new ABean[][][]{{{new ABean().init(),null},null},null};
-			}
-
-			@Override
-			public List<ABean> returnBeanList() {
-				return asList(new ABean().init());
-			}
-
-			@Override
-			public List<ABean[][][]> returnBean1d3dList() {
-				return new AList<ABean[][][]>().append(new ABean[][][]{{{new ABean().init(),null},null},null}).append(null);
-			}
-
-			@Override
-			public Map<String,ABean> returnBeanMap() {
-				return new AMap<String,ABean>().append("foo",new ABean().init());
-			}
-
-			@Override
-			public Map<String,List<ABean>> returnBeanListMap() {
-				return new AMap<String,List<ABean>>().append("foo",asList(new ABean().init()));
-			}
-
-			@Override
-			public Map<String,List<ABean[][][]>> returnBean1d3dListMap() {
-				return new AMap<String,List<ABean[][][]>>().append("foo", new AList<ABean[][][]>().append(new ABean[][][]{{{new ABean().init(),null},null},null}).append(null));
-			}
-
-			@Override
-			public Map<Integer,List<ABean>> returnBeanListMapIntegerKeys() {
-				return new AMap<Integer,List<ABean>>().append(1,asList(new ABean().init()));
-			}
-
-			// Typed beans
-
-			@Override
-			public TypedBean returnTypedBean() {
-				return new TypedBeanImpl().init();
-			}
-
-			@Override
-			public TypedBean[][][] returnTypedBean3dArray() {
-				return new TypedBean[][][]{{{new TypedBeanImpl().init(),null},null},null};
-			}
-
-			@Override
-			public List<TypedBean> returnTypedBeanList() {
-				return asList((TypedBean)new TypedBeanImpl().init());
-			}
-
-			@Override
-			public List<TypedBean[][][]> returnTypedBean1d3dList() {
-				return new AList<TypedBean[][][]>().append(new TypedBean[][][]{{{new TypedBeanImpl().init(),null},null},null}).append(null);
-			}
-
-			@Override
-			public Map<String,TypedBean> returnTypedBeanMap() {
-				return new AMap<String,TypedBean>().append("foo",new TypedBeanImpl().init());
-			}
-
-			@Override
-			public Map<String,List<TypedBean>> returnTypedBeanListMap() {
-				return new AMap<String,List<TypedBean>>().append("foo",asList((TypedBean)new TypedBeanImpl().init()));
-			}
-
-			@Override
-			public Map<String,List<TypedBean[][][]>> returnTypedBean1d3dListMap() {
-				return new AMap<String,List<TypedBean[][][]>>().append("foo", new AList<TypedBean[][][]>().append(new TypedBean[][][]{{{new TypedBeanImpl().init(),null},null},null}).append(null));
-			}
-
-			@Override
-			public Map<Integer,List<TypedBean>> returnTypedBeanListMapIntegerKeys() {
-				return new AMap<Integer,List<TypedBean>>().append(1,asList((TypedBean)new TypedBeanImpl().init()));
-			}
-
-			// Swapped POJOs
-
-			@Override
-			public SwappedPojo returnSwappedPojo() {
-				return new SwappedPojo();
-			}
-
-			@Override
-			public SwappedPojo[][][] returnSwappedPojo3dArray() {
-				return new SwappedPojo[][][]{{{new SwappedPojo(),null},null},null};
-			}
-
-			@Override
-			public Map<SwappedPojo,SwappedPojo> returnSwappedPojoMap() {
-				return new AMap<SwappedPojo,SwappedPojo>().append(new SwappedPojo(), new SwappedPojo());
-			}
-
-			@Override
-			public Map<SwappedPojo,SwappedPojo[][][]> returnSwappedPojo3dMap() {
-				return new AMap<SwappedPojo,SwappedPojo[][][]>().append(new SwappedPojo(), new SwappedPojo[][][]{{{new SwappedPojo(),null},null},null});
-			}
-
-			// Implicit swapped POJOs
-
-			@Override
-			public ImplicitSwappedPojo returnImplicitSwappedPojo() {
-				return new ImplicitSwappedPojo();
-			}
-
-			@Override
-			public ImplicitSwappedPojo[][][] returnImplicitSwappedPojo3dArray() {
-				return new ImplicitSwappedPojo[][][]{{{new ImplicitSwappedPojo(),null},null},null};
-			}
-
-			@Override
-			public Map<ImplicitSwappedPojo,ImplicitSwappedPojo> returnImplicitSwappedPojoMap() {
-				return new AMap<ImplicitSwappedPojo,ImplicitSwappedPojo>().append(new ImplicitSwappedPojo(), new ImplicitSwappedPojo());
-			}
-
-			@Override
-			public Map<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> returnImplicitSwappedPojo3dMap() {
-				return new AMap<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]>().append(new ImplicitSwappedPojo(), new ImplicitSwappedPojo[][][]{{{new ImplicitSwappedPojo(),null},null},null});
-			}
-
-			// Enums
-
-			@Override
-			public TestEnum returnEnum() {
-				return TestEnum.TWO;
-			}
-
-			@Override
-			public TestEnum[][][] returnEnum3d() {
-				return new TestEnum[][][]{{{TestEnum.TWO,null},null},null};
-			}
-
-			@Override
-			public List<TestEnum> returnEnumList() {
-				return new AList<TestEnum>().append(TestEnum.TWO).append(null);
-			}
-
-			@Override
-			public List<List<List<TestEnum>>> returnEnum3dList() {
-				return new AList<List<List<TestEnum>>>()
-				.append(
-					new AList<List<TestEnum>>()
-					.append(
-						new AList<TestEnum>().append(TestEnum.TWO).append(null)
-					)
-					.append(null)
-				.append(null)
-				);
-			}
-
-			@Override
-			public List<TestEnum[][][]> returnEnum1d3dList() {
-				return new AList<TestEnum[][][]>().append(new TestEnum[][][]{{{TestEnum.TWO,null},null},null}).append(null);
-			}
-
-			@Override
-			public Map<TestEnum,TestEnum> returnEnumMap() {
-				return new AMap<TestEnum,TestEnum>().append(TestEnum.ONE,TestEnum.TWO);
-			}
-
-			@Override
-			public Map<TestEnum,TestEnum[][][]> returnEnum3dArrayMap() {
-				return new AMap<TestEnum,TestEnum[][][]>().append(TestEnum.ONE, new TestEnum[][][]{{{TestEnum.TWO,null},null},null});
-			}
-
-			@Override
-			public Map<TestEnum,List<TestEnum[][][]>> returnEnum1d3dListMap() {
-				return new AMap<TestEnum,List<TestEnum[][][]>>().append(TestEnum.ONE, new AList<TestEnum[][][]>().append(new TestEnum[][][]{{{TestEnum.TWO,null},null},null}).append(null));
-			}
-
-			//--------------------------------------------------------------------------------
-			// Test server-side exception serialization.
-			//--------------------------------------------------------------------------------
-
-			@Override
-			public void throwException1() throws InterfaceProxy.InterfaceProxyException1 {
-				throw new InterfaceProxy.InterfaceProxyException1("foo");
-			}
-
-			@Override
-			public void throwException2() throws InterfaceProxy.InterfaceProxyException2 {
-				throw new InterfaceProxy.InterfaceProxyException2();
-			}
-
-			//--------------------------------------------------------------------------------
-			// Test parameters
-			//--------------------------------------------------------------------------------
-
-			// Various primitives
-
-			@Override
-			public void setNothing() {
-			}
-
-			@Override
-			public void setInt(int x) {
-				assertEquals(1, x);
-			}
-
-			@Override
-			public void setInteger(Integer x) {
-				assertEquals((Integer)1, x);
-			}
-
-			@Override
-			public void setBoolean(boolean x) {
-				assertTrue(x);
-			}
-
-			@Override
-			public void setFloat(float x) {
-				assertTrue(1f == x);
-			}
-
-			@Override
-			public void setFloatObject(Float x) {
-				assertTrue(1f == x);
-			}
-
-			@Override
-			public void setString(String x) {
-				assertEquals("foo", x);
-			}
-
-			@Override
-			public void setNullString(String x) {
-				assertNull(x);
-			}
-
-			@Override
-			public void setInt3dArray(int[][][] x) {
-				assertObjectEquals("[[[1,2],null],null]", x);
-			}
-
-			@Override
-			public void setInteger3dArray(Integer[][][] x) {
-				assertObjectEquals("[[[1,null],null],null]", x);
-			}
-
-			@Override
-			public void setString3dArray(String[][][] x) {
-				assertObjectEquals("[[['foo',null],null],null]", x);
-			}
-
-			@Override
-			public void setIntegerList(List<Integer> x) {
-				assertObjectEquals("[1,null]", x);
-				assertClass(Integer.class, x.get(0));
-			}
-
-			@Override
-			public void setInteger3dList(List<List<List<Integer>>> x) {
-				assertObjectEquals("[[[1,null],null],null]", x);
-				assertClass(Integer.class, x.get(0).get(0).get(0));
-			}
-
-			@Override
-			public void setInteger1d3dList(List<Integer[][][]> x) {
-				assertObjectEquals("[[[[1,null],null],null],null]", x);
-				assertClass(Integer[][][].class, x.get(0));
-				assertClass(Integer.class, x.get(0)[0][0][0]);
-			}
-
-			@Override
-			public void setInt1d3dList(List<int[][][]> x) {
-				assertObjectEquals("[[[[1,2],null],null],null]", x);
-				assertClass(int[][][].class, x.get(0));
-			}
-
-			@Override
-			public void setStringList(List<String> x) {
-				assertObjectEquals("['foo','bar',null]", x);
-			}
-
-			// Beans
-
-			@Override
-			public void setBean(ABean x) {
-				assertObjectEquals("{a:1,b:'foo'}", x);
-			}
-
-			@Override
-			public void setBean3dArray(ABean[][][] x) {
-				assertObjectEquals("[[[{a:1,b:'foo'},null],null],null]", x);
-			}
-
-			@Override
-			public void setBeanList(List<ABean> x) {
-				assertObjectEquals("[{a:1,b:'foo'}]", x);
-			}
-
-			@Override
-			public void setBean1d3dList(List<ABean[][][]> x) {
-				assertObjectEquals("[[[[{a:1,b:'foo'},null],null],null],null]", x);
-			}
-
-			@Override
-			public void setBeanMap(Map<String,ABean> x) {
-				assertObjectEquals("{foo:{a:1,b:'foo'}}", x);
-			}
-
-			@Override
-			public void setBeanListMap(Map<String,List<ABean>> x) {
-				assertObjectEquals("{foo:[{a:1,b:'foo'}]}", x);
-			}
-
-			@Override
-			public void setBean1d3dListMap(Map<String,List<ABean[][][]>> x) {
-				assertObjectEquals("{foo:[[[[{a:1,b:'foo'},null],null],null],null]}", x);
-			}
-
-			@Override
-			public void setBeanListMapIntegerKeys(Map<Integer,List<ABean>> x) {
-				assertObjectEquals("{'1':[{a:1,b:'foo'}]}", x);  // Note: JsonSerializer serializes key as string.
-				assertClass(Integer.class, x.keySet().iterator().next());
-			}
-
-			// Typed beans
-
-			@Override
-			public void setTypedBean(TypedBean x) {
-				assertObjectEquals("{_type:'TypedBeanImpl',a:1,b:'foo'}", x);
-				assertClass(TypedBeanImpl.class, x);
-			}
-
-			@Override
-			public void setTypedBean3dArray(TypedBean[][][] x) {
-				assertObjectEquals("[[[{_type:'TypedBeanImpl',a:1,b:'foo'},null],null],null]", x);
-				assertClass(TypedBeanImpl.class, x[0][0][0]);
-			}
-
-			@Override
-			public void setTypedBeanList(List<TypedBean> x) {
-				assertObjectEquals("[{_type:'TypedBeanImpl',a:1,b:'foo'}]", x);
-				assertClass(TypedBeanImpl.class, x.get(0));
-			}
-
-			@Override
-			public void setTypedBean1d3dList(List<TypedBean[][][]> x) {
-				assertObjectEquals("[[[[{_type:'TypedBeanImpl',a:1,b:'foo'},null],null],null],null]", x);
-				assertClass(TypedBeanImpl.class, x.get(0)[0][0][0]);
-			}
-
-			@Override
-			public void setTypedBeanMap(Map<String,TypedBean> x) {
-				assertObjectEquals("{foo:{_type:'TypedBeanImpl',a:1,b:'foo'}}", x);
-				assertClass(TypedBeanImpl.class, x.get("foo"));
-			}
-
-			@Override
-			public void setTypedBeanListMap(Map<String,List<TypedBean>> x) {
-				assertObjectEquals("{foo:[{_type:'TypedBeanImpl',a:1,b:'foo'}]}", x);
-				assertClass(TypedBeanImpl.class, x.get("foo").get(0));
-			}
-
-			@Override
-			public void setTypedBean1d3dListMap(Map<String,List<TypedBean[][][]>> x) {
-				assertObjectEquals("{foo:[[[[{_type:'TypedBeanImpl',a:1,b:'foo'},null],null],null],null]}", x);
-				assertClass(TypedBeanImpl.class, x.get("foo").get(0)[0][0][0]);
-			}
-
-			@Override
-			public void setTypedBeanListMapIntegerKeys(Map<Integer,List<TypedBean>> x) {
-				assertObjectEquals("{'1':[{_type:'TypedBeanImpl',a:1,b:'foo'}]}", x);  // Note: JsonSerializer serializes key as string.
-				assertClass(TypedBeanImpl.class, x.get(1).get(0));
-			}
-
-			// Swapped POJOs
-
-			@Override
-			public void setSwappedPojo(SwappedPojo x) {
-				assertTrue(x.wasUnswapped);
-			}
-
-			@Override
-			public void setSwappedPojo3dArray(SwappedPojo[][][] x) {
-				assertObjectEquals("[[['"+SWAP+"',null],null],null]", x);
-				assertTrue(x[0][0][0].wasUnswapped);
-			}
-
-			@Override
-			public void setSwappedPojoMap(Map<SwappedPojo,SwappedPojo> x) {
-				assertObjectEquals("{'"+SWAP+"':'"+SWAP+"'}", x);
-				Map.Entry<SwappedPojo,SwappedPojo> e = x.entrySet().iterator().next();
-				assertTrue(e.getKey().wasUnswapped);
-				assertTrue(e.getValue().wasUnswapped);
-			}
-
-			@Override
-			public void setSwappedPojo3dMap(Map<SwappedPojo,SwappedPojo[][][]> x) {
-				assertObjectEquals("{'"+SWAP+"':[[['"+SWAP+"',null],null],null]}", x);
-				Map.Entry<SwappedPojo,SwappedPojo[][][]> e = x.entrySet().iterator().next();
-				assertTrue(e.getKey().wasUnswapped);
-				assertTrue(e.getValue()[0][0][0].wasUnswapped);
-			}
-
-			// Implicit swapped POJOs
-
-			@Override
-			public void setImplicitSwappedPojo(ImplicitSwappedPojo x) {
-				assertTrue(x.wasUnswapped);
-			}
-
-			@Override
-			public void setImplicitSwappedPojo3dArray(ImplicitSwappedPojo[][][] x) {
-				assertObjectEquals("[[['"+SWAP+"',null],null],null]", x);
-				assertTrue(x[0][0][0].wasUnswapped);
-			}
-
-			@Override
-			public void setImplicitSwappedPojoMap(Map<ImplicitSwappedPojo,ImplicitSwappedPojo> x) {
-				assertObjectEquals("{'"+SWAP+"':'"+SWAP+"'}", x);
-				Map.Entry<ImplicitSwappedPojo,ImplicitSwappedPojo> e = x.entrySet().iterator().next();
-				assertTrue(e.getKey().wasUnswapped);
-				assertTrue(e.getValue().wasUnswapped);
-			}
-
-			@Override
-			public void setImplicitSwappedPojo3dMap(Map<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> x) {
-				assertObjectEquals("{'"+SWAP+"':[[['"+SWAP+"',null],null],null]}", x);
-				Map.Entry<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> e = x.entrySet().iterator().next();
-				assertTrue(e.getKey().wasUnswapped);
-				assertTrue(e.getValue()[0][0][0].wasUnswapped);
-			}
-
-			// Enums
-
-			@Override
-			public void setEnum(TestEnum x) {
-				assertEquals(TestEnum.TWO, x);
-			}
-
-			@Override
-			public void setEnum3d(TestEnum[][][] x) {
-				assertObjectEquals("[[['TWO',null],null],null]", x);
-			}
-
-			@Override
-			public void setEnumList(List<TestEnum> x) {
-				assertObjectEquals("['TWO',null]", x);
-				assertClass(TestEnum.class, x.get(0));
-			}
-
-			@Override
-			public void setEnum3dList(List<List<List<TestEnum>>> x) {
-				assertObjectEquals("[[['TWO',null],null,null]]", x);
-				assertClass(TestEnum.class, x.get(0).get(0).get(0));
-			}
-
-			@Override
-			public void setEnum1d3dList(List<TestEnum[][][]> x) {
-				assertObjectEquals("[[[['TWO',null],null],null],null]", x);
-				assertClass(TestEnum[][][].class, x.get(0));
-			}
-
-			@Override
-			public void setEnumMap(Map<TestEnum,TestEnum> x) {
-				assertObjectEquals("{ONE:'TWO'}", x);
-				Map.Entry<TestEnum,TestEnum> e = x.entrySet().iterator().next();
-				assertClass(TestEnum.class, e.getKey());
-				assertClass(TestEnum.class, e.getValue());
-			}
-
-			@Override
-			public void setEnum3dArrayMap(Map<TestEnum,TestEnum[][][]> x) {
-				assertObjectEquals("{ONE:[[['TWO',null],null],null]}", x);
-				Map.Entry<TestEnum,TestEnum[][][]> e = x.entrySet().iterator().next();
-				assertClass(TestEnum.class, e.getKey());
-				assertClass(TestEnum[][][].class, e.getValue());
-			}
-
-			@Override
-			public void setEnum1d3dListMap(Map<TestEnum,List<TestEnum[][][]>> x) {
-				assertObjectEquals("{ONE:[[[['TWO',null],null],null],null]}", x);
-				Map.Entry<TestEnum,List<TestEnum[][][]>> e = x.entrySet().iterator().next();
-				assertClass(TestEnum.class, e.getKey());
-				assertClass(TestEnum[][][].class, e.getValue().get(0));
-			}
-
-			//--------------------------------------------------------------------------------
-			// Test multi-parameters
-			//--------------------------------------------------------------------------------
-
-			@Override
-			public void setMultiParamsInts(int x1, int[][][] x2, int[][][] x2n, List<int[][][]> x3, List<int[][][]> x3n) {
-				assertObjectEquals("1", x1);
-				assertObjectEquals("[[[1,2],null],null]", x2);
-				assertNull(x2n);
-				assertObjectEquals("[[[[1,2],null],null],null]", x3);
-				assertClass(int[][][].class, x3.get(0));
-				assertNull(x3n);
-			}
-
-			@Override
-			public void setMultiParamsInteger(Integer x1, Integer x1n, Integer[][][] x2, Integer[][][] x2n, List<Integer[][][]> x3, List<Integer[][][]> x3n) {
-				assertObjectEquals("1", x1);
-				assertObjectEquals("[[[1,null],null],null]", x2);
-				assertNull(x2n);
-				assertObjectEquals("[[[[1,null],null],null],null]", x3);
-				assertClass(Integer[][][].class, x3.get(0));
-				assertNull(x3n);
-			}
-
-			@Override
-			public void setMultiParamsFloat(float x1, float[][][] x2, float[][][] x2n, List<float[][][]> x3, List<float[][][]> x3n) {
-				assertObjectEquals("1.0", x1);
-				assertObjectEquals("[[[1.0,2.0],null],null]", x2);
-				assertNull(x2n);
-				assertObjectEquals("[[[[1.0,2.0],null],null],null]", x3);
-				assertClass(float[][][].class, x3.get(0));
-				assertNull(x3n);
-			}
-
-			@Override
-			public void setMultiParamsFloatObject(Float x1, Float x1n, Float[][][] x2, Float[][][] x2n, List<Float[][][]> x3, List<Float[][][]> x3n) {
-				assertObjectEquals("1.0", x1);
-				assertObjectEquals("[[[1.0,null],null],null]", x2);
-				assertNull(x2n);
-				assertObjectEquals("[[[[1.0,null],null],null],null]", x3);
-				assertClass(Float[][][].class, x3.get(0));
-				assertNull(x3n);
-			}
-
-			@Override
-			public void setMultiParamsString(String x1, String[][][] x2, String[][][] x2n, List<String[][][]> x3, List<String[][][]> x3n) {
-				assertObjectEquals("'foo'", x1);
-				assertObjectEquals("[[['foo',null],null],null]", x2);
-				assertNull(x2n);
-				assertObjectEquals("[[[['foo',null],null],null],null]", x3);
-				assertClass(String[][][].class, x3.get(0));
-				assertNull(x3n);
-			}
-
-			@Override
-			public void setMultiParamsBean(ABean x1, ABean[][][] x2, ABean[][][] x2n, List<ABean[][][]> x3, List<ABean[][][]> x3n, Map<String,ABean> x4, Map<String,ABean> x4n, Map<String,List<ABean[][][]>> x5, Map<String,List<ABean[][][]>> x5n) {
-				assertObjectEquals("{a:1,b:'foo'}", x1);
-				assertObjectEquals("[[[{a:1,b:'foo'},null],null],null]", x2);
-				assertNull(x2n);
-				assertObjectEquals("[[[[{a:1,b:'foo'},null],null],null],null]", x3);
-				assertClass(ABean[][][].class, x3.get(0));
-				assertNull(x3n);
-				assertObjectEquals("{foo:{a:1,b:'foo'}}", x4);
-				assertNull(x4n);
-				assertObjectEquals("{foo:[[[[{a:1,b:'foo'},null],null],null],null]}", x5);
-				assertNull(x5n);
-			}
-
-			@Override
-			public void setMultiParamsSwappedPojo(SwappedPojo x1, SwappedPojo[][][] x2, SwappedPojo[][][] x2n, List<SwappedPojo[][][]> x3, List<SwappedPojo[][][]> x3n, Map<SwappedPojo,SwappedPojo> x4, Map<SwappedPojo,SwappedPojo> x4n, Map<SwappedPojo,List<SwappedPojo[][][]>> x5, Map<SwappedPojo,List<SwappedPojo[][][]>> x5n) {
-				assertObjectEquals("'"+SWAP+"'", x1);
-				assertObjectEquals("[[['"+SWAP+"',null],null],null]", x2);
-				assertNull(x2n);
-				assertObjectEquals("[[[['"+SWAP+"',null],null],null],null]", x3);
-				assertClass(SwappedPojo[][][].class, x3.get(0));
-				assertNull(x3n);
-				assertObjectEquals("{'"+SWAP+"':'"+SWAP+"'}", x4);
-				assertNull(x4n);
-				assertObjectEquals("{'"+SWAP+"':[[[['"+SWAP+"',null],null],null],null]}", x5);
-				assertNull(x5n);
-			}
-
-			@Override
-			public void setMultiParamsImplicitSwappedPojo(ImplicitSwappedPojo x1, ImplicitSwappedPojo[][][] x2, ImplicitSwappedPojo[][][] x2n, List<ImplicitSwappedPojo[][][]> x3, List<ImplicitSwappedPojo[][][]> x3n, Map<ImplicitSwappedPojo,ImplicitSwappedPojo> x4, Map<ImplicitSwappedPojo,ImplicitSwappedPojo> x4n, Map<ImplicitSwappedPojo,List<ImplicitSwappedPojo[][][]>> x5, Map<ImplicitSwappedPojo,List<ImplicitSwappedPojo[][][]>> x5n) {
-				assertObjectEquals("'"+SWAP+"'", x1);
-				assertObjectEquals("[[['"+SWAP+"',null],null],null]", x2);
-				assertNull(x2n);
-				assertObjectEquals("[[[['"+SWAP+"',null],null],null],null]", x3);
-				assertClass(ImplicitSwappedPojo[][][].class, x3.get(0));
-				assertNull(x3n);
-				assertObjectEquals("{'"+SWAP+"':'"+SWAP+"'}", x4);
-				assertNull(x4n);
-				assertObjectEquals("{'"+SWAP+"':[[[['"+SWAP+"',null],null],null],null]}", x5);
-				assertNull(x5n);
-			}
-
-			@Override
-			public void setMultiParamsEnum(TestEnum x1, TestEnum[][][] x2, TestEnum[][][] x2n, List<TestEnum[][][]> x3, List<TestEnum[][][]> x3n, Map<TestEnum,TestEnum> x4, Map<TestEnum,TestEnum> x4n, Map<TestEnum,List<TestEnum[][][]>> x5, Map<TestEnum,List<TestEnum[][][]>> x5n) {
-				assertObjectEquals("'TWO'", x1);
-				assertObjectEquals("[[['TWO',null],null],null]", x2);
-				assertNull(x2n);
-				assertObjectEquals("[[[['TWO',null],null],null],null]", x3);
-				assertClass(TestEnum[][][].class, x3.get(0));
-				assertNull(x3n);
-				assertObjectEquals("{ONE:'TWO'}", x4);
-				assertNull(x4n);
-				assertObjectEquals("{ONE:[[[['TWO',null],null],null],null]}", x5);
-				assertNull(x5n);
-			}
-		};
-	}
-}
diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/_TestSuite.java b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/_TestSuite.java
index 5c36bb0..e1da651 100644
--- a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/_TestSuite.java
+++ b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/_TestSuite.java
@@ -30,6 +30,7 @@ import org.junit.runners.Suite.*;
 	ConfigTest.class,
 	FormDataTest.class,
 	InterfaceProxyTest.class,
+	MockRestTest.class,
 	RequestBeanProxyTest.class,
 	RestClientTest.class,
 	ThirdPartyProxyTest.class,
diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/InterfaceProxyTest.java b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/InterfaceProxyTest.java
index 8de356d..96123f0 100644
--- a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/InterfaceProxyTest.java
+++ b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/InterfaceProxyTest.java
@@ -12,18 +12,26 @@
 // ***************************************************************************************************************************
 package org.apache.juneau.rest.test.client;
 
+import static java.util.Arrays.*;
+import static org.apache.juneau.http.HttpMethodName.*;
 import static org.apache.juneau.rest.testutils.Constants.*;
 import static org.apache.juneau.rest.testutils.TestUtils.*;
 import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import java.util.*;
 
 import org.apache.juneau.html.*;
 import org.apache.juneau.jena.*;
 import org.apache.juneau.json.*;
+import org.apache.juneau.microservice.*;
 import org.apache.juneau.msgpack.*;
 import org.apache.juneau.parser.*;
-import org.apache.juneau.rest.test.*;
+import org.apache.juneau.remoteable.*;
+import org.apache.juneau.rest.*;
+import org.apache.juneau.rest.annotation.*;
+import org.apache.juneau.rest.client.*;
+import org.apache.juneau.rest.mock.*;
 import org.apache.juneau.rest.testutils.*;
 import org.apache.juneau.serializer.*;
 import org.apache.juneau.uon.*;
@@ -36,8 +44,8 @@ import org.junit.runners.*;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @RunWith(Parameterized.class)
-public class InterfaceProxyTest extends RestTestcase {
-
+public class InterfaceProxyTest {
+	
 	@Parameterized.Parameters
 	public static Collection<Object[]> getParameters() {
 		return Arrays.asList(new Object[][] {
@@ -52,15 +60,902 @@ public class InterfaceProxyTest extends RestTestcase {
 		});
 	}
 
-	private InterfaceProxy proxy;
+	@Remoteable
+	public interface InterfaceProxy {
+
+		public static final String SWAP = "swap-~!@#$%^&*()_+`-={}[]|:;\"<,>.?/";
+
+		//--------------------------------------------------------------------------------
+		// Test return types.
+		//--------------------------------------------------------------------------------
+
+		// Various primitives
+		void returnVoid();
+		int returnInt();
+		Integer returnInteger();
+		boolean returnBoolean();
+		float returnFloat();
+		Float returnFloatObject();
+		String returnString();
+		String returnNullString();
+		int[][][] returnInt3dArray();
+		Integer[][][] returnInteger3dArray();
+		String[][][] returnString3dArray();
+		List<Integer> returnIntegerList();
+		List<List<List<Integer>>> returnInteger3dList();
+		List<Integer[][][]> returnInteger1d3dList();
+		List<int[][][]> returnInt1d3dList();
+		List<String> returnStringList();
+
+		// Beans
+		ABean returnBean();
+		ABean[][][] returnBean3dArray();
+		List<ABean> returnBeanList();
+		List<ABean[][][]> returnBean1d3dList();
+		Map<String,ABean> returnBeanMap();
+		Map<String,List<ABean>> returnBeanListMap();
+		Map<String,List<ABean[][][]>> returnBean1d3dListMap();
+		Map<Integer,List<ABean>> returnBeanListMapIntegerKeys();
+
+		// Typed beans
+		TypedBean returnTypedBean();
+		TypedBean[][][] returnTypedBean3dArray();
+		List<TypedBean> returnTypedBeanList();
+		List<TypedBean[][][]> returnTypedBean1d3dList();
+		Map<String,TypedBean> returnTypedBeanMap();
+		Map<String,List<TypedBean>> returnTypedBeanListMap();
+		Map<String,List<TypedBean[][][]>> returnTypedBean1d3dListMap();
+		Map<Integer,List<TypedBean>> returnTypedBeanListMapIntegerKeys();
+
+		// Swapped POJOs
+		SwappedPojo returnSwappedPojo();
+		SwappedPojo[][][] returnSwappedPojo3dArray();
+		Map<SwappedPojo,SwappedPojo> returnSwappedPojoMap();
+		Map<SwappedPojo,SwappedPojo[][][]> returnSwappedPojo3dMap();
+
+		// Implicit swapped POJOs
+		ImplicitSwappedPojo returnImplicitSwappedPojo();
+		ImplicitSwappedPojo[][][] returnImplicitSwappedPojo3dArray();
+		Map<ImplicitSwappedPojo,ImplicitSwappedPojo> returnImplicitSwappedPojoMap();
+		Map<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> returnImplicitSwappedPojo3dMap();
+
+		// Enums
+		TestEnum returnEnum();
+		TestEnum[][][] returnEnum3d();
+		List<TestEnum> returnEnumList();
+		List<List<List<TestEnum>>> returnEnum3dList();
+		List<TestEnum[][][]> returnEnum1d3dList();
+		Map<TestEnum,TestEnum> returnEnumMap();
+		Map<TestEnum,TestEnum[][][]> returnEnum3dArrayMap();
+		Map<TestEnum,List<TestEnum[][][]>> returnEnum1d3dListMap();
+
+		//--------------------------------------------------------------------------------
+		// Test server-side exception serialization.
+		//--------------------------------------------------------------------------------
+
+		void throwException1() throws InterfaceProxyException1;
+		void throwException2() throws InterfaceProxyException2;
+
+		//--------------------------------------------------------------------------------
+		// Test parameters
+		//--------------------------------------------------------------------------------
+
+		// Various primitives
+		void setNothing();
+		void setInt(int x);
+		void setInteger(Integer x);
+		void setBoolean(boolean x);
+		void setFloat(float x);
+		void setFloatObject(Float x);
+		void setString(String x);
+		void setNullString(String x);
+		void setInt3dArray(int[][][] x);
+		void setInteger3dArray(Integer[][][] x);
+		void setString3dArray(String[][][] x);
+		void setIntegerList(List<Integer> x);
+		void setInteger3dList(List<List<List<Integer>>> x);
+		void setInteger1d3dList(List<Integer[][][]> x);
+		void setInt1d3dList(List<int[][][]> x);
+		void setStringList(List<String> x);
+
+		// Beans
+		void setBean(ABean x);
+		void setBean3dArray(ABean[][][] x);
+		void setBeanList(List<ABean> x);
+		void setBean1d3dList(List<ABean[][][]> x);
+		void setBeanMap(Map<String,ABean> x);
+		void setBeanListMap(Map<String,List<ABean>> x);
+		void setBean1d3dListMap(Map<String,List<ABean[][][]>> x);
+		void setBeanListMapIntegerKeys(Map<Integer,List<ABean>> x);
+
+		// Typed beans
+		void setTypedBean(TypedBean x);
+		void setTypedBean3dArray(TypedBean[][][] x);
+		void setTypedBeanList(List<TypedBean> x);
+		void setTypedBean1d3dList(List<TypedBean[][][]> x);
+		void setTypedBeanMap(Map<String,TypedBean> x);
+		void setTypedBeanListMap(Map<String,List<TypedBean>> x);
+		void setTypedBean1d3dListMap(Map<String,List<TypedBean[][][]>> x);
+		void setTypedBeanListMapIntegerKeys(Map<Integer,List<TypedBean>> x);
+
+		// Swapped POJOs
+		void setSwappedPojo(SwappedPojo x);
+		void setSwappedPojo3dArray(SwappedPojo[][][] x);
+		void setSwappedPojoMap(Map<SwappedPojo,SwappedPojo> x);
+		void setSwappedPojo3dMap(Map<SwappedPojo,SwappedPojo[][][]> x);
+
+		// Implicit swapped POJOs
+		void setImplicitSwappedPojo(ImplicitSwappedPojo x);
+		void setImplicitSwappedPojo3dArray(ImplicitSwappedPojo[][][] x);
+		void setImplicitSwappedPojoMap(Map<ImplicitSwappedPojo,ImplicitSwappedPojo> x);
+		void setImplicitSwappedPojo3dMap(Map<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> x);
+
+		// Enums
+		void setEnum(TestEnum x);
+		void setEnum3d(TestEnum[][][] x);
+		void setEnumList(List<TestEnum> x);
+		void setEnum3dList(List<List<List<TestEnum>>> x);
+		void setEnum1d3dList(List<TestEnum[][][]> x);
+		void setEnumMap(Map<TestEnum,TestEnum> x);
+		void setEnum3dArrayMap(Map<TestEnum,TestEnum[][][]> x);
+		void setEnum1d3dListMap(Map<TestEnum,List<TestEnum[][][]>> x);
+
+		//--------------------------------------------------------------------------------
+		// Test multi-parameters
+		//--------------------------------------------------------------------------------
+
+		void setMultiParamsInts(int x1, int[][][] x2, int[][][] x2n, List<int[][][]> x3, List<int[][][]> x3n);
+		void setMultiParamsInteger(Integer x1, Integer x1n, Integer[][][] x2, Integer[][][] x2n, List<Integer[][][]> x3, List<Integer[][][]> x3n);
+		void setMultiParamsFloat(float x1, float[][][] x2, float[][][] x2n, List<float[][][]> x3, List<float[][][]> x3n);
+		void setMultiParamsFloatObject(Float x1, Float x1n, Float[][][] x2, Float[][][] x2n, List<Float[][][]> x3, List<Float[][][]> x3n);
+		void setMultiParamsString(String x1, String[][][] x2, String[][][] x2n, List<String[][][]> x3, List<String[][][]> x3n);
+		void setMultiParamsBean(ABean x1, ABean[][][] x2, ABean[][][] x2n, List<ABean[][][]> x3, List<ABean[][][]> x3n, Map<String,ABean> x4, Map<String,ABean> x4n, Map<String,List<ABean[][][]>> x5, Map<String,List<ABean[][][]>> x5n);
+		void setMultiParamsSwappedPojo(SwappedPojo x1, SwappedPojo[][][] x2, SwappedPojo[][][] x2n, List<SwappedPojo[][][]> x3, List<SwappedPojo[][][]> x3n, Map<SwappedPojo,SwappedPojo> x4, Map<SwappedPojo,SwappedPojo> x4n, Map<SwappedPojo,List<SwappedPojo[][][]>> x5, Map<SwappedPojo,List<SwappedPojo[][][]>> x5n);
+		void setMultiParamsImplicitSwappedPojo(ImplicitSwappedPojo x1, ImplicitSwappedPojo[][][] x2, ImplicitSwappedPojo[][][] x2n, List<ImplicitSwappedPojo[][][]> x3, List<ImplicitSwappedPojo[][][]> x3n, Map<ImplicitSwappedPojo,ImplicitSwappedPojo> x4, Map<ImplicitSwappedPojo,ImplicitSwappedPojo> x4n, Map<ImplicitSwappedPojo,List<ImplicitSwappedPojo[][][]>> x5, Map<ImplicitSwappedPojo,List<ImplicitSwappedPojo[][][]>> x5n);
+		void setMultiParamsEnum(TestEnum x1, TestEnum[][][] x2, TestEnum[][][] x2n, List<TestEnum[][][]> x3, List<TestEnum[][][]> x3n, Map<TestEnum,TestEnum> x4, Map<TestEnum,TestEnum> x4n, Map<TestEnum,List<TestEnum[][][]>> x5, Map<TestEnum,List<TestEnum[][][]>> x5n);
+
+		//--------------------------------------------------------------------------------
+		// Helper classes
+		//--------------------------------------------------------------------------------
+
+		@SuppressWarnings("serial")
+		public static class InterfaceProxyException1 extends Throwable {
+			public InterfaceProxyException1(String msg) {
+				super(msg);
+			}
+		}
 
+		@SuppressWarnings("serial")
+		public static class InterfaceProxyException2 extends Throwable {
+		}
+	}
+	
+	@RestResource(
+		flags={Serializer.SERIALIZER_addRootType, Serializer.SERIALIZER_addBeanTypes},
+		logger=NoOpRestLogger.class
+	)
+	public static class InterfaceProxyResource extends BasicRestServletJena {
+		private static final long serialVersionUID = 1L;
+
+		//====================================================================================================
+		// Test that Q-values are being resolved correctly.
+		//====================================================================================================
+		@RestMethod(name=PROXY, path="/proxy/*")
+		public InterfaceProxy getProxy() {
+			return new InterfaceProxy() {
+
+				//--------------------------------------------------------------------------------
+				// Test return types.
+				//--------------------------------------------------------------------------------
+
+				// Various primitives
+
+				@Override
+				public void returnVoid() {
+				}
+
+				@Override
+				public Integer returnInteger() {
+					return 1;
+				}
+
+				@Override
+				public int returnInt() {
+					return 1;
+				}
+
+				@Override
+				public boolean returnBoolean() {
+					return true;
+				}
+
+				@Override
+				public float returnFloat() {
+					return 1f;
+				}
+
+				@Override
+				public Float returnFloatObject() {
+					return 1f;
+				}
+
+				@Override
+				public String returnString() {
+					return "foobar";
+				}
+
+				@Override
+				public String returnNullString() {
+					return null;
+				}
+
+				@Override
+				public int[][][] returnInt3dArray() {
+					return new int[][][]{{{1,2},null},null};
+				}
+
+				@Override
+				public Integer[][][] returnInteger3dArray() {
+					return new Integer[][][]{{{1,null},null},null};
+				}
+
+				@Override
+				public String[][][] returnString3dArray() {
+					return new String[][][]{{{"foo","bar",null},null},null};
+				}
+
+				@Override
+				public List<Integer> returnIntegerList() {
+					return asList(new Integer[]{1,null});
+				}
+
+				@Override
+				public List<List<List<Integer>>> returnInteger3dList() {
+					return new AList<List<List<Integer>>>()
+					.append(
+						new AList<List<Integer>>()
+						.append(
+							new AList<Integer>().append(1).append(null)
+						)
+						.append(null)
+					)
+					.append(null);
+				}
+
+				@Override
+				public List<Integer[][][]> returnInteger1d3dList() {
+					return new AList<Integer[][][]>().append(new Integer[][][]{{{1,null},null},null}).append(null);
+				}
+
+				@Override
+				public List<int[][][]> returnInt1d3dList() {
+					return new AList<int[][][]>().append(new int[][][]{{{1,2},null},null}).append(null);
+				}
+
+				@Override
+				public List<String> returnStringList() {
+					return asList(new String[]{"foo","bar",null});
+				}
+
+				// Beans
+
+				@Override
+				public ABean returnBean() {
+					return new ABean().init();
+				}
+
+				@Override
+				public ABean[][][] returnBean3dArray() {
+					return new ABean[][][]{{{new ABean().init(),null},null},null};
+				}
+
+				@Override
+				public List<ABean> returnBeanList() {
+					return asList(new ABean().init());
+				}
+
+				@Override
+				public List<ABean[][][]> returnBean1d3dList() {
+					return new AList<ABean[][][]>().append(new ABean[][][]{{{new ABean().init(),null},null},null}).append(null);
+				}
+
+				@Override
+				public Map<String,ABean> returnBeanMap() {
+					return new AMap<String,ABean>().append("foo",new ABean().init());
+				}
+
+				@Override
+				public Map<String,List<ABean>> returnBeanListMap() {
+					return new AMap<String,List<ABean>>().append("foo",asList(new ABean().init()));
+				}
+
+				@Override
+				public Map<String,List<ABean[][][]>> returnBean1d3dListMap() {
+					return new AMap<String,List<ABean[][][]>>().append("foo", new AList<ABean[][][]>().append(new ABean[][][]{{{new ABean().init(),null},null},null}).append(null));
+				}
+
+				@Override
+				public Map<Integer,List<ABean>> returnBeanListMapIntegerKeys() {
+					return new AMap<Integer,List<ABean>>().append(1,asList(new ABean().init()));
+				}
+
+				// Typed beans
+
+				@Override
+				public TypedBean returnTypedBean() {
+					return new TypedBeanImpl().init();
+				}
+
+				@Override
+				public TypedBean[][][] returnTypedBean3dArray() {
+					return new TypedBean[][][]{{{new TypedBeanImpl().init(),null},null},null};
+				}
+
+				@Override
+				public List<TypedBean> returnTypedBeanList() {
+					return asList((TypedBean)new TypedBeanImpl().init());
+				}
+
+				@Override
+				public List<TypedBean[][][]> returnTypedBean1d3dList() {
+					return new AList<TypedBean[][][]>().append(new TypedBean[][][]{{{new TypedBeanImpl().init(),null},null},null}).append(null);
+				}
+
+				@Override
+				public Map<String,TypedBean> returnTypedBeanMap() {
+					return new AMap<String,TypedBean>().append("foo",new TypedBeanImpl().init());
+				}
+
+				@Override
+				public Map<String,List<TypedBean>> returnTypedBeanListMap() {
+					return new AMap<String,List<TypedBean>>().append("foo",asList((TypedBean)new TypedBeanImpl().init()));
+				}
+
+				@Override
+				public Map<String,List<TypedBean[][][]>> returnTypedBean1d3dListMap() {
+					return new AMap<String,List<TypedBean[][][]>>().append("foo", new AList<TypedBean[][][]>().append(new TypedBean[][][]{{{new TypedBeanImpl().init(),null},null},null}).append(null));
+				}
+
+				@Override
+				public Map<Integer,List<TypedBean>> returnTypedBeanListMapIntegerKeys() {
+					return new AMap<Integer,List<TypedBean>>().append(1,asList((TypedBean)new TypedBeanImpl().init()));
+				}
+
+				// Swapped POJOs
+
+				@Override
+				public SwappedPojo returnSwappedPojo() {
+					return new SwappedPojo();
+				}
+
+				@Override
+				public SwappedPojo[][][] returnSwappedPojo3dArray() {
+					return new SwappedPojo[][][]{{{new SwappedPojo(),null},null},null};
+				}
+
+				@Override
+				public Map<SwappedPojo,SwappedPojo> returnSwappedPojoMap() {
+					return new AMap<SwappedPojo,SwappedPojo>().append(new SwappedPojo(), new SwappedPojo());
+				}
+
+				@Override
+				public Map<SwappedPojo,SwappedPojo[][][]> returnSwappedPojo3dMap() {
+					return new AMap<SwappedPojo,SwappedPojo[][][]>().append(new SwappedPojo(), new SwappedPojo[][][]{{{new SwappedPojo(),null},null},null});
+				}
+
+				// Implicit swapped POJOs
+
+				@Override
+				public ImplicitSwappedPojo returnImplicitSwappedPojo() {
+					return new ImplicitSwappedPojo();
+				}
+
+				@Override
+				public ImplicitSwappedPojo[][][] returnImplicitSwappedPojo3dArray() {
+					return new ImplicitSwappedPojo[][][]{{{new ImplicitSwappedPojo(),null},null},null};
+				}
+
+				@Override
+				public Map<ImplicitSwappedPojo,ImplicitSwappedPojo> returnImplicitSwappedPojoMap() {
+					return new AMap<ImplicitSwappedPojo,ImplicitSwappedPojo>().append(new ImplicitSwappedPojo(), new ImplicitSwappedPojo());
+				}
+
+				@Override
+				public Map<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> returnImplicitSwappedPojo3dMap() {
+					return new AMap<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]>().append(new ImplicitSwappedPojo(), new ImplicitSwappedPojo[][][]{{{new ImplicitSwappedPojo(),null},null},null});
+				}
+
+				// Enums
+
+				@Override
+				public TestEnum returnEnum() {
+					return TestEnum.TWO;
+				}
+
+				@Override
+				public TestEnum[][][] returnEnum3d() {
+					return new TestEnum[][][]{{{TestEnum.TWO,null},null},null};
+				}
+
+				@Override
+				public List<TestEnum> returnEnumList() {
+					return new AList<TestEnum>().append(TestEnum.TWO).append(null);
+				}
+
+				@Override
+				public List<List<List<TestEnum>>> returnEnum3dList() {
+					return new AList<List<List<TestEnum>>>()
+					.append(
+						new AList<List<TestEnum>>()
+						.append(
+							new AList<TestEnum>().append(TestEnum.TWO).append(null)
+						)
+						.append(null)
+					.append(null)
+					);
+				}
+
+				@Override
+				public List<TestEnum[][][]> returnEnum1d3dList() {
+					return new AList<TestEnum[][][]>().append(new TestEnum[][][]{{{TestEnum.TWO,null},null},null}).append(null);
+				}
+
+				@Override
+				public Map<TestEnum,TestEnum> returnEnumMap() {
+					return new AMap<TestEnum,TestEnum>().append(TestEnum.ONE,TestEnum.TWO);
+				}
+
+				@Override
+				public Map<TestEnum,TestEnum[][][]> returnEnum3dArrayMap() {
+					return new AMap<TestEnum,TestEnum[][][]>().append(TestEnum.ONE, new TestEnum[][][]{{{TestEnum.TWO,null},null},null});
+				}
+
+				@Override
+				public Map<TestEnum,List<TestEnum[][][]>> returnEnum1d3dListMap() {
+					return new AMap<TestEnum,List<TestEnum[][][]>>().append(TestEnum.ONE, new AList<TestEnum[][][]>().append(new TestEnum[][][]{{{TestEnum.TWO,null},null},null}).append(null));
+				}
+
+				//--------------------------------------------------------------------------------
+				// Test server-side exception serialization.
+				//--------------------------------------------------------------------------------
+
+				@Override
+				public void throwException1() throws InterfaceProxy.InterfaceProxyException1 {
+					throw new InterfaceProxy.InterfaceProxyException1("foo");
+				}
+
+				@Override
+				public void throwException2() throws InterfaceProxy.InterfaceProxyException2 {
+					throw new InterfaceProxy.InterfaceProxyException2();
+				}
+
+				//--------------------------------------------------------------------------------
+				// Test parameters
+				//--------------------------------------------------------------------------------
+
+				// Various primitives
+
+				@Override
+				public void setNothing() {
+				}
+
+				@Override
+				public void setInt(int x) {
+					assertEquals(1, x);
+				}
+
+				@Override
+				public void setInteger(Integer x) {
+					assertEquals((Integer)1, x);
+				}
+
+				@Override
+				public void setBoolean(boolean x) {
+					assertTrue(x);
+				}
+
+				@Override
+				public void setFloat(float x) {
+					assertTrue(1f == x);
+				}
+
+				@Override
+				public void setFloatObject(Float x) {
+					assertTrue(1f == x);
+				}
+
+				@Override
+				public void setString(String x) {
+					assertEquals("foo", x);
+				}
+
+				@Override
+				public void setNullString(String x) {
+					assertNull(x);
+				}
+
+				@Override
+				public void setInt3dArray(int[][][] x) {
+					assertObjectEquals("[[[1,2],null],null]", x);
+				}
+
+				@Override
+				public void setInteger3dArray(Integer[][][] x) {
+					assertObjectEquals("[[[1,null],null],null]", x);
+				}
+
+				@Override
+				public void setString3dArray(String[][][] x) {
+					assertObjectEquals("[[['foo',null],null],null]", x);
+				}
+
+				@Override
+				public void setIntegerList(List<Integer> x) {
+					assertObjectEquals("[1,null]", x);
+					assertClass(Integer.class, x.get(0));
+				}
+
+				@Override
+				public void setInteger3dList(List<List<List<Integer>>> x) {
+					assertObjectEquals("[[[1,null],null],null]", x);
+					assertClass(Integer.class, x.get(0).get(0).get(0));
+				}
+
+				@Override
+				public void setInteger1d3dList(List<Integer[][][]> x) {
+					assertObjectEquals("[[[[1,null],null],null],null]", x);
+					assertClass(Integer[][][].class, x.get(0));
+					assertClass(Integer.class, x.get(0)[0][0][0]);
+				}
+
+				@Override
+				public void setInt1d3dList(List<int[][][]> x) {
+					assertObjectEquals("[[[[1,2],null],null],null]", x);
+					assertClass(int[][][].class, x.get(0));
+				}
+
+				@Override
+				public void setStringList(List<String> x) {
+					assertObjectEquals("['foo','bar',null]", x);
+				}
+
+				// Beans
+
+				@Override
+				public void setBean(ABean x) {
+					assertObjectEquals("{a:1,b:'foo'}", x);
+				}
+
+				@Override
+				public void setBean3dArray(ABean[][][] x) {
+					assertObjectEquals("[[[{a:1,b:'foo'},null],null],null]", x);
+				}
+
+				@Override
+				public void setBeanList(List<ABean> x) {
+					assertObjectEquals("[{a:1,b:'foo'}]", x);
+				}
+
+				@Override
+				public void setBean1d3dList(List<ABean[][][]> x) {
+					assertObjectEquals("[[[[{a:1,b:'foo'},null],null],null],null]", x);
+				}
+
+				@Override
+				public void setBeanMap(Map<String,ABean> x) {
+					assertObjectEquals("{foo:{a:1,b:'foo'}}", x);
+				}
+
+				@Override
+				public void setBeanListMap(Map<String,List<ABean>> x) {
+					assertObjectEquals("{foo:[{a:1,b:'foo'}]}", x);
+				}
+
+				@Override
+				public void setBean1d3dListMap(Map<String,List<ABean[][][]>> x) {
+					assertObjectEquals("{foo:[[[[{a:1,b:'foo'},null],null],null],null]}", x);
+				}
+
+				@Override
+				public void setBeanListMapIntegerKeys(Map<Integer,List<ABean>> x) {
+					assertObjectEquals("{'1':[{a:1,b:'foo'}]}", x);  // Note: JsonSerializer serializes key as string.
+					assertClass(Integer.class, x.keySet().iterator().next());
+				}
+
+				// Typed beans
+
+				@Override
+				public void setTypedBean(TypedBean x) {
+					assertObjectEquals("{_type:'TypedBeanImpl',a:1,b:'foo'}", x);
+					assertClass(TypedBeanImpl.class, x);
+				}
+
+				@Override
+				public void setTypedBean3dArray(TypedBean[][][] x) {
+					assertObjectEquals("[[[{_type:'TypedBeanImpl',a:1,b:'foo'},null],null],null]", x);
+					assertClass(TypedBeanImpl.class, x[0][0][0]);
+				}
+
+				@Override
+				public void setTypedBeanList(List<TypedBean> x) {
+					assertObjectEquals("[{_type:'TypedBeanImpl',a:1,b:'foo'}]", x);
+					assertClass(TypedBeanImpl.class, x.get(0));
+				}
+
+				@Override
+				public void setTypedBean1d3dList(List<TypedBean[][][]> x) {
+					assertObjectEquals("[[[[{_type:'TypedBeanImpl',a:1,b:'foo'},null],null],null],null]", x);
+					assertClass(TypedBeanImpl.class, x.get(0)[0][0][0]);
+				}
+
+				@Override
+				public void setTypedBeanMap(Map<String,TypedBean> x) {
+					assertObjectEquals("{foo:{_type:'TypedBeanImpl',a:1,b:'foo'}}", x);
+					assertClass(TypedBeanImpl.class, x.get("foo"));
+				}
+
+				@Override
+				public void setTypedBeanListMap(Map<String,List<TypedBean>> x) {
+					assertObjectEquals("{foo:[{_type:'TypedBeanImpl',a:1,b:'foo'}]}", x);
+					assertClass(TypedBeanImpl.class, x.get("foo").get(0));
+				}
+
+				@Override
+				public void setTypedBean1d3dListMap(Map<String,List<TypedBean[][][]>> x) {
+					assertObjectEquals("{foo:[[[[{_type:'TypedBeanImpl',a:1,b:'foo'},null],null],null],null]}", x);
+					assertClass(TypedBeanImpl.class, x.get("foo").get(0)[0][0][0]);
+				}
+
+				@Override
+				public void setTypedBeanListMapIntegerKeys(Map<Integer,List<TypedBean>> x) {
+					assertObjectEquals("{'1':[{_type:'TypedBeanImpl',a:1,b:'foo'}]}", x);  // Note: JsonSerializer serializes key as string.
+					assertClass(TypedBeanImpl.class, x.get(1).get(0));
+				}
+
+				// Swapped POJOs
+
+				@Override
+				public void setSwappedPojo(SwappedPojo x) {
+					assertTrue(x.wasUnswapped);
+				}
+
+				@Override
+				public void setSwappedPojo3dArray(SwappedPojo[][][] x) {
+					assertObjectEquals("[[['"+SWAP+"',null],null],null]", x);
+					assertTrue(x[0][0][0].wasUnswapped);
+				}
+
+				@Override
+				public void setSwappedPojoMap(Map<SwappedPojo,SwappedPojo> x) {
+					assertObjectEquals("{'"+SWAP+"':'"+SWAP+"'}", x);
+					Map.Entry<SwappedPojo,SwappedPojo> e = x.entrySet().iterator().next();
+					assertTrue(e.getKey().wasUnswapped);
+					assertTrue(e.getValue().wasUnswapped);
+				}
+
+				@Override
+				public void setSwappedPojo3dMap(Map<SwappedPojo,SwappedPojo[][][]> x) {
+					assertObjectEquals("{'"+SWAP+"':[[['"+SWAP+"',null],null],null]}", x);
+					Map.Entry<SwappedPojo,SwappedPojo[][][]> e = x.entrySet().iterator().next();
+					assertTrue(e.getKey().wasUnswapped);
+					assertTrue(e.getValue()[0][0][0].wasUnswapped);
+				}
+
+				// Implicit swapped POJOs
+
+				@Override
+				public void setImplicitSwappedPojo(ImplicitSwappedPojo x) {
+					assertTrue(x.wasUnswapped);
+				}
+
+				@Override
+				public void setImplicitSwappedPojo3dArray(ImplicitSwappedPojo[][][] x) {
+					assertObjectEquals("[[['"+SWAP+"',null],null],null]", x);
+					assertTrue(x[0][0][0].wasUnswapped);
+				}
+
+				@Override
+				public void setImplicitSwappedPojoMap(Map<ImplicitSwappedPojo,ImplicitSwappedPojo> x) {
+					assertObjectEquals("{'"+SWAP+"':'"+SWAP+"'}", x);
+					Map.Entry<ImplicitSwappedPojo,ImplicitSwappedPojo> e = x.entrySet().iterator().next();
+					assertTrue(e.getKey().wasUnswapped);
+					assertTrue(e.getValue().wasUnswapped);
+				}
+
+				@Override
+				public void setImplicitSwappedPojo3dMap(Map<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> x) {
+					assertObjectEquals("{'"+SWAP+"':[[['"+SWAP+"',null],null],null]}", x);
+					Map.Entry<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> e = x.entrySet().iterator().next();
+					assertTrue(e.getKey().wasUnswapped);
+					assertTrue(e.getValue()[0][0][0].wasUnswapped);
+				}
+
+				// Enums
+
+				@Override
+				public void setEnum(TestEnum x) {
+					assertEquals(TestEnum.TWO, x);
+				}
+
+				@Override
+				public void setEnum3d(TestEnum[][][] x) {
+					assertObjectEquals("[[['TWO',null],null],null]", x);
+				}
+
+				@Override
+				public void setEnumList(List<TestEnum> x) {
+					assertObjectEquals("['TWO',null]", x);
+					assertClass(TestEnum.class, x.get(0));
+				}
+
+				@Override
+				public void setEnum3dList(List<List<List<TestEnum>>> x) {
+					assertObjectEquals("[[['TWO',null],null,null]]", x);
+					assertClass(TestEnum.class, x.get(0).get(0).get(0));
+				}
+
+				@Override
+				public void setEnum1d3dList(List<TestEnum[][][]> x) {
+					assertObjectEquals("[[[['TWO',null],null],null],null]", x);
+					assertClass(TestEnum[][][].class, x.get(0));
+				}
+
+				@Override
+				public void setEnumMap(Map<TestEnum,TestEnum> x) {
+					assertObjectEquals("{ONE:'TWO'}", x);
+					Map.Entry<TestEnum,TestEnum> e = x.entrySet().iterator().next();
+					assertClass(TestEnum.class, e.getKey());
+					assertClass(TestEnum.class, e.getValue());
+				}
+
+				@Override
+				public void setEnum3dArrayMap(Map<TestEnum,TestEnum[][][]> x) {
+					assertObjectEquals("{ONE:[[['TWO',null],null],null]}", x);
+					Map.Entry<TestEnum,TestEnum[][][]> e = x.entrySet().iterator().next();
+					assertClass(TestEnum.class, e.getKey());
+					assertClass(TestEnum[][][].class, e.getValue());
+				}
+
+				@Override
+				public void setEnum1d3dListMap(Map<TestEnum,List<TestEnum[][][]>> x) {
+					assertObjectEquals("{ONE:[[[['TWO',null],null],null],null]}", x);
+					Map.Entry<TestEnum,List<TestEnum[][][]>> e = x.entrySet().iterator().next();
+					assertClass(TestEnum.class, e.getKey());
+					assertClass(TestEnum[][][].class, e.getValue().get(0));
+				}
+
+				//--------------------------------------------------------------------------------
+				// Test multi-parameters
+				//--------------------------------------------------------------------------------
+
+				@Override
+				public void setMultiParamsInts(int x1, int[][][] x2, int[][][] x2n, List<int[][][]> x3, List<int[][][]> x3n) {
+					assertObjectEquals("1", x1);
+					assertObjectEquals("[[[1,2],null],null]", x2);
+					assertNull(x2n);
+					assertObjectEquals("[[[[1,2],null],null],null]", x3);
+					assertClass(int[][][].class, x3.get(0));
+					assertNull(x3n);
+				}
+
+				@Override
+				public void setMultiParamsInteger(Integer x1, Integer x1n, Integer[][][] x2, Integer[][][] x2n, List<Integer[][][]> x3, List<Integer[][][]> x3n) {
+					assertObjectEquals("1", x1);
+					assertObjectEquals("[[[1,null],null],null]", x2);
+					assertNull(x2n);
+					assertObjectEquals("[[[[1,null],null],null],null]", x3);
+					assertClass(Integer[][][].class, x3.get(0));
+					assertNull(x3n);
+				}
+
+				@Override
+				public void setMultiParamsFloat(float x1, float[][][] x2, float[][][] x2n, List<float[][][]> x3, List<float[][][]> x3n) {
+					assertObjectEquals("1.0", x1);
+					assertObjectEquals("[[[1.0,2.0],null],null]", x2);
+					assertNull(x2n);
+					assertObjectEquals("[[[[1.0,2.0],null],null],null]", x3);
+					assertClass(float[][][].class, x3.get(0));
+					assertNull(x3n);
+				}
+
+				@Override
+				public void setMultiParamsFloatObject(Float x1, Float x1n, Float[][][] x2, Float[][][] x2n, List<Float[][][]> x3, List<Float[][][]> x3n) {
+					assertObjectEquals("1.0", x1);
+					assertObjectEquals("[[[1.0,null],null],null]", x2);
+					assertNull(x2n);
+					assertObjectEquals("[[[[1.0,null],null],null],null]", x3);
+					assertClass(Float[][][].class, x3.get(0));
+					assertNull(x3n);
+				}
+
+				@Override
+				public void setMultiParamsString(String x1, String[][][] x2, String[][][] x2n, List<String[][][]> x3, List<String[][][]> x3n) {
+					assertObjectEquals("'foo'", x1);
+					assertObjectEquals("[[['foo',null],null],null]", x2);
+					assertNull(x2n);
+					assertObjectEquals("[[[['foo',null],null],null],null]", x3);
+					assertClass(String[][][].class, x3.get(0));
+					assertNull(x3n);
+				}
+
+				@Override
+				public void setMultiParamsBean(ABean x1, ABean[][][] x2, ABean[][][] x2n, List<ABean[][][]> x3, List<ABean[][][]> x3n, Map<String,ABean> x4, Map<String,ABean> x4n, Map<String,List<ABean[][][]>> x5, Map<String,List<ABean[][][]>> x5n) {
+					assertObjectEquals("{a:1,b:'foo'}", x1);
+					assertObjectEquals("[[[{a:1,b:'foo'},null],null],null]", x2);
+					assertNull(x2n);
+					assertObjectEquals("[[[[{a:1,b:'foo'},null],null],null],null]", x3);
+					assertClass(ABean[][][].class, x3.get(0));
+					assertNull(x3n);
+					assertObjectEquals("{foo:{a:1,b:'foo'}}", x4);
+					assertNull(x4n);
+					assertObjectEquals("{foo:[[[[{a:1,b:'foo'},null],null],null],null]}", x5);
+					assertNull(x5n);
+				}
+
+				@Override
+				public void setMultiParamsSwappedPojo(SwappedPojo x1, SwappedPojo[][][] x2, SwappedPojo[][][] x2n, List<SwappedPojo[][][]> x3, List<SwappedPojo[][][]> x3n, Map<SwappedPojo,SwappedPojo> x4, Map<SwappedPojo,SwappedPojo> x4n, Map<SwappedPojo,List<SwappedPojo[][][]>> x5, Map<SwappedPojo,List<SwappedPojo[][][]>> x5n) {
+					assertObjectEquals("'"+SWAP+"'", x1);
+					assertObjectEquals("[[['"+SWAP+"',null],null],null]", x2);
+					assertNull(x2n);
+					assertObjectEquals("[[[['"+SWAP+"',null],null],null],null]", x3);
+					assertClass(SwappedPojo[][][].class, x3.get(0));
+					assertNull(x3n);
+					assertObjectEquals("{'"+SWAP+"':'"+SWAP+"'}", x4);
+					assertNull(x4n);
+					assertObjectEquals("{'"+SWAP+"':[[[['"+SWAP+"',null],null],null],null]}", x5);
+					assertNull(x5n);
+				}
+
+				@Override
+				public void setMultiParamsImplicitSwappedPojo(ImplicitSwappedPojo x1, ImplicitSwappedPojo[][][] x2, ImplicitSwappedPojo[][][] x2n, List<ImplicitSwappedPojo[][][]> x3, List<ImplicitSwappedPojo[][][]> x3n, Map<ImplicitSwappedPojo,ImplicitSwappedPojo> x4, Map<ImplicitSwappedPojo,ImplicitSwappedPojo> x4n, Map<ImplicitSwappedPojo,List<ImplicitSwappedPojo[][][]>> x5, Map<ImplicitSwappedPojo,List<ImplicitSwappedPojo[][][]>> x5n) {
+					assertObjectEquals("'"+SWAP+"'", x1);
+					assertObjectEquals("[[['"+SWAP+"',null],null],null]", x2);
+					assertNull(x2n);
+					assertObjectEquals("[[[['"+SWAP+"',null],null],null],null]", x3);
+					assertClass(ImplicitSwappedPojo[][][].class, x3.get(0));
+					assertNull(x3n);
+					assertObjectEquals("{'"+SWAP+"':'"+SWAP+"'}", x4);
+					assertNull(x4n);
+					assertObjectEquals("{'"+SWAP+"':[[[['"+SWAP+"',null],null],null],null]}", x5);
+					assertNull(x5n);
+				}
+
+				@Override
+				public void setMultiParamsEnum(TestEnum x1, TestEnum[][][] x2, TestEnum[][][] x2n, List<TestEnum[][][]> x3, List<TestEnum[][][]> x3n, Map<TestEnum,TestEnum> x4, Map<TestEnum,TestEnum> x4n, Map<TestEnum,List<TestEnum[][][]>> x5, Map<TestEnum,List<TestEnum[][][]>> x5n) {
+					assertObjectEquals("'TWO'", x1);
+					assertObjectEquals("[[['TWO',null],null],null]", x2);
+					assertNull(x2n);
+					assertObjectEquals("[[[['TWO',null],null],null],null]", x3);
+					assertClass(TestEnum[][][].class, x3.get(0));
+					assertNull(x3n);
+					assertObjectEquals("{ONE:'TWO'}", x4);
+					assertNull(x4n);
+					assertObjectEquals("{ONE:[[[['TWO',null],null],null],null]}", x5);
+					assertNull(x5n);
+				}
+			};
+		}
+	}
+	static MockRest interfaceProxyResource = MockRest.create(InterfaceProxyResource.class);
+	
+	private static Map<String,InterfaceProxy> cache = new LinkedHashMap<String,InterfaceProxy>();
+	
+	private InterfaceProxy proxy;
+	
 	public InterfaceProxyTest(String label, Serializer serializer, Parser parser) {
-		proxy = getCached(label, InterfaceProxy.class);
+		proxy = cache.get(label);
 		if (proxy == null) {
-			proxy = getClient(label, serializer, parser).getRemoteableProxy(InterfaceProxy.class, "/testInterfaceProxyResource/proxy");
-			cache(label, proxy);
+			proxy = RestClient.create().mockHttpConnection(interfaceProxyResource).serializer(serializer).parser(parser).build().getRemoteableProxy(InterfaceProxy.class, "/proxy");
+			cache.put(label, proxy);
 		}
-	}
+//		if (proxy == null) {
+//			proxy = getClient(label, serializer, parser).getRemoteableProxy(InterfaceProxy.class, "/testInterfaceProxyResource/proxy");
+//			cache(label, proxy);
+//		}
+	}
+	
+	
+	
 
 	//--------------------------------------------------------------------------------
 	// Test return types.
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/mock/MockHttpClientConnection.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/mock/MockHttpClientConnection.java
index 2c551e0..668c17f 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/mock/MockHttpClientConnection.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/mock/MockHttpClientConnection.java
@@ -89,7 +89,7 @@ public class MockHttpClientConnection implements HttpClientConnection {
 
 	@Override /* HttpClientConnection */
 	public void sendRequestEntity(HttpEntityEnclosingRequest request) throws HttpException, IOException {
-		req.body(IOUtils.read(request.getEntity().getContent()));
+		req.body(request.getEntity() == null ? "" : IOUtils.readBytes(request.getEntity().getContent(), 1024));
 	}
 
 	@Override /* HttpClientConnection */

-- 
To stop receiving notification emails like this one, please contact
jamesbognar@apache.org.

Mime
View raw message