http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/39cecfc7/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ThirdPartyProxyResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ThirdPartyProxyResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ThirdPartyProxyResource.java index db35799..77e050f 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ThirdPartyProxyResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ThirdPartyProxyResource.java @@ -16,6 +16,7 @@ import static java.util.Arrays.*; import static org.apache.juneau.rest.test.TestUtils.*; import static org.apache.juneau.rest.test.pojos.Constants.*; import static org.junit.Assert.*; +import static org.apache.juneau.http.HttpMethodName.*; import java.io.*; import java.util.*; @@ -96,7 +97,7 @@ public class ThirdPartyProxyResource extends ResourceJena { // Header tests //-------------------------------------------------------------------------------- - @RestMethod(name="GET", path="/primitiveHeaders") + @RestMethod(name=GET, path="/primitiveHeaders") public String primitiveHeaders( @Header("a") String a, @Header("an") String an, @@ -119,7 +120,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/primitiveCollectionHeaders") + @RestMethod(name=GET, path="/primitiveCollectionHeaders") public String primitiveCollectionHeaders( @Header("a") int[][][] a, @Header("b") Integer[][][] b, @@ -148,7 +149,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/beanHeaders") + @RestMethod(name=GET, path="/beanHeaders") public String beanHeaders( @Header("a") ABean a, @Header("an") ABean an, @@ -181,7 +182,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/typedBeanHeaders") + @RestMethod(name=GET, path="/typedBeanHeaders") public String typedBeanHeaders( @Header("a") TypedBean a, @Header("an") TypedBean an, @@ -217,7 +218,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/swappedPojoHeaders") + @RestMethod(name=GET, path="/swappedPojoHeaders") public String swappedPojoHeaders( @Header("a") SwappedPojo a, @Header("b") SwappedPojo[][][] b, @@ -240,7 +241,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/implicitSwappedPojoHeaders") + @RestMethod(name=GET, path="/implicitSwappedPojoHeaders") public String implicitSwappedPojoHeaders( @Header("a") ImplicitSwappedPojo a, @Header("b") ImplicitSwappedPojo[][][] b, @@ -263,7 +264,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/enumHeaders") + @RestMethod(name=GET, path="/enumHeaders") public String enumHeaders( @Header("a") TestEnum a, @Header("an") TestEnum an, @@ -299,7 +300,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/mapHeader") + @RestMethod(name=GET, path="/mapHeader") public String mapHeader( @Header("a") String a, @Header("b") String b, @@ -313,7 +314,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/beanHeader") + @RestMethod(name=GET, path="/beanHeader") public String beanHeader( @Header("a") String a, @Header("b") String b, @@ -327,7 +328,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/nameValuePairsHeader") + @RestMethod(name=GET, path="/nameValuePairsHeader") public String nameValuePairsHeader( @Header("a") String a, @Header("b") String b, @@ -341,7 +342,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/headerIfNE1") + @RestMethod(name=GET, path="/headerIfNE1") public String headerIfNE1( @Header("a") String a ) throws Exception { @@ -351,7 +352,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/headerIfNE2") + @RestMethod(name=GET, path="/headerIfNE2") public String headerIfNE2( @Header("a") String a ) throws Exception { @@ -361,7 +362,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/headerIfNEMap") + @RestMethod(name=GET, path="/headerIfNEMap") public String headerIfNEMap( @Header("a") String a, @Header("b") String b, @@ -375,7 +376,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/headerIfNEBean") + @RestMethod(name=GET, path="/headerIfNEBean") public String headerIfNEBean( @Header("a") String a, @Header("b") String b, @@ -389,7 +390,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/headerIfNEnameValuePairs") + @RestMethod(name=GET, path="/headerIfNEnameValuePairs") public String headerIfNEnameValuePairs( @Header("a") String a, @Header("b") String b, @@ -408,7 +409,7 @@ public class ThirdPartyProxyResource extends ResourceJena { // Query tests //-------------------------------------------------------------------------------- - @RestMethod(name="GET", path="/primitiveQueries") + @RestMethod(name=GET, path="/primitiveQueries") public String primitiveQueries( @Query("a") String a, @Query("an") String an, @@ -431,7 +432,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/primitiveCollectionQueries") + @RestMethod(name=GET, path="/primitiveCollectionQueries") public String primitiveCollectionQueries( @Query("a") int[][][] a, @Query("b") Integer[][][] b, @@ -460,7 +461,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/beanQueries") + @RestMethod(name=GET, path="/beanQueries") public String beanQueries( @Query("a") ABean a, @Query("an") ABean an, @@ -493,7 +494,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/typedBeanQueries") + @RestMethod(name=GET, path="/typedBeanQueries") public String typedBeanQueries( @Query("a") TypedBean a, @Query("an") TypedBean an, @@ -529,7 +530,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/swappedPojoQueries") + @RestMethod(name=GET, path="/swappedPojoQueries") public String swappedPojoQueries( @Query("a") SwappedPojo a, @Query("b") SwappedPojo[][][] b, @@ -552,7 +553,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/implicitSwappedPojoQueries") + @RestMethod(name=GET, path="/implicitSwappedPojoQueries") public String implicitSwappedPojoQueries( @Query("a") ImplicitSwappedPojo a, @Query("b") ImplicitSwappedPojo[][][] b, @@ -575,7 +576,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/enumQueries") + @RestMethod(name=GET, path="/enumQueries") public String enumQueries( @Query("a") TestEnum a, @Query("an") TestEnum an, @@ -611,7 +612,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/stringQuery1") + @RestMethod(name=GET, path="/stringQuery1") public String stringQuery1( @Query("a") int a, @Query("b") String b @@ -623,7 +624,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/stringQuery2") + @RestMethod(name=GET, path="/stringQuery2") public String stringQuery2( @Query("a") int a, @Query("b") String b @@ -635,7 +636,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/mapQuery") + @RestMethod(name=GET, path="/mapQuery") public String mapQuery( @Query("a") int a, @Query("b") String b @@ -647,7 +648,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/beanQuery") + @RestMethod(name=GET, path="/beanQuery") public String beanQuery( @Query("a") String a, @Query("b") String b, @@ -661,7 +662,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/nameValuePairsQuery") + @RestMethod(name=GET, path="/nameValuePairsQuery") public String nameValuePairsQuery( @Query("a") String a, @Query("b") String b, @@ -675,7 +676,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/queryIfNE1") + @RestMethod(name=GET, path="/queryIfNE1") public String queryIfNE1( @Query("a") String a ) throws Exception { @@ -685,7 +686,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/queryIfNE2") + @RestMethod(name=GET, path="/queryIfNE2") public String queryIfNE2( @Query("q") String a ) throws Exception { @@ -695,7 +696,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/queryIfNEMap") + @RestMethod(name=GET, path="/queryIfNEMap") public String queryIfNEMap( @Query("a") String a, @Query("b") String b, @@ -709,7 +710,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/queryIfNEBean") + @RestMethod(name=GET, path="/queryIfNEBean") public String queryIfNEBean( @Query("a") String a, @Query("b") String b, @@ -723,7 +724,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="GET", path="/queryIfNEnameValuePairs") + @RestMethod(name=GET, path="/queryIfNEnameValuePairs") public String queryIfNEnameValuePairs( @Query("a") String a, @Query("b") String b, @@ -742,7 +743,7 @@ public class ThirdPartyProxyResource extends ResourceJena { // FormData tests //-------------------------------------------------------------------------------- - @RestMethod(name="POST", path="/primitiveFormData") + @RestMethod(name=POST, path="/primitiveFormData") public String primitiveFormData( @FormData("a") String a, @FormData("an") String an, @@ -765,7 +766,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="POST", path="/primitiveCollectionFormData") + @RestMethod(name=POST, path="/primitiveCollectionFormData") public String primitiveCollectionFormData( @FormData("a") int[][][] a, @FormData("b") Integer[][][] b, @@ -794,7 +795,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="POST", path="/beanFormData") + @RestMethod(name=POST, path="/beanFormData") public String beanFormData( @FormData("a") ABean a, @FormData("an") ABean an, @@ -827,7 +828,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="POST", path="/typedBeanFormData") + @RestMethod(name=POST, path="/typedBeanFormData") public String typedBeanFormData( @FormData("a") TypedBean a, @FormData("an") TypedBean an, @@ -863,7 +864,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="POST", path="/swappedPojoFormData") + @RestMethod(name=POST, path="/swappedPojoFormData") public String swappedPojoFormData( @FormData("a") SwappedPojo a, @FormData("b") SwappedPojo[][][] b, @@ -886,7 +887,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="POST", path="/implicitSwappedPojoFormData") + @RestMethod(name=POST, path="/implicitSwappedPojoFormData") public String implicitSwappedPojoFormData( @FormData("a") ImplicitSwappedPojo a, @FormData("b") ImplicitSwappedPojo[][][] b, @@ -909,7 +910,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="POST", path="/enumFormData") + @RestMethod(name=POST, path="/enumFormData") public String enumFormData( @FormData("a") TestEnum a, @FormData("an") TestEnum an, @@ -945,7 +946,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="POST", path="/mapFormData") + @RestMethod(name=POST, path="/mapFormData") public String mapFormData( @FormData("a") String a, @FormData("b") String b, @@ -959,7 +960,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="POST", path="/beanFormData2") + @RestMethod(name=POST, path="/beanFormData2") public String beanFormData( @FormData("a") String a, @FormData("b") String b, @@ -973,7 +974,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="POST", path="/nameValuePairsFormData") + @RestMethod(name=POST, path="/nameValuePairsFormData") public String nameValuePairsFormData( @FormData("a") String a, @FormData("b") String b, @@ -987,7 +988,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="POST", path="/formDataIfNE1") + @RestMethod(name=POST, path="/formDataIfNE1") public String formDataIfNE1( @FormData("a") String a ) throws Exception { @@ -997,7 +998,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="POST", path="/formDataIfNE2") + @RestMethod(name=POST, path="/formDataIfNE2") public String formDataIfNE2( @FormData("a") String a ) throws Exception { @@ -1007,7 +1008,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="POST", path="/formDataIfNEMap") + @RestMethod(name=POST, path="/formDataIfNEMap") public String formDataIfNEMap( @FormData("a") String a, @FormData("b") String b, @@ -1021,7 +1022,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="POST", path="/formDataIfNEBean") + @RestMethod(name=POST, path="/formDataIfNEBean") public String formDataIfNEBean( @FormData("a") String a, @FormData("b") String b, @@ -1035,7 +1036,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="POST", path="/formDataIfNENameValuePairs") + @RestMethod(name=POST, path="/formDataIfNENameValuePairs") public String formDataIfNENameValuePairs( @FormData("a") String a, @FormData("b") String b, @@ -1054,7 +1055,7 @@ public class ThirdPartyProxyResource extends ResourceJena { // Path tests //-------------------------------------------------------------------------------- - @RestMethod(name="POST", path="/pathVars1/{a}/{b}") + @RestMethod(name=POST, path="/pathVars1/{a}/{b}") public String pathVars1( @Path("a") int a, @Path("b") String b @@ -1067,7 +1068,7 @@ public class ThirdPartyProxyResource extends ResourceJena { } - @RestMethod(name="POST", path="/pathVars2/{a}/{b}") + @RestMethod(name=POST, path="/pathVars2/{a}/{b}") public String pathVars2( @Path("a") int a, @Path("b") String b @@ -1079,7 +1080,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="POST", path="/pathVars3/{a}/{b}") + @RestMethod(name=POST, path="/pathVars3/{a}/{b}") public String pathVars3( @Path("a") int a, @Path("b") String b @@ -1095,7 +1096,7 @@ public class ThirdPartyProxyResource extends ResourceJena { // RequestBean tests //-------------------------------------------------------------------------------- - @RestMethod(name="POST", path="/reqBeanPath/{a}/{b}") + @RestMethod(name=POST, path="/reqBeanPath/{a}/{b}") public String reqBeanPath( @Path("a") int a, @Path("b") String b @@ -1107,7 +1108,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="POST", path="/reqBeanQuery") + @RestMethod(name=POST, path="/reqBeanQuery") public String reqBeanQuery( @Query("a") int a, @Query("b") String b @@ -1119,7 +1120,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="POST", path="/reqBeanQueryIfNE") + @RestMethod(name=POST, path="/reqBeanQueryIfNE") public String reqBeanQueryIfNE( @Query("a") String a, @Query("b") String b, @@ -1133,7 +1134,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="POST", path="/reqBeanFormData") + @RestMethod(name=POST, path="/reqBeanFormData") public String reqBeanFormData( @FormData("a") int a, @FormData("b") String b @@ -1145,7 +1146,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="POST", path="/reqBeanFormDataIfNE") + @RestMethod(name=POST, path="/reqBeanFormDataIfNE") public String reqBeanFormDataIfNE( @FormData("a") String a, @FormData("b") String b, @@ -1159,7 +1160,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="POST", path="/reqBeanHeader") + @RestMethod(name=POST, path="/reqBeanHeader") public String reqBeanHeader( @Header("a") int a, @Header("b") String b @@ -1171,7 +1172,7 @@ public class ThirdPartyProxyResource extends ResourceJena { return "OK"; } - @RestMethod(name="POST", path="/reqBeanHeaderIfNE") + @RestMethod(name=POST, path="/reqBeanHeaderIfNE") public String reqBeanHeaderIfNE( @Header("a") String a, @Header("b") String b, @@ -1190,66 +1191,66 @@ public class ThirdPartyProxyResource extends ResourceJena { // Various primitives - @RestMethod(name="GET", path="/returnVoid") + @RestMethod(name=GET, path="/returnVoid") public void returnVoid() { } - @RestMethod(name="GET", path="/returnInteger") + @RestMethod(name=GET, path="/returnInteger") public Integer returnInteger() { return 1; } - @RestMethod(name="GET", path="/returnInt") + @RestMethod(name=GET, path="/returnInt") public int returnInt() { return 1; } - @RestMethod(name="GET", path="/returnBoolean") + @RestMethod(name=GET, path="/returnBoolean") public boolean returnBoolean() { return true; } - @RestMethod(name="GET", path="/returnFloat") + @RestMethod(name=GET, path="/returnFloat") public float returnFloat() { return 1f; } - @RestMethod(name="GET", path="/returnFloatObject") + @RestMethod(name=GET, path="/returnFloatObject") public Float returnFloatObject() { return 1f; } - @RestMethod(name="GET", path="/returnString") + @RestMethod(name=GET, path="/returnString") public String returnString() { return "foobar"; } - @RestMethod(name="GET", path="/returnNullString") + @RestMethod(name=GET, path="/returnNullString") public String returnNullString() { return null; } - @RestMethod(name="GET", path="/returnInt3dArray") + @RestMethod(name=GET, path="/returnInt3dArray") public int[][][] returnInt3dArray() { return new int[][][]{{{1,2},null},null}; } - @RestMethod(name="GET", path="/returnInteger3dArray") + @RestMethod(name=GET, path="/returnInteger3dArray") public Integer[][][] returnInteger3dArray() { return new Integer[][][]{{{1,null},null},null}; } - @RestMethod(name="GET", path="/returnString3dArray") + @RestMethod(name=GET, path="/returnString3dArray") public String[][][] returnString3dArray() { return new String[][][]{{{"foo","bar",null},null},null}; } - @RestMethod(name="GET", path="/returnIntegerList") + @RestMethod(name=GET, path="/returnIntegerList") public List<Integer> returnIntegerList() { return asList(new Integer[]{1,null}); } - @RestMethod(name="GET", path="/returnInteger3dList") + @RestMethod(name=GET, path="/returnInteger3dList") public List<List<List<Integer>>> returnInteger3dList() { return new AList<List<List<Integer>>>() .append( @@ -1262,167 +1263,167 @@ public class ThirdPartyProxyResource extends ResourceJena { .append(null); } - @RestMethod(name="GET", path="/returnInteger1d3dList") + @RestMethod(name=GET, path="/returnInteger1d3dList") public List<Integer[][][]> returnInteger1d3dList() { return new AList<Integer[][][]>().append(new Integer[][][]{{{1,null},null},null}).append(null); } - @RestMethod(name="GET", path="/returnInt1d3dList") + @RestMethod(name=GET, path="/returnInt1d3dList") public List<int[][][]> returnInt1d3dList() { return new AList<int[][][]>().append(new int[][][]{{{1,2},null},null}).append(null); } - @RestMethod(name="GET", path="/returnStringList") + @RestMethod(name=GET, path="/returnStringList") public List<String> returnStringList() { return asList(new String[]{"foo","bar",null}); } // Beans - @RestMethod(name="GET", path="/returnBean") + @RestMethod(name=GET, path="/returnBean") public ABean returnBean() { return new ABean().init(); } - @RestMethod(name="GET", path="/returnBean3dArray") + @RestMethod(name=GET, path="/returnBean3dArray") public ABean[][][] returnBean3dArray() { return new ABean[][][]{{{new ABean().init(),null},null},null}; } - @RestMethod(name="GET", path="/returnBeanList") + @RestMethod(name=GET, path="/returnBeanList") public List<ABean> returnBeanList() { return asList(new ABean().init()); } - @RestMethod(name="GET", path="/returnBean1d3dList") + @RestMethod(name=GET, path="/returnBean1d3dList") public List<ABean[][][]> returnBean1d3dList() { return new AList<ABean[][][]>().append(new ABean[][][]{{{new ABean().init(),null},null},null}).append(null); } - @RestMethod(name="GET", path="/returnBeanMap") + @RestMethod(name=GET, path="/returnBeanMap") public Map<String,ABean> returnBeanMap() { return new AMap<String,ABean>().append("foo",new ABean().init()); } - @RestMethod(name="GET", path="/returnBeanListMap") + @RestMethod(name=GET, path="/returnBeanListMap") public Map<String,List<ABean>> returnBeanListMap() { return new AMap<String,List<ABean>>().append("foo",asList(new ABean().init())); } - @RestMethod(name="GET", path="/returnBean1d3dListMap") + @RestMethod(name=GET, path="/returnBean1d3dListMap") 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)); } - @RestMethod(name="GET", path="/returnBeanListMapIntegerKeys") + @RestMethod(name=GET, path="/returnBeanListMapIntegerKeys") public Map<Integer,List<ABean>> returnBeanListMapIntegerKeys() { return new AMap<Integer,List<ABean>>().append(1,asList(new ABean().init())); } // Typed beans - @RestMethod(name="GET", path="/returnTypedBean") + @RestMethod(name=GET, path="/returnTypedBean") public TypedBean returnTypedBean() { return new TypedBeanImpl().init(); } - @RestMethod(name="GET", path="/returnTypedBean3dArray") + @RestMethod(name=GET, path="/returnTypedBean3dArray") public TypedBean[][][] returnTypedBean3dArray() { return new TypedBean[][][]{{{new TypedBeanImpl().init(),null},null},null}; } - @RestMethod(name="GET", path="/returnTypedBeanList") + @RestMethod(name=GET, path="/returnTypedBeanList") public List<TypedBean> returnTypedBeanList() { return asList((TypedBean)new TypedBeanImpl().init()); } - @RestMethod(name="GET", path="/returnTypedBean1d3dList") + @RestMethod(name=GET, path="/returnTypedBean1d3dList") public List<TypedBean[][][]> returnTypedBean1d3dList() { return new AList<TypedBean[][][]>().append(new TypedBean[][][]{{{new TypedBeanImpl().init(),null},null},null}).append(null); } - @RestMethod(name="GET", path="/returnTypedBeanMap") + @RestMethod(name=GET, path="/returnTypedBeanMap") public Map<String,TypedBean> returnTypedBeanMap() { return new AMap<String,TypedBean>().append("foo",new TypedBeanImpl().init()); } - @RestMethod(name="GET", path="/returnTypedBeanListMap") + @RestMethod(name=GET, path="/returnTypedBeanListMap") public Map<String,List<TypedBean>> returnTypedBeanListMap() { return new AMap<String,List<TypedBean>>().append("foo",asList((TypedBean)new TypedBeanImpl().init())); } - @RestMethod(name="GET", path="/returnTypedBean1d3dListMap") + @RestMethod(name=GET, path="/returnTypedBean1d3dListMap") 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)); } - @RestMethod(name="GET", path="/returnTypedBeanListMapIntegerKeys") + @RestMethod(name=GET, path="/returnTypedBeanListMapIntegerKeys") public Map<Integer,List<TypedBean>> returnTypedBeanListMapIntegerKeys() { return new AMap<Integer,List<TypedBean>>().append(1,asList((TypedBean)new TypedBeanImpl().init())); } // Swapped POJOs - @RestMethod(name="GET", path="/returnSwappedPojo") + @RestMethod(name=GET, path="/returnSwappedPojo") public SwappedPojo returnSwappedPojo() { return new SwappedPojo(); } - @RestMethod(name="GET", path="/returnSwappedPojo3dArray") + @RestMethod(name=GET, path="/returnSwappedPojo3dArray") public SwappedPojo[][][] returnSwappedPojo3dArray() { return new SwappedPojo[][][]{{{new SwappedPojo(),null},null},null}; } - @RestMethod(name="GET", path="/returnSwappedPojoMap") + @RestMethod(name=GET, path="/returnSwappedPojoMap") public Map<SwappedPojo,SwappedPojo> returnSwappedPojoMap() { return new AMap<SwappedPojo,SwappedPojo>().append(new SwappedPojo(), new SwappedPojo()); } - @RestMethod(name="GET", path="/returnSwappedPojo3dMap") + @RestMethod(name=GET, path="/returnSwappedPojo3dMap") public Map<SwappedPojo,SwappedPojo[][][]> returnSwappedPojo3dMap() { return new AMap<SwappedPojo,SwappedPojo[][][]>().append(new SwappedPojo(), new SwappedPojo[][][]{{{new SwappedPojo(),null},null},null}); } // Implicit swapped POJOs - @RestMethod(name="GET", path="/returnImplicitSwappedPojo") + @RestMethod(name=GET, path="/returnImplicitSwappedPojo") public ImplicitSwappedPojo returnImplicitSwappedPojo() { return new ImplicitSwappedPojo(); } - @RestMethod(name="GET", path="/returnImplicitSwappedPojo3dArray") + @RestMethod(name=GET, path="/returnImplicitSwappedPojo3dArray") public ImplicitSwappedPojo[][][] returnImplicitSwappedPojo3dArray() { return new ImplicitSwappedPojo[][][]{{{new ImplicitSwappedPojo(),null},null},null}; } - @RestMethod(name="GET", path="/returnImplicitSwappedPojoMap") + @RestMethod(name=GET, path="/returnImplicitSwappedPojoMap") public Map<ImplicitSwappedPojo,ImplicitSwappedPojo> returnImplicitSwappedPojoMap() { return new AMap<ImplicitSwappedPojo,ImplicitSwappedPojo>().append(new ImplicitSwappedPojo(), new ImplicitSwappedPojo()); } - @RestMethod(name="GET", path="/returnImplicitSwappedPojo3dMap") + @RestMethod(name=GET, path="/returnImplicitSwappedPojo3dMap") public Map<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> returnImplicitSwappedPojo3dMap() { return new AMap<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]>().append(new ImplicitSwappedPojo(), new ImplicitSwappedPojo[][][]{{{new ImplicitSwappedPojo(),null},null},null}); } // Enums - @RestMethod(name="GET", path="/returnEnum") + @RestMethod(name=GET, path="/returnEnum") public TestEnum returnEnum() { return TestEnum.TWO; } - @RestMethod(name="GET", path="/returnEnum3d") + @RestMethod(name=GET, path="/returnEnum3d") public TestEnum[][][] returnEnum3d() { return new TestEnum[][][]{{{TestEnum.TWO,null},null},null}; } - @RestMethod(name="GET", path="/returnEnumList") + @RestMethod(name=GET, path="/returnEnumList") public List<TestEnum> returnEnumList() { return new AList<TestEnum>().append(TestEnum.TWO).append(null); } - @RestMethod(name="GET", path="/returnEnum3dList") + @RestMethod(name=GET, path="/returnEnum3dList") public List<List<List<TestEnum>>> returnEnum3dList() { return new AList<List<List<TestEnum>>>() .append( @@ -1435,22 +1436,22 @@ public class ThirdPartyProxyResource extends ResourceJena { ); } - @RestMethod(name="GET", path="/returnEnum1d3dList") + @RestMethod(name=GET, path="/returnEnum1d3dList") public List<TestEnum[][][]> returnEnum1d3dList() { return new AList<TestEnum[][][]>().append(new TestEnum[][][]{{{TestEnum.TWO,null},null},null}).append(null); } - @RestMethod(name="GET", path="/returnEnumMap") + @RestMethod(name=GET, path="/returnEnumMap") public Map<TestEnum,TestEnum> returnEnumMap() { return new AMap<TestEnum,TestEnum>().append(TestEnum.ONE,TestEnum.TWO); } - @RestMethod(name="GET", path="/returnEnum3dArrayMap") + @RestMethod(name=GET, path="/returnEnum3dArrayMap") public Map<TestEnum,TestEnum[][][]> returnEnum3dArrayMap() { return new AMap<TestEnum,TestEnum[][][]>().append(TestEnum.ONE, new TestEnum[][][]{{{TestEnum.TWO,null},null},null}); } - @RestMethod(name="GET", path="/returnEnum1d3dListMap") + @RestMethod(name=GET, path="/returnEnum1d3dListMap") 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)); } @@ -1461,124 +1462,124 @@ public class ThirdPartyProxyResource extends ResourceJena { // Various primitives - @RestMethod(name="POST", path="/setInt") + @RestMethod(name=POST, path="/setInt") public void setInt(@Body int x) { assertEquals(1, x); } - @RestMethod(name="POST", path="/setInteger") + @RestMethod(name=POST, path="/setInteger") public void setInteger(@Body Integer x) { assertEquals((Integer)1, x); } - @RestMethod(name="POST", path="/setBoolean") + @RestMethod(name=POST, path="/setBoolean") public void setBoolean(@Body boolean x) { assertTrue(x); } - @RestMethod(name="POST", path="/setFloat") + @RestMethod(name=POST, path="/setFloat") public void setFloat(@Body float x) { assertTrue(1f == x); } - @RestMethod(name="POST", path="/setFloatObject") + @RestMethod(name=POST, path="/setFloatObject") public void setFloatObject(@Body Float x) { assertTrue(1f == x); } - @RestMethod(name="POST", path="/setString") + @RestMethod(name=POST, path="/setString") public void setString(@Body String x) { assertEquals("foo", x); } - @RestMethod(name="POST", path="/setNullString") + @RestMethod(name=POST, path="/setNullString") public void setNullString(@Body String x) { assertNull(x); } - @RestMethod(name="POST", path="/setInt3dArray") + @RestMethod(name=POST, path="/setInt3dArray") public String setInt3dArray(@Body int[][][] x) { return ""+x[0][0][0]; } - @RestMethod(name="POST", path="/setInteger3dArray") + @RestMethod(name=POST, path="/setInteger3dArray") public void setInteger3dArray(@Body Integer[][][] x) { assertObjectEquals("[[[1,null],null],null]", x); } - @RestMethod(name="POST", path="/setString3dArray") + @RestMethod(name=POST, path="/setString3dArray") public void setString3dArray(@Body String[][][] x) { assertObjectEquals("[[['foo',null],null],null]", x); } - @RestMethod(name="POST", path="/setIntegerList") + @RestMethod(name=POST, path="/setIntegerList") public void setIntegerList(@Body List<Integer> x) { assertObjectEquals("[1,null]", x); assertClass(Integer.class, x.get(0)); } - @RestMethod(name="POST", path="/setInteger3dList") + @RestMethod(name=POST, path="/setInteger3dList") public void setInteger3dList(@Body List<List<List<Integer>>> x) { assertObjectEquals("[[[1,null],null],null]", x); assertClass(Integer.class, x.get(0).get(0).get(0)); } - @RestMethod(name="POST", path="/setInteger1d3dList") + @RestMethod(name=POST, path="/setInteger1d3dList") public void setInteger1d3dList(@Body 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]); } - @RestMethod(name="POST", path="/setInt1d3dList") + @RestMethod(name=POST, path="/setInt1d3dList") public void setInt1d3dList(@Body List<int[][][]> x) { assertObjectEquals("[[[[1,2],null],null],null]", x); assertClass(int[][][].class, x.get(0)); } - @RestMethod(name="POST", path="/setStringList") + @RestMethod(name=POST, path="/setStringList") public void setStringList(@Body List<String> x) { assertObjectEquals("['foo','bar',null]", x); } // Beans - @RestMethod(name="POST", path="/setBean") + @RestMethod(name=POST, path="/setBean") public void setBean(@Body ABean x) { assertObjectEquals("{a:1,b:'foo'}", x); } - @RestMethod(name="POST", path="/setBean3dArray") + @RestMethod(name=POST, path="/setBean3dArray") public void setBean3dArray(@Body ABean[][][] x) { assertObjectEquals("[[[{a:1,b:'foo'},null],null],null]", x); } - @RestMethod(name="POST", path="/setBeanList") + @RestMethod(name=POST, path="/setBeanList") public void setBeanList(@Body List<ABean> x) { assertObjectEquals("[{a:1,b:'foo'}]", x); } - @RestMethod(name="POST", path="/setBean1d3dList") + @RestMethod(name=POST, path="/setBean1d3dList") public void setBean1d3dList(@Body List<ABean[][][]> x) { assertObjectEquals("[[[[{a:1,b:'foo'},null],null],null],null]", x); } - @RestMethod(name="POST", path="/setBeanMap") + @RestMethod(name=POST, path="/setBeanMap") public void setBeanMap(@Body Map<String,ABean> x) { assertObjectEquals("{foo:{a:1,b:'foo'}}", x); } - @RestMethod(name="POST", path="/setBeanListMap") + @RestMethod(name=POST, path="/setBeanListMap") public void setBeanListMap(@Body Map<String,List<ABean>> x) { assertObjectEquals("{foo:[{a:1,b:'foo'}]}", x); } - @RestMethod(name="POST", path="/setBean1d3dListMap") + @RestMethod(name=POST, path="/setBean1d3dListMap") public void setBean1d3dListMap(@Body Map<String,List<ABean[][][]>> x) { assertObjectEquals("{foo:[[[[{a:1,b:'foo'},null],null],null],null]}", x); } - @RestMethod(name="POST", path="/setBeanListMapIntegerKeys") + @RestMethod(name=POST, path="/setBeanListMapIntegerKeys") public void setBeanListMapIntegerKeys(@Body 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()); @@ -1586,49 +1587,49 @@ public class ThirdPartyProxyResource extends ResourceJena { // Typed beans - @RestMethod(name="POST", path="/setTypedBean") + @RestMethod(name=POST, path="/setTypedBean") public void setTypedBean(@Body TypedBean x) { assertObjectEquals("{_type:'TypedBeanImpl',a:1,b:'foo'}", x); assertClass(TypedBeanImpl.class, x); } - @RestMethod(name="POST", path="/setTypedBean3dArray") + @RestMethod(name=POST, path="/setTypedBean3dArray") public void setTypedBean3dArray(@Body TypedBean[][][] x) { assertObjectEquals("[[[{_type:'TypedBeanImpl',a:1,b:'foo'},null],null],null]", x); assertClass(TypedBeanImpl.class, x[0][0][0]); } - @RestMethod(name="POST", path="/setTypedBeanList") + @RestMethod(name=POST, path="/setTypedBeanList") public void setTypedBeanList(@Body List<TypedBean> x) { assertObjectEquals("[{_type:'TypedBeanImpl',a:1,b:'foo'}]", x); assertClass(TypedBeanImpl.class, x.get(0)); } - @RestMethod(name="POST", path="/setTypedBean1d3dList") + @RestMethod(name=POST, path="/setTypedBean1d3dList") public void setTypedBean1d3dList(@Body List<TypedBean[][][]> x) { assertObjectEquals("[[[[{_type:'TypedBeanImpl',a:1,b:'foo'},null],null],null],null]", x); assertClass(TypedBeanImpl.class, x.get(0)[0][0][0]); } - @RestMethod(name="POST", path="/setTypedBeanMap") + @RestMethod(name=POST, path="/setTypedBeanMap") public void setTypedBeanMap(@Body Map<String,TypedBean> x) { assertObjectEquals("{foo:{_type:'TypedBeanImpl',a:1,b:'foo'}}", x); assertClass(TypedBeanImpl.class, x.get("foo")); } - @RestMethod(name="POST", path="/setTypedBeanListMap") + @RestMethod(name=POST, path="/setTypedBeanListMap") public void setTypedBeanListMap(@Body Map<String,List<TypedBean>> x) { assertObjectEquals("{foo:[{_type:'TypedBeanImpl',a:1,b:'foo'}]}", x); assertClass(TypedBeanImpl.class, x.get("foo").get(0)); } - @RestMethod(name="POST", path="/setTypedBean1d3dListMap") + @RestMethod(name=POST, path="/setTypedBean1d3dListMap") public void setTypedBean1d3dListMap(@Body 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]); } - @RestMethod(name="POST", path="/setTypedBeanListMapIntegerKeys") + @RestMethod(name=POST, path="/setTypedBeanListMapIntegerKeys") public void setTypedBeanListMapIntegerKeys(@Body 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)); @@ -1636,18 +1637,18 @@ public class ThirdPartyProxyResource extends ResourceJena { // Swapped POJOs - @RestMethod(name="POST", path="/setSwappedPojo") + @RestMethod(name=POST, path="/setSwappedPojo") public void setSwappedPojo(@Body SwappedPojo x) { assertTrue(x.wasUnswapped); } - @RestMethod(name="POST", path="/setSwappedPojo3dArray") + @RestMethod(name=POST, path="/setSwappedPojo3dArray") public void setSwappedPojo3dArray(@Body SwappedPojo[][][] x) { assertObjectEquals("[[['"+SWAP+"',null],null],null]", x); assertTrue(x[0][0][0].wasUnswapped); } - @RestMethod(name="POST", path="/setSwappedPojoMap") + @RestMethod(name=POST, path="/setSwappedPojoMap") public void setSwappedPojoMap(@Body Map<SwappedPojo,SwappedPojo> x) { assertObjectEquals("{'"+SWAP+"':'"+SWAP+"'}", x); Map.Entry<SwappedPojo,SwappedPojo> e = x.entrySet().iterator().next(); @@ -1655,7 +1656,7 @@ public class ThirdPartyProxyResource extends ResourceJena { assertTrue(e.getValue().wasUnswapped); } - @RestMethod(name="POST", path="/setSwappedPojo3dMap") + @RestMethod(name=POST, path="/setSwappedPojo3dMap") public void setSwappedPojo3dMap(@Body Map<SwappedPojo,SwappedPojo[][][]> x) { assertObjectEquals("{'"+SWAP+"':[[['"+SWAP+"',null],null],null]}", x); Map.Entry<SwappedPojo,SwappedPojo[][][]> e = x.entrySet().iterator().next(); @@ -1665,18 +1666,18 @@ public class ThirdPartyProxyResource extends ResourceJena { // Implicit swapped POJOs - @RestMethod(name="POST", path="/setImplicitSwappedPojo") + @RestMethod(name=POST, path="/setImplicitSwappedPojo") public void setImplicitSwappedPojo(@Body ImplicitSwappedPojo x) { assertTrue(x.wasUnswapped); } - @RestMethod(name="POST", path="/setImplicitSwappedPojo3dArray") + @RestMethod(name=POST, path="/setImplicitSwappedPojo3dArray") public void setImplicitSwappedPojo3dArray(@Body ImplicitSwappedPojo[][][] x) { assertObjectEquals("[[['"+SWAP+"',null],null],null]", x); assertTrue(x[0][0][0].wasUnswapped); } - @RestMethod(name="POST", path="/setImplicitSwappedPojoMap") + @RestMethod(name=POST, path="/setImplicitSwappedPojoMap") public void setImplicitSwappedPojoMap(@Body Map<ImplicitSwappedPojo,ImplicitSwappedPojo> x) { assertObjectEquals("{'"+SWAP+"':'"+SWAP+"'}", x); Map.Entry<ImplicitSwappedPojo,ImplicitSwappedPojo> e = x.entrySet().iterator().next(); @@ -1684,7 +1685,7 @@ public class ThirdPartyProxyResource extends ResourceJena { assertTrue(e.getValue().wasUnswapped); } - @RestMethod(name="POST", path="/setImplicitSwappedPojo3dMap") + @RestMethod(name=POST, path="/setImplicitSwappedPojo3dMap") public void setImplicitSwappedPojo3dMap(@Body Map<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> x) { assertObjectEquals("{'"+SWAP+"':[[['"+SWAP+"',null],null],null]}", x); Map.Entry<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> e = x.entrySet().iterator().next(); @@ -1694,35 +1695,35 @@ public class ThirdPartyProxyResource extends ResourceJena { // Enums - @RestMethod(name="POST", path="/setEnum") + @RestMethod(name=POST, path="/setEnum") public void setEnum(@Body TestEnum x) { assertEquals(TestEnum.TWO, x); } - @RestMethod(name="POST", path="/setEnum3d") + @RestMethod(name=POST, path="/setEnum3d") public void setEnum3d(@Body TestEnum[][][] x) { assertObjectEquals("[[['TWO',null],null],null]", x); } - @RestMethod(name="POST", path="/setEnumList") + @RestMethod(name=POST, path="/setEnumList") public void setEnumList(@Body List<TestEnum> x) { assertObjectEquals("['TWO',null]", x); assertClass(TestEnum.class, x.get(0)); } - @RestMethod(name="POST", path="/setEnum3dList") + @RestMethod(name=POST, path="/setEnum3dList") public void setEnum3dList(@Body List<List<List<TestEnum>>> x) { assertObjectEquals("[[['TWO',null],null,null]]", x); assertClass(TestEnum.class, x.get(0).get(0).get(0)); } - @RestMethod(name="POST", path="/setEnum1d3dList") + @RestMethod(name=POST, path="/setEnum1d3dList") public void setEnum1d3dList(@Body List<TestEnum[][][]> x) { assertObjectEquals("[[[['TWO',null],null],null],null]", x); assertClass(TestEnum[][][].class, x.get(0)); } - @RestMethod(name="POST", path="/setEnumMap") + @RestMethod(name=POST, path="/setEnumMap") public void setEnumMap(@Body Map<TestEnum,TestEnum> x) { assertObjectEquals("{ONE:'TWO'}", x); Map.Entry<TestEnum,TestEnum> e = x.entrySet().iterator().next(); @@ -1730,7 +1731,7 @@ public class ThirdPartyProxyResource extends ResourceJena { assertClass(TestEnum.class, e.getValue()); } - @RestMethod(name="POST", path="/setEnum3dArrayMap") + @RestMethod(name=POST, path="/setEnum3dArrayMap") public void setEnum3dArrayMap(@Body Map<TestEnum,TestEnum[][][]> x) { assertObjectEquals("{ONE:[[['TWO',null],null],null]}", x); Map.Entry<TestEnum,TestEnum[][][]> e = x.entrySet().iterator().next(); @@ -1738,7 +1739,7 @@ public class ThirdPartyProxyResource extends ResourceJena { assertClass(TestEnum[][][].class, e.getValue()); } - @RestMethod(name="POST", path="/setEnum1d3dListMap") + @RestMethod(name=POST, path="/setEnum1d3dListMap") public void setEnum1d3dListMap(@Body Map<TestEnum,List<TestEnum[][][]>> x) { assertObjectEquals("{ONE:[[[['TWO',null],null],null],null]}", x); Map.Entry<TestEnum,List<TestEnum[][][]>> e = x.entrySet().iterator().next(); @@ -1750,7 +1751,7 @@ public class ThirdPartyProxyResource extends ResourceJena { // PartFormatter tests //-------------------------------------------------------------------------------- - @RestMethod(name="POST", path="/partFormatters/{p1}") + @RestMethod(name=POST, path="/partFormatters/{p1}") public String partFormatter( @Path("p1") String p1, @Header("h1") String h1, @@ -1783,12 +1784,12 @@ public class ThirdPartyProxyResource extends ResourceJena { // @RemoteableMethod(returns=HTTP_STATUS) //-------------------------------------------------------------------------------- - @RestMethod(name="GET", path="/httpStatusReturn200") + @RestMethod(name=GET, path="/httpStatusReturn200") public void httpStatusReturn200(RestResponse res) { res.setStatus(200); } - @RestMethod(name="GET", path="/httpStatusReturn404") + @RestMethod(name=GET, path="/httpStatusReturn404") public void httpStatusReturn404(RestResponse res) { res.setStatus(404); }
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/39cecfc7/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/TransformsResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/TransformsResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/TransformsResource.java index 1b52c13..190ecfd 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/TransformsResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/TransformsResource.java @@ -12,6 +12,8 @@ // *************************************************************************************************************************** package org.apache.juneau.rest.test; +import static org.apache.juneau.http.HttpMethodName.*; + import org.apache.juneau.*; import org.apache.juneau.parser.*; import org.apache.juneau.rest.annotation.*; @@ -32,15 +34,15 @@ public class TransformsResource extends TransformsParentResource { // Test class transform overrides parent class transform // Should return "A2-1". //==================================================================================================== - @RestMethod(name="GET", path="/testClassTransformOverridesParentClassTransform") + @RestMethod(name=GET, path="/testClassTransformOverridesParentClassTransform") public A testClassTransformOverridesParentClassTransform() { return new A(); } - @RestMethod(name="PUT", path="/testClassTransformOverridesParentClassTransform") + @RestMethod(name=PUT, path="/testClassTransformOverridesParentClassTransform") public A test1b(@Body A a) { return a; } - @RestMethod(name="PUT", path="/testClassTransformOverridesParentClassTransform/{a}") + @RestMethod(name=PUT, path="/testClassTransformOverridesParentClassTransform/{a}") public A test1c(@Path A a) { return a; } @@ -49,15 +51,15 @@ public class TransformsResource extends TransformsParentResource { // Test method transform overrides class transform // Should return "A3-1". //==================================================================================================== - @RestMethod(name="GET", path="/testMethodTransformOverridesClassTransform", pojoSwaps={SwapA3.class}) + @RestMethod(name=GET, path="/testMethodTransformOverridesClassTransform", pojoSwaps={SwapA3.class}) public A test2a() { return new A(); } - @RestMethod(name="PUT", path="/testMethodTransformOverridesClassTransform", pojoSwaps={SwapA3.class}) + @RestMethod(name=PUT, path="/testMethodTransformOverridesClassTransform", pojoSwaps={SwapA3.class}) public A test2b(@Body A a) { return a; } - @RestMethod(name="PUT", path="/testMethodTransformOverridesClassTransform/{a}", pojoSwaps={SwapA3.class}) + @RestMethod(name=PUT, path="/testMethodTransformOverridesClassTransform/{a}", pojoSwaps={SwapA3.class}) public A test2c(@Path A a) { return a; } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/39cecfc7/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/UrisResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/UrisResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/UrisResource.java index bd64b36..aa46c10 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/UrisResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/UrisResource.java @@ -12,6 +12,8 @@ // *************************************************************************************************************************** package org.apache.juneau.rest.test; +import static org.apache.juneau.http.HttpMethodName.*; + import org.apache.juneau.*; import org.apache.juneau.rest.*; import org.apache.juneau.rest.annotation.*; @@ -25,22 +27,22 @@ import org.apache.juneau.rest.annotation.*; public class UrisResource extends RestServletDefault { private static final long serialVersionUID = 1L; - @RestMethod(name="GET", path="/*") + @RestMethod(name=GET, path="/*") public ObjectMap test1(RestRequest req) throws Exception { return getPathInfoObject(req).append("testMethod", "root.test1"); } - @RestMethod(name="GET", path="/test2/*") + @RestMethod(name=GET, path="/test2/*") public ObjectMap test2(RestRequest req) throws Exception { return getPathInfoObject(req).append("testMethod", "root.test2"); } - @RestMethod(name="GET", path="/test3%2Ftest3/*") + @RestMethod(name=GET, path="/test3%2Ftest3/*") public ObjectMap test3(RestRequest req) throws Exception { return getPathInfoObject(req).append("testMethod", "root.test3"); } - @RestMethod(name="GET", path="/test4/test4/*") + @RestMethod(name=GET, path="/test4/test4/*") public ObjectMap test4(RestRequest req) throws Exception { return getPathInfoObject(req).append("testMethod", "root.test4"); } @@ -54,22 +56,22 @@ public class UrisResource extends RestServletDefault { public static class Child extends RestServletDefault { private static final long serialVersionUID = 1L; - @RestMethod(name="GET", path="/*") + @RestMethod(name=GET, path="/*") public ObjectMap test1(RestRequest req) throws Exception { return getPathInfoObject(req).append("testMethod", "child.test1"); } - @RestMethod(name="GET", path="/test2/*") + @RestMethod(name=GET, path="/test2/*") public ObjectMap test2(RestRequest req) throws Exception { return getPathInfoObject(req).append("testMethod", "child.test2"); } - @RestMethod(name="GET", path="/test3%2Ftest3/*") + @RestMethod(name=GET, path="/test3%2Ftest3/*") public ObjectMap test3(RestRequest req) throws Exception { return getPathInfoObject(req).append("testMethod", "child.test3"); } - @RestMethod(name="GET", path="/test4/test4/*") + @RestMethod(name=GET, path="/test4/test4/*") public ObjectMap test4(RestRequest req) throws Exception { return getPathInfoObject(req).append("testMethod", "child.test4"); } @@ -81,22 +83,22 @@ public class UrisResource extends RestServletDefault { public static class GrandChild extends RestServletDefault { private static final long serialVersionUID = 1L; - @RestMethod(name="GET", path="/*") + @RestMethod(name=GET, path="/*") public ObjectMap test1(RestRequest req) throws Exception { return getPathInfoObject(req).append("testMethod", "grandchild.test1"); } - @RestMethod(name="GET", path="/test2/*") + @RestMethod(name=GET, path="/test2/*") public ObjectMap test2(RestRequest req) throws Exception { return getPathInfoObject(req).append("testMethod", "grandchild.test2"); } - @RestMethod(name="GET", path="/test3%2Ftest3/*") + @RestMethod(name=GET, path="/test3%2Ftest3/*") public ObjectMap test3(RestRequest req) throws Exception { return getPathInfoObject(req).append("testMethod", "grandchild.test3"); } - @RestMethod(name="GET", path="/test4/test4/*") + @RestMethod(name=GET, path="/test4/test4/*") public ObjectMap test4(RestRequest req) throws Exception { return getPathInfoObject(req).append("testMethod", "grandchild.test4"); } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/39cecfc7/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/UrlContentResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/UrlContentResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/UrlContentResource.java index 3719c49..3cdc924 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/UrlContentResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/UrlContentResource.java @@ -12,6 +12,8 @@ // *************************************************************************************************************************** package org.apache.juneau.rest.test; +import static org.apache.juneau.http.HttpMethodName.*; + import org.apache.juneau.json.*; import org.apache.juneau.plaintext.*; import org.apache.juneau.rest.*; @@ -28,12 +30,12 @@ import org.apache.juneau.rest.annotation.*; public class UrlContentResource extends RestServlet { private static final long serialVersionUID = 1L; - @RestMethod(name="GET", path="/testString") + @RestMethod(name=GET, path="/testString") public String testString(@Body String content) { return String.format("class=%s, value=%s", content.getClass().getName(), content.toString()); } - @RestMethod(name="GET", path="/testEnum") + @RestMethod(name=GET, path="/testEnum") public String testEnum(@Body TestEnum content) { return String.format("class=%s, value=%s", content.getClass().getName(), content.toString()); } @@ -42,7 +44,7 @@ public class UrlContentResource extends RestServlet { X1 } - @RestMethod(name="GET", path="/testBean") + @RestMethod(name=GET, path="/testBean") public String testBean(@Body TestBean content) throws Exception { return String.format("class=%s, value=%s", content.getClass().getName(), JsonSerializer.DEFAULT_LAX.serialize(content)); } @@ -52,7 +54,7 @@ public class UrlContentResource extends RestServlet { public String f2; } - @RestMethod(name="GET", path="/testInt") + @RestMethod(name=GET, path="/testInt") public String testString(@Body Integer content) { return String.format("class=%s, value=%s", content.getClass().getName(), content.toString()); } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/39cecfc7/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/ContentTest.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/ContentTest.java b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/ContentTest.java index 1db53ad..f6b43b3 100644 --- a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/ContentTest.java +++ b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/ContentTest.java @@ -33,7 +33,7 @@ public class ContentTest extends RestTestcase { RestClient c = TestMicroservice.client().accept("text/json+simple").build(); String r; - // @RestMethod(name="POST", path="/boolean") + // @RestMethod(name=POST, path="/boolean") // public boolean testBool(@Body boolean b) { // return b; // } @@ -51,7 +51,7 @@ public class ContentTest extends RestTestcase { } - // @RestMethod(name="POST", path="/Boolean") + // @RestMethod(name=POST, path="/Boolean") // public Boolean testBoolean(@Body Boolean b) { // return b; // } @@ -68,7 +68,7 @@ public class ContentTest extends RestTestcase { assertEquals(400, e.getResponseCode()); } - // @RestMethod(name="POST", path="/int") + // @RestMethod(name=POST, path="/int") // public int testInt(@Body int i) { // return i; // } @@ -83,7 +83,7 @@ public class ContentTest extends RestTestcase { assertEquals(400, e.getResponseCode()); } - // @RestMethod(name="POST", path="/Integer") + // @RestMethod(name=POST, path="/Integer") // public Integer testInteger(@Body Integer i) { // return i; // } @@ -98,7 +98,7 @@ public class ContentTest extends RestTestcase { assertEquals(400, e.getResponseCode()); } - // @RestMethod(name="POST", path="/float") + // @RestMethod(name=POST, path="/float") // public float testFloat(@Body float f) { // return f; // } @@ -113,7 +113,7 @@ public class ContentTest extends RestTestcase { assertEquals(400, e.getResponseCode()); } - // @RestMethod(name="POST", path="/Float") + // @RestMethod(name=POST, path="/Float") // public Float testFloat2(@Body Float f) { // return f; // } @@ -128,7 +128,7 @@ public class ContentTest extends RestTestcase { assertEquals(400, e.getResponseCode()); } - // @RestMethod(name="POST", path="/Map") + // @RestMethod(name=POST, path="/Map") // public TreeMap<String,String> testMap(@Body TreeMap<String,String> m) { // return m; // } @@ -143,7 +143,7 @@ public class ContentTest extends RestTestcase { assertEquals(400, e.getResponseCode()); } - // @RestMethod(name="POST", path="/B") + // @RestMethod(name=POST, path="/B") // public DTO2s.B testPojo1(@Body DTO2s.B b) { // return b; // } @@ -151,7 +151,7 @@ public class ContentTest extends RestTestcase { r = c.doPost(URL + "/B?body=" + UonSerializer.DEFAULT.serialize(b), null).getResponseAsString(); assertEquals("{f01:['a','b'],f02:['c','d'],f03:[1,2],f04:[3,4],f05:[['e','f'],['g','h']],f06:[['i','j'],['k','l']],f07:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}],f08:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}],f09:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f10:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f11:['a','b'],f12:['c','d'],f13:[1,2],f14:[3,4],f15:[['e','f'],['g','h']],f16:[['i','j'],['k','l']],f17:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}],f18:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}],f19:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f20:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]]}", r); - // @RestMethod(name="POST", path="/C") + // @RestMethod(name=POST, path="/C") // public DTO2s.C testPojo2(@Body DTO2s.C c) { // return c; // } @@ -170,7 +170,7 @@ public class ContentTest extends RestTestcase { RestClient c = TestMicroservice.client().accept("text/json+simple").build(); String r; - // @RestMethod(name="POST", path="/boolean") + // @RestMethod(name=POST, path="/boolean") // public boolean testBool(@Body boolean b) { // return b; // } @@ -192,7 +192,7 @@ public class ContentTest extends RestTestcase { } - // @RestMethod(name="POST", path="/Boolean") + // @RestMethod(name=POST, path="/Boolean") // public Boolean testBoolean(@Body Boolean b) { // return b; // } @@ -209,7 +209,7 @@ public class ContentTest extends RestTestcase { assertEquals(400, e.getResponseCode()); } - // @RestMethod(name="POST", path="/int") + // @RestMethod(name=POST, path="/int") // public int testInt(@Body int i) { // return i; // } @@ -228,7 +228,7 @@ public class ContentTest extends RestTestcase { assertEquals(400, e.getResponseCode()); } - // @RestMethod(name="POST", path="/Integer") + // @RestMethod(name=POST, path="/Integer") // public Integer testInteger(@Body Integer i) { // return i; // } @@ -243,7 +243,7 @@ public class ContentTest extends RestTestcase { assertEquals(400, e.getResponseCode()); } - // @RestMethod(name="POST", path="/float") + // @RestMethod(name=POST, path="/float") // public float testFloat(@Body float f) { // return f; // } @@ -262,7 +262,7 @@ public class ContentTest extends RestTestcase { assertEquals(400, e.getResponseCode()); } - // @RestMethod(name="POST", path="/Float") + // @RestMethod(name=POST, path="/Float") // public Float testFloat2(@Body Float f) { // return f; // } @@ -277,7 +277,7 @@ public class ContentTest extends RestTestcase { assertEquals(400, e.getResponseCode()); } - // @RestMethod(name="POST", path="/Map") + // @RestMethod(name=POST, path="/Map") // public TreeMap<String,String> testMap(@Body TreeMap<String,String> m) { // return m; // } @@ -292,7 +292,7 @@ public class ContentTest extends RestTestcase { assertEquals(400, e.getResponseCode()); } - // @RestMethod(name="POST", path="/B") + // @RestMethod(name=POST, path="/B") // public DTO2s.B testPojo1(@Body DTO2s.B b) { // return b; // } @@ -300,7 +300,7 @@ public class ContentTest extends RestTestcase { r = c.doPost(URL + "/B?body=" + urlEncode(JsonSerializer.DEFAULT_LAX.serialize(b)) + "&Content-Type=text/json", null).getResponseAsString(); assertEquals("{f01:['a','b'],f02:['c','d'],f03:[1,2],f04:[3,4],f05:[['e','f'],['g','h']],f06:[['i','j'],['k','l']],f07:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}],f08:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}],f09:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f10:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f11:['a','b'],f12:['c','d'],f13:[1,2],f14:[3,4],f15:[['e','f'],['g','h']],f16:[['i','j'],['k','l']],f17:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}],f18:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}],f19:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f20:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]]}", r); - // @RestMethod(name="POST", path="/C") + // @RestMethod(name=POST, path="/C") // public DTO2s.C testPojo2(@Body DTO2s.C c) { // return c; // } @@ -319,7 +319,7 @@ public class ContentTest extends RestTestcase { RestClient c = TestMicroservice.client().accept("text/json+simple").contentType("text/uon").serializer(PlainTextSerializer.class).build(); String r; - // @RestMethod(name="POST", path="/boolean") + // @RestMethod(name=POST, path="/boolean") // public boolean testBool(@Body boolean b) { // return b; // } @@ -337,7 +337,7 @@ public class ContentTest extends RestTestcase { } - // @RestMethod(name="POST", path="/Boolean") + // @RestMethod(name=POST, path="/Boolean") // public Boolean testBoolean(@Body Boolean b) { // return b; // } @@ -354,7 +354,7 @@ public class ContentTest extends RestTestcase { assertEquals(400, e.getResponseCode()); } - // @RestMethod(name="POST", path="/int") + // @RestMethod(name=POST, path="/int") // public int testInt(@Body int i) { // return i; // } @@ -369,7 +369,7 @@ public class ContentTest extends RestTestcase { assertEquals(400, e.getResponseCode()); } - // @RestMethod(name="POST", path="/Integer") + // @RestMethod(name=POST, path="/Integer") // public Integer testInteger(@Body Integer i) { // return i; // } @@ -384,7 +384,7 @@ public class ContentTest extends RestTestcase { assertEquals(400, e.getResponseCode()); } - // @RestMethod(name="POST", path="/float") + // @RestMethod(name=POST, path="/float") // public float testFloat(@Body float f) { // return f; // } @@ -399,7 +399,7 @@ public class ContentTest extends RestTestcase { assertEquals(400, e.getResponseCode()); } - // @RestMethod(name="POST", path="/Float") + // @RestMethod(name=POST, path="/Float") // public Float testFloat2(@Body Float f) { // return f; // } @@ -414,7 +414,7 @@ public class ContentTest extends RestTestcase { assertEquals(400, e.getResponseCode()); } - // @RestMethod(name="POST", path="/Map") + // @RestMethod(name=POST, path="/Map") // public TreeMap<String,String> testMap(@Body TreeMap<String,String> m) { // return m; // } @@ -429,7 +429,7 @@ public class ContentTest extends RestTestcase { assertEquals(400, e.getResponseCode()); } - // @RestMethod(name="POST", path="/B") + // @RestMethod(name=POST, path="/B") // public DTO2s.B testPojo1(@Body DTO2s.B b) { // return b; // } @@ -437,7 +437,7 @@ public class ContentTest extends RestTestcase { r = c.doPost(URL + "/B", "" + UonSerializer.DEFAULT.serialize(b)).getResponseAsString(); assertEquals("{f01:['a','b'],f02:['c','d'],f03:[1,2],f04:[3,4],f05:[['e','f'],['g','h']],f06:[['i','j'],['k','l']],f07:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}],f08:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}],f09:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f10:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f11:['a','b'],f12:['c','d'],f13:[1,2],f14:[3,4],f15:[['e','f'],['g','h']],f16:[['i','j'],['k','l']],f17:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}],f18:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}],f19:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f20:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]]}", r); - // @RestMethod(name="POST", path="/C") + // @RestMethod(name=POST, path="/C") // public DTO2s.C testPojo2(@Body DTO2s.C c) { // return c; // } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/39cecfc7/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/ParamsTest.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/ParamsTest.java b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/ParamsTest.java index 3026c07..d655e91 100644 --- a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/ParamsTest.java +++ b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/ParamsTest.java @@ -43,7 +43,7 @@ public class ParamsTest extends RestTestcase { RestCall r; // @Override - // @RestMethod(name="GET",pattern="/") + // @RestMethod(name=GET,pattern="/") // public void doGet(RestRequest req, RestResponse res) { // res.setOutput("No args"); // } @@ -58,7 +58,7 @@ public class ParamsTest extends RestTestcase { checkErrorResponse(debug, e, SC_NOT_FOUND, "Method 'GET' not found on resource with matching pattern on path '/getx'"); } - // @RestMethod(name="GET",pattern="/get1") + // @RestMethod(name=GET,pattern="/get1") // public void doGet1(RestRequest req, RestResponse res) { // res.setOutput("/get1"); // } @@ -73,7 +73,7 @@ public class ParamsTest extends RestTestcase { checkErrorResponse(debug, e, SC_NOT_FOUND, "Method 'GET' not found on resource with matching pattern on path '/get1a'"); } - // @RestMethod(name="GET",pattern="/get1/{foo}") + // @RestMethod(name=GET,pattern="/get1/{foo}") // public void doGet(RestRequest req, RestResponse res, String foo) { // res.setOutput("/get1/" + foo); // } @@ -102,7 +102,7 @@ public class ParamsTest extends RestTestcase { checkErrorResponse(debug, e, SC_NOT_FOUND, "Method 'GET' not found on resource with matching pattern on path '/get1/foo/bar/baz'"); } - // @RestMethod(name="GET",pattern="/get3/{foo}/{bar}/*") + // @RestMethod(name=GET,pattern="/get3/{foo}/{bar}/*") // public void doGet3(RestRequest req, RestResponse res, String foo, int bar) { // res.setOutput("/get3/"+foo+"/"+bar+", remainder="+req.getRemainder()); // } @@ -135,7 +135,7 @@ public class ParamsTest extends RestTestcase { assertEquals("POST remainder=foo", r.getResponse(String.class)); // // Bunch of different argument types - // @RestMethod(name="POST",pattern="/person/{person}") + // @RestMethod(name=POST,pattern="/person/{person}") // public void doPost(RestRequest req, RestResponse res, Person p) { // res.setOutput("POST, /person, name="+p.name+", age="+p.age+" remainder="+req.getRemainder()); // } @@ -147,7 +147,7 @@ public class ParamsTest extends RestTestcase { assertEquals("POST remainder=person/(name:'John Smith',age:123)/foo", r.getResponse(String.class)); // // Various primitive types - // @RestMethod(name="PUT",pattern="/primitives/{xInt}.{xShort},{xLong}/{xChar}/{xFloat}/{xDouble}/{xByte}/{xBoolean}") + // @RestMethod(name=PUT,pattern="/primitives/{xInt}.{xShort},{xLong}/{xChar}/{xFloat}/{xDouble}/{xByte}/{xBoolean}") // public void doPut1(RestRequest req, RestResponse res, int xInt, short xShort, long xLong, char xChar, float xFloat, double xDouble, byte xByte, boolean xBoolean) { // res.setOutput("PUT, /primitives/"+xInt+"."+xShort+","+xLong+"/"+xChar+"/"+xFloat+"/"+xDouble+"/"+xByte+"/"+xBoolean); // } @@ -155,7 +155,7 @@ public class ParamsTest extends RestTestcase { assertEquals("PUT /primitives/1/2/3/x/4.0/5.0/6/true", r.getResponse(String.class)); // // Various primitive objects - // @RestMethod(name="PUT",pattern="/primitiveObjects/{xInt}/{xShort}/{xLong}/{xChar}/{xFloat}/{xDouble}/{xByte}/{xBoolean}") + // @RestMethod(name=PUT,pattern="/primitiveObjects/{xInt}/{xShort}/{xLong}/{xChar}/{xFloat}/{xDouble}/{xByte}/{xBoolean}") // public void doPut1(RestRequest req, RestResponse res, Integer xInt, Short xShort, Long xLong, Character xChar, Float xFloat, Double xDouble, Byte xByte, Boolean xBoolean) { // res.setOutput("PUT /primitives/"+xInt+"/"+xShort+"/"+xLong+"/"+xChar+"/"+xFloat+"/"+xDouble+"/"+xByte+"/"+xBoolean); // } @@ -163,7 +163,7 @@ public class ParamsTest extends RestTestcase { assertEquals("PUT /primitiveObjects/1/2/3/x/4.0/5.0/6/true", r.getResponse(String.class)); // // Object with forString(String) method - // @RestMethod(name="PUT",pattern="/uuid/{uuid}") + // @RestMethod(name=PUT,pattern="/uuid/{uuid}") // public void doPut1(RestRequest req, RestResponse res, UUID uuid) { // res.setOutput("PUT /uuid/"+uuid); // } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/39cecfc7/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/Redirect.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/Redirect.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/Redirect.java index 98fdb75..71ac859 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/Redirect.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/Redirect.java @@ -29,13 +29,13 @@ import org.apache.juneau.urlencoding.*; * <jc>// Redirect to "/contextPath/servletPath/foobar"</jc> * * <jc>// Using RestRequest and RestResponse</jc> - * <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/example1"</js>) + * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/example1"</js>) * <jk>public void</jk> example1(RestRequest req, RestResponse res) <jk>throws</jk> IOException { * res.sendRedirect(req.getServletURI() + <js>"/foobar"</js>); * } * * <jc>// Using Redirect</jc> - * <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/example2"</js>) + * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/example2"</js>) * <jk>public</jk> Redirect example2() { * <jk>return new</jk> Redirect(<js>"foobar"</js>); * } @@ -44,7 +44,7 @@ import org.apache.juneau.urlencoding.*; * <p> * The constructor can use a {@link MessageFormat}-style pattern with multiple arguments: * <p class='bcode'> - * <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/example3"</js>) + * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/example3"</js>) * <jk>public</jk> Redirect example3() { * <jk>return new</jk> Redirect(<js>"foo/{0}/bar/{1}"</js>, id1, id2); * } @@ -60,7 +60,7 @@ import org.apache.juneau.urlencoding.*; * <p class='bcode'> * <jc>// Simply redirect to the servlet root. * // Equivalent to res.sendRedirect(req.getServletURI()).</jc> - * <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/example4"</js>) + * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/example4"</js>) * <jk>public</jk> Redirect exmaple4() { * <jk>return new</jk> Redirect(); * } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/39cecfc7/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPathMatch.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPathMatch.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPathMatch.java index 2e5c538..639436d 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPathMatch.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPathMatch.java @@ -196,7 +196,7 @@ public class RequestPathMatch extends TreeMap<String,String> { * <h5 class='section'>Example:</h5> * <p class='bcode'> * <jc>// REST method</jc> - * <ja>@RestMethod</ja>(name=<js>"GET"</js>,path=<js>"/foo/{bar}/*"</js>) + * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>,path=<js>"/foo/{bar}/*"</js>) * <jk>public</jk> String doGetById(RequestPathParams pathParams, <jk>int</jk> bar) { * <jk>return</jk> pathParams.getRemainder(); * } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/39cecfc7/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ResponseHandler.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ResponseHandler.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ResponseHandler.java index 710f81c..225904c 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ResponseHandler.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ResponseHandler.java @@ -70,7 +70,7 @@ import org.apache.juneau.rest.response.*; * ) * <jk>public class</jk> Example <jk>extends</jk> RestServlet { * - * <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/"</js>) + * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/"</js>) * <jk>public</jk> Foo test1() { * <jk>return new</jk> Foo(<js>"123"</js>); * } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/39cecfc7/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java index 2d4489c..b8f5e78 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java @@ -698,7 +698,7 @@ public final class RestContext extends Context { * A typical usage pattern involves using variables inside the {@link HtmlDoc} annotation: * <p class='bcode'> * <ja>@RestMethod</ja>( - * name=<js>"GET"</js>, path=<js>"/{name}/*"</js>, + * name=<jsf>GET</jsf>, path=<js>"/{name}/*"</js>, * htmldoc=@HtmlDoc( * links={ * <js>"up: $R{requestParentURI}"</js>, http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/39cecfc7/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConverter.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConverter.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConverter.java index c60972a..3b55120 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConverter.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConverter.java @@ -32,7 +32,7 @@ import org.apache.juneau.serializer.*; * <jk>public class</jk> RequestEchoResource <jk>extends</jk> RestServlet { * * <jc>// GET request handler</jc> - * <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/*"</js>, converters={Queryable.<jk>class</jk>,Traversable.<jk>class</jk>}) + * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>, converters={Queryable.<jk>class</jk>,Traversable.<jk>class</jk>}) * <jk>public</jk> HttpServletRequest doGet(RestRequest req) { * res.setTitle(<js>"Contents of HttpServletRequest object"</js>); * <jk>return</jk> req; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/39cecfc7/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestGuard.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestGuard.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestGuard.java index 54d5f85..c828cc6 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestGuard.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestGuard.java @@ -49,7 +49,7 @@ import org.apache.juneau.rest.annotation.*; * <jk>public</jk> MyResource <jk>extends</jk> RestServlet { * * <jc>// Delete method with guard that only allows Billy to call it.</jc> - * <ja>@RestMethod</ja>(name=<js>"DELETE"</js>, guards=BillyGuard.<jk>class</jk>) + * <ja>@RestMethod</ja>(name=<jsf>DELETE</jsf>, guards=BillyGuard.<jk>class</jk>) * <jk>public</jk> doDelete(RestRequest req, RestResponse res) <jk>throws</jk> Exception {...} * } * </p> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/39cecfc7/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMatcher.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMatcher.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMatcher.java index 4967193..05752a8 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMatcher.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMatcher.java @@ -36,12 +36,12 @@ import org.apache.juneau.rest.annotation.*; * <p class='bcode'> * <jk>public class</jk> MyResource <jk>extends</jk> RestServlet { * - * <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/foo"</js>, matchers=IsDNT.<jk>class</jk>) + * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foo"</js>, matchers=IsDNT.<jk>class</jk>) * <jk>public</jk> Object doGetWithDNT() { * <jc>// Handle request with Do-Not-Track specified</jc> * } * - * <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/foo"</js>) + * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foo"</js>) * <jk>public</jk> Object doGetWithoutDNT() { * <jc>// Handle request without Do-Not-Track specified</jc> * } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/39cecfc7/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java index 4cb12fc..e70b5e2 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java @@ -44,7 +44,7 @@ import org.apache.juneau.xml.*; * * <h5 class='section'>Example:</h5> * <p class='bcode'> - * <ja>@RestMethod</ja>(name=<js>"GET"</js>) + * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>) * <jk>public void</jk> doGet(RestRequest req, RestResponse res) { * res.setPageTitle(<js>"My title"</js>) * .setOutput(<js>"Simple string response"</js>); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/39cecfc7/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletDefault.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletDefault.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletDefault.java index aa42c82..900d1ad 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletDefault.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletDefault.java @@ -12,6 +12,8 @@ // *************************************************************************************************************************** package org.apache.juneau.rest; +import static org.apache.juneau.http.HttpMethodName.*; + import org.apache.juneau.dto.swagger.*; import org.apache.juneau.html.*; import org.apache.juneau.jso.*; @@ -208,7 +210,7 @@ public abstract class RestServletDefault extends RestServlet { * @param req The HTTP request. * @return A bean containing the contents for the OPTIONS page. */ - @RestMethod(name="OPTIONS", path="/*", + @RestMethod(name=OPTIONS, path="/*", htmldoc=@HtmlDoc( links={ "back: servlet:/", http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/39cecfc7/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletGroupDefault.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletGroupDefault.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletGroupDefault.java index 7376453..5be7201 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletGroupDefault.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletGroupDefault.java @@ -12,6 +12,8 @@ // *************************************************************************************************************************** package org.apache.juneau.rest; +import static org.apache.juneau.http.HttpMethodName.*; + import org.apache.juneau.rest.annotation.*; import org.apache.juneau.rest.labels.*; @@ -35,7 +37,7 @@ public abstract class RestServletGroupDefault extends RestServletDefault { * @param req The HTTP request. * @return The bean containing links to the child resources. */ - @RestMethod(name="GET", path="/", description="Child resources") + @RestMethod(name=GET, path="/", description="Child resources") public ChildResourceDescriptions getChildren(RestRequest req) { return new ChildResourceDescriptions(getContext(), req); } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/39cecfc7/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Body.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Body.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Body.java index 5457265..bee7c8b 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Body.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Body.java @@ -24,7 +24,7 @@ import java.lang.annotation.*; * * <h5 class='section'>Example:</h5> * <p class='bcode'> - * <ja>@RestMethod</ja>(name=<js>"POST"</js>) + * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>) * <jk>public void</jk> doPostPerson(RestRequest req, RestResponse res, <ja>@Body</ja> Person person) { * ... * } @@ -33,7 +33,7 @@ import java.lang.annotation.*; * <p> * This is functionally equivalent to the following code... * <p class='bcode'> - * <ja>@RestMethod</ja>(name=<js>"POST"</js>) + * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>) * <jk>public void</jk> doPostPerson(RestRequest req, RestResponse res) { * Person person = req.getBody().asType(Person.<jk>class</jk>); * ... @@ -44,7 +44,7 @@ import java.lang.annotation.*; * {@link Reader Readers} and {@link InputStream InputStreams} can also be specified as content parameters. * When specified, any registered parsers are bypassed. * <p class='bcode'> - * <ja>@RestMethod</ja>(name=<js>"POST"</js>) + * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>) * <jk>public void</jk> doPostPerson(<ja>@Header</ja>(<js>"Content-Type"</js>) String mediaType, <ja>@Body</ja> InputStream input) { * ... * } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/39cecfc7/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/FormData.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/FormData.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/FormData.java index 84720fc..4f06dba 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/FormData.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/FormData.java @@ -25,7 +25,7 @@ import org.apache.juneau.rest.*; * * <h5 class='section'>Example:</h5> * <p class='bcode'> - * <ja>@RestMethod</ja>(name=<js>"POST"</js>) + * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>) * <jk>public void</jk> doPost(RestRequest req, RestResponse res, * <ja>@FormData</ja>(<js>"p1"</js>) <jk>int</jk> p1, <ja>@FormData</ja>(<js>"p2"</js>) String p2, <ja>@FormData</ja>(<js>"p3"</js>) UUID p3) { * ... @@ -35,7 +35,7 @@ import org.apache.juneau.rest.*; * <p> * This is functionally equivalent to the following code... * <p class='bcode'> - * <ja>@RestMethod</ja>(name=<js>"POST"</js>) + * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>) * <jk>public void</jk> doPost(RestRequest req, RestResponse res) { * <jk>int</jk> p1 = req.getFormData(<jk>int</jk>.<jk>class</jk>, <js>"p1"</js>, 0); * String p2 = req.getFormData(String.<jk>class</jk>, <js>"p2"</js>); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/39cecfc7/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HasFormData.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HasFormData.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HasFormData.java index 76078cc..28ec934 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HasFormData.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HasFormData.java @@ -28,7 +28,7 @@ import org.apache.juneau.rest.*; * * <h5 class='section'>Example:</h5> * <p class='bcode'> - * <ja>@RestMethod</ja>(name=<js>"POST"</js>) + * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>) * <jk>public void</jk> doPost(<ja>@HasFormData</ja>(<js>"p1"</js>) <jk>boolean</jk> p1) { * ... * } @@ -37,7 +37,7 @@ import org.apache.juneau.rest.*; * <p> * This is functionally equivalent to the following code... * <p class='bcode'> - * <ja>@RestMethod</ja>(name=<js>"POST"</js>) + * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>) * <jk>public void</jk> doPost(RestRequest req) { * <jk>boolean</jk> p1 = req.hasFormData(<js>"p1"</js>); * ...
