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 85d641c REST refactoring.
85d641c is described below
commit 85d641c3fc5ad992f07844affc4d128a3d01c270
Author: JamesBognar <[email protected]>
AuthorDate: Thu Mar 4 13:46:41 2021 -0500
REST refactoring.
---
.../org/apache/juneau/http/header/HeaderList.java | 2 +-
.../rest/test/client/ThirdPartyProxyResource.java | 313 ++++++++++-----------
.../rest/test/client/ThirdPartyProxyTest.java | 11 +-
.../org/apache/juneau/http/HeaderList_Test.java | 10 +-
.../http/remote/Remote_HeaderAnnotation_Test.java | 2 +-
5 files changed, 169 insertions(+), 169 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/HeaderList.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/HeaderList.java
index 153e0a8..c05d086 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/HeaderList.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/HeaderList.java
@@ -103,7 +103,7 @@ public class HeaderList implements Iterable<Header> {
*
* @param headers The initial list of headers. <jk>null</jk> entries
are ignored.
*/
- public HeaderList(List<Header> headers) {
+ protected HeaderList(List<Header> headers) {
if (headers == null || headers.isEmpty())
this.headers = emptyList();
else {
diff --git
a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
index 4f437d3..28ee2ae 100644
---
a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
+++
b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
@@ -15,7 +15,6 @@ package org.apache.juneau.rest.test.client;
import static java.util.Arrays.*;
import static org.junit.Assert.*;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.HttpMethod.*;
import static org.apache.juneau.testutils.Constants.*;
import java.io.*;
@@ -101,7 +100,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
// Header tests
//-----------------------------------------------------------------------------------------------------------------
- @RestOp(method=GET, path="/primitiveHeaders")
+ @RestGet(path="/primitiveHeaders")
public String primitiveHeaders(
@Header("a") String a,
@Header("an") String an,
@@ -124,7 +123,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/primitiveCollectionHeaders")
+ @RestGet(path="/primitiveCollectionHeaders")
public String primitiveCollectionHeaders(
@Header("a") int[][][] a,
@Header("b") Integer[][][] b,
@@ -153,7 +152,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/beanHeaders")
+ @RestGet(path="/beanHeaders")
public String beanHeaders(
@Header(name="a",cf="uon") ABean a,
@Header(name="an",cf="uon") ABean an,
@@ -186,7 +185,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/typedBeanHeaders")
+ @RestGet(path="/typedBeanHeaders")
public String typedBeanHeaders(
@Header(n="a",cf="uon") TypedBean a,
@Header(n="an",cf="uon") TypedBean an,
@@ -222,7 +221,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/swappedPojoHeaders")
+ @RestGet(path="/swappedPojoHeaders")
public String swappedPojoHeaders(
@Header(n="a",cf="uon") SwappedPojo a,
@Header(n="b",cf="uon") SwappedPojo[][][] b,
@@ -245,7 +244,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/implicitSwappedPojoHeaders")
+ @RestGet(path="/implicitSwappedPojoHeaders")
public String implicitSwappedPojoHeaders(
@Header(n="a",cf="uon") ImplicitSwappedPojo a,
@Header(n="b",cf="uon") ImplicitSwappedPojo[][][] b,
@@ -268,7 +267,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/enumHeaders")
+ @RestGet(path="/enumHeaders")
public String enumHeaders(
@Header(n="a",cf="uon") TestEnum a,
@Header(n="an",cf="uon") TestEnum an,
@@ -304,7 +303,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/mapHeader")
+ @RestGet(path="/mapHeader")
public String mapHeader(
@Header("a") String a,
@Header(name="b",allowEmptyValue=true) String b,
@@ -318,7 +317,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/beanHeader")
+ @RestGet(path="/beanHeader")
public String beanHeader(
@Header("a") String a,
@Header(name="b",allowEmptyValue=true) String b,
@@ -332,8 +331,8 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/nameValuePairsHeader")
- public String nameValuePairsHeader(
+ @RestGet(path="/headerList")
+ public String headerList(
@Header("a") String a,
@Header(name="b",allowEmptyValue=true) String b,
@Header("c") String c
@@ -346,7 +345,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/headerIfNE1")
+ @RestGet(path="/headerIfNE1")
public String headerIfNE1(
@Header("a") String a
) throws Exception {
@@ -356,7 +355,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/headerIfNE2")
+ @RestGet(path="/headerIfNE2")
public String headerIfNE2(
@Header("a") String a
) throws Exception {
@@ -366,7 +365,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/headerIfNEMap")
+ @RestGet(path="/headerIfNEMap")
public String headerIfNEMap(
@Header("a") String a,
@Header("b") String b,
@@ -380,7 +379,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/headerIfNEBean")
+ @RestGet(path="/headerIfNEBean")
public String headerIfNEBean(
@Header("a") String a,
@Header("b") String b,
@@ -394,7 +393,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/headerIfNEnameValuePairs")
+ @RestGet(path="/headerIfNEnameValuePairs")
public String headerIfNEnameValuePairs(
@Header("a") String a,
@Header("b") String b,
@@ -413,7 +412,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
// Query tests
//-----------------------------------------------------------------------------------------------------------------
- @RestOp(method=GET, path="/primitiveQueries")
+ @RestGet(path="/primitiveQueries")
public String primitiveQueries(
@Query("a") String a,
@Query("an") String an,
@@ -436,7 +435,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/primitiveCollectionQueries")
+ @RestGet(path="/primitiveCollectionQueries")
public String primitiveCollectionQueries(
@Query("a") int[][][] a,
@Query("b") Integer[][][] b,
@@ -465,7 +464,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/beanQueries")
+ @RestGet(path="/beanQueries")
public String beanQueries(
@Query(n="a",cf="uon") ABean a,
@Query(n="an",cf="uon") ABean an,
@@ -498,7 +497,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/typedBeanQueries")
+ @RestGet(path="/typedBeanQueries")
public String typedBeanQueries(
@Query(n="a",cf="uon") TypedBean a,
@Query(n="an",cf="uon") TypedBean an,
@@ -534,7 +533,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/swappedPojoQueries")
+ @RestGet(path="/swappedPojoQueries")
public String swappedPojoQueries(
@Query(n="a",cf="uon") SwappedPojo a,
@Query(n="b",cf="uon") SwappedPojo[][][] b,
@@ -557,7 +556,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/implicitSwappedPojoQueries")
+ @RestGet(path="/implicitSwappedPojoQueries")
public String implicitSwappedPojoQueries(
@Query(n="a",cf="uon") ImplicitSwappedPojo a,
@Query(n="b",cf="uon") ImplicitSwappedPojo[][][] b,
@@ -580,7 +579,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/enumQueries")
+ @RestGet(path="/enumQueries")
public String enumQueries(
@Query(n="a",cf="uon") TestEnum a,
@Query(n="an",cf="uon") TestEnum an,
@@ -616,7 +615,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/stringQuery1")
+ @RestGet(path="/stringQuery1")
public String stringQuery1(
@Query("a") int a,
@Query("b") String b
@@ -628,7 +627,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/stringQuery2")
+ @RestGet(path="/stringQuery2")
public String stringQuery2(
@Query("a") int a,
@Query("b") String b
@@ -640,7 +639,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/mapQuery")
+ @RestGet(path="/mapQuery")
public String mapQuery(
@Query("a") int a,
@Query("b") String b
@@ -652,7 +651,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/beanQuery")
+ @RestGet(path="/beanQuery")
public String beanQuery(
@Query("a") String a,
@Query(n="b",allowEmptyValue=true) String b,
@@ -666,7 +665,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/nameValuePairsQuery")
+ @RestGet(path="/nameValuePairsQuery")
public String nameValuePairsQuery(
@Query("a") String a,
@Query(n="b",allowEmptyValue=true) String b,
@@ -680,7 +679,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/queryIfNE1")
+ @RestGet(path="/queryIfNE1")
public String queryIfNE1(
@Query("a") String a
) throws Exception {
@@ -690,7 +689,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/queryIfNE2")
+ @RestGet(path="/queryIfNE2")
public String queryIfNE2(
@Query("q") String a
) throws Exception {
@@ -700,7 +699,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/queryIfNEMap")
+ @RestGet(path="/queryIfNEMap")
public String queryIfNEMap(
@Query("a") String a,
@Query("b") String b,
@@ -714,7 +713,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/queryIfNEBean")
+ @RestGet(path="/queryIfNEBean")
public String queryIfNEBean(
@Query("a") String a,
@Query("b") String b,
@@ -728,7 +727,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=GET, path="/queryIfNEnameValuePairs")
+ @RestGet(path="/queryIfNEnameValuePairs")
public String queryIfNEnameValuePairs(
@Query("a") String a,
@Query("b") String b,
@@ -747,7 +746,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
// FormData tests
//-----------------------------------------------------------------------------------------------------------------
- @RestOp(method=POST, path="/primitiveFormData")
+ @RestPost(path="/primitiveFormData")
public String primitiveFormData(
@FormData("a") String a,
@FormData("an") String an,
@@ -770,7 +769,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=POST, path="/primitiveCollectionFormData")
+ @RestPost(path="/primitiveCollectionFormData")
public String primitiveCollectionFormData(
@FormData("a") int[][][] a,
@FormData("b") Integer[][][] b,
@@ -799,7 +798,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=POST, path="/beanFormData")
+ @RestPost(path="/beanFormData")
public String beanFormData(
@FormData(n="a",cf="uon") ABean a,
@FormData(n="an",cf="uon") ABean an,
@@ -832,7 +831,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=POST, path="/typedBeanFormData")
+ @RestPost(path="/typedBeanFormData")
public String typedBeanFormData(
@FormData(n="a",cf="uon") TypedBean a,
@FormData(n="an",cf="uon") TypedBean an,
@@ -868,7 +867,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=POST, path="/swappedPojoFormData")
+ @RestPost(path="/swappedPojoFormData")
public String swappedPojoFormData(
@FormData(n="a",cf="uon") SwappedPojo a,
@FormData(n="b",cf="uon") SwappedPojo[][][] b,
@@ -891,7 +890,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=POST, path="/implicitSwappedPojoFormData")
+ @RestPost(path="/implicitSwappedPojoFormData")
public String implicitSwappedPojoFormData(
@FormData(n="a",cf="uon") ImplicitSwappedPojo a,
@FormData(n="b",cf="uon") ImplicitSwappedPojo[][][] b,
@@ -914,7 +913,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=POST, path="/enumFormData")
+ @RestPost(path="/enumFormData")
public String enumFormData(
@FormData(n="a",cf="uon") TestEnum a,
@FormData(n="an",cf="uon") TestEnum an,
@@ -950,7 +949,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=POST, path="/mapFormData")
+ @RestPost(path="/mapFormData")
public String mapFormData(
@FormData("a") String a,
@FormData(n="b",aev=true) String b,
@@ -964,7 +963,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=POST, path="/beanFormData2")
+ @RestPost(path="/beanFormData2")
public String beanFormData(
@FormData("a") String a,
@FormData(n="b",aev=true) String b,
@@ -978,7 +977,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=POST, path="/nameValuePairsFormData")
+ @RestPost(path="/nameValuePairsFormData")
public String nameValuePairsFormData(
@FormData("a") String a,
@FormData(n="b",aev=true) String b,
@@ -992,7 +991,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=POST, path="/formDataIfNE1")
+ @RestPost(path="/formDataIfNE1")
public String formDataIfNE1(
@FormData("a") String a
) throws Exception {
@@ -1002,7 +1001,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=POST, path="/formDataIfNE2")
+ @RestPost(path="/formDataIfNE2")
public String formDataIfNE2(
@FormData("a") String a
) throws Exception {
@@ -1012,7 +1011,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=POST, path="/formDataIfNEMap")
+ @RestPost(path="/formDataIfNEMap")
public String formDataIfNEMap(
@FormData("a") String a,
@FormData("b") String b,
@@ -1026,7 +1025,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=POST, path="/formDataIfNEBean")
+ @RestPost(path="/formDataIfNEBean")
public String formDataIfNEBean(
@FormData("a") String a,
@FormData("b") String b,
@@ -1040,7 +1039,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=POST, path="/formDataIfNENameValuePairs")
+ @RestPost(path="/formDataIfNENameValuePairs")
public String formDataIfNENameValuePairs(
@FormData("a") String a,
@FormData("b") String b,
@@ -1059,7 +1058,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
// Path tests
//-----------------------------------------------------------------------------------------------------------------
- @RestOp(method=POST, path="/pathVars1/{a}/{b}")
+ @RestPost(path="/pathVars1/{a}/{b}")
public String pathVars1(
@Path("a") int a,
@Path("b") String b
@@ -1072,7 +1071,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
}
- @RestOp(method=POST, path="/pathVars2/{a}/{b}")
+ @RestPost(path="/pathVars2/{a}/{b}")
public String pathVars2(
@Path("a") int a,
@Path("b") String b
@@ -1084,7 +1083,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=POST, path="/pathVars3/{a}/{b}")
+ @RestPost(path="/pathVars3/{a}/{b}")
public String pathVars3(
@Path("a") int a,
@Path("b") String b
@@ -1100,7 +1099,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
// @Request tests
//-----------------------------------------------------------------------------------------------------------------
- @RestOp(method=POST, path="/reqBeanPath/{a}/{b}")
+ @RestPost(path="/reqBeanPath/{a}/{b}")
public String reqBeanPath(
@Path("a") int a,
@Path("b") String b
@@ -1112,7 +1111,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=POST, path="/reqBeanQuery")
+ @RestPost(path="/reqBeanQuery")
public String reqBeanQuery(
@Query("a") int a,
@Query("b") String b
@@ -1124,7 +1123,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=POST, path="/reqBeanQueryIfNE")
+ @RestPost(path="/reqBeanQueryIfNE")
public String reqBeanQueryIfNE(
@Query("a") String a,
@Query("b") String b,
@@ -1138,7 +1137,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=POST, path="/reqBeanFormData")
+ @RestPost(path="/reqBeanFormData")
public String reqBeanFormData(
@FormData("a") int a,
@FormData("b") String b
@@ -1150,7 +1149,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=POST, path="/reqBeanFormDataIfNE")
+ @RestPost(path="/reqBeanFormDataIfNE")
public String reqBeanFormDataIfNE(
@FormData("a") String a,
@FormData("b") String b,
@@ -1164,7 +1163,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=POST, path="/reqBeanHeader")
+ @RestPost(path="/reqBeanHeader")
public String reqBeanHeader(
@Header("a") int a,
@Header("b") String b
@@ -1176,7 +1175,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
return "OK";
}
- @RestOp(method=POST, path="/reqBeanHeaderIfNE")
+ @RestPost(path="/reqBeanHeaderIfNE")
public String reqBeanHeaderIfNE(
@Header("a") String a,
@Header("b") String b,
@@ -1195,251 +1194,251 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
// Various primitives
- @RestOp(method=GET, path="/returnVoid")
+ @RestGet(path="/returnVoid")
public void returnVoid() {
}
- @RestOp(method=GET, path="/returnInteger")
+ @RestGet(path="/returnInteger")
public Integer returnInteger() {
return 1;
}
- @RestOp(method=GET, path="/returnInt")
+ @RestGet(path="/returnInt")
public int returnInt() {
return 1;
}
- @RestOp(method=GET, path="/returnBoolean")
+ @RestGet(path="/returnBoolean")
public boolean returnBoolean() {
return true;
}
- @RestOp(method=GET, path="/returnFloat")
+ @RestGet(path="/returnFloat")
public float returnFloat() {
return 1f;
}
- @RestOp(method=GET, path="/returnFloatObject")
+ @RestGet(path="/returnFloatObject")
public Float returnFloatObject() {
return 1f;
}
- @RestOp(method=GET, path="/returnString")
+ @RestGet(path="/returnString")
public String returnString() {
return "foobar";
}
- @RestOp(method=GET, path="/returnNullString")
+ @RestGet(path="/returnNullString")
public String returnNullString() {
return null;
}
- @RestOp(method=GET, path="/returnInt3dArray")
+ @RestGet(path="/returnInt3dArray")
public int[][][] returnInt3dArray() {
return new int[][][]{{{1,2},null},null};
}
- @RestOp(method=GET, path="/returnInteger3dArray")
+ @RestGet(path="/returnInteger3dArray")
public Integer[][][] returnInteger3dArray() {
return new Integer[][][]{{{1,null},null},null};
}
- @RestOp(method=GET, path="/returnString3dArray")
+ @RestGet(path="/returnString3dArray")
public String[][][] returnString3dArray() {
return new String[][][]{{{"foo","bar",null},null},null};
}
- @RestOp(method=GET, path="/returnIntegerList")
+ @RestGet(path="/returnIntegerList")
public List<Integer> returnIntegerList() {
return asList(new Integer[]{1,null});
}
- @RestOp(method=GET, path="/returnInteger3dList")
+ @RestGet(path="/returnInteger3dList")
public List<List<List<Integer>>> returnInteger3dList() {
return AList.of(AList.of(AList.of(1,null),null),null);
}
- @RestOp(method=GET, path="/returnInteger1d3dList")
+ @RestGet(path="/returnInteger1d3dList")
public List<Integer[][][]> returnInteger1d3dList() {
return AList.of(new Integer[][][]{{{1,null},null},null},null);
}
- @RestOp(method=GET, path="/returnInt1d3dList")
+ @RestGet(path="/returnInt1d3dList")
public List<int[][][]> returnInt1d3dList() {
return AList.of(new int[][][]{{{1,2},null},null},null);
}
- @RestOp(method=GET, path="/returnStringList")
+ @RestGet(path="/returnStringList")
public List<String> returnStringList() {
return asList(new String[]{"foo","bar",null});
}
// Beans
- @RestOp(method=GET, path="/returnBean")
+ @RestGet(path="/returnBean")
public ABean returnBean() {
return ABean.get();
}
- @RestOp(method=GET, path="/returnBean3dArray")
+ @RestGet(path="/returnBean3dArray")
public ABean[][][] returnBean3dArray() {
return new ABean[][][]{{{ABean.get(),null},null},null};
}
- @RestOp(method=GET, path="/returnBeanList")
+ @RestGet(path="/returnBeanList")
public List<ABean> returnBeanList() {
return asList(ABean.get());
}
- @RestOp(method=GET, path="/returnBean1d3dList")
+ @RestGet(path="/returnBean1d3dList")
public List<ABean[][][]> returnBean1d3dList() {
return AList.of(new
ABean[][][]{{{ABean.get(),null},null},null},null);
}
- @RestOp(method=GET, path="/returnBeanMap")
+ @RestGet(path="/returnBeanMap")
public Map<String,ABean> returnBeanMap() {
return AMap.of("foo",ABean.get());
}
- @RestOp(method=GET, path="/returnBeanListMap")
+ @RestGet(path="/returnBeanListMap")
public Map<String,List<ABean>> returnBeanListMap() {
return AMap.of("foo",asList(ABean.get()));
}
- @RestOp(method=GET, path="/returnBean1d3dListMap")
+ @RestGet(path="/returnBean1d3dListMap")
public Map<String,List<ABean[][][]>> returnBean1d3dListMap() {
return AMap.of("foo", AList.of(new
ABean[][][]{{{ABean.get(),null},null},null},null));
}
- @RestOp(method=GET, path="/returnBeanListMapIntegerKeys")
+ @RestGet(path="/returnBeanListMapIntegerKeys")
public Map<Integer,List<ABean>> returnBeanListMapIntegerKeys() {
return AMap.of(1,asList(ABean.get()));
}
// Typed beans
- @RestOp(method=GET, path="/returnTypedBean")
+ @RestGet(path="/returnTypedBean")
public TypedBean returnTypedBean() {
return TypedBeanImpl.get();
}
- @RestOp(method=GET, path="/returnTypedBean3dArray")
+ @RestGet(path="/returnTypedBean3dArray")
public TypedBean[][][] returnTypedBean3dArray() {
return new
TypedBean[][][]{{{TypedBeanImpl.get(),null},null},null};
}
- @RestOp(method=GET, path="/returnTypedBeanList")
+ @RestGet(path="/returnTypedBeanList")
public List<TypedBean> returnTypedBeanList() {
return asList((TypedBean)TypedBeanImpl.get());
}
- @RestOp(method=GET, path="/returnTypedBean1d3dList")
+ @RestGet(path="/returnTypedBean1d3dList")
public List<TypedBean[][][]> returnTypedBean1d3dList() {
return AList.of(new
TypedBean[][][]{{{TypedBeanImpl.get(),null},null},null},null);
}
- @RestOp(method=GET, path="/returnTypedBeanMap")
+ @RestGet(path="/returnTypedBeanMap")
public Map<String,TypedBean> returnTypedBeanMap() {
return AMap.of("foo",TypedBeanImpl.get());
}
- @RestOp(method=GET, path="/returnTypedBeanListMap")
+ @RestGet(path="/returnTypedBeanListMap")
public Map<String,List<TypedBean>> returnTypedBeanListMap() {
return AMap.of("foo",asList((TypedBean)TypedBeanImpl.get()));
}
- @RestOp(method=GET, path="/returnTypedBean1d3dListMap")
+ @RestGet(path="/returnTypedBean1d3dListMap")
public Map<String,List<TypedBean[][][]>> returnTypedBean1d3dListMap() {
return AMap.of("foo", AList.of(new
TypedBean[][][]{{{TypedBeanImpl.get(),null},null},null},null));
}
- @RestOp(method=GET, path="/returnTypedBeanListMapIntegerKeys")
+ @RestGet(path="/returnTypedBeanListMapIntegerKeys")
public Map<Integer,List<TypedBean>> returnTypedBeanListMapIntegerKeys()
{
return AMap.of(1,asList((TypedBean)TypedBeanImpl.get()));
}
// Swapped POJOs
- @RestOp(method=GET, path="/returnSwappedPojo")
+ @RestGet(path="/returnSwappedPojo")
public SwappedPojo returnSwappedPojo() {
return new SwappedPojo();
}
- @RestOp(method=GET, path="/returnSwappedPojo3dArray")
+ @RestGet(path="/returnSwappedPojo3dArray")
public SwappedPojo[][][] returnSwappedPojo3dArray() {
return new SwappedPojo[][][]{{{new
SwappedPojo(),null},null},null};
}
- @RestOp(method=GET, path="/returnSwappedPojoMap")
+ @RestGet(path="/returnSwappedPojoMap")
public Map<SwappedPojo,SwappedPojo> returnSwappedPojoMap() {
return AMap.of(new SwappedPojo(),new SwappedPojo());
}
- @RestOp(method=GET, path="/returnSwappedPojo3dMap")
+ @RestGet(path="/returnSwappedPojo3dMap")
public Map<SwappedPojo,SwappedPojo[][][]> returnSwappedPojo3dMap() {
return AMap.of(new SwappedPojo(),new SwappedPojo[][][]{{{new
SwappedPojo(),null},null},null});
}
// Implicit swapped POJOs
- @RestOp(method=GET, path="/returnImplicitSwappedPojo")
+ @RestGet(path="/returnImplicitSwappedPojo")
public ImplicitSwappedPojo returnImplicitSwappedPojo() {
return new ImplicitSwappedPojo();
}
- @RestOp(method=GET, path="/returnImplicitSwappedPojo3dArray")
+ @RestGet(path="/returnImplicitSwappedPojo3dArray")
public ImplicitSwappedPojo[][][] returnImplicitSwappedPojo3dArray() {
return new ImplicitSwappedPojo[][][]{{{new
ImplicitSwappedPojo(),null},null},null};
}
- @RestOp(method=GET, path="/returnImplicitSwappedPojoMap")
+ @RestGet(path="/returnImplicitSwappedPojoMap")
public Map<ImplicitSwappedPojo,ImplicitSwappedPojo>
returnImplicitSwappedPojoMap() {
return AMap.of(new ImplicitSwappedPojo(),new
ImplicitSwappedPojo());
}
- @RestOp(method=GET, path="/returnImplicitSwappedPojo3dMap")
+ @RestGet(path="/returnImplicitSwappedPojo3dMap")
public Map<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]>
returnImplicitSwappedPojo3dMap() {
return AMap.of(new ImplicitSwappedPojo(),new
ImplicitSwappedPojo[][][]{{{new ImplicitSwappedPojo(),null},null},null});
}
// Enums
- @RestOp(method=GET, path="/returnEnum")
+ @RestGet(path="/returnEnum")
public TestEnum returnEnum() {
return TestEnum.TWO;
}
- @RestOp(method=GET, path="/returnEnum3d")
+ @RestGet(path="/returnEnum3d")
public TestEnum[][][] returnEnum3d() {
return new TestEnum[][][]{{{TestEnum.TWO,null},null},null};
}
- @RestOp(method=GET, path="/returnEnumList")
+ @RestGet(path="/returnEnumList")
public List<TestEnum> returnEnumList() {
return AList.of(TestEnum.TWO,null);
}
- @RestOp(method=GET, path="/returnEnum3dList")
+ @RestGet(path="/returnEnum3dList")
public List<List<List<TestEnum>>> returnEnum3dList() {
return
AList.of(AList.of(AList.of(TestEnum.TWO,null),null),null);
}
- @RestOp(method=GET, path="/returnEnum1d3dList")
+ @RestGet(path="/returnEnum1d3dList")
public List<TestEnum[][][]> returnEnum1d3dList() {
return AList.of(new
TestEnum[][][]{{{TestEnum.TWO,null},null},null},null);
}
- @RestOp(method=GET, path="/returnEnumMap")
+ @RestGet(path="/returnEnumMap")
public Map<TestEnum,TestEnum> returnEnumMap() {
return AMap.of(TestEnum.ONE,TestEnum.TWO);
}
- @RestOp(method=GET, path="/returnEnum3dArrayMap")
+ @RestGet(path="/returnEnum3dArrayMap")
public Map<TestEnum,TestEnum[][][]> returnEnum3dArrayMap() {
return AMap.of(TestEnum.ONE,new
TestEnum[][][]{{{TestEnum.TWO,null},null},null});
}
- @RestOp(method=GET, path="/returnEnum1d3dListMap")
+ @RestGet(path="/returnEnum1d3dListMap")
public Map<TestEnum,List<TestEnum[][][]>> returnEnum1d3dListMap() {
return AMap.of(TestEnum.ONE,AList.of(new
TestEnum[][][]{{{TestEnum.TWO,null},null},null},null));
}
@@ -1450,124 +1449,124 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
// Various primitives
- @RestOp(method=POST, path="/setInt")
+ @RestPost(path="/setInt")
public void setInt(@Body int x) {
assertEquals(1, x);
}
- @RestOp(method=POST, path="/setInteger")
+ @RestPost(path="/setInteger")
public void setInteger(@Body Integer x) {
assertEquals((Integer)1, x);
}
- @RestOp(method=POST, path="/setBoolean")
+ @RestPost(path="/setBoolean")
public void setBoolean(@Body boolean x) {
assertTrue(x);
}
- @RestOp(method=POST, path="/setFloat")
+ @RestPost(path="/setFloat")
public void setFloat(@Body float x) {
assertTrue(1f == x);
}
- @RestOp(method=POST, path="/setFloatObject")
+ @RestPost(path="/setFloatObject")
public void setFloatObject(@Body Float x) {
assertTrue(1f == x);
}
- @RestOp(method=POST, path="/setString")
+ @RestPost(path="/setString")
public void setString(@Body String x) {
assertEquals("foo", x);
}
- @RestOp(method=POST, path="/setNullString")
+ @RestPost(path="/setNullString")
public void setNullString(@Body String x) {
assertNull(x);
}
- @RestOp(method=POST, path="/setInt3dArray")
+ @RestPost(path="/setInt3dArray")
public String setInt3dArray(@Body int[][][] x) {
return ""+x[0][0][0];
}
- @RestOp(method=POST, path="/setInteger3dArray")
+ @RestPost(path="/setInteger3dArray")
public void setInteger3dArray(@Body Integer[][][] x) {
assertObject(x).asJson().is("[[[1,null],null],null]");
}
- @RestOp(method=POST, path="/setString3dArray")
+ @RestPost(path="/setString3dArray")
public void setString3dArray(@Body String[][][] x) {
assertObject(x).asJson().is("[[['foo',null],null],null]");
}
- @RestOp(method=POST, path="/setIntegerList")
+ @RestPost(path="/setIntegerList")
public void setIntegerList(@Body List<Integer> x) {
assertObject(x).asJson().is("[1,null]");
assertObject(x.get(0)).isType(Integer.class);
}
- @RestOp(method=POST, path="/setInteger3dList")
+ @RestPost(path="/setInteger3dList")
public void setInteger3dList(@Body List<List<List<Integer>>> x) {
assertObject(x).asJson().is("[[[1,null],null],null]");
assertObject(x.get(0).get(0).get(0)).isType(Integer.class);
}
- @RestOp(method=POST, path="/setInteger1d3dList")
+ @RestPost(path="/setInteger1d3dList")
public void setInteger1d3dList(@Body List<Integer[][][]> x) {
assertObject(x).asJson().is("[[[[1,null],null],null],null]");
assertObject(x.get(0)).isType(Integer[][][].class);
assertObject(x.get(0)[0][0][0]).isType(Integer.class);
}
- @RestOp(method=POST, path="/setInt1d3dList")
+ @RestPost(path="/setInt1d3dList")
public void setInt1d3dList(@Body List<int[][][]> x) {
assertObject(x).asJson().is("[[[[1,2],null],null],null]");
assertObject(x.get(0)).isType(int[][][].class);
}
- @RestOp(method=POST, path="/setStringList")
+ @RestPost(path="/setStringList")
public void setStringList(@Body List<String> x) {
assertObject(x).asJson().is("['foo','bar',null]");
}
// Beans
- @RestOp(method=POST, path="/setBean")
+ @RestPost(path="/setBean")
public void setBean(@Body ABean x) {
assertObject(x).asJson().is("{a:1,b:'foo'}");
}
- @RestOp(method=POST, path="/setBean3dArray")
+ @RestPost(path="/setBean3dArray")
public void setBean3dArray(@Body ABean[][][] x) {
assertObject(x).asJson().is("[[[{a:1,b:'foo'},null],null],null]");
}
- @RestOp(method=POST, path="/setBeanList")
+ @RestPost(path="/setBeanList")
public void setBeanList(@Body List<ABean> x) {
assertObject(x).asJson().is("[{a:1,b:'foo'}]");
}
- @RestOp(method=POST, path="/setBean1d3dList")
+ @RestPost(path="/setBean1d3dList")
public void setBean1d3dList(@Body List<ABean[][][]> x) {
assertObject(x).asJson().is("[[[[{a:1,b:'foo'},null],null],null],null]");
}
- @RestOp(method=POST, path="/setBeanMap")
+ @RestPost(path="/setBeanMap")
public void setBeanMap(@Body Map<String,ABean> x) {
assertObject(x).asJson().is("{foo:{a:1,b:'foo'}}");
}
- @RestOp(method=POST, path="/setBeanListMap")
+ @RestPost(path="/setBeanListMap")
public void setBeanListMap(@Body Map<String,List<ABean>> x) {
assertObject(x).asJson().is("{foo:[{a:1,b:'foo'}]}");
}
- @RestOp(method=POST, path="/setBean1d3dListMap")
+ @RestPost(path="/setBean1d3dListMap")
public void setBean1d3dListMap(@Body Map<String,List<ABean[][][]>> x) {
assertObject(x).asJson().is("{foo:[[[[{a:1,b:'foo'},null],null],null],null]}");
}
- @RestOp(method=POST, path="/setBeanListMapIntegerKeys")
+ @RestPost(path="/setBeanListMapIntegerKeys")
public void setBeanListMapIntegerKeys(@Body Map<Integer,List<ABean>> x)
{
assertObject(x).asJson().is("{'1':[{a:1,b:'foo'}]}"); // Note:
JsonSerializer serializes key as string.
assertObject(x.keySet().iterator().next()).isType(Integer.class);
@@ -1575,49 +1574,49 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
// Typed beans
- @RestOp(method=POST, path="/setTypedBean")
+ @RestPost(path="/setTypedBean")
public void setTypedBean(@Body TypedBean x) {
assertObject(x).asJson().is("{a:1,b:'foo'}");
assertObject(x).isType(TypedBeanImpl.class);
}
- @RestOp(method=POST, path="/setTypedBean3dArray")
+ @RestPost(path="/setTypedBean3dArray")
public void setTypedBean3dArray(@Body TypedBean[][][] x) {
assertObject(x).asJson().is("[[[{a:1,b:'foo'},null],null],null]");
assertObject(x[0][0][0]).isType(TypedBeanImpl.class);
}
- @RestOp(method=POST, path="/setTypedBeanList")
+ @RestPost(path="/setTypedBeanList")
public void setTypedBeanList(@Body List<TypedBean> x) {
assertObject(x).asJson().is("[{a:1,b:'foo'}]");
assertObject(x.get(0)).isType(TypedBeanImpl.class);
}
- @RestOp(method=POST, path="/setTypedBean1d3dList")
+ @RestPost(path="/setTypedBean1d3dList")
public void setTypedBean1d3dList(@Body List<TypedBean[][][]> x) {
assertObject(x).asJson().is("[[[[{a:1,b:'foo'},null],null],null],null]");
assertObject(x.get(0)[0][0][0]).isType(TypedBeanImpl.class);
}
- @RestOp(method=POST, path="/setTypedBeanMap")
+ @RestPost(path="/setTypedBeanMap")
public void setTypedBeanMap(@Body Map<String,TypedBean> x) {
assertObject(x).asJson().is("{foo:{a:1,b:'foo'}}");
assertObject(x.get("foo")).isType(TypedBeanImpl.class);
}
- @RestOp(method=POST, path="/setTypedBeanListMap")
+ @RestPost(path="/setTypedBeanListMap")
public void setTypedBeanListMap(@Body Map<String,List<TypedBean>> x) {
assertObject(x).asJson().is("{foo:[{a:1,b:'foo'}]}");
assertObject(x.get("foo").get(0)).isType(TypedBeanImpl.class);
}
- @RestOp(method=POST, path="/setTypedBean1d3dListMap")
+ @RestPost(path="/setTypedBean1d3dListMap")
public void setTypedBean1d3dListMap(@Body
Map<String,List<TypedBean[][][]>> x) {
assertObject(x).asJson().is("{foo:[[[[{a:1,b:'foo'},null],null],null],null]}");
assertObject(x.get("foo").get(0)[0][0][0]).isType(TypedBeanImpl.class);
}
- @RestOp(method=POST, path="/setTypedBeanListMapIntegerKeys")
+ @RestPost(path="/setTypedBeanListMapIntegerKeys")
public void setTypedBeanListMapIntegerKeys(@Body
Map<Integer,List<TypedBean>> x) {
assertObject(x).asJson().is("{'1':[{a:1,b:'foo'}]}"); // Note:
JsonSerializer serializes key as string.
assertObject(x.get(1).get(0)).isType(TypedBeanImpl.class);
@@ -1625,18 +1624,18 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
// Swapped POJOs
- @RestOp(method=POST, path="/setSwappedPojo")
+ @RestPost(path="/setSwappedPojo")
public void setSwappedPojo(@Body SwappedPojo x) {
assertTrue(x.wasUnswapped);
}
- @RestOp(method=POST, path="/setSwappedPojo3dArray")
+ @RestPost(path="/setSwappedPojo3dArray")
public void setSwappedPojo3dArray(@Body SwappedPojo[][][] x) {
assertObject(x).asJson().is("[[['"+SWAP+"',null],null],null]");
assertTrue(x[0][0][0].wasUnswapped);
}
- @RestOp(method=POST, path="/setSwappedPojoMap")
+ @RestPost(path="/setSwappedPojoMap")
public void setSwappedPojoMap(@Body Map<SwappedPojo,SwappedPojo> x) {
assertObject(x).asJson().is("{'"+SWAP+"':'"+SWAP+"'}");
Map.Entry<SwappedPojo,SwappedPojo> e =
x.entrySet().iterator().next();
@@ -1644,7 +1643,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
assertTrue(e.getValue().wasUnswapped);
}
- @RestOp(method=POST, path="/setSwappedPojo3dMap")
+ @RestPost(path="/setSwappedPojo3dMap")
public void setSwappedPojo3dMap(@Body
Map<SwappedPojo,SwappedPojo[][][]> x) {
assertObject(x).asJson().is("{'"+SWAP+"':[[['"+SWAP+"',null],null],null]}");
Map.Entry<SwappedPojo,SwappedPojo[][][]> e =
x.entrySet().iterator().next();
@@ -1654,18 +1653,18 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
// Implicit swapped POJOs
- @RestOp(method=POST, path="/setImplicitSwappedPojo")
+ @RestPost(path="/setImplicitSwappedPojo")
public void setImplicitSwappedPojo(@Body ImplicitSwappedPojo x) {
assertTrue(x.wasUnswapped);
}
- @RestOp(method=POST, path="/setImplicitSwappedPojo3dArray")
+ @RestPost(path="/setImplicitSwappedPojo3dArray")
public void setImplicitSwappedPojo3dArray(@Body
ImplicitSwappedPojo[][][] x) {
assertObject(x).asJson().is("[[['"+SWAP+"',null],null],null]");
assertTrue(x[0][0][0].wasUnswapped);
}
- @RestOp(method=POST, path="/setImplicitSwappedPojoMap")
+ @RestPost(path="/setImplicitSwappedPojoMap")
public void setImplicitSwappedPojoMap(@Body
Map<ImplicitSwappedPojo,ImplicitSwappedPojo> x) {
assertObject(x).asJson().is("{'"+SWAP+"':'"+SWAP+"'}");
Map.Entry<ImplicitSwappedPojo,ImplicitSwappedPojo> e =
x.entrySet().iterator().next();
@@ -1673,7 +1672,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
assertTrue(e.getValue().wasUnswapped);
}
- @RestOp(method=POST, path="/setImplicitSwappedPojo3dMap")
+ @RestPost(path="/setImplicitSwappedPojo3dMap")
public void setImplicitSwappedPojo3dMap(@Body
Map<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> x) {
assertObject(x).asJson().is("{'"+SWAP+"':[[['"+SWAP+"',null],null],null]}");
Map.Entry<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> e =
x.entrySet().iterator().next();
@@ -1683,35 +1682,35 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
// Enums
- @RestOp(method=POST, path="/setEnum")
+ @RestPost(path="/setEnum")
public void setEnum(@Body TestEnum x) {
assertEquals(TestEnum.TWO, x);
}
- @RestOp(method=POST, path="/setEnum3d")
+ @RestPost(path="/setEnum3d")
public void setEnum3d(@Body TestEnum[][][] x) {
assertObject(x).asJson().is("[[['TWO',null],null],null]");
}
- @RestOp(method=POST, path="/setEnumList")
+ @RestPost(path="/setEnumList")
public void setEnumList(@Body List<TestEnum> x) {
assertObject(x).asJson().is("['TWO',null]");
assertObject(x.get(0)).isType(TestEnum.class);
}
- @RestOp(method=POST, path="/setEnum3dList")
+ @RestPost(path="/setEnum3dList")
public void setEnum3dList(@Body List<List<List<TestEnum>>> x) {
assertObject(x).asJson().is("[[['TWO',null],null],null]");
assertObject(x.get(0).get(0).get(0)).isType(TestEnum.class);
}
- @RestOp(method=POST, path="/setEnum1d3dList")
+ @RestPost(path="/setEnum1d3dList")
public void setEnum1d3dList(@Body List<TestEnum[][][]> x) {
assertObject(x).asJson().is("[[[['TWO',null],null],null],null]");
assertObject(x.get(0)).isType(TestEnum[][][].class);
}
- @RestOp(method=POST, path="/setEnumMap")
+ @RestPost(path="/setEnumMap")
public void setEnumMap(@Body Map<TestEnum,TestEnum> x) {
assertObject(x).asJson().is("{ONE:'TWO'}");
Map.Entry<TestEnum,TestEnum> e = x.entrySet().iterator().next();
@@ -1719,7 +1718,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
assertObject(e.getValue()).isType(TestEnum.class);
}
- @RestOp(method=POST, path="/setEnum3dArrayMap")
+ @RestPost(path="/setEnum3dArrayMap")
public void setEnum3dArrayMap(@Body Map<TestEnum,TestEnum[][][]> x) {
assertObject(x).asJson().is("{ONE:[[['TWO',null],null],null]}");
Map.Entry<TestEnum,TestEnum[][][]> e =
x.entrySet().iterator().next();
@@ -1727,7 +1726,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
assertObject(e.getValue()).isType(TestEnum[][][].class);
}
- @RestOp(method=POST, path="/setEnum1d3dListMap")
+ @RestPost(path="/setEnum1d3dListMap")
public void setEnum1d3dListMap(@Body Map<TestEnum,List<TestEnum[][][]>>
x) {
assertObject(x).asJson().is("{ONE:[[[['TWO',null],null],null],null]}");
Map.Entry<TestEnum,List<TestEnum[][][]>> e =
x.entrySet().iterator().next();
@@ -1739,7 +1738,7 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
// PartFormatter tests
//-----------------------------------------------------------------------------------------------------------------
- @RestOp(method=POST, path="/partFormatters/{p1}")
+ @RestPost(path="/partFormatters/{p1}")
public String partFormatter(
@Path("p1") String p1,
@Header("h1") String h1,
@@ -1759,12 +1758,12 @@ public class ThirdPartyProxyResource extends
BasicRestServletJena {
// @RemoteOp(returns=HTTP_STATUS)
//-----------------------------------------------------------------------------------------------------------------
- @RestOp(method=GET, path="/httpStatusReturn200")
+ @RestGet(path="/httpStatusReturn200")
public void httpStatusReturn200(RestResponse res) {
res.setStatus(200);
}
- @RestOp(method=GET, path="/httpStatusReturn404")
+ @RestGet(path="/httpStatusReturn404")
public void httpStatusReturn404(RestResponse res) {
res.setStatus(404);
}
diff --git
a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
index 04914fb..32dc0e7 100644
---
a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
+++
b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.testutils.Constants.*;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.runners.MethodSorters.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import java.util.*;
import java.util.concurrent.atomic.*;
@@ -232,9 +233,9 @@ public class ThirdPartyProxyTest extends RestTestcase {
}
@Test
- public void a10_nameValuePairsHeader() throws Exception {
- String r = proxy.nameValuePairsHeader(
- HeaderList.ofPairs("a","foo","b","","c",null)
+ public void a10_headerList() throws Exception {
+ String r = proxy.headerList(
+ headerList("a","foo","b","","c",null)
);
assertEquals("OK", r);
}
@@ -1617,8 +1618,8 @@ public class ThirdPartyProxyTest extends RestTestcase {
@Header("*") NeBean a
);
- @RemoteOp(method="GET", path="/nameValuePairsHeader")
- String nameValuePairsHeader(
+ @RemoteOp(method="GET", path="/headerList")
+ String headerList(
@Header(value="*", allowEmptyValue=true) HeaderList a
);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/HeaderList_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/HeaderList_Test.java
index 0de66ae..c652589 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/HeaderList_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/HeaderList_Test.java
@@ -55,16 +55,16 @@ public class HeaderList_Test {
public void a02_creators() {
HeaderList x;
- x = HeaderList.of(header("Foo","bar"), header("Foo","baz"),
null);
+ x = headerList(header("Foo","bar"), header("Foo","baz"), null);
assertObject(x.iterator()).asJson().is("['Foo: bar','Foo:
baz']");
- x = HeaderList.of(AList.of(header("Foo","bar"),
header("Foo","baz"), null));
+ x = headerList(AList.of(header("Foo","bar"),
header("Foo","baz"), null));
assertObject(x.iterator()).asJson().is("['Foo: bar','Foo:
baz']");
- x = HeaderList.ofPairs("Foo","bar","Foo","baz");
+ x = headerList("Foo","bar","Foo","baz");
assertObject(x.iterator()).asJson().is("['Foo: bar','Foo:
baz']");
- assertThrown(()->HeaderList.ofPairs("Foo")).is("Odd number of
parameters passed into HeaderList.ofPairs()");
+ assertThrown(()->headerList("Foo")).is("Odd number of
parameters passed into HeaderList.ofPairs()");
}
@Test
@@ -95,7 +95,7 @@ public class HeaderList_Test {
HeaderListBuilder x = HeaderList
.create()
.add("X1","1")
- .add(HeaderList.ofPairs("X2","2"));
+ .add(headerList("X2","2"));
assertObject(x.build().getAll()).asJson().is("['X1: 1','X2:
2']");
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
index b577487..60baf13 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
@@ -891,7 +891,7 @@ public class Remote_HeaderAnnotation_Test {
//------------------------------------------------------------------------------------------------------------------
private static HeaderList headers(Object...pairs) {
- return HeaderList.ofPairs(pairs);
+ return headerList(pairs);
}
private static org.apache.http.Header header(String key,Object val) {
