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/ParamsResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ParamsResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ParamsResource.java index a7055bb..f5a11d7 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ParamsResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ParamsResource.java @@ -13,6 +13,7 @@ package org.apache.juneau.rest.test; import static org.apache.juneau.internal.IOUtils.*; +import static org.apache.juneau.http.HttpMethodName.*; import java.io.*; import java.util.*; @@ -52,27 +53,27 @@ public class ParamsResource extends RestServletDefault { //==================================================================================================== // Basic tests //==================================================================================================== - @RestMethod(name="GET", path="/") + @RestMethod(name=GET, path="/") public void doGet(RestResponse res) { - res.setOutput("GET"); + res.setOutput(GET); } - @RestMethod(name="GET", path="/get1") + @RestMethod(name=GET, path="/get1") public String doGet1() { return "GET /get1"; } - @RestMethod(name="GET", path="/get1/{foo}") + @RestMethod(name=GET, path="/get1/{foo}") public void doGet1a(RestResponse res, String foo) { res.setOutput("GET /get1a " + foo); } - @RestMethod(name="GET", path="/get1/{foo}/{bar}") + @RestMethod(name=GET, path="/get1/{foo}/{bar}") public void doGet1b(RestResponse res, String foo, String bar) { res.setOutput("GET /get1b " + foo + "," + bar); } - @RestMethod(name="GET", path="/get3/{foo}/{bar}/*") + @RestMethod(name=GET, path="/get3/{foo}/{bar}/*") public void doGet3(HttpServletRequest reqx, HttpServletResponse resx, String foo, int bar) { RestRequest req = (RestRequest)reqx; RestResponse res = (RestResponse)resx; @@ -86,31 +87,31 @@ public class ParamsResource extends RestServletDefault { } // Default POST - @RestMethod(name="POST") + @RestMethod(name=POST) public void doPost(RestRequest req, RestResponse res) { res.setOutput("POST remainder="+req.getPathMatch().getRemainder()); } // Bean parameter - @RestMethod(name="POST", path="/person/{person}") + @RestMethod(name=POST, path="/person/{person}") public void doPost(RestRequest req, RestResponse res, Person p) { res.setOutput("POST /person/{name="+p.name+",birthDate.year="+p.birthDate.get(Calendar.YEAR)+"} remainder="+req.getPathMatch().getRemainder()); } // Various primitive types - @RestMethod(name="PUT", path="/primitives/{xInt}/{xShort}/{xLong}/{xChar}/{xFloat}/{xDouble}/{xByte}/{xBoolean}") + @RestMethod(name=PUT, path="/primitives/{xInt}/{xShort}/{xLong}/{xChar}/{xFloat}/{xDouble}/{xByte}/{xBoolean}") public void doPut1(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); } // Various primitive objects - @RestMethod(name="PUT", path="/primitiveObjects/{xInt}/{xShort}/{xLong}/{xChar}/{xFloat}/{xDouble}/{xByte}/{xBoolean}") + @RestMethod(name=PUT, path="/primitiveObjects/{xInt}/{xShort}/{xLong}/{xChar}/{xFloat}/{xDouble}/{xByte}/{xBoolean}") public void doPut2(RestResponse res, Integer xInt, Short xShort, Long xLong, Character xChar, Float xFloat, Double xDouble, Byte xByte, Boolean xBoolean) { res.setOutput("PUT /primitiveObjects/"+xInt+"/"+xShort+"/"+xLong+"/"+xChar+"/"+xFloat+"/"+xDouble+"/"+xByte+"/"+xBoolean); } // Object with forString(String) method - @RestMethod(name="PUT", path="/uuid/{uuid}") + @RestMethod(name=PUT, path="/uuid/{uuid}") public void doPut1(RestResponse res, UUID uuid) { res.setOutput("PUT /uuid/"+uuid); } @@ -118,7 +119,7 @@ public class ParamsResource extends RestServletDefault { //==================================================================================================== // @FormData annotation - GET //==================================================================================================== - @RestMethod(name="GET", path="/testParamGet/*") + @RestMethod(name=GET, path="/testParamGet/*") public String testParamGet(RestRequest req, @Query("p1") String p1, @Query("p2") int p2) throws Exception { RequestQuery q = req.getQuery(); return "p1=["+p1+","+req.getQuery().getString("p1")+","+q.get("p1", String.class)+"],p2=["+p2+","+q.getString("p2")+","+q.get("p2", int.class)+"]"; @@ -127,7 +128,7 @@ public class ParamsResource extends RestServletDefault { //==================================================================================================== // @FormData annotation - POST //==================================================================================================== - @RestMethod(name="POST", path="/testParamPost/*") + @RestMethod(name=POST, path="/testParamPost/*") public String testParamPost(RestRequest req, @FormData("p1") String p1, @FormData("p2") int p2) throws Exception { RequestFormData f = req.getFormData(); return "p1=["+p1+","+req.getFormData().getString("p1")+","+f.get("p1", String.class)+"],p2=["+p2+","+req.getFormData().getString("p2")+","+f.get("p2", int.class)+"]"; @@ -136,7 +137,7 @@ public class ParamsResource extends RestServletDefault { //==================================================================================================== // @Query annotation - GET //==================================================================================================== - @RestMethod(name="GET", path="/testQParamGet/*") + @RestMethod(name=GET, path="/testQParamGet/*") public String testQParamGet(RestRequest req, @Query("p1") String p1, @Query("p2") int p2) throws Exception { RequestQuery q = req.getQuery(); return "p1=["+p1+","+req.getQuery().getString("p1")+","+q.get("p1", String.class)+"],p2=["+p2+","+q.getString("p2")+","+q.get("p2", int.class)+"]"; @@ -145,7 +146,7 @@ public class ParamsResource extends RestServletDefault { //==================================================================================================== // @Query annotation - POST //==================================================================================================== - @RestMethod(name="POST", path="/testQParamPost/*") + @RestMethod(name=POST, path="/testQParamPost/*") public String testQParamPost(RestRequest req, @Query("p1") String p1, @Query("p2") int p2) throws Exception { RequestQuery q = req.getQuery(); return "p1=["+p1+","+req.getQuery().getString("p1")+","+q.get("p1", String.class)+"],p2=["+p2+","+q.getString("p2")+","+q.get("p2", int.class)+"]"; @@ -154,7 +155,7 @@ public class ParamsResource extends RestServletDefault { //==================================================================================================== // @FormData(format=PLAIN) annotation - GET //==================================================================================================== - @RestMethod(name="GET", path="/testPlainParamGet/*") + @RestMethod(name=GET, path="/testPlainParamGet/*") public String testPlainParamGet(RestRequest req, @Query(value="p1",format="PLAIN") String p1) throws Exception { RequestQuery q = req.getQuery(); return "p1=["+p1+","+req.getQuery().getString("p1")+","+q.get("p1", String.class)+"]"; @@ -163,7 +164,7 @@ public class ParamsResource extends RestServletDefault { //==================================================================================================== // @FormData(format=PLAIN) annotation - POST //==================================================================================================== - @RestMethod(name="POST", path="/testPlainParamPost/*") + @RestMethod(name=POST, path="/testPlainParamPost/*") public String testPlainParamPost(RestRequest req, @FormData(value="p1",format="PLAIN") String p1) throws Exception { RequestFormData f = req.getFormData(); return "p1=["+p1+","+req.getFormData().getString("p1")+","+f.get("p1", String.class)+"]"; @@ -172,7 +173,7 @@ public class ParamsResource extends RestServletDefault { //==================================================================================================== // @Query(format=PLAIN) annotation - GET //==================================================================================================== - @RestMethod(name="GET", path="/testPlainQParamGet/*") + @RestMethod(name=GET, path="/testPlainQParamGet/*") public String testPlainQParamGet(RestRequest req, @Query(value="p1",format="PLAIN") String p1) throws Exception { RequestQuery q = req.getQuery(); return "p1=["+p1+","+req.getQuery().getString("p1")+","+q.get("p1", String.class)+"]"; @@ -181,7 +182,7 @@ public class ParamsResource extends RestServletDefault { //==================================================================================================== // @Query(format=PLAIN) annotation - POST //==================================================================================================== - @RestMethod(name="POST", path="/testPlainQParamPost/*") + @RestMethod(name=POST, path="/testPlainQParamPost/*") public String testPlainQParamPost(RestRequest req, @Query(value="p1",format="PLAIN") String p1) throws Exception { RequestQuery q = req.getQuery(); return "p1=["+p1+","+req.getQuery().getString("p1")+","+q.get("p1", String.class)+"]"; @@ -190,7 +191,7 @@ public class ParamsResource extends RestServletDefault { //==================================================================================================== // @HasQuery annotation - GET //==================================================================================================== - @RestMethod(name="GET", path="/testHasParamGet/*") + @RestMethod(name=GET, path="/testHasParamGet/*") public String testHasParamGet(RestRequest req, @HasQuery("p1") boolean p1, @HasQuery("p2") Boolean p2) throws Exception { RequestQuery q = req.getQuery(); return "p1=["+p1+","+q.containsKey("p1")+"],p2=["+p2+","+q.containsKey("p2")+"]"; @@ -199,7 +200,7 @@ public class ParamsResource extends RestServletDefault { //==================================================================================================== // @HasQuery annotation - POST //==================================================================================================== - @RestMethod(name="POST", path="/testHasParamPost/*") + @RestMethod(name=POST, path="/testHasParamPost/*") public String testHasParamPost(RestRequest req, @HasFormData("p1") boolean p1, @HasFormData("p2") Boolean p2) throws Exception { RequestFormData f = req.getFormData(); return "p1=["+p1+","+f.containsKey("p1")+"],p2=["+p2+","+f.containsKey("p2")+"]"; @@ -208,7 +209,7 @@ public class ParamsResource extends RestServletDefault { //==================================================================================================== // @HasQuery annotation - GET //==================================================================================================== - @RestMethod(name="GET", path="/testHasQParamGet/*") + @RestMethod(name=GET, path="/testHasQParamGet/*") public String testHasQParamGet(RestRequest req, @HasQuery("p1") boolean p1, @HasQuery("p2") Boolean p2) throws Exception { RequestQuery q = req.getQuery(); return "p1=["+p1+","+q.containsKey("p1")+"],p2=["+p2+","+q.containsKey("p2")+"]"; @@ -217,7 +218,7 @@ public class ParamsResource extends RestServletDefault { //==================================================================================================== // @HasQuery annotation - POST //==================================================================================================== - @RestMethod(name="POST", path="/testHasQParamPost/*") + @RestMethod(name=POST, path="/testHasQParamPost/*") public String testHasQParamPost_post(RestRequest req, @HasQuery("p1") boolean p1, @HasQuery("p2") Boolean p2) throws Exception { RequestQuery q = req.getQuery(); return "p1=["+p1+","+q.containsKey("p1")+"],p2=["+p2+","+q.containsKey("p2")+"]"; @@ -226,7 +227,7 @@ public class ParamsResource extends RestServletDefault { //==================================================================================================== // Form POSTS with @Body parameter //==================================================================================================== - @RestMethod(name="POST", path="/testFormPostAsContent/*") + @RestMethod(name=POST, path="/testFormPostAsContent/*") public String testFormPostAsContent(@Body Test6Bean bean, @HasQuery("p1") boolean hqp1, @HasQuery("p2") boolean hqp2, @Query("p1") String qp1, @Query("p2") int qp2) throws Exception { @@ -241,7 +242,7 @@ public class ParamsResource extends RestServletDefault { //==================================================================================================== // Test @FormData and @Query annotations when using multi-part parameters (e.g. &key=val1,&key=val2). //==================================================================================================== - @RestMethod(name="GET", path="/testMultiPartParams") + @RestMethod(name=GET, path="/testMultiPartParams") public String testMultiPartParams( @Query(value="p1",multipart=true) String[] p1, @Query(value="p2",multipart=true) int[] p2, @@ -282,7 +283,7 @@ public class ParamsResource extends RestServletDefault { // using URLENC_expandedParams property. // A simple round-trip test to verify that both serializing and parsing works. //==================================================================================================== - @RestMethod(name="POST", path="/testFormPostsWithMultiParamsUsingProperty", + @RestMethod(name=POST, path="/testFormPostsWithMultiParamsUsingProperty", properties={ @Property(name=UrlEncodingContext.URLENC_expandedParams, value="true") } @@ -296,7 +297,7 @@ public class ParamsResource extends RestServletDefault { // using @UrlEncoding(expandedParams=true) annotation. // A simple round-trip test to verify that both serializing and parsing works. //==================================================================================================== - @RestMethod(name="POST", path="/testFormPostsWithMultiParamsUsingAnnotation") + @RestMethod(name=POST, path="/testFormPostsWithMultiParamsUsingAnnotation") public DTO2s.C testFormPostsWithMultiParamsUsingAnnotation(@Body DTO2s.C content) throws Exception { return content; } @@ -305,111 +306,111 @@ public class ParamsResource extends RestServletDefault { // Test other available object types as parameters. //==================================================================================================== - @RestMethod(name="GET", path="/otherObjects/ResourceBundle") + @RestMethod(name=GET, path="/otherObjects/ResourceBundle") public String testOtherResourceBundle(ResourceBundle t) { if (t != null) return t.getString("foo"); return null; } - @RestMethod(name="GET", path="/otherObjects/MessageBundle") + @RestMethod(name=GET, path="/otherObjects/MessageBundle") public String testOtherMessages(MessageBundle t) { if (t != null) return t.getString("foo"); return null; } - @RestMethod(name="POST", path="/otherObjects/InputStream") + @RestMethod(name=POST, path="/otherObjects/InputStream") public String testOtherInputStream(InputStream t) throws IOException { return read(t); } - @RestMethod(name="POST", path="/otherObjects/ServletInputStream") + @RestMethod(name=POST, path="/otherObjects/ServletInputStream") public String testOtherServletInputStream(ServletInputStream t) throws IOException { return read(t); } - @RestMethod(name="POST", path="/otherObjects/Reader") + @RestMethod(name=POST, path="/otherObjects/Reader") public String testOtherReader(Reader t) throws IOException { return read(t); } - @RestMethod(name="GET", path="/otherObjects/OutputStream") + @RestMethod(name=GET, path="/otherObjects/OutputStream") public void testOtherOutputStream(OutputStream t) throws IOException { t.write("OK".getBytes()); } - @RestMethod(name="GET", path="/otherObjects/ServletOutputStream") + @RestMethod(name=GET, path="/otherObjects/ServletOutputStream") public void testOtherServletOutputStream(ServletOutputStream t) throws IOException { t.write("OK".getBytes()); } - @RestMethod(name="GET", path="/otherObjects/Writer") + @RestMethod(name=GET, path="/otherObjects/Writer") public void testOtherWriter(Writer t) throws IOException { t.write("OK"); } - @RestMethod(name="GET", path="/otherObjects/RequestHeaders") + @RestMethod(name=GET, path="/otherObjects/RequestHeaders") public boolean testOtherRequestHeaders(RequestHeaders t) { return t != null; } - @RestMethod(name="GET", path="/otherObjects/RequestQuery") + @RestMethod(name=GET, path="/otherObjects/RequestQuery") public boolean testOtherRequestQueryParams(RequestQuery t) { return t != null; } - @RestMethod(name="GET", path="/otherObjects/RequestFormData") + @RestMethod(name=GET, path="/otherObjects/RequestFormData") public boolean testOtherRequestFormData(RequestFormData t) { return t != null; } - @RestMethod(name="GET", path="/otherObjects/HttpMethod") + @RestMethod(name=GET, path="/otherObjects/HttpMethod") public String testOtherHttpMethod(HttpMethod t) { return t.toString(); } - @RestMethod(name="GET", path="/otherObjects/Logger") + @RestMethod(name=GET, path="/otherObjects/Logger") public boolean testOtherLogger(Logger t) { return t != null; } - @RestMethod(name="GET", path="/otherObjects/JuneauLogger") + @RestMethod(name=GET, path="/otherObjects/JuneauLogger") public boolean testOtherJuneauLogger(JuneauLogger t) { return t != null; } - @RestMethod(name="GET", path="/otherObjects/RestContext") + @RestMethod(name=GET, path="/otherObjects/RestContext") public boolean testOtherRestContext(RestContext t) { return t != null; } - @RestMethod(name="GET", path="/otherObjects/Parser") + @RestMethod(name=GET, path="/otherObjects/Parser") public String testOtherParser(Parser t) { return t.getClass().getName(); } - @RestMethod(name="GET", path="/otherObjects/Locale") + @RestMethod(name=GET, path="/otherObjects/Locale") public String testOtherLocale(Locale t) { return t.toString(); } - @RestMethod(name="GET", path="/otherObjects/Swagger") + @RestMethod(name=GET, path="/otherObjects/Swagger") public boolean testOtherSwagger(Swagger t) { return t != null; } - @RestMethod(name="GET", path="/otherObjects/RequestPathMatch") + @RestMethod(name=GET, path="/otherObjects/RequestPathMatch") public boolean testOtherRequestPathMatch(RequestPathMatch t) { return t != null; } - @RestMethod(name="GET", path="/otherObjects/RequestBody") + @RestMethod(name=GET, path="/otherObjects/RequestBody") public boolean testOtherRequestBody(RequestBody t) { return t != null; } - @RestMethod(name="GET", path="/otherObjects/ConfigFile") + @RestMethod(name=GET, path="/otherObjects/ConfigFile") public boolean testOtherConfigFile(ConfigFile t) { return t != null; }
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/ParsersResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ParsersResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ParsersResource.java index 9cb9d13..a473cc3 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ParsersResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ParsersResource.java @@ -14,6 +14,7 @@ package org.apache.juneau.rest.test; import static org.apache.juneau.internal.IOUtils.*; import static org.apache.juneau.rest.annotation.Inherit.*; +import static org.apache.juneau.http.HttpMethodName.*; import org.apache.juneau.*; import org.apache.juneau.parser.*; @@ -55,7 +56,7 @@ public class ParsersResource extends RestServletDefault { //==================================================================================================== // Parser defined on class. //==================================================================================================== - @RestMethod(name="PUT", path="/testParserOnClass") + @RestMethod(name=PUT, path="/testParserOnClass") public String testParserOnClass(@Body String in) { return in; } @@ -63,7 +64,7 @@ public class ParsersResource extends RestServletDefault { //==================================================================================================== // Parser defined on method. //==================================================================================================== - @RestMethod(name="PUT", path="/testParserOnMethod", parsers=TestParserB.class) + @RestMethod(name=PUT, path="/testParserOnMethod", parsers=TestParserB.class) public String testParserOnMethod(@Body String in) { return in; } @@ -90,7 +91,7 @@ public class ParsersResource extends RestServletDefault { //==================================================================================================== // Parser overridden on method. //==================================================================================================== - @RestMethod(name="PUT", path="/testParserOverriddenOnMethod", parsers={TestParserB.class,TestParserC.class}, parsersInherit=PARSERS) + @RestMethod(name=PUT, path="/testParserOverriddenOnMethod", parsers={TestParserB.class,TestParserC.class}, parsersInherit=PARSERS) public String testParserOverriddenOnMethod(@Body String in) { return in; } @@ -117,7 +118,7 @@ public class ParsersResource extends RestServletDefault { //==================================================================================================== // Parser with different Accept than Content-Type. //==================================================================================================== - @RestMethod(name="PUT", path="/testParserWithDifferentMediaTypes", parsers={TestParserD.class}, parsersInherit=PARSERS) + @RestMethod(name=PUT, path="/testParserWithDifferentMediaTypes", parsers={TestParserD.class}, parsersInherit=PARSERS) public String testParserWithDifferentMediaTypes(@Body String in) { return in; } @@ -144,7 +145,7 @@ public class ParsersResource extends RestServletDefault { //==================================================================================================== // Check for valid error response. //==================================================================================================== - @RestMethod(name="PUT", path="/testValidErrorResponse") + @RestMethod(name=PUT, path="/testValidErrorResponse") public String testValidErrorResponse(@Body String in) { return in; } 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/PathResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PathResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PathResource.java index e1b7f5c..43a54e4 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PathResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PathResource.java @@ -12,6 +12,8 @@ // *************************************************************************************************************************** package org.apache.juneau.rest.test; +import static org.apache.juneau.http.HttpMethodName.*; + import org.apache.juneau.rest.*; import org.apache.juneau.rest.annotation.*; @@ -31,7 +33,7 @@ public class PathResource extends RestServletDefault { //==================================================================================================== // Basic tests //==================================================================================================== - @RestMethod(name="GET", path="/") + @RestMethod(name=GET, path="/") public String doGet() { return getContext().getPath(); } @@ -45,7 +47,7 @@ public class PathResource extends RestServletDefault { public static class TestPath2 extends RestServletDefault { private static final long serialVersionUID = 1L; // Basic tests - @RestMethod(name="GET", path="/") + @RestMethod(name=GET, path="/") public String doGet() { return getContext().getPath(); } @@ -57,7 +59,7 @@ public class PathResource extends RestServletDefault { public static class TestPath3a extends RestServletDefault { private static final long serialVersionUID = 1L; // Basic tests - @RestMethod(name="GET", path="/") + @RestMethod(name=GET, path="/") public String doGet() { return getContext().getPath(); } 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/PathVariablesResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PathVariablesResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PathVariablesResource.java index 1a72297..349bcce 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PathVariablesResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PathVariablesResource.java @@ -12,6 +12,8 @@ // *************************************************************************************************************************** package org.apache.juneau.rest.test; +import static org.apache.juneau.http.HttpMethodName.*; + import org.apache.juneau.rest.*; import org.apache.juneau.rest.annotation.*; import org.apache.juneau.utils.*; @@ -26,22 +28,22 @@ import org.apache.juneau.utils.*; public class PathVariablesResource extends RestServletDefault { private static final long serialVersionUID = 1L; - @RestMethod(name="GET", path="/test1/{x}/foo/{y}/bar/{z}/*") + @RestMethod(name=GET, path="/test1/{x}/foo/{y}/bar/{z}/*") public StringMessage test1(@Path String x, @Path int y, @Path boolean z) { return new StringMessage("x={0},y={1},z={2}", x, y, z); } - @RestMethod(name="GET", path="/test2/{z}/foo/{y}/bar/{x}/*") + @RestMethod(name=GET, path="/test2/{z}/foo/{y}/bar/{x}/*") public StringMessage test2(@Path("x") String x, @Path("y") int y, @Path("z") boolean z) { return new StringMessage("x={0},y={1},z={2}", x, y, z); } - @RestMethod(name="GET", path="/test3/{0}/foo/{1}/bar/{2}/*") + @RestMethod(name=GET, path="/test3/{0}/foo/{1}/bar/{2}/*") public StringMessage test3(@Path String x, @Path int y, @Path boolean z) { return new StringMessage("x={0},y={1},z={2}", x, y, z); } - @RestMethod(name="GET", path="/test4/{2}/foo/{1}/bar/{0}/*") + @RestMethod(name=GET, path="/test4/{2}/foo/{1}/bar/{0}/*") public StringMessage test4(@Path String x, @Path int y, @Path boolean z) { return new StringMessage("x={0},y={1},z={2}", x, y, z); } 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/PathsResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PathsResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PathsResource.java index d9de449..8b922b8 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PathsResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PathsResource.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.*; @@ -29,12 +31,12 @@ import org.apache.juneau.rest.annotation.*; public class PathsResource extends RestServletDefault { private static final long serialVersionUID = 1L; - @RestMethod(name="GET", path="/*") + @RestMethod(name=GET, path="/*") public ObjectMap doGet1(RestRequest req, @PathRemainder String r) { return getPaths(req).append("pathRemainder2", r).append("method",1); } - @RestMethod(name="GET", path="/test2/*") + @RestMethod(name=GET, path="/test2/*") public ObjectMap doGet2(RestRequest req, @PathRemainder String r) { return getPaths(req).append("pathRemainder2", r).append("method",2); } @@ -44,11 +46,11 @@ public class PathsResource extends RestServletDefault { ) public static class A extends RestServletDefault { private static final long serialVersionUID = 1L; - @RestMethod(name="GET", path="/*") + @RestMethod(name=GET, path="/*") public ObjectMap doGet1(RestRequest req, @PathRemainder String r) { return getPaths(req).append("pathRemainder2", r).append("method",3); } - @RestMethod(name="GET", path="/test2/*") + @RestMethod(name=GET, path="/test2/*") public ObjectMap doGet2(RestRequest req, @PathRemainder String r) { return getPaths(req).append("pathRemainder2", r).append("method",4); } 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/PropertiesResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PropertiesResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PropertiesResource.java index c608a68..889eb63 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PropertiesResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PropertiesResource.java @@ -13,6 +13,7 @@ package org.apache.juneau.rest.test; import static java.lang.String.*; +import static org.apache.juneau.http.HttpMethodName.*; import org.apache.juneau.*; import org.apache.juneau.rest.*; @@ -44,7 +45,7 @@ public class PropertiesResource extends RestServletDefault { //==================================================================================================== // Properties defined on method. //==================================================================================================== - @RestMethod(name="GET", path="/testPropertiesDefinedOnMethod", + @RestMethod(name=GET, path="/testPropertiesDefinedOnMethod", properties={ @Property(name="B1",value="b1"), @Property(name="B2",value="b2") @@ -81,7 +82,7 @@ public class PropertiesResource extends RestServletDefault { //==================================================================================================== // Make sure attributes/parameters/headers are available through ctx.getProperties(). //==================================================================================================== - @RestMethod(name="GET", path="/testProperties/{A}", serializers=PropertySerializer2.class) + @RestMethod(name=GET, path="/testProperties/{A}", serializers=PropertySerializer2.class) public void testProperties(RestResponse res) { res.setOutput(null); } 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/QueryResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/QueryResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/QueryResource.java index db470ac..001f67a 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/QueryResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/QueryResource.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.*; @@ -29,7 +31,7 @@ public class QueryResource extends RestServletDefault { // Default values. //==================================================================================================== - @RestMethod(name="GET", path="/defaultQuery", defaultQuery={"f1:1","f2=2"," f3 : 3 "}) + @RestMethod(name=GET, path="/defaultQuery", defaultQuery={"f1:1","f2=2"," f3 : 3 "}) public ObjectMap defaultQuery(RequestQuery query) { return new ObjectMap() .append("f1", query.getString("f1")) @@ -37,7 +39,7 @@ public class QueryResource extends RestServletDefault { .append("f3", query.getString("f3")); } - @RestMethod(name="GET", path="/annotatedQuery") + @RestMethod(name=GET, path="/annotatedQuery") public ObjectMap annotatedQuery(@Query("f1") String f1, @Query("f2") String f2, @Query("f3") String f3) { return new ObjectMap() .append("f1", f1) @@ -45,7 +47,7 @@ public class QueryResource extends RestServletDefault { .append("f3", f3); } - @RestMethod(name="GET", path="/annotatedQueryDefault") + @RestMethod(name=GET, path="/annotatedQueryDefault") public ObjectMap annotatedQueryDefault(@Query(value="f1",def="1") String f1, @Query(value="f2",def="2") String f2, @Query(value="f3",def="3") String f3) { return new ObjectMap() .append("f1", f1) @@ -53,7 +55,7 @@ public class QueryResource extends RestServletDefault { .append("f3", f3); } - @RestMethod(name="GET", path="/annotatedAndDefaultQuery", defaultQuery={"f1:1","f2=2"," f3 : 3 "}) + @RestMethod(name=GET, path="/annotatedAndDefaultQuery", defaultQuery={"f1:1","f2=2"," f3 : 3 "}) public ObjectMap annotatedAndDefaultQuery(@Query(value="f1",def="4") String f1, @Query(value="f2",def="5") String f2, @Query(value="f3",def="6") String f3) { return new ObjectMap() .append("f1", f1) 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/RequestBeanProxyResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RequestBeanProxyResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RequestBeanProxyResource.java index eed0679..da3b956 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RequestBeanProxyResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RequestBeanProxyResource.java @@ -12,6 +12,7 @@ // *************************************************************************************************************************** package org.apache.juneau.rest.test; +import static org.apache.juneau.http.HttpMethodName.*; import java.io.*; @@ -28,22 +29,22 @@ import org.apache.juneau.rest.annotation.*; @SuppressWarnings("serial") public class RequestBeanProxyResource extends ResourceJena { - @RestMethod(name="GET", path="/echoQuery") + @RestMethod(name=GET, path="/echoQuery") public Reader echoQuery(RestRequest req) throws Exception { return new StringReader(req.getQuery().toString(true)); } - @RestMethod(name="POST", path="/echoFormData") + @RestMethod(name=POST, path="/echoFormData") public Reader echoFormData(RestRequest req) throws Exception { return new StringReader(req.getFormData().toString(true)); } - @RestMethod(name="GET", path="/echoHeaders") + @RestMethod(name=GET, path="/echoHeaders") public Reader echoHeaders(RestRequest req) throws Exception { return new StringReader(req.getHeaders().subset("a,b,c,d,e,f,g,h,i,a1,a2,a3,a4,b1,b2,b3,b4,c1,c2,c3,c4").toString(true)); } - @RestMethod(name="GET", path="/echoPath/*") + @RestMethod(name=GET, path="/echoPath/*") public Reader echoPath(RestRequest req) throws Exception { return new StringReader(req.getPathMatch().getRemainder()); } 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/RestClient2Resource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RestClient2Resource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RestClient2Resource.java index 5aa04b9..6c3c8fe 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RestClient2Resource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RestClient2Resource.java @@ -12,6 +12,8 @@ // *************************************************************************************************************************** package org.apache.juneau.rest.test; +import static org.apache.juneau.http.HttpMethodName.*; + import java.io.*; import org.apache.juneau.rest.*; @@ -29,7 +31,7 @@ public class RestClient2Resource extends RestServletDefault { //==================================================================================================== // Echo response //==================================================================================================== - @RestMethod(name="POST", path="/") + @RestMethod(name=POST, path="/") public Reader test1(RestRequest req) throws Exception { return new StringReader(req.getBody().asString()); } 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/RestHooksInitResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RestHooksInitResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RestHooksInitResource.java index 4a85c2c..f71f05d 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RestHooksInitResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RestHooksInitResource.java @@ -13,6 +13,7 @@ package org.apache.juneau.rest.test; import static org.apache.juneau.rest.annotation.HookEvent.*; +import static org.apache.juneau.http.HttpMethodName.*; import java.util.*; @@ -104,17 +105,17 @@ public class RestHooksInitResource extends RestServletDefault { postInitChildFirst.add("super-2a"); } - @RestMethod(name="GET", path="/init") + @RestMethod(name=GET, path="/init") public List<String> getInitEvents() { return init; } - @RestMethod(name="GET", path="/postInit") + @RestMethod(name=GET, path="/postInit") public List<String> getPostInitEvents() { return postInit; } - @RestMethod(name="GET", path="/postInitChildFirst") + @RestMethod(name=GET, path="/postInitChildFirst") public List<String> getPostInitChildFirstEvents() { return postInitChildFirst; } @@ -211,12 +212,12 @@ public class RestHooksInitResource extends RestServletDefault { postInitChildFirstOrderTest = "PARENT"; } - @RestMethod(name="GET", path="/postInitOrder") + @RestMethod(name=GET, path="/postInitOrder") public String postInitOrderTest() { return postInitOrderTest; } - @RestMethod(name="GET", path="/postInitChildFirstOrder") + @RestMethod(name=GET, path="/postInitChildFirstOrder") public String postInitChildFirstOrderTest() { return postInitChildFirstOrderTest; } 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/Root.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/Root.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/Root.java index 6a20171..43c1181 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/Root.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/Root.java @@ -12,6 +12,8 @@ // *************************************************************************************************************************** package org.apache.juneau.rest.test; +import static org.apache.juneau.http.HttpMethodName.*; + import org.apache.juneau.microservice.resources.*; import org.apache.juneau.rest.*; import org.apache.juneau.rest.annotation.*; @@ -79,7 +81,7 @@ import org.apache.juneau.rest.labels.*; public class Root extends RestServletDefault { private static final long serialVersionUID = 1L; - @RestMethod(name="GET", path="/") + @RestMethod(name=GET, path="/") public ChildResourceDescriptions doGet(RestRequest req) { return new ChildResourceDescriptions(getContext(), req); } 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/SerializersResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/SerializersResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/SerializersResource.java index 21b1f37..d9b89c9 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/SerializersResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/SerializersResource.java @@ -13,6 +13,7 @@ package org.apache.juneau.rest.test; import static org.apache.juneau.rest.annotation.Inherit.*; +import static org.apache.juneau.http.HttpMethodName.*; import org.apache.juneau.*; import org.apache.juneau.rest.*; @@ -68,7 +69,7 @@ public class SerializersResource extends RestServletDefault { //==================================================================================================== // Serializer defined on class. //==================================================================================================== - @RestMethod(name="GET", path="/testSerializerOnClass") + @RestMethod(name=GET, path="/testSerializerOnClass") public String testSerializerOnClass() { return "test1"; } @@ -76,7 +77,7 @@ public class SerializersResource extends RestServletDefault { //==================================================================================================== // Serializer defined on method. //==================================================================================================== - @RestMethod(name="GET", path="/testSerializerOnMethod", serializers=TestSerializerB.class) + @RestMethod(name=GET, path="/testSerializerOnMethod", serializers=TestSerializerB.class) public String testSerializerOnMethod() { return "test2"; } @@ -84,7 +85,7 @@ public class SerializersResource extends RestServletDefault { //==================================================================================================== // Serializer overridden on method. //==================================================================================================== - @RestMethod(name="GET", path="/testSerializerOverriddenOnMethod", serializers={TestSerializerB.class,TestSerializerC.class}, serializersInherit=SERIALIZERS) + @RestMethod(name=GET, path="/testSerializerOverriddenOnMethod", serializers={TestSerializerB.class,TestSerializerC.class}, serializersInherit=SERIALIZERS) public String testSerializerOverriddenOnMethod() { return "test3"; } @@ -110,7 +111,7 @@ public class SerializersResource extends RestServletDefault { //==================================================================================================== // Serializer with different Accept than Content-Type. //==================================================================================================== - @RestMethod(name="GET", path="/testSerializerWithDifferentMediaTypes", serializers={TestSerializerD.class}, serializersInherit=SERIALIZERS) + @RestMethod(name=GET, path="/testSerializerWithDifferentMediaTypes", serializers={TestSerializerD.class}, serializersInherit=SERIALIZERS) public String testSerializerWithDifferentMediaTypes() { return "test4"; } @@ -136,7 +137,7 @@ public class SerializersResource extends RestServletDefault { //==================================================================================================== // Check for valid 406 error response. //==================================================================================================== - @RestMethod(name="GET", path="/test406") + @RestMethod(name=GET, path="/test406") public String test406() { return "test406"; } 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/StaticFilesResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/StaticFilesResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/StaticFilesResource.java index ba9d895..c6c2c10 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/StaticFilesResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/StaticFilesResource.java @@ -12,6 +12,8 @@ // *************************************************************************************************************************** package org.apache.juneau.rest.test; +import static org.apache.juneau.http.HttpMethodName.*; + import org.apache.juneau.rest.*; import org.apache.juneau.rest.annotation.*; @@ -28,7 +30,7 @@ public class StaticFilesResource extends RestServlet { //==================================================================================================== // Tests the @RestResource(staticFiles) annotation. //==================================================================================================== - @RestMethod(name="GET", path="/*") + @RestMethod(name=GET, path="/*") public String testXdocs() { return null; }
